Kaynağa Gözat

Merge branch 'dev' of craft-in-america/vue-wp into master

master
Alej 1 yıl önce
ebeveyn
işleme
cb422cbdd4

+ 2
- 2
vue-theme/src/components/navigation/navigation.vue Dosyayı Görüntüle

21
                     li
21
                     li
22
                         router-link(to="/technique") Techniques
22
                         router-link(to="/technique") Techniques
23
             li.f-grow
23
             li.f-grow
24
-                router-link(to="/artist/") Artists
24
+                router-link(to="/artist") Artists
25
                 ul.submenu
25
                 ul.submenu
26
                     li
26
                     li
27
                         router-link(to="/artist/sorted/by-alpha") A - Z
27
                         router-link(to="/artist/sorted/by-alpha") A - Z
28
                     li
28
                     li
29
                         router-link(to="/artist/sorted/by-material") By Material
29
                         router-link(to="/artist/sorted/by-material") By Material
30
             li.f-grow 
30
             li.f-grow 
31
-                router-link(to="/exhibition/") Exhibitions
31
+                router-link(to="/exhibition") Exhibitions
32
                 ul.submenu 
32
                 ul.submenu 
33
                     li
33
                     li
34
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming
34
                         router-link(to="/exhibition/sorted/by-current-and-upcoming") Current/Upcoming

+ 16
- 4
vue-theme/src/components/sidebars/sidebar.vue Dosyayı Görüntüle

69
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
69
                         router-link(:to="`/${type}/sorted/by-episode#${episodeSet}`")
70
                             p {{ episodeSet }}   
70
                             p {{ episodeSet }}   
71
 
71
 
72
+        //- //- if {{type}} has sorted by-type show subtype sets 
73
+        //- .shadow(v-if="includes(type) && layout !== 'single'")
74
+        //-     h3.t-up {{ type }}s type  
75
+        //-     ul.t-up
76
+        //-         li
77
+        //-             template(v-for="subtypeSet in subtypeSets") 
78
+        //-                 router-link(:to="`/${type}/sorted/by-type#${subtypeSet}`")
79
+        //-                     p {{ subtypeSet }}
80
+
72
         //- if {{type}} has sorted by-type show subtype sets 
81
         //- if {{type}} has sorted by-type show subtype sets 
82
+        
83
+        //- .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single' && type === 'artist'")
73
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
84
         .shadow(v-if="shouldShowTypeSort.includes(type) && layout !== 'single'")
74
-            h3.t-up {{ type }}s type  
85
+            h3.t-up Organizations & Institutions   
75
             ul.t-up
86
             ul.t-up
76
                 li
87
                 li
77
                     template(v-for="subtypeSet in subtypeSets") 
88
                     template(v-for="subtypeSet in subtypeSets") 
136
                 'by episode': `${sortTypes.episode}`,   //:3
147
                 'by episode': `${sortTypes.episode}`,   //:3
137
                 'by type': `${sortTypes.subtype}`,      //:4
148
                 'by type': `${sortTypes.subtype}`,      //:4
138
                 'by past': `${sortTypes.past}`,         //:5
149
                 'by past': `${sortTypes.past}`,         //:5
150
+                'Organizations & Institutions': `${sortTypes.subtype}`,      //:6
139
                 // subtype: 'by-type',
151
                 // subtype: 'by-type',
140
             },
152
             },
141
             charaSets: [
153
             charaSets: [
143
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
155
                 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
144
             ],
156
             ],
145
             episodeSets: [
157
             episodeSets: [
146
-                'play', 'miniatures', 'inspiration', 'home', 'jewelry', 'harmony', 'storytellers', 
158
+                'collectors', 'science', 'play', 'miniatures', 'inspiration', 'home', 'jewelry', 'harmony', 'storytellers', 
147
                 'democracy', 'identity', 'quilts', 'visionaries', 'california', 
159
                 'democracy', 'identity', 'quilts', 'visionaries', 'california', 
148
                 'neighbors', 'borders', 'nature', 'teachers', 'music', 
160
                 'neighbors', 'borders', 'nature', 'teachers', 'music', 
149
                 'celebration', 'service', 'industry', 'holiday', 'forge', 
161
                 'celebration', 'service', 'industry', 'holiday', 'forge', 
185
                         Object.keys(this.sortTypes)[0],
197
                         Object.keys(this.sortTypes)[0],
186
                         Object.keys(this.sortTypes)[1],
198
                         Object.keys(this.sortTypes)[1],
187
                         Object.keys(this.sortTypes)[3],
199
                         Object.keys(this.sortTypes)[3],
188
-                        Object.keys(this.sortTypes)[4],
200
+                        Object.keys(this.sortTypes)[6],
189
                         // `by ${this.type} type`,
201
                         // `by ${this.type} type`,
190
                     ]
202
                     ]
191
                     break
203
                     break
203
                     break
215
                     break
204
                 case 'post':
216
                 case 'post':
205
                     opts = [
217
                     opts = [
206
-                        Object.keys(this.sortTypes)[4],
218
+                        // Object.keys(this.sortTypes)[4],
207
                     ]
219
                     ]
208
                     break
220
                     break
209
                 case 'short':
221
                 case 'short':

+ 3
- 2
vue-theme/src/pages/list.vue Dosyayı Görüntüle

7
                 h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }} 
7
                 h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }} 
8
                 h3(v-else) Search results for: {{$route.query.s }} 
8
                 h3(v-else) Search results for: {{$route.query.s }} 
9
                 span(v-if="sortBy")
9
                 span(v-if="sortBy")
10
-                    h3 {{ sortBy.replace(/[-]/g, ' ')}}
11
-                    //- h3 :{{ sortBy.replace(/[b][y]|[-]/g, ' ')}}
10
+                    //- h3 {{ sortBy.replace(/[-]/g, ' ')}}
11
+                    //- h3 {{ sortBy.replace(/[-]type/g, ' Organizations & Institutions ')}}
12
+                    h3 :{{ sortBy.replace(/[b][y]|[-]/g, ' ')}}
12
 
13
 
13
             h3(v-if="!loaded") loading...
14
             h3(v-if="!loaded") loading...
14
             .content(
15
             .content(

Loading…
İptal
Kaydet