Merge lp:~quam-plures-core/quam-plures/rename_evobar into lp:quam-plures
- rename_evobar
- Merge into trunk
Proposed by
EdB
Status: | Merged |
---|---|
Merge reported by: | Yabs |
Merged at revision: | not available |
Proposed branch: | lp:~quam-plures-core/quam-plures/rename_evobar |
Merge into: | lp:quam-plures |
Diff against target: |
566 lines (+61/-61) 30 files modified
inc/_core/__core.init.php (+2/-2) inc/dashboard/dashboard.ctrl.php (+1/-1) inc/plugins/_plugin.class.php (+1/-1) inc/plugins/model/_plugins_admin.class.php (+1/-1) inc/sessions/_sessions.init.php (+2/-2) inc/users/views/_group.form.php (+1/-1) locales/de_DE/LC_MESSAGES/messages.po (+4/-4) locales/de_DE/_global.php (+2/-2) locales/fr_FR/LC_MESSAGES/messages.po (+3/-3) locales/fr_FR/_global.php (+1/-1) locales/messages.pot (+2/-2) locales/ru_RU/LC_MESSAGES/messages.po (+2/-2) locales/ru_RU/_global.php (+2/-2) plugins/test_plugin/_test.plugin.php (+2/-2) rsc/css/basic.css (+6/-6) rsc/js/blog_widgets.js (+2/-2) templates/_toolbar.inc.php (+8/-8) templates/asevo/print.css (+1/-1) templates/basic/css/navbar_superfish.css (+7/-7) templates/basic/print.css (+1/-1) templates/custom/print.css (+1/-1) templates/evocamp/print.css (+1/-1) templates/evopress/print.css (+1/-1) templates/miami_blue/print.css (+1/-1) templates/natural_pink/print.css (+1/-1) templates/nifty_corners/print.css (+1/-1) templates/photoblog/print.css (+1/-1) templates/pixelgreen/print.css (+1/-1) templates/terrafirma/print.css (+1/-1) templates/vastitude/print.css (+1/-1) |
To merge this branch: | bzr merge lp:~quam-plures-core/quam-plures/rename_evobar |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Yabs (community) | Approve | ||
Review via email: mp+20824@code.launchpad.net |
Commit message
Description of the change
Another 'evo' gone - evobar is now navbar. Have fun with it :)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'inc/_core/__core.init.php' |
2 | --- inc/_core/__core.init.php 2010-02-22 15:02:40 +0000 |
3 | +++ inc/_core/__core.init.php 2010-03-06 16:22:19 +0000 |
4 | @@ -126,9 +126,9 @@ |
5 | class _core_Module |
6 | { |
7 | /** |
8 | - * Build teh evobar menu |
9 | + * Build the navbar menu |
10 | */ |
11 | - function build_evobar_menu() |
12 | + function build_navbar_menu() |
13 | { |
14 | /** |
15 | * @var Menu |
16 | |
17 | === modified file 'inc/dashboard/dashboard.ctrl.php' |
18 | --- inc/dashboard/dashboard.ctrl.php 2010-02-19 10:50:37 +0000 |
19 | +++ inc/dashboard/dashboard.ctrl.php 2010-03-06 16:22:19 +0000 |
20 | @@ -296,7 +296,7 @@ |
21 | .'top of this page.'), $app_name ); |
22 | echo '</p>'; |
23 | |
24 | - echo '<p>'.T_('You can come back here at any time by clicking "Manage" in that same evobar.').'</p>'; |
25 | + echo '<p>'.T_('You can come back here at any time by clicking "Manage" in that same navbar.').'</p>'; |
26 | |
27 | $block_item_Widget->disp_template_raw( 'block_end' ); |
28 | } |
29 | |
30 | === modified file 'inc/plugins/_plugin.class.php' |
31 | --- inc/plugins/_plugin.class.php 2010-02-11 01:13:27 +0000 |
32 | +++ inc/plugins/_plugin.class.php 2010-03-06 16:22:19 +0000 |
33 | @@ -669,7 +669,7 @@ |
34 | /** |
35 | * Event handler: Gets invoked in /toolbar.inc.php after the menu structure is built. |
36 | */ |
37 | - function AdminAfterEvobarInit() |
38 | + function AdminAfterNavbarInit() |
39 | { |
40 | } |
41 | |
42 | |
43 | === modified file 'inc/plugins/model/_plugins_admin.class.php' |
44 | --- inc/plugins/model/_plugins_admin.class.php 2010-02-11 01:13:27 +0000 |
45 | +++ inc/plugins/model/_plugins_admin.class.php 2010-03-06 16:22:19 +0000 |
46 | @@ -105,7 +105,7 @@ |
47 | 'AdminDisplayToolbarSidebar' => 'Called when displaying editor toolbars at the top of the sidebar', |
48 | |
49 | 'AdminEndHtmlHead' => 'This gets called at the end of the HTML HEAD section in backoffice templates', |
50 | - 'AdminAfterEvobarInit' => 'This gets called after the Evobar menu has been initialized.', |
51 | + 'AdminAfterNavbarInit' => 'This gets called after the navbar menu has been initialized.', |
52 | 'AdminAfterMenuInit' => 'This gets called after the backoffice menu has been initialized.', |
53 | 'AdminTabAction' => 'This gets called before AdminTabPayload when the Tools tab for the plugin is selected; no output allowed!', |
54 | 'AdminTabPayload' => 'This gets called when the Tools tab for the plugin is selected and content should be displayed.', |
55 | |
56 | === modified file 'inc/sessions/_sessions.init.php' |
57 | --- inc/sessions/_sessions.init.php 2010-02-19 10:50:37 +0000 |
58 | +++ inc/sessions/_sessions.init.php 2010-03-06 16:22:19 +0000 |
59 | @@ -70,9 +70,9 @@ |
60 | class sessions_Module |
61 | { |
62 | /** |
63 | - * Build the evobar menu |
64 | + * Build the navbar menu |
65 | */ |
66 | - function build_evobar_menu() |
67 | + function build_navbar_menu() |
68 | { |
69 | /** |
70 | * @var Menu |
71 | |
72 | === modified file 'inc/users/views/_group.form.php' |
73 | --- inc/users/views/_group.form.php 2010-02-19 10:50:37 +0000 |
74 | +++ inc/users/views/_group.form.php 2010-03-06 16:22:19 +0000 |
75 | @@ -81,7 +81,7 @@ |
76 | $Form->radio( 'edited_grp_perm_admin', $edited_Group->get('perm_admin'), |
77 | array( $perm_none_option, |
78 | array( 'hidden', T_('Hidden (type in admin.php directly)') ), |
79 | - array( 'visible', T_('Visible links to admin in evobar') ) // TODO: this may be obsolete, especially now we have the evobar |
80 | + array( 'visible', T_('Visible links to admin in navbar') ) // TODO: this may be obsolete, especially now we have the navbar |
81 | ), T_('Access to Admin area'), false ); |
82 | } |
83 | else |
84 | |
85 | === modified file 'locales/de_DE/LC_MESSAGES/messages.po' |
86 | --- locales/de_DE/LC_MESSAGES/messages.po 2010-02-18 14:03:17 +0000 |
87 | +++ locales/de_DE/LC_MESSAGES/messages.po 2010-03-06 16:22:19 +0000 |
88 | @@ -5587,8 +5587,8 @@ |
89 | msgstr "Sie können Ihr Blog jederzeit ansehen, indem Sie \"Anschauen\" in der b2evolution-Toolbar oben auf dieser Seite anklicken." |
90 | |
91 | #: ../../../inc/dashboard/dashboard.ctrl.php:294 |
92 | -msgid "You can come back here at any time by clicking \"Manage\" in that same evobar." |
93 | -msgstr "Sie können jederzeit hierher zurückkehren, indem Sie \"Verwalten\" in eben dieser Evobar wählen." |
94 | +msgid "You can come back here at any time by clicking \"Manage\" in that same navbar." |
95 | +msgstr "Sie können jederzeit hierher zurückkehren, indem Sie \"Verwalten\" in eben dieser navbar wählen." |
96 | |
97 | #: ../../../inc/dashboard/dashboard.ctrl.php:313 |
98 | msgid "Manage your blog" |
99 | @@ -11202,8 +11202,8 @@ |
100 | msgstr "Versteckt (admin.php direkt eingeben)" |
101 | |
102 | #: ../../../inc/users/views/_group.form.php:85 |
103 | -msgid "Visible links to admin in evobar" |
104 | -msgstr "Sichtbare Links zum Admin.-Bereich in evobar" |
105 | +msgid "Visible links to admin in navbar" |
106 | +msgstr "Sichtbare Links zum Admin.-Bereich in navbar" |
107 | |
108 | #: ../../../inc/users/views/_group.form.php:86 |
109 | #: ../../../inc/users/views/_group.form.php:90 |
110 | |
111 | === modified file 'locales/de_DE/_global.php' |
112 | --- locales/de_DE/_global.php 2010-01-30 08:02:04 +0000 |
113 | +++ locales/de_DE/_global.php 2010-03-06 16:22:19 +0000 |
114 | @@ -1064,7 +1064,7 @@ |
115 | 'Welcome to your new blog\'s dashboard!' => 'Willkommen zur Übersichtsseite Ihres neuen Blogs!', |
116 | 'Use the links on the right to write a first post or to customize your blog.' => 'Benutzen Sie die Links rechts, um einen ersten Eintrag zu schreiben oder Ihr Blog anzupassen.', |
117 | 'You can see your blog page at any time by clicking "See" in the b2evolution toolbar at the top of this page.' => 'Sie können Ihr Blog jederzeit ansehen, indem Sie "Anschauen" in der b2evolution-Toolbar oben auf dieser Seite anklicken.', |
118 | -'You can come back here at any time by clicking "Manage" in that same evobar.' => 'Sie können jederzeit hierher zurückkehren, indem Sie "Verwalten" in eben dieser Evobar wählen.', |
119 | +'You can come back here at any time by clicking "Manage" in that same navbar.' => 'Sie können jederzeit hierher zurückkehren, indem Sie "Verwalten" in eben dieser navbar wählen.', |
120 | 'Manage your blog' => 'Ihr Blog verwalten', |
121 | 'Write a new post' => 'Einen neuen Eintrag schreiben', |
122 | 'Browse' => 'Durchsuchen', |
123 | @@ -2296,7 +2296,7 @@ |
124 | 'View details' => 'Details ansehen', |
125 | 'Edit/delete all' => 'Alle ändern/löschen', |
126 | 'Hidden (type in admin.php directly)' => 'Versteckt (admin.php direkt eingeben)', |
127 | -'Visible links to admin in evobar' => 'Sichtbare Links zum Admin.-Bereich in evobar', |
128 | +'Visible links to admin in navbar' => 'Sichtbare Links zum Admin.-Bereich in navbar', |
129 | 'Access to Admin area' => 'Zugriff auf Administrationsbereich', |
130 | 'Visible link' => 'Sichtbarer Link', |
131 | 'Blogging permissions' => 'Blogging-Berechtigungen', |
132 | |
133 | === modified file 'locales/fr_FR/LC_MESSAGES/messages.po' |
134 | --- locales/fr_FR/LC_MESSAGES/messages.po 2010-02-18 14:03:17 +0000 |
135 | +++ locales/fr_FR/LC_MESSAGES/messages.po 2010-03-06 16:22:19 +0000 |
136 | @@ -5638,8 +5638,8 @@ |
137 | msgstr "Vous pouvez voir la page de de votre blog à tout moment en cliquant sur \"Voir\" dans la barre d'outils b2evolution en haut de cette page." |
138 | |
139 | #: ../../../inc/dashboard/dashboard.ctrl.php:294 |
140 | -msgid "You can come back here at any time by clicking \"Manage\" in that same evobar." |
141 | -msgstr "Vous pouvez revenir ici à tout moment en cliquanr sur \"Gérer\" dans cette même evobar." |
142 | +msgid "You can come back here at any time by clicking \"Manage\" in that same navbar." |
143 | +msgstr "Vous pouvez revenir ici à tout moment en cliquanr sur \"Gérer\" dans cette même navbar." |
144 | |
145 | # D:\www\b2evo20\blogs\inc\MODEL\collections\_blog.class.php:249 |
146 | #: ../../../inc/dashboard/dashboard.ctrl.php:313 |
147 | @@ -11282,7 +11282,7 @@ |
148 | msgstr "" |
149 | |
150 | #: ../../../inc/users/views/_group.form.php:85 |
151 | -msgid "Visible links to admin in evobar" |
152 | +msgid "Visible links to admin in navbar" |
153 | msgstr "" |
154 | |
155 | #: ../../../inc/users/views/_group.form.php:86 |
156 | |
157 | === modified file 'locales/fr_FR/_global.php' |
158 | --- locales/fr_FR/_global.php 2010-01-02 08:34:34 +0000 |
159 | +++ locales/fr_FR/_global.php 2010-03-06 16:22:19 +0000 |
160 | @@ -1017,7 +1017,7 @@ |
161 | 'Welcome to your new blog\'s dashboard!' => 'Bienvenue sur le tableau de bord de votre nouveau blog!', |
162 | 'Use the links on the right to write a first post or to customize your blog.' => 'Utilisez les liens sur la droite pour rédiger votre premier article ou personnaliser votre blog.', |
163 | 'You can see your blog page at any time by clicking "See" in the b2evolution toolbar at the top of this page.' => 'Vous pouvez voir la page de de votre blog à tout moment en cliquant sur "Voir" dans la barre d\'outils b2evolution en haut de cette page.', |
164 | -'You can come back here at any time by clicking "Manage" in that same evobar.' => 'Vous pouvez revenir ici à tout moment en cliquanr sur "Gérer" dans cette même evobar.', |
165 | +'You can come back here at any time by clicking "Manage" in that same navbar.' => 'Vous pouvez revenir ici à tout moment en cliquanr sur "Gérer" dans cette même navbar.', |
166 | 'Manage your blog' => 'Gérez votre blog', |
167 | 'Write a new post' => 'Rédiger un nouvel article', |
168 | 'Browse' => 'Parcourir', |
169 | |
170 | === modified file 'locales/messages.pot' |
171 | --- locales/messages.pot 2010-02-18 14:03:17 +0000 |
172 | +++ locales/messages.pot 2010-03-06 16:22:19 +0000 |
173 | @@ -5550,7 +5550,7 @@ |
174 | msgstr "" |
175 | |
176 | #: ../../../inc/dashboard/dashboard.ctrl.php:294 |
177 | -msgid "You can come back here at any time by clicking \"Manage\" in that same evobar." |
178 | +msgid "You can come back here at any time by clicking \"Manage\" in that same navbar." |
179 | msgstr "" |
180 | |
181 | #: ../../../inc/dashboard/dashboard.ctrl.php:313 |
182 | @@ -11116,7 +11116,7 @@ |
183 | msgstr "" |
184 | |
185 | #: ../../../inc/users/views/_group.form.php:85 |
186 | -msgid "Visible links to admin in evobar" |
187 | +msgid "Visible links to admin in navbar" |
188 | msgstr "" |
189 | |
190 | #: ../../../inc/users/views/_group.form.php:86 |
191 | |
192 | === modified file 'locales/ru_RU/LC_MESSAGES/messages.po' |
193 | --- locales/ru_RU/LC_MESSAGES/messages.po 2010-02-18 14:03:17 +0000 |
194 | +++ locales/ru_RU/LC_MESSAGES/messages.po 2010-03-06 16:22:19 +0000 |
195 | @@ -5531,7 +5531,7 @@ |
196 | msgstr "Вы можете увидеть �одержимое вашего блога в любое врем� нажав \"Про�мотр\" на панели ин�трументов b2evolution, �верху �той �траницы." |
197 | |
198 | #: ..\..\..\inc\dashboard\dashboard.ctrl.php:294 |
199 | -msgid "You can come back here at any time by clicking \"Manage\" in that same evobar." |
200 | +msgid "You can come back here at any time by clicking \"Manage\" in that same navbar." |
201 | msgstr "Вы можете вернуть�� �юда в любое врем� нажав \"Панель управлени�\" на той же панели �вобар." |
202 | |
203 | #: ..\..\..\inc\dashboard\dashboard.ctrl.php:313 |
204 | @@ -11088,7 +11088,7 @@ |
205 | msgstr "Скрыт (admin.php вводит�� вручную)" |
206 | |
207 | #: ..\..\..\inc\users\views\_group.form.php:85 |
208 | -msgid "Visible links to admin in evobar" |
209 | +msgid "Visible links to admin in navbar" |
210 | msgstr "Видима� ��ылка в Панель управлени� на �вобаре" |
211 | |
212 | #: ..\..\..\inc\users\views\_group.form.php:86 |
213 | |
214 | === modified file 'locales/ru_RU/_global.php' |
215 | --- locales/ru_RU/_global.php 2010-01-30 08:02:04 +0000 |
216 | +++ locales/ru_RU/_global.php 2010-03-06 16:22:19 +0000 |
217 | @@ -1063,7 +1063,7 @@ |
218 | 'Welcome to your new blog\'s dashboard!' => "Добро пожаловать в панель управлени� вашего нового блога!", |
219 | 'Use the links on the right to write a first post or to customize your blog.' => "И�пользуйте ��ылки �права дл� напи�ани� первой запи�и или на�тройки вашего блога.", |
220 | 'You can see your blog page at any time by clicking "See" in the b2evolution toolbar at the top of this page.' => "Вы можете увидеть �одержимое вашего блога в любое врем� нажав \"Про�мотр\" на панели ин�трументов b2evolution, �верху �той �траницы.", |
221 | - 'You can come back here at any time by clicking "Manage" in that same evobar.' => "Вы можете вернуть�� �юда в любое врем� нажав \"Панель управлени�\" на той же панели �вобар.", |
222 | + 'You can come back here at any time by clicking "Manage" in that same navbar.' => "Вы можете вернуть�� �юда в любое врем� нажав \"Панель управлени�\" на той же панели �вобар.", |
223 | 'Manage your blog' => "Управление вашим блогом", |
224 | 'Write a new post' => "�апи�ать новую запи�ь", |
225 | 'Browse' => "Обзор", |
226 | @@ -2285,7 +2285,7 @@ |
227 | 'View details' => "Про�мотр деталей", |
228 | 'Edit/delete all' => "Редактировать / удалить в�е", |
229 | 'Hidden (type in admin.php directly)' => "Скрыт (admin.php вводит�� вручную)", |
230 | - 'Visible links to admin in evobar' => "Видима� ��ылка в Панель управлени� на �вобаре", |
231 | + 'Visible links to admin in navbar' => "Видима� ��ылка в Панель управлени� на �вобаре", |
232 | 'Access to Admin area' => "До�туп к панели управлени�", |
233 | 'Visible link' => "Видима� ��ылка", |
234 | 'Blogging permissions' => "Разрешени� блоггинга", |
235 | |
236 | === modified file 'plugins/test_plugin/_test.plugin.php' |
237 | --- plugins/test_plugin/_test.plugin.php 2010-02-19 10:50:37 +0000 |
238 | +++ plugins/test_plugin/_test.plugin.php 2010-03-06 16:22:19 +0000 |
239 | @@ -451,9 +451,9 @@ |
240 | /** |
241 | * Event handler: Gets invoked in /toolbar.inc.php after the menu structure is built. |
242 | * |
243 | - * @see Plugin::AdminAfterEvobarInit() |
244 | + * @see Plugin::AdminAfterNavbarInit() |
245 | */ |
246 | - function AdminAfterEvobarInit() |
247 | + function AdminAfterNavbarInit() |
248 | { |
249 | |
250 | // The following is a tiny bit hackish and should probably be abstracted a bit, but just a little bit |
251 | |
252 | === modified file 'rsc/css/basic.css' |
253 | --- rsc/css/basic.css 2010-02-21 19:38:44 +0000 |
254 | +++ rsc/css/basic.css 2010-03-06 16:22:19 +0000 |
255 | @@ -89,7 +89,7 @@ |
256 | * Note: there may be some properties that seem overkill but the fact is we need to override |
257 | * any too general styles a template may want to bring in for its own body/general display. |
258 | */ |
259 | -div#evo_toolbar { |
260 | +div#toolbar { |
261 | background-color: ThreeDFace; |
262 | color: ButtonText; |
263 | border-top: 1px solid ThreeDHighlight; |
264 | @@ -115,19 +115,19 @@ |
265 | padding-top: 1px; |
266 | } |
267 | |
268 | -div#evo_toolbar .actions_left { |
269 | +div#toolbar .actions_left { |
270 | padding: 1px 4px; |
271 | } |
272 | -div#evo_toolbar .actions_right { |
273 | +div#toolbar .actions_right { |
274 | padding: 1px 4px; |
275 | float: right; |
276 | } |
277 | |
278 | |
279 | -div#evo_toolbar img { |
280 | +div#toolbar img { |
281 | position: relative; |
282 | top: -2px; |
283 | - vertical-align: top; /* required in strict mode (where no 'align="top"' gets added to IMGs, FF3). Otherwise text next to the img wraps out of the evobar */ |
284 | + vertical-align: top; /* required in strict mode (where no 'align="top"' gets added to IMGs, FF3). Otherwise text next to the img wraps out of the navbar */ |
285 | } |
286 | |
287 | /* *** SuperFish *** */ |
288 | @@ -250,7 +250,7 @@ |
289 | border-bottom: 1px solid ThreeDHighlight; |
290 | width: 100%; |
291 | } |
292 | -.evo_toolbar_msie hr { |
293 | +.toolbar_msie hr { |
294 | position: relative; |
295 | top: -6px; |
296 | margin: 6px 0 0; |
297 | |
298 | === modified file 'rsc/js/blog_widgets.js' |
299 | --- rsc/js/blog_widgets.js 2010-01-02 08:34:34 +0000 |
300 | +++ rsc/js/blog_widgets.js 2010-03-06 16:22:19 +0000 |
301 | @@ -391,8 +391,8 @@ |
302 | { |
303 | // add placeholder for widgets settings form: |
304 | jQuery( 'body' ).append( '<div id="screen_mask" onclick="closeWidgetSettings()"></div><div id="widget_settings"></div>' ); |
305 | - // var evobar_height = jQuery( '#evo_toolbar' ).height(); |
306 | - // jQuery( '#screen_mask' ).css({ top: evobar_height }); |
307 | + // var navbar_height = jQuery( '#toolbar' ).height(); |
308 | + // jQuery( '#screen_mask' ).css({ top: navbar_height }); |
309 | jQuery( '#screen_mask' ).fadeTo(1,0.5).fadeIn(200); |
310 | jQuery( '#widget_settings' ).html( the_html ).addClass( 'widget_settings_active' ); |
311 | jQuery( '#widget_settings' ).prepend( jQuery( '#server_messages' ) ); |
312 | |
313 | === modified file 'templates/_toolbar.inc.php' |
314 | --- templates/_toolbar.inc.php 2010-02-21 19:45:41 +0000 |
315 | +++ templates/_toolbar.inc.php 2010-03-06 16:22:19 +0000 |
316 | @@ -40,29 +40,29 @@ |
317 | load_class( '_core/ui/_menu.class.php' ); |
318 | |
319 | /** |
320 | - * @global Menu Evobar menu on the top left (should be useed for content & system management features) |
321 | + * @global Menu navbar menu on the top left (should be useed for content & system management features) |
322 | */ |
323 | global $topleft_Menu; |
324 | $topleft_Menu = new Menu(); |
325 | |
326 | /** |
327 | - * @global Menu Evobar menu on the top right (should be used for current user's session, profile & prefs features) |
328 | + * @global Menu navbar menu on the top right (should be used for current user's session, profile & prefs features) |
329 | */ |
330 | global $topright_Menu; |
331 | $topright_Menu = new Menu(); |
332 | |
333 | // Let the modules construct the menu: |
334 | -modules_call_method( 'build_evobar_menu' ); |
335 | +modules_call_method( 'build_navbar_menu' ); |
336 | |
337 | -// Call AdminAfterToolbarInit to notify Plugins that the toolbar menus are initialized. Plugins can add entries. |
338 | -$Plugins->trigger_event( 'AdminAfterEvobarInit' ); |
339 | +// Call AdminAfterNavbarInit to notify Plugins that the toolbar menus are initialized. Plugins can add entries. |
340 | +$Plugins->trigger_event( 'AdminAfterNavbarInit' ); |
341 | ?> |
342 | |
343 | -<div id="evo_toolbar" class="evo_toolbar_<?php echo $Hit->get_agent_name(); ?>"> |
344 | +<div id="toolbar" class="toolbar_<?php echo $Hit->get_agent_name(); ?>"> |
345 | |
346 | <div class="actions_right"> |
347 | <?php |
348 | -// Display evobar menu: |
349 | +// Display navbar menu: |
350 | echo $topright_Menu->get_html_menu( NULL, 'sf-menu-right' ); |
351 | ?> |
352 | </div> |
353 | @@ -71,7 +71,7 @@ |
354 | <?php |
355 | if( $is_admin_page || $current_User->check_perm( 'admin', 'visible' ) ) |
356 | { // We are already in admin or we have permission to view admin options: |
357 | - // Display evobar menu: |
358 | + // Display navbar menu: |
359 | echo $topleft_Menu->get_html_menu( NULL, 'sf-menu-left' ); |
360 | if( $debug ) |
361 | { |
362 | |
363 | === modified file 'templates/asevo/print.css' |
364 | --- templates/asevo/print.css 2010-02-27 22:55:51 +0000 |
365 | +++ templates/asevo/print.css 2010-03-06 16:22:19 +0000 |
366 | @@ -4,7 +4,7 @@ |
367 | font-family: serif; font-size: 11pt; |
368 | } |
369 | /* hide the navbar */ |
370 | -#evo_toolbar { |
371 | +#toolbar { |
372 | display: none; |
373 | } |
374 | /* no image borders */ |
375 | |
376 | === modified file 'templates/basic/css/navbar_superfish.css' |
377 | --- templates/basic/css/navbar_superfish.css 2010-01-22 21:33:56 +0000 |
378 | +++ templates/basic/css/navbar_superfish.css 2010-03-06 16:22:19 +0000 |
379 | @@ -1,9 +1,9 @@ |
380 | /* |
381 | - * Evo Toolbar |
382 | + * Toolbar |
383 | * Note: there may be some properties that seem overkill but the fact is we need to override |
384 | * any too general styles a template may want to bring in for its own body/general display. |
385 | */ |
386 | -div#evo_toolbar { |
387 | +div#toolbar { |
388 | background-color: ThreeDFace; |
389 | color: ButtonText; |
390 | border-top: 1px solid ThreeDHighlight; |
391 | @@ -29,19 +29,19 @@ |
392 | padding-top: 1px; |
393 | } |
394 | |
395 | -div#evo_toolbar .actions_left { |
396 | +div#toolbar .actions_left { |
397 | padding: 1px 4px; |
398 | } |
399 | -div#evo_toolbar .actions_right { |
400 | +div#toolbar .actions_right { |
401 | padding: 1px 4px; |
402 | float: right; |
403 | } |
404 | |
405 | |
406 | -div#evo_toolbar img { |
407 | +div#toolbar img { |
408 | position: relative; |
409 | top: -2px; |
410 | - vertical-align: top; /* required in strict mode (where no 'align="top"' gets added to IMGs, FF3). Otherwise text next to the img wraps out of the evobar */ |
411 | + vertical-align: top; /* required in strict mode (where no 'align="top"' gets added to IMGs, FF3). Otherwise text next to the img wraps out of the navbar */ |
412 | } |
413 | |
414 | /* *** SuperFish *** */ |
415 | @@ -160,7 +160,7 @@ |
416 | border-bottom: 1px solid ThreeDHighlight; |
417 | width: 100%; |
418 | } |
419 | -.evo_toolbar_msie hr { |
420 | +.toolbar_msie hr { |
421 | position: relative; |
422 | top: -6px; |
423 | margin: 6px 0 0; |
424 | |
425 | === modified file 'templates/basic/print.css' |
426 | --- templates/basic/print.css 2010-02-27 22:55:51 +0000 |
427 | +++ templates/basic/print.css 2010-03-06 16:22:19 +0000 |
428 | @@ -4,7 +4,7 @@ |
429 | font-family: serif; font-size: 11pt; |
430 | } |
431 | /* hide the navbar */ |
432 | -#evo_toolbar { |
433 | +#toolbar { |
434 | display: none; |
435 | } |
436 | /* no image borders */ |
437 | |
438 | === modified file 'templates/custom/print.css' |
439 | --- templates/custom/print.css 2010-02-27 22:55:51 +0000 |
440 | +++ templates/custom/print.css 2010-03-06 16:22:19 +0000 |
441 | @@ -4,7 +4,7 @@ |
442 | font-family: serif; font-size: 11pt; |
443 | } |
444 | /* hide the navbar */ |
445 | -#evo_toolbar { |
446 | +#toolbar { |
447 | display: none; |
448 | } |
449 | /* no image borders */ |
450 | |
451 | === modified file 'templates/evocamp/print.css' |
452 | --- templates/evocamp/print.css 2010-02-27 22:55:51 +0000 |
453 | +++ templates/evocamp/print.css 2010-03-06 16:22:19 +0000 |
454 | @@ -4,7 +4,7 @@ |
455 | font-family: serif; font-size: 11pt; |
456 | } |
457 | /* hide the navbar */ |
458 | -#evo_toolbar { |
459 | +#toolbar { |
460 | display: none; |
461 | } |
462 | /* no image borders */ |
463 | |
464 | === modified file 'templates/evopress/print.css' |
465 | --- templates/evopress/print.css 2010-02-27 22:55:51 +0000 |
466 | +++ templates/evopress/print.css 2010-03-06 16:22:19 +0000 |
467 | @@ -4,7 +4,7 @@ |
468 | font-family: serif; font-size: 11pt; |
469 | } |
470 | /* hide the navbar */ |
471 | -#evo_toolbar { |
472 | +#toolbar { |
473 | display: none; |
474 | } |
475 | /* no image borders */ |
476 | |
477 | === modified file 'templates/miami_blue/print.css' |
478 | --- templates/miami_blue/print.css 2010-02-27 22:55:51 +0000 |
479 | +++ templates/miami_blue/print.css 2010-03-06 16:22:19 +0000 |
480 | @@ -4,7 +4,7 @@ |
481 | font-family: serif; font-size: 11pt; |
482 | } |
483 | /* hide the navbar */ |
484 | -#evo_toolbar { |
485 | +#toolbar { |
486 | display: none; |
487 | } |
488 | /* no image borders */ |
489 | |
490 | === modified file 'templates/natural_pink/print.css' |
491 | --- templates/natural_pink/print.css 2010-02-27 22:55:51 +0000 |
492 | +++ templates/natural_pink/print.css 2010-03-06 16:22:19 +0000 |
493 | @@ -4,7 +4,7 @@ |
494 | font-family: serif; font-size: 11pt; |
495 | } |
496 | /* hide the navbar */ |
497 | -#evo_toolbar { |
498 | +#toolbar { |
499 | display: none; |
500 | } |
501 | /* no image borders */ |
502 | |
503 | === modified file 'templates/nifty_corners/print.css' |
504 | --- templates/nifty_corners/print.css 2010-02-27 22:55:51 +0000 |
505 | +++ templates/nifty_corners/print.css 2010-03-06 16:22:19 +0000 |
506 | @@ -4,7 +4,7 @@ |
507 | font-family: serif; font-size: 11pt; |
508 | } |
509 | /* hide the navbar */ |
510 | -#evo_toolbar { |
511 | +#toolbar { |
512 | display: none; |
513 | } |
514 | /* no image borders */ |
515 | |
516 | === modified file 'templates/photoblog/print.css' |
517 | --- templates/photoblog/print.css 2010-02-27 22:55:51 +0000 |
518 | +++ templates/photoblog/print.css 2010-03-06 16:22:19 +0000 |
519 | @@ -4,7 +4,7 @@ |
520 | font-family: serif; font-size: 11pt; |
521 | } |
522 | /* hide the navbar */ |
523 | -#evo_toolbar { |
524 | +#toolbar { |
525 | display: none; |
526 | } |
527 | /* no image borders */ |
528 | |
529 | === modified file 'templates/pixelgreen/print.css' |
530 | --- templates/pixelgreen/print.css 2010-02-27 22:55:51 +0000 |
531 | +++ templates/pixelgreen/print.css 2010-03-06 16:22:19 +0000 |
532 | @@ -4,7 +4,7 @@ |
533 | font-family: serif; font-size: 11pt; |
534 | } |
535 | /* hide the navbar */ |
536 | -#evo_toolbar { |
537 | +#toolbar { |
538 | display: none; |
539 | } |
540 | /* no image borders */ |
541 | |
542 | === modified file 'templates/terrafirma/print.css' |
543 | --- templates/terrafirma/print.css 2010-02-27 22:55:51 +0000 |
544 | +++ templates/terrafirma/print.css 2010-03-06 16:22:19 +0000 |
545 | @@ -4,7 +4,7 @@ |
546 | font-family: serif; font-size: 11pt; |
547 | } |
548 | /* hide the navbar */ |
549 | -#evo_toolbar { |
550 | +#toolbar { |
551 | display: none; |
552 | } |
553 | /* no image borders */ |
554 | |
555 | === modified file 'templates/vastitude/print.css' |
556 | --- templates/vastitude/print.css 2010-02-27 22:55:51 +0000 |
557 | +++ templates/vastitude/print.css 2010-03-06 16:22:19 +0000 |
558 | @@ -4,7 +4,7 @@ |
559 | font-family: serif; font-size: 11pt; |
560 | } |
561 | /* hide the navbar */ |
562 | -#evo_toolbar { |
563 | +#toolbar { |
564 | display: none; |
565 | } |
566 | /* no image borders */ |
Another bit bites the dust ;)
¥