Skip to content

Commit db0b35b

Browse files
author
dalikim
committed
민주주의가 드러나게 GNB를 다듬습니다
1 parent 0312246 commit db0b35b

File tree

4 files changed

+11
-16
lines changed

4 files changed

+11
-16
lines changed

app/models/post.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class Post < ApplicationRecord
22
CATEGORIES = (
3-
(Solution::DICTIONARY.map { |solution_slug, solution_info| [solution_slug, solution_info[:title]] }) + [ [:data, '공공 데이터·알고리즘'], [:lab, '민주주의 실험'], [:culture, '조직 문화'] ]
3+
(Solution::DICTIONARY.map { |solution_slug, solution_info| [solution_slug, solution_info[:title]] }) + [ [:data, '공공·공익 데이터'], [:lab, '민주주의 '], [:culture, '조직 문화'] ]
44
).to_h
55

66
scope :recent, -> (limit_count = nil){

app/models/solution.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ class Solution
206206
DICTIONARY = {
207207
demos: {
208208
path_text: :solutions_demos_path,
209-
title: '참여 공론장',
209+
title: '이해관계자 숙의 공론장',
210210
subtitle: '일상 곳곳을 민주적으로',
211211
image_path: 'solutions/card-demos.png',
212212
items_name: '툴킷',
@@ -215,7 +215,7 @@ class Solution
215215
},
216216
org: {
217217
path_text: :solutions_org_path,
218-
title: '이슈 커뮤니티',
218+
title: '협력적 커뮤니티',
219219
subtitle: '함께 일하고 함께 노는',
220220
image_path: 'solutions/card-org.png',
221221
items_name: '툴킷',

app/views/application/_header.html.haml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@
55
%span.navbar-toggler-icon
66
#navbarCollapse.collapse.navbar-collapse
77
%ul.navbar-nav.mt-2.ml-lg-auto.d-lg-flex.d-sm-flex
8-
%li.nav-item
9-
%a.nav-link{ href: what_we_do_path }
10-
우리가 하는 일
118
%li.nav-item.dropdown
129
%a.nav-link.dropdown-toggle{ href: '#', id: 'header-navbar-dropdown', role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': 'true', 'aria-expanded': 'false' }
13-
솔루션
10+
민주주의 솔루션
1411
.dropdown-menu{ 'aria-labelledby': 'header-navbar-dropdown' }
1512
- Solution::DICTIONARY.reject{ |key, _| key == :soft }.each do |_, solution_info|
1613
%a.dropdown-item{ href: send(solution_info[:path_text]) }
1714
!= solution_info[:title]
18-
%li.nav-item.dropdown
19-
%a.nav-link.dropdown-toggle{ href: '#', id: 'header-navbar-dropdown', role: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': 'true', 'aria-expanded': 'false' }
20-
플랫폼
21-
.dropdown-menu{ 'aria-labelledby': 'header-navbar-dropdown' }
22-
- Solution::DICTIONARY[:soft][:items].each do |item|
23-
%a.dropdown-item{ href: "#{send(Solution::DICTIONARY[:soft][:path_text])}#anchor-item-#{item[:slug]}" }
24-
!= item[:title]
15+
%li.nav-item
16+
%a.nav-link{ href: send(Solution::DICTIONARY[:soft][:path_text]) }
17+
민주주의 플랫폼
18+
%li.nav-item
19+
%a.nav-link{ href: what_we_do_path } 소식
2520
%li.nav-item
2621
%a.nav-link{ href: new_contact_path } 협업 문의
2722
-# %form.form-inline.mt-2.mt-md-0

app/views/solutions/_show.html.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
.tiles-title-line
5555
.container
5656
.tiles-title.text-keep-all
57-
#{ slug == :soft ? '플랫폼' : '솔루션' }으로 하는 일
57+
#{ slug == :soft ? '플랫폼 소식' : '솔루션 으로 하는 일' }
5858
.container.container-full
5959
.tiles-container
6060
- Post.published.recent.by_category_slug(slug).limit(3).each do |post|
@@ -67,6 +67,6 @@
6767
.tile-container<>
6868
= link_to what_we_do_path(category_slug: slug), class: 'tile tile-more' do
6969
.more-link
70-
하는 일 더 보기
70+
#{ slug == :soft ? '소식 더 보기' : '하는 일 더 보기' }
7171
.more-icon
7272
%i.fas.fa-arrow-right

0 commit comments

Comments
 (0)