Quam Plures

Merge lp:~quam-plures-core/quam-plures/navbar_in_styles into lp:quam-plures

  1. navbar_in_styles
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/navbar_in_styles
Merge into: lp:quam-plures
Diff against target: 275 lines (+43/-101)
7 files modified
a_notemplate.php (+3/-3)
contact.php (+3/-3)
inc/items/views/_item_list_full.view.php (+2/-2)
multiblogs.php (+3/-3)
rsc/css/fp02.css (+27/-85)
summary.php (+3/-3)
templates_adm/chicago/chicago.css (+2/-2)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/navbar_in_styles
Reviewer Review Type Date Requested Status
Tilman Blumenbach (community) merge Approve
Review via email: mp+21609@code.launchpad.net

Description of the change

This is a styles-only change. http://forums.quamplures.net/viewtopic.php?f=9&t=281

NavBar became bloglist, NavButtons went away (was unused), NavButtons2 became buttons. Pretty simple, and gets rid of those files when one searches the app for 'navbar' :)

To post a comment you must log in.
Revision history for this message
Tilman Blumenbach (tblue) :
review: Approve (merge)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'a_notemplate.php'
2--- a_notemplate.php 2010-03-12 16:43:42 +0000
3+++ a_notemplate.php 2010-03-18 03:20:36 +0000
4@@ -128,7 +128,7 @@
5 // display the Public Blog List widget
6 template_widget( array(
7 'widget' => 'bloglist',
8- 'block_start' => '<div class="NavBar">',
9+ 'block_start' => '<div class="bloglist">',
10 'block_end' => '</div>',
11 'block_display_title' => false,
12 'list_start' => '',
13@@ -137,8 +137,8 @@
14 'item_end' => '',
15 'item_selected_start' => '',
16 'item_selected_end' => '',
17- 'link_selected_class' => 'NavButton2',
18- 'link_default_class' => 'NavButton2',
19+ 'link_selected_class' => 'buttons',
20+ 'link_default_class' => 'buttons',
21 ) );
22 ?>
23
24
25=== modified file 'contact.php'
26--- contact.php 2010-02-11 01:13:27 +0000
27+++ contact.php 2010-03-18 03:20:36 +0000
28@@ -78,7 +78,7 @@
29 // display the Public Blog List widget
30 template_widget( array(
31 'widget' => 'bloglist',
32- 'block_start' => '<div class="NavBar">',
33+ 'block_start' => '<div class="bloglist">',
34 'block_end' => '</div>',
35 'block_display_title' => false,
36 'list_start' => '',
37@@ -87,8 +87,8 @@
38 'item_end' => '',
39 'item_selected_start' => '',
40 'item_selected_end' => '',
41- 'link_selected_class' => 'NavButton2',
42- 'link_default_class' => 'NavButton2',
43+ 'link_selected_class' => 'buttons',
44+ 'link_default_class' => 'buttons',
45 ) );
46 ?>
47 <div class="pageTitle">
48
49=== modified file 'inc/items/views/_item_list_full.view.php'
50--- inc/items/views/_item_list_full.view.php 2010-02-19 10:50:37 +0000
51+++ inc/items/views/_item_list_full.view.php 2010-03-18 03:20:36 +0000
52@@ -96,12 +96,12 @@
53
54 // Initialize things in order to be ready for displaying.
55 $display_params = array(
56- 'header_start' => '<div class="NavBar center">',
57+ 'header_start' => '<div class="full_nav center">',
58 'header_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$',
59 'header_text_single' => T_('1 page'),
60 'header_end' => '</div>',
61 'footer_start' => '',
62- 'footer_text' => '<div class="NavBar center"><strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$</div>',
63+ 'footer_text' => '<div class="full_nav center"><strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$</div>',
64 'footer_text_single' => '',
65 'prev_text' => T_('Previous'),
66 'next_text' => T_('Next'),
67
68=== modified file 'multiblogs.php'
69--- multiblogs.php 2010-02-19 10:50:37 +0000
70+++ multiblogs.php 2010-03-18 03:20:36 +0000
71@@ -124,7 +124,7 @@
72 // display the Public Blog List widget
73 template_widget( array(
74 'widget' => 'bloglist',
75- 'block_start' => '<div class="NavBar">',
76+ 'block_start' => '<div class="bloglist">',
77 'block_end' => '</div>',
78 'block_display_title' => false,
79 'list_start' => '',
80@@ -133,8 +133,8 @@
81 'item_end' => '',
82 'item_selected_start' => '',
83 'item_selected_end' => '',
84- 'link_selected_class' => 'NavButton2',
85- 'link_default_class' => 'NavButton2',
86+ 'link_selected_class' => 'buttons',
87+ 'link_default_class' => 'buttons',
88 ) );
89 ?>
90
91
92=== modified file 'rsc/css/fp02.css'
93--- rsc/css/fp02.css 2009-05-18 01:42:38 +0000
94+++ rsc/css/fp02.css 2010-03-18 03:20:36 +0000
95@@ -343,42 +343,12 @@
96 margin: 0px;
97 }
98
99-div.NavBar {
100+div.bloglist {
101 clear: both;
102 height: 2em;
103 }
104
105-a.NavButton {
106- text-decoration: none;
107- background-color: #33AAAA;
108- border: 1px solid #FFFFFF;
109- padding-top: 2px;
110- padding-right: 4px;
111- padding-bottom: 2px;
112- padding-left: 4px;
113- white-space: nowrap;
114- margin-right: 3px;
115- display: block;
116- width: 14ex;
117- float: left;
118-}
119-a.NavButtonCurr {
120- text-decoration: none;
121- background-color: #33CCCC;
122- border: 1px solid #FFFFFF;
123- text-align: left;
124- vertical-align: top;
125- padding-top: 2px;
126- padding-right: 4px;
127- padding-bottom: 2px;
128- padding-left: 4px;
129- white-space: nowrap;
130- margin-right: 3px;
131- display: block;
132- width: 14ex;
133- float: left;
134-}
135-a.NavButton2 {
136+a.buttons {
137 text-decoration: none;
138 background-color: #33BBBB;
139 border: 1px solid #FFFFFF;
140@@ -394,7 +364,7 @@
141 width: 14ex;
142 float: left;
143 }
144-a.NavButton2Curr {
145+a.buttons_curr {
146 text-decoration: none;
147 background-color: #33CCCC;
148 border: 1px solid #FFFFFF;
149@@ -410,58 +380,30 @@
150 width: 14ex;
151 float: left;
152 }
153-
154-a.NavButton:link {
155- color: #FFFFFF;
156-}
157-a.NavButton:visited {
158- color: #FFFFFF;
159-}
160-a.NavButton:active {
161- color: #FFFFFF;
162-}
163-a.NavButton:hover {
164- color: #FFFFFF;
165- background-color: #33CCCC;
166- /* text-decoration: underline; */
167-}
168-a.NavButtonCurr:link {
169- color: #FFFFFF;
170-}
171-a.NavButtonCurr:visited {
172- color: #FFFFFF;
173-}
174-a.NavButtonCurr:active {
175- color: #FFFFFF;
176-}
177-a.NavButtonCurr:hover {
178- color: #338888;
179- /* text-decoration: underline; */
180-}
181-a.NavButton2:link {
182- color: #FFFFFF;
183-}
184-a.NavButton2:visited {
185- color: #FFFFFF;
186-}
187-a.NavButton2:active {
188- color: #FFFFFF;
189-}
190-a.NavButton2:hover {
191- color: #FFFFFF;
192- background-color: #33CCCC;
193- /* text-decoration: underline; */
194-}
195-a.NavButton2Curr:link {
196- color: #FFFFFF;
197-}
198-a.NavButton2Curr:visited {
199- color: #FFFFFF;
200-}
201-a.NavButton2Curr:active {
202- color: #FFFFFF;
203-}
204-a.NavButton2Curr:hover {
205+a.buttons:link {
206+ color: #FFFFFF;
207+}
208+a.buttons:visited {
209+ color: #FFFFFF;
210+}
211+a.buttons:active {
212+ color: #FFFFFF;
213+}
214+a.buttons:hover {
215+ color: #FFFFFF;
216+ background-color: #33CCCC;
217+ /* text-decoration: underline; */
218+}
219+a.buttons_curr:link {
220+ color: #FFFFFF;
221+}
222+a.buttons_curr:visited {
223+ color: #FFFFFF;
224+}
225+a.buttons_curr:active {
226+ color: #FFFFFF;
227+}
228+a.buttons_curr:hover {
229 color: #33AAAA;
230 /* text-decoration: underline; */
231 }
232
233=== modified file 'summary.php'
234--- summary.php 2010-02-19 10:50:37 +0000
235+++ summary.php 2010-03-18 03:20:36 +0000
236@@ -77,7 +77,7 @@
237 // display the Public Blog List widget
238 template_widget( array(
239 'widget' => 'bloglist',
240- 'block_start' => '<div class="NavBar">',
241+ 'block_start' => '<div class="bloglist">',
242 'block_end' => '</div>',
243 'block_display_title' => false,
244 'list_start' => '',
245@@ -86,8 +86,8 @@
246 'item_end' => '',
247 'item_selected_start' => '',
248 'item_selected_end' => '',
249- 'link_selected_class' => 'NavButton2',
250- 'link_default_class' => 'NavButton2',
251+ 'link_selected_class' => 'buttons',
252+ 'link_default_class' => 'buttons',
253 ) );
254 ?>
255
256
257=== modified file 'templates_adm/chicago/chicago.css'
258--- templates_adm/chicago/chicago.css 2010-02-03 02:41:14 +0000
259+++ templates_adm/chicago/chicago.css 2010-03-18 03:20:36 +0000
260@@ -530,13 +530,13 @@
261 padding: 1ex;
262 }
263
264-div.NavBar {
265+div.full_nav {
266 background-color: #F1F6F8;
267 border: 1px solid #becdd6;
268 padding: 1ex;
269 margin: 0 0 1ex 0;
270 }
271-div.NavBar table {
272+div.full_nav table {
273 width: 100%;
274 }
275 div.PostActionsArea,

Subscribers

People subscribed via source and target branches