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

Proposed by EdB
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/rename_templates_adm
Merge into: lp:quam-plures
Diff against target: 11180 lines (+4606/-4603)
48 files modified
conf/_advanced.php (+1/-1)
inc/_core/_class5.funcs.php (+1/-1)
inc/_main.inc.php (+1/-1)
install/automated-install.html (+1/-1)
locales/de_DE/LC_MESSAGES/messages.po (+103/-103)
locales/fr_FR/LC_MESSAGES/messages.po (+103/-103)
locales/messages.pot (+159/-156)
locales/ru_RU/LC_MESSAGES/messages.po (+103/-103)
locales/tr_TR/LC_MESSAGES/messages.po (+103/-103)
plugins/smilies_plugin/_smilies.plugin.php (+1/-1)
templates_adm/_access_denied.main.php (+0/-31)
templates_adm/_adminUI_general.class.php (+0/-1290)
templates_adm/_html_footer.inc.php (+0/-77)
templates_adm/_html_header.inc.php (+0/-286)
templates_adm/chicago/_adminUI.class.php (+0/-381)
templates_adm/chicago/chicago.css (+0/-941)
templates_adm/chicago/img/index.html (+0/-1)
templates_adm/chicago/index.html (+0/-1)
templates_adm/conf_error.main.php (+0/-37)
templates_adm/index.html (+0/-1)
templates_adm/license.txt (+0/-298)
templates_adm/login/_html_footer.inc.php (+0/-41)
templates_adm/login/_html_header.inc.php (+0/-62)
templates_adm/login/_login_form.main.php (+0/-226)
templates_adm/login/_lostpass_form.main.php (+0/-64)
templates_adm/login/_reg_complete.main.php (+0/-68)
templates_adm/login/_reg_disabled.main.php (+0/-47)
templates_adm/login/_reg_form.main.php (+0/-86)
templates_adm/login/_validate_form.main.php (+0/-92)
view_admin/_access_denied.main.php (+31/-0)
view_admin/_adminUI_general.class.php (+1290/-0)
view_admin/_html_footer.inc.php (+77/-0)
view_admin/_html_header.inc.php (+286/-0)
view_admin/chicago/_adminUI.class.php (+381/-0)
view_admin/chicago/chicago.css (+941/-0)
view_admin/chicago/img/index.html (+1/-0)
view_admin/chicago/index.html (+1/-0)
view_admin/conf_error.main.php (+37/-0)
view_admin/index.html (+1/-0)
view_admin/license.txt (+298/-0)
view_admin/login/_html_footer.inc.php (+41/-0)
view_admin/login/_html_header.inc.php (+62/-0)
view_admin/login/_login_form.main.php (+226/-0)
view_admin/login/_lostpass_form.main.php (+64/-0)
view_admin/login/_reg_complete.main.php (+68/-0)
view_admin/login/_reg_disabled.main.php (+47/-0)
view_admin/login/_reg_form.main.php (+86/-0)
view_admin/login/_validate_form.main.php (+92/-0)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/rename_templates_adm
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+22756@code.launchpad.net

Description of the change

Renamed "templates_adm" folder to "view_admin", and edited a few files. Tested without issue :)

http://forums.quamplures.net/viewtopic.php?f=9&t=305

To post a comment you must log in.
Revision history for this message
Yabs (yabs) wrote :

Ok, this one's gonna take a smidge of testing, will let you know when I'm done.

¥

7455. By EdB

Adding more_plugin_stuff and localize_templates_1 from core to branch

7456. By EdB

Adding merged bug-554470 FROM trunk

Revision history for this message
Yabs (yabs) wrote :

Ok, had a smidge more time to play, I missed loads on first glance (which is what raised my worries), this is good to go.

Can I leave you to merge? If not then I'll do it on my Am

¥

review: Approve
Revision history for this message
EdB (edb) wrote :

I'll try to get it done this local evening.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/_advanced.php'
2--- conf/_advanced.php 2010-02-20 02:32:40 +0000
3+++ conf/_advanced.php 2010-04-11 01:32:28 +0000
4@@ -444,7 +444,7 @@
5 *
6 * @global string $admintemplates_subdir
7 */
8-$admintemplates_subdir = 'templates_adm/'; // Subdirectory relative to ADMIN
9+$admintemplates_subdir = 'view_admin/'; // Subdirectory relative to ADMIN
10 $admintemplates_path = $basepath.$admintemplates_subdir; // You should not need to change this
11 $admintemplates_url = $baseurl.$admintemplates_subdir; // You should not need to change this
12
13
14=== modified file 'inc/_core/_class5.funcs.php'
15--- inc/_core/_class5.funcs.php 2010-01-02 08:34:34 +0000
16+++ inc/_core/_class5.funcs.php 2010-04-11 01:32:28 +0000
17@@ -44,7 +44,7 @@
18
19 /*
20 List generated with (executed in ./blogs):
21- for i in $(find . -name \*.class.php -o -name \*.widget.php); do echo "'$(basename $i .php | tr '[:upper:'] '[:lower:'] | sed 's/.widget$/_widget/; s/.class$//; s/^_//; s/^collsettings$/collectionsettings/; s/^itemlist$/itemlist2/; s/^widget$/componentwidget/; s/^uiwidget$/widget/')' => $(echo $i|sed "s~^./inc/~\$inc_path.'~;s~^./templates_adm/~\$admintemplates_path.'/~")',"; done
22+ for i in $(find . -name \*.class.php -o -name \*.widget.php); do echo "'$(basename $i .php | tr '[:upper:'] '[:lower:'] | sed 's/.widget$/_widget/; s/.class$//; s/^_//; s/^collsettings$/collectionsettings/; s/^itemlist$/itemlist2/; s/^widget$/componentwidget/; s/^uiwidget$/widget/')' => $(echo $i|sed "s~^./inc/~\$inc_path.'~;s~^./view_admin/~\$admintemplates_path.'/~")',"; done
23 */
24 if( ! isset($map_class_path) )
25 {
26
27=== modified file 'inc/_main.inc.php'
28--- inc/_main.inc.php 2010-02-19 10:50:37 +0000
29+++ inc/_main.inc.php 2010-04-11 01:32:28 +0000
30@@ -173,7 +173,7 @@
31 }
32 if( isset( $error_message ) )
33 { // error & exit
34- require dirname(__FILE__).'/../templates_adm/conf_error.main.php';
35+ require dirname(__FILE__).'/../view_admin/conf_error.main.php';
36 }
37
38
39
40=== modified file 'install/automated-install.html'
41--- install/automated-install.html 2010-01-16 14:19:12 +0000
42+++ install/automated-install.html 2010-04-11 01:32:28 +0000
43@@ -164,7 +164,7 @@
44 <li>www/plugins/ (if requested)</li>
45 <li>www/rsc/</li>
46 <li>www/templates/ (if requested)</li>
47- <li>www/templates_adm/</li>
48+ <li>www/view_admin/</li>
49 <li>www/xmlsrv/</li>
50 </ul></dd>
51 <dd>After that copy all files and folders from the new Quam Plures' package, <strong>except /media/</strong>.</dd>
52
53=== modified file 'locales/de_DE/LC_MESSAGES/messages.po'
54--- locales/de_DE/LC_MESSAGES/messages.po 2010-03-14 14:58:16 +0000
55+++ locales/de_DE/LC_MESSAGES/messages.po 2010-04-11 01:32:28 +0000
56@@ -37,18 +37,18 @@
57 #: ..\..\a_notemplate.php:306
58 #: ..\..\multiblogs.php:250
59 #: ..\..\inc\items\views\_item_list_full.view.php:106
60-#: ..\..\templates_adm\_adminUI_general.class.php:816
61-#: ..\..\templates_adm\_adminUI_general.class.php:901
62-#: ..\..\templates_adm\chicago\_adminUI.class.php:264
63+#: ..\..\view_admin\_adminUI_general.class.php:816
64+#: ..\..\view_admin\_adminUI_general.class.php:901
65+#: ..\..\view_admin\chicago\_adminUI.class.php:264
66 msgid "Previous"
67 msgstr "Vorherige"
68
69 #: ..\..\a_notemplate.php:307
70 #: ..\..\multiblogs.php:251
71 #: ..\..\inc\items\views\_item_list_full.view.php:107
72-#: ..\..\templates_adm\_adminUI_general.class.php:817
73-#: ..\..\templates_adm\_adminUI_general.class.php:902
74-#: ..\..\templates_adm\chicago\_adminUI.class.php:265
75+#: ..\..\view_admin\_adminUI_general.class.php:817
76+#: ..\..\view_admin\_adminUI_general.class.php:902
77+#: ..\..\view_admin\chicago\_adminUI.class.php:265
78 msgid "Next"
79 msgstr "Nächste"
80
81@@ -338,9 +338,9 @@
82 #: ..\..\templates\_msgform.disp.php:153
83 #: ..\..\templates\_profile.disp.php:48
84 #: ..\..\templates\_subs.disp.php:46
85-#: ..\..\templates_adm\login\_reg_complete.main.php:48
86-#: ..\..\templates_adm\login\_reg_form.main.php:67
87-#: ..\..\templates_adm\login\_validate_form.main.php:57
88+#: ..\..\view_admin\login\_reg_complete.main.php:48
89+#: ..\..\view_admin\login\_reg_form.main.php:67
90+#: ..\..\view_admin\login\_validate_form.main.php:57
91 msgid "Email"
92 msgstr "E-Mail"
93
94@@ -1094,49 +1094,49 @@
95 # TRANS: abbrev. for Sunday
96 #. TRANS: abbrev. for Sunday
97 #: ..\..\inc\_vars.inc.php:206
98-#: ..\..\templates_adm\_html_header.inc.php:256
99+#: ..\..\view_admin\_html_header.inc.php:256
100 msgid "Sun"
101 msgstr "So"
102
103 # TRANS: abbrev. for Monday
104 #. TRANS: abbrev. for Monday
105 #: ..\..\inc\_vars.inc.php:208
106-#: ..\..\templates_adm\_html_header.inc.php:256
107+#: ..\..\view_admin\_html_header.inc.php:256
108 msgid "Mon"
109 msgstr "Mo"
110
111 # TRANS: abbrev. for Tuesday
112 #. TRANS: abbrev. for Tuesday
113 #: ..\..\inc\_vars.inc.php:210
114-#: ..\..\templates_adm\_html_header.inc.php:256
115+#: ..\..\view_admin\_html_header.inc.php:256
116 msgid "Tue"
117 msgstr "Di"
118
119 # TRANS: abbrev. for Wednesday
120 #. TRANS: abbrev. for Wednesday
121 #: ..\..\inc\_vars.inc.php:212
122-#: ..\..\templates_adm\_html_header.inc.php:256
123+#: ..\..\view_admin\_html_header.inc.php:256
124 msgid "Wed"
125 msgstr "Mi"
126
127 # TRANS: abbrev. for Thursday
128 #. TRANS: abbrev. for Thursday
129 #: ..\..\inc\_vars.inc.php:214
130-#: ..\..\templates_adm\_html_header.inc.php:256
131+#: ..\..\view_admin\_html_header.inc.php:256
132 msgid "Thu"
133 msgstr "Do"
134
135 # TRANS: abbrev. for Friday
136 #. TRANS: abbrev. for Friday
137 #: ..\..\inc\_vars.inc.php:216
138-#: ..\..\templates_adm\_html_header.inc.php:256
139+#: ..\..\view_admin\_html_header.inc.php:256
140 msgid "Fri"
141 msgstr "Fr"
142
143 # TRANS: abbrev. for Saturday
144 #. TRANS: abbrev. for Saturday
145 #: ..\..\inc\_vars.inc.php:218
146-#: ..\..\templates_adm\_html_header.inc.php:256
147+#: ..\..\view_admin\_html_header.inc.php:256
148 msgid "Sat"
149 msgstr "Sa"
150
151@@ -1186,22 +1186,22 @@
152 msgstr " S "
153
154 #: ..\..\inc\_vars.inc.php:238
155-#: ..\..\templates_adm\_html_header.inc.php:255
156+#: ..\..\view_admin\_html_header.inc.php:255
157 msgid "January"
158 msgstr "Januar"
159
160 #: ..\..\inc\_vars.inc.php:239
161-#: ..\..\templates_adm\_html_header.inc.php:255
162+#: ..\..\view_admin\_html_header.inc.php:255
163 msgid "February"
164 msgstr "Februar"
165
166 #: ..\..\inc\_vars.inc.php:240
167-#: ..\..\templates_adm\_html_header.inc.php:255
168+#: ..\..\view_admin\_html_header.inc.php:255
169 msgid "March"
170 msgstr "März"
171
172 #: ..\..\inc\_vars.inc.php:241
173-#: ..\..\templates_adm\_html_header.inc.php:255
174+#: ..\..\view_admin\_html_header.inc.php:255
175 msgid "April"
176 msgstr "April"
177
178@@ -1211,37 +1211,37 @@
179 msgstr "Mai "
180
181 #: ..\..\inc\_vars.inc.php:244
182-#: ..\..\templates_adm\_html_header.inc.php:255
183+#: ..\..\view_admin\_html_header.inc.php:255
184 msgid "June"
185 msgstr "Juni"
186
187 #: ..\..\inc\_vars.inc.php:245
188-#: ..\..\templates_adm\_html_header.inc.php:255
189+#: ..\..\view_admin\_html_header.inc.php:255
190 msgid "July"
191 msgstr "Juli"
192
193 #: ..\..\inc\_vars.inc.php:246
194-#: ..\..\templates_adm\_html_header.inc.php:255
195+#: ..\..\view_admin\_html_header.inc.php:255
196 msgid "August"
197 msgstr "August"
198
199 #: ..\..\inc\_vars.inc.php:247
200-#: ..\..\templates_adm\_html_header.inc.php:255
201+#: ..\..\view_admin\_html_header.inc.php:255
202 msgid "September"
203 msgstr "September"
204
205 #: ..\..\inc\_vars.inc.php:248
206-#: ..\..\templates_adm\_html_header.inc.php:255
207+#: ..\..\view_admin\_html_header.inc.php:255
208 msgid "October"
209 msgstr "Oktober"
210
211 #: ..\..\inc\_vars.inc.php:249
212-#: ..\..\templates_adm\_html_header.inc.php:255
213+#: ..\..\view_admin\_html_header.inc.php:255
214 msgid "November"
215 msgstr "November"
216
217 #: ..\..\inc\_vars.inc.php:250
218-#: ..\..\templates_adm\_html_header.inc.php:255
219+#: ..\..\view_admin\_html_header.inc.php:255
220 msgid "December"
221 msgstr "Dezember"
222
223@@ -1272,7 +1272,7 @@
224 # TRANS: abbrev. for May
225 #. TRANS: abbrev. for May
226 #: ..\..\inc\_vars.inc.php:262
227-#: ..\..\templates_adm\_html_header.inc.php:255
228+#: ..\..\view_admin\_html_header.inc.php:255
229 msgid "May"
230 msgstr "Mai"
231
232@@ -3292,10 +3292,10 @@
233 #: ..\..\templates\_profile.disp.php:57
234 #: ..\..\templates\_subs.disp.php:45
235 #: ..\..\templates\_user.disp.php:44
236-#: ..\..\templates_adm\login\_login_form.main.php:119
237-#: ..\..\templates_adm\login\_lostpass_form.main.php:54
238-#: ..\..\templates_adm\login\_reg_complete.main.php:47
239-#: ..\..\templates_adm\login\_reg_form.main.php:52
240+#: ..\..\view_admin\login\_login_form.main.php:119
241+#: ..\..\view_admin\login\_lostpass_form.main.php:54
242+#: ..\..\view_admin\login\_reg_complete.main.php:47
243+#: ..\..\view_admin\login\_reg_form.main.php:52
244 msgid "Login"
245 msgstr "Benutzername"
246
247@@ -3390,7 +3390,7 @@
248 #: ..\..\inc\locales\_locale_settings.form.php:84
249 #: ..\..\inc\locales\_locale_settings.form.php:279
250 #: ..\..\templates\_user.disp.php:61
251-#: ..\..\templates_adm\login\_reg_form.main.php:69
252+#: ..\..\view_admin\login\_reg_form.main.php:69
253 msgid "Locale"
254 msgstr "Gebietsschema"
255
256@@ -5929,7 +5929,7 @@
257 msgstr "Standardrechte"
258
259 #: ..\..\inc\files\views\_file_permissions.form.php:66
260-#: ..\..\templates_adm\_html_header.inc.php:162
261+#: ..\..\view_admin\_html_header.inc.php:162
262 msgid "check all"
263 msgstr "alle markieren"
264
265@@ -6691,11 +6691,11 @@
266 #: ..\..\inc\items\views\_item_list_full.view.php:104
267 #: ..\..\inc\_core\__core.init.php:210
268 #: ..\..\inc\_core\ui\results\_results.class.php:1739
269-#: ..\..\templates_adm\_adminUI_general.class.php:754
270-#: ..\..\templates_adm\_adminUI_general.class.php:810
271-#: ..\..\templates_adm\_adminUI_general.class.php:895
272-#: ..\..\templates_adm\chicago\_adminUI.class.php:198
273-#: ..\..\templates_adm\chicago\_adminUI.class.php:258
274+#: ..\..\view_admin\_adminUI_general.class.php:754
275+#: ..\..\view_admin\_adminUI_general.class.php:810
276+#: ..\..\view_admin\_adminUI_general.class.php:895
277+#: ..\..\view_admin\chicago\_adminUI.class.php:198
278+#: ..\..\view_admin\chicago\_adminUI.class.php:258
279 msgid "Pages"
280 msgstr "Seiten"
281
282@@ -7068,12 +7068,12 @@
283
284 #: ..\..\inc\items\views\_item_list_full.view.php:108
285 #: ..\..\inc\items\views\_item_list_full.view.php:109
286-#: ..\..\templates_adm\_adminUI_general.class.php:820
287-#: ..\..\templates_adm\_adminUI_general.class.php:821
288-#: ..\..\templates_adm\_adminUI_general.class.php:905
289-#: ..\..\templates_adm\_adminUI_general.class.php:906
290-#: ..\..\templates_adm\chicago\_adminUI.class.php:268
291-#: ..\..\templates_adm\chicago\_adminUI.class.php:269
292+#: ..\..\view_admin\_adminUI_general.class.php:820
293+#: ..\..\view_admin\_adminUI_general.class.php:821
294+#: ..\..\view_admin\_adminUI_general.class.php:905
295+#: ..\..\view_admin\_adminUI_general.class.php:906
296+#: ..\..\view_admin\chicago\_adminUI.class.php:268
297+#: ..\..\view_admin\chicago\_adminUI.class.php:269
298 msgid "..."
299 msgstr "..."
300
301@@ -9092,8 +9092,8 @@
302 #: ..\..\install\index.php:520
303 #: ..\..\install\_functions_install.php:193
304 #: ..\..\templates\_profile.disp.php:65
305-#: ..\..\templates_adm\login\_login_form.main.php:129
306-#: ..\..\templates_adm\login\_reg_form.main.php:58
307+#: ..\..\view_admin\login\_login_form.main.php:129
308+#: ..\..\view_admin\login\_reg_form.main.php:58
309 msgid "Password"
310 msgstr "Passwort"
311
312@@ -10178,9 +10178,9 @@
313 #: ..\..\inc\users\model\_user.funcs.php:242
314 #: ..\..\inc\_core\__core.init.php:445
315 #: ..\..\inc\_core\__core.init.php:479
316-#: ..\..\templates_adm\_access_denied.main.php:23
317-#: ..\..\templates_adm\_adminUI_general.class.php:1229
318-#: ..\..\templates_adm\_adminUI_general.class.php:1231
319+#: ..\..\view_admin\_access_denied.main.php:23
320+#: ..\..\view_admin\_adminUI_general.class.php:1229
321+#: ..\..\view_admin\_adminUI_general.class.php:1231
322 msgid "Logout"
323 msgstr "Abmelden"
324
325@@ -11371,7 +11371,7 @@
326 msgstr "Benutzerprofil bearbeiten"
327
328 #: ..\..\inc\_core\__core.init.php:463
329-#: ..\..\templates_adm\login\_reg_disabled.main.php:41
330+#: ..\..\view_admin\login\_reg_disabled.main.php:41
331 msgid "Home"
332 msgstr "Start"
333
334@@ -11502,22 +11502,22 @@
335 msgstr "Liste filtern"
336
337 #: ..\..\inc\_core\ui\_uiwidget.class.php:810
338-#: ..\..\templates_adm\_adminUI_general.class.php:768
339-#: ..\..\templates_adm\_adminUI_general.class.php:770
340-#: ..\..\templates_adm\_adminUI_general.class.php:853
341-#: ..\..\templates_adm\_adminUI_general.class.php:855
342-#: ..\..\templates_adm\chicago\_adminUI.class.php:216
343-#: ..\..\templates_adm\chicago\_adminUI.class.php:218
344+#: ..\..\view_admin\_adminUI_general.class.php:768
345+#: ..\..\view_admin\_adminUI_general.class.php:770
346+#: ..\..\view_admin\_adminUI_general.class.php:853
347+#: ..\..\view_admin\_adminUI_general.class.php:855
348+#: ..\..\view_admin\chicago\_adminUI.class.php:216
349+#: ..\..\view_admin\chicago\_adminUI.class.php:218
350 msgid "Ascending order"
351 msgstr "Aufsteigende Reihenfolge"
352
353 #: ..\..\inc\_core\ui\_uiwidget.class.php:815
354-#: ..\..\templates_adm\_adminUI_general.class.php:772
355-#: ..\..\templates_adm\_adminUI_general.class.php:774
356-#: ..\..\templates_adm\_adminUI_general.class.php:857
357-#: ..\..\templates_adm\_adminUI_general.class.php:859
358-#: ..\..\templates_adm\chicago\_adminUI.class.php:220
359-#: ..\..\templates_adm\chicago\_adminUI.class.php:222
360+#: ..\..\view_admin\_adminUI_general.class.php:772
361+#: ..\..\view_admin\_adminUI_general.class.php:774
362+#: ..\..\view_admin\_adminUI_general.class.php:857
363+#: ..\..\view_admin\_adminUI_general.class.php:859
364+#: ..\..\view_admin\chicago\_adminUI.class.php:220
365+#: ..\..\view_admin\chicago\_adminUI.class.php:222
366 msgid "Descending order"
367 msgstr "Absteigende Reihenfolge"
368
369@@ -12739,148 +12739,148 @@
370 msgid "Tag Cloud"
371 msgstr "Schlagwort-Wolke"
372
373-#: ..\..\templates_adm\_access_denied.main.php:15
374-#: ..\..\templates_adm\_access_denied.main.php:19
375+#: ..\..\view_admin\_access_denied.main.php:15
376+#: ..\..\view_admin\_access_denied.main.php:19
377 msgid "Access denied"
378 msgstr "Zugriff verweigert"
379
380-#: ..\..\templates_adm\_access_denied.main.php:20
381+#: ..\..\view_admin\_access_denied.main.php:20
382 msgid "Sorry, you have no permission to access this section."
383 msgstr "Entschuldigung, Sie haben keine Rechte, um auf diesen Bereich zuzugreifen."
384
385-#: ..\..\templates_adm\_access_denied.main.php:25
386+#: ..\..\view_admin\_access_denied.main.php:25
387 msgid "Exit to blogs"
388 msgstr "Zu den Blogs"
389
390-#: ..\..\templates_adm\_adminUI_general.class.php:1262
391-#: ..\..\templates_adm\chicago\_adminUI.class.php:124
392+#: ..\..\view_admin\_adminUI_general.class.php:1262
393+#: ..\..\view_admin\chicago\_adminUI.class.php:124
394 #, fuzzy
395 msgid "WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox."
396 msgstr "WARNUNG: Internet Explorer 6 könnte nicht in der Lage sein, diesen Skin ordnungsgemäß darzustellen. Wir empfehlen Ihnen wärmstens, auf IE 7 oder Firefox upzugraden."
397
398-#: ..\..\templates_adm\_html_header.inc.php:158
399+#: ..\..\view_admin\_html_header.inc.php:158
400 msgid "uncheck all"
401 msgstr "Alle abwählen"
402
403-#: ..\..\templates_adm\login\_login_form.main.php:43
404+#: ..\..\view_admin\login\_login_form.main.php:43
405 #, php-format
406 msgid "Note: You are already logged in as %s!"
407 msgstr "Hinweis: Sie sind bereits als %s angemeldet!"
408
409-#: ..\..\templates_adm\login\_login_form.main.php:44
410-#: ..\..\templates_adm\login\_reg_complete.main.php:60
411+#: ..\..\view_admin\login\_login_form.main.php:44
412+#: ..\..\view_admin\login\_reg_complete.main.php:60
413 msgid "Continue"
414 msgstr "Fortfahren"
415
416-#: ..\..\templates_adm\login\_login_form.main.php:53
417+#: ..\..\view_admin\login\_login_form.main.php:53
418 msgid "Login form"
419 msgstr "Anmeldeformular"
420
421-#: ..\..\templates_adm\login\_login_form.main.php:117
422+#: ..\..\view_admin\login\_login_form.main.php:117
423 msgid "You will have to accept cookies in order to log in."
424 msgstr "Sie werden Cookies akzeptieren müssen, um sich anmelden zu können."
425
426-#: ..\..\templates_adm\login\_login_form.main.php:127
427-#: ..\..\templates_adm\login\_lostpass_form.main.php:35
428-#: ..\..\templates_adm\login\_lostpass_form.main.php:46
429+#: ..\..\view_admin\login\_login_form.main.php:127
430+#: ..\..\view_admin\login\_lostpass_form.main.php:35
431+#: ..\..\view_admin\login\_lostpass_form.main.php:46
432 msgid "Lost password ?"
433 msgstr "Passwort vergessen?"
434
435-#: ..\..\templates_adm\login\_login_form.main.php:137
436+#: ..\..\view_admin\login\_login_form.main.php:137
437 msgid "Log in!"
438 msgstr "Einloggen!"
439
440-#: ..\..\templates_adm\login\_login_form.main.php:142
441+#: ..\..\view_admin\login\_login_form.main.php:142
442 msgid "Log into backoffice!"
443 msgstr "In Administrationsbereich einloggen!"
444
445-#: ..\..\templates_adm\login\_login_form.main.php:173
446+#: ..\..\view_admin\login\_login_form.main.php:173
447 msgid "Please wait..."
448 msgstr "Bitte warten..."
449
450-#: ..\..\templates_adm\login\_login_form.main.php:209
451+#: ..\..\view_admin\login\_login_form.main.php:209
452 msgid "Abort login!"
453 msgstr "Anmeldung abbrechen!"
454
455-#: ..\..\templates_adm\login\_lostpass_form.main.php:49
456+#: ..\..\view_admin\login\_lostpass_form.main.php:49
457 msgid "Please enter your login below. Do <strong>NOT</strong> enter your e-mail address!"
458 msgstr "Bitte geben Sie unten Ihren Benutzernamen an. Geben Sie <strong>NICHT</strong> Ihre E-Mail-Adresse an!"
459
460-#: ..\..\templates_adm\login\_lostpass_form.main.php:50
461+#: ..\..\view_admin\login\_lostpass_form.main.php:50
462 msgid "An email will be sent to your registered email address immediately."
463 msgstr "Eine E-Mail wird unverzüglich an Ihre registrierte E-Mail-Adresse gesendet."
464
465-#: ..\..\templates_adm\login\_lostpass_form.main.php:51
466+#: ..\..\view_admin\login\_lostpass_form.main.php:51
467 msgid "As soon as you receive the email, click on the link therein to change your password."
468 msgstr "Sobald Sie die E-Mail erhalten, klicken Sie auf den darin enthaltenen Link, um Ihr Passwort zu ändern."
469
470 # TRANS: Text for submit button to request an activation link by email
471 #. TRANS: Text for submit button to request an activation link by email
472-#: ..\..\templates_adm\login\_lostpass_form.main.php:56
473-#: ..\..\templates_adm\login\_validate_form.main.php:62
474+#: ..\..\view_admin\login\_lostpass_form.main.php:56
475+#: ..\..\view_admin\login\_validate_form.main.php:62
476 msgid "Send me an email now!"
477 msgstr "Mir jetzt eine E-Mail schicken!"
478
479-#: ..\..\templates_adm\login\_reg_complete.main.php:34
480+#: ..\..\view_admin\login\_reg_complete.main.php:34
481 msgid "Registration complete"
482 msgstr "Registrierung abgeschlossen"
483
484-#: ..\..\templates_adm\login\_reg_disabled.main.php:34
485+#: ..\..\view_admin\login\_reg_disabled.main.php:34
486 msgid "Registration Currently Disabled"
487 msgstr "Registrierung zur Zeit deaktiviert"
488
489-#: ..\..\templates_adm\login\_reg_disabled.main.php:37
490+#: ..\..\view_admin\login\_reg_disabled.main.php:37
491 msgid "User registration is currently not allowed."
492 msgstr "Benutzerregistrierung ist zur Zeit nicht erlaubt."
493
494-#: ..\..\templates_adm\login\_reg_form.main.php:38
495+#: ..\..\view_admin\login\_reg_form.main.php:38
496 msgid "Register form"
497 msgstr "Registrierungsformular"
498
499-#: ..\..\templates_adm\login\_reg_form.main.php:58
500+#: ..\..\view_admin\login\_reg_form.main.php:58
501 msgid "(twice)"
502 msgstr "(zweimal)"
503
504-#: ..\..\templates_adm\login\_reg_form.main.php:62
505+#: ..\..\view_admin\login\_reg_form.main.php:62
506 #, php-format
507 msgid "Minimum %d characters, please."
508 msgstr "Mindestens %d Buchstaben, bitte."
509
510-#: ..\..\templates_adm\login\_reg_form.main.php:69
511+#: ..\..\view_admin\login\_reg_form.main.php:69
512 msgid "Preferred language"
513 msgstr "Bevorzugte Sprache"
514
515-#: ..\..\templates_adm\login\_reg_form.main.php:73
516+#: ..\..\view_admin\login\_reg_form.main.php:73
517 msgid "Register!"
518 msgstr "Registrieren!"
519
520-#: ..\..\templates_adm\login\_reg_form.main.php:80
521+#: ..\..\view_admin\login\_reg_form.main.php:80
522 msgid "Log into existing account..."
523 msgstr "An einem vorhandenen Account anmelden..."
524
525-#: ..\..\templates_adm\login\_validate_form.main.php:37
526-#: ..\..\templates_adm\login\_validate_form.main.php:49
527+#: ..\..\view_admin\login\_validate_form.main.php:37
528+#: ..\..\view_admin\login\_validate_form.main.php:49
529 msgid "Email address validation"
530 msgstr "E-Mail-Adressen-Bestätigung"
531
532-#: ..\..\templates_adm\login\_validate_form.main.php:52
533+#: ..\..\view_admin\login\_validate_form.main.php:52
534 msgid "Please confirm your email address below."
535 msgstr "Bitte bestätigen Sie unten Ihre E-Mail-Adresse."
536
537-#: ..\..\templates_adm\login\_validate_form.main.php:53
538+#: ..\..\view_admin\login\_validate_form.main.php:53
539 msgid "An email will be sent to this address immediately."
540 msgstr "Eine E-Mail wird unverzüglich an diese E-Mail-Adresse gesendet."
541
542-#: ..\..\templates_adm\login\_validate_form.main.php:54
543+#: ..\..\view_admin\login\_validate_form.main.php:54
544 msgid "As soon as you receive the email, click on the link therein to activate your account."
545 msgstr "Sobald Sie die E-Mail erhalten, klicken Sie auf den darin enthaltenen Link, um Ihren Account zu aktivieren."
546
547-#: ..\..\templates_adm\login\_validate_form.main.php:76
548+#: ..\..\view_admin\login\_validate_form.main.php:76
549 #, php-format
550 msgid "Since you are an admin user, you can validate your email address (%s) by a single click."
551 msgstr "Da Sie ein Admin-Benutzer sind, können Sie Ihre E-Mail-Adresse (%s) mit einem einfachen Klick bestätigen."
552
553-#: ..\..\templates_adm\login\_validate_form.main.php:78
554+#: ..\..\view_admin\login\_validate_form.main.php:78
555 msgid "Activate my account!"
556 msgstr "Meinen Account aktivieren!"
557
558
559=== modified file 'locales/fr_FR/LC_MESSAGES/messages.po'
560--- locales/fr_FR/LC_MESSAGES/messages.po 2010-03-14 14:58:16 +0000
561+++ locales/fr_FR/LC_MESSAGES/messages.po 2010-04-11 01:32:28 +0000
562@@ -37,18 +37,18 @@
563 #: ..\..\a_notemplate.php:306
564 #: ..\..\multiblogs.php:250
565 #: ..\..\inc\items\views\_item_list_full.view.php:106
566-#: ..\..\templates_adm\_adminUI_general.class.php:816
567-#: ..\..\templates_adm\_adminUI_general.class.php:901
568-#: ..\..\templates_adm\chicago\_adminUI.class.php:264
569+#: ..\..\view_admin\_adminUI_general.class.php:816
570+#: ..\..\view_admin\_adminUI_general.class.php:901
571+#: ..\..\view_admin\chicago\_adminUI.class.php:264
572 msgid "Previous"
573 msgstr "Précédente"
574
575 #: ..\..\a_notemplate.php:307
576 #: ..\..\multiblogs.php:251
577 #: ..\..\inc\items\views\_item_list_full.view.php:107
578-#: ..\..\templates_adm\_adminUI_general.class.php:817
579-#: ..\..\templates_adm\_adminUI_general.class.php:902
580-#: ..\..\templates_adm\chicago\_adminUI.class.php:265
581+#: ..\..\view_admin\_adminUI_general.class.php:817
582+#: ..\..\view_admin\_adminUI_general.class.php:902
583+#: ..\..\view_admin\chicago\_adminUI.class.php:265
584 msgid "Next"
585 msgstr "Suivante"
586
587@@ -348,9 +348,9 @@
588 #: ..\..\templates\_msgform.disp.php:153
589 #: ..\..\templates\_profile.disp.php:48
590 #: ..\..\templates\_subs.disp.php:46
591-#: ..\..\templates_adm\login\_reg_complete.main.php:48
592-#: ..\..\templates_adm\login\_reg_form.main.php:67
593-#: ..\..\templates_adm\login\_validate_form.main.php:57
594+#: ..\..\view_admin\login\_reg_complete.main.php:48
595+#: ..\..\view_admin\login\_reg_form.main.php:67
596+#: ..\..\view_admin\login\_validate_form.main.php:57
597 msgid "Email"
598 msgstr "Email"
599
600@@ -1112,43 +1112,43 @@
601
602 #. TRANS: abbrev. for Sunday
603 #: ..\..\inc\_vars.inc.php:206
604-#: ..\..\templates_adm\_html_header.inc.php:256
605+#: ..\..\view_admin\_html_header.inc.php:256
606 msgid "Sun"
607 msgstr "Dim"
608
609 #. TRANS: abbrev. for Monday
610 #: ..\..\inc\_vars.inc.php:208
611-#: ..\..\templates_adm\_html_header.inc.php:256
612+#: ..\..\view_admin\_html_header.inc.php:256
613 msgid "Mon"
614 msgstr "Lun"
615
616 #. TRANS: abbrev. for Tuesday
617 #: ..\..\inc\_vars.inc.php:210
618-#: ..\..\templates_adm\_html_header.inc.php:256
619+#: ..\..\view_admin\_html_header.inc.php:256
620 msgid "Tue"
621 msgstr "Mar"
622
623 #. TRANS: abbrev. for Wednesday
624 #: ..\..\inc\_vars.inc.php:212
625-#: ..\..\templates_adm\_html_header.inc.php:256
626+#: ..\..\view_admin\_html_header.inc.php:256
627 msgid "Wed"
628 msgstr "Mer"
629
630 #. TRANS: abbrev. for Thursday
631 #: ..\..\inc\_vars.inc.php:214
632-#: ..\..\templates_adm\_html_header.inc.php:256
633+#: ..\..\view_admin\_html_header.inc.php:256
634 msgid "Thu"
635 msgstr "Jeu"
636
637 #. TRANS: abbrev. for Friday
638 #: ..\..\inc\_vars.inc.php:216
639-#: ..\..\templates_adm\_html_header.inc.php:256
640+#: ..\..\view_admin\_html_header.inc.php:256
641 msgid "Fri"
642 msgstr "Ven"
643
644 #. TRANS: abbrev. for Saturday
645 #: ..\..\inc\_vars.inc.php:218
646-#: ..\..\templates_adm\_html_header.inc.php:256
647+#: ..\..\view_admin\_html_header.inc.php:256
648 msgid "Sat"
649 msgstr "Sam"
650
651@@ -1197,22 +1197,22 @@
652 msgstr "S"
653
654 #: ..\..\inc\_vars.inc.php:238
655-#: ..\..\templates_adm\_html_header.inc.php:255
656+#: ..\..\view_admin\_html_header.inc.php:255
657 msgid "January"
658 msgstr "Janvier"
659
660 #: ..\..\inc\_vars.inc.php:239
661-#: ..\..\templates_adm\_html_header.inc.php:255
662+#: ..\..\view_admin\_html_header.inc.php:255
663 msgid "February"
664 msgstr "Février"
665
666 #: ..\..\inc\_vars.inc.php:240
667-#: ..\..\templates_adm\_html_header.inc.php:255
668+#: ..\..\view_admin\_html_header.inc.php:255
669 msgid "March"
670 msgstr "Mars"
671
672 #: ..\..\inc\_vars.inc.php:241
673-#: ..\..\templates_adm\_html_header.inc.php:255
674+#: ..\..\view_admin\_html_header.inc.php:255
675 msgid "April"
676 msgstr "Avril"
677
678@@ -1222,37 +1222,37 @@
679 msgstr "Mai"
680
681 #: ..\..\inc\_vars.inc.php:244
682-#: ..\..\templates_adm\_html_header.inc.php:255
683+#: ..\..\view_admin\_html_header.inc.php:255
684 msgid "June"
685 msgstr "Juin"
686
687 #: ..\..\inc\_vars.inc.php:245
688-#: ..\..\templates_adm\_html_header.inc.php:255
689+#: ..\..\view_admin\_html_header.inc.php:255
690 msgid "July"
691 msgstr "Juillet"
692
693 #: ..\..\inc\_vars.inc.php:246
694-#: ..\..\templates_adm\_html_header.inc.php:255
695+#: ..\..\view_admin\_html_header.inc.php:255
696 msgid "August"
697 msgstr "Août"
698
699 #: ..\..\inc\_vars.inc.php:247
700-#: ..\..\templates_adm\_html_header.inc.php:255
701+#: ..\..\view_admin\_html_header.inc.php:255
702 msgid "September"
703 msgstr "Septembre"
704
705 #: ..\..\inc\_vars.inc.php:248
706-#: ..\..\templates_adm\_html_header.inc.php:255
707+#: ..\..\view_admin\_html_header.inc.php:255
708 msgid "October"
709 msgstr "Octobre"
710
711 #: ..\..\inc\_vars.inc.php:249
712-#: ..\..\templates_adm\_html_header.inc.php:255
713+#: ..\..\view_admin\_html_header.inc.php:255
714 msgid "November"
715 msgstr "Novembre"
716
717 #: ..\..\inc\_vars.inc.php:250
718-#: ..\..\templates_adm\_html_header.inc.php:255
719+#: ..\..\view_admin\_html_header.inc.php:255
720 msgid "December"
721 msgstr "Décembre"
722
723@@ -1278,7 +1278,7 @@
724
725 #. TRANS: abbrev. for May
726 #: ..\..\inc\_vars.inc.php:262
727-#: ..\..\templates_adm\_html_header.inc.php:255
728+#: ..\..\view_admin\_html_header.inc.php:255
729 msgid "May"
730 msgstr "Mai"
731
732@@ -3318,10 +3318,10 @@
733 #: ..\..\templates\_profile.disp.php:57
734 #: ..\..\templates\_subs.disp.php:45
735 #: ..\..\templates\_user.disp.php:44
736-#: ..\..\templates_adm\login\_login_form.main.php:119
737-#: ..\..\templates_adm\login\_lostpass_form.main.php:54
738-#: ..\..\templates_adm\login\_reg_complete.main.php:47
739-#: ..\..\templates_adm\login\_reg_form.main.php:52
740+#: ..\..\view_admin\login\_login_form.main.php:119
741+#: ..\..\view_admin\login\_lostpass_form.main.php:54
742+#: ..\..\view_admin\login\_reg_complete.main.php:47
743+#: ..\..\view_admin\login\_reg_form.main.php:52
744 msgid "Login"
745 msgstr "Identifiant "
746
747@@ -3417,7 +3417,7 @@
748 #: ..\..\inc\locales\_locale_settings.form.php:84
749 #: ..\..\inc\locales\_locale_settings.form.php:279
750 #: ..\..\templates\_user.disp.php:61
751-#: ..\..\templates_adm\login\_reg_form.main.php:69
752+#: ..\..\view_admin\login\_reg_form.main.php:69
753 msgid "Locale"
754 msgstr "Locale"
755
756@@ -5985,7 +5985,7 @@
757 # C:\www\b2evo090\blogs\admin\_menutop.php:108
758 # TRANS: Warning this is a javascript string
759 #: ..\..\inc\files\views\_file_permissions.form.php:66
760-#: ..\..\templates_adm\_html_header.inc.php:162
761+#: ..\..\view_admin\_html_header.inc.php:162
762 msgid "check all"
763 msgstr "cocher tout"
764
765@@ -6748,11 +6748,11 @@
766 #: ..\..\inc\items\views\_item_list_full.view.php:104
767 #: ..\..\inc\_core\__core.init.php:210
768 #: ..\..\inc\_core\ui\results\_results.class.php:1739
769-#: ..\..\templates_adm\_adminUI_general.class.php:754
770-#: ..\..\templates_adm\_adminUI_general.class.php:810
771-#: ..\..\templates_adm\_adminUI_general.class.php:895
772-#: ..\..\templates_adm\chicago\_adminUI.class.php:198
773-#: ..\..\templates_adm\chicago\_adminUI.class.php:258
774+#: ..\..\view_admin\_adminUI_general.class.php:754
775+#: ..\..\view_admin\_adminUI_general.class.php:810
776+#: ..\..\view_admin\_adminUI_general.class.php:895
777+#: ..\..\view_admin\chicago\_adminUI.class.php:198
778+#: ..\..\view_admin\chicago\_adminUI.class.php:258
779 msgid "Pages"
780 msgstr "Pages"
781
782@@ -7125,12 +7125,12 @@
783
784 #: ..\..\inc\items\views\_item_list_full.view.php:108
785 #: ..\..\inc\items\views\_item_list_full.view.php:109
786-#: ..\..\templates_adm\_adminUI_general.class.php:820
787-#: ..\..\templates_adm\_adminUI_general.class.php:821
788-#: ..\..\templates_adm\_adminUI_general.class.php:905
789-#: ..\..\templates_adm\_adminUI_general.class.php:906
790-#: ..\..\templates_adm\chicago\_adminUI.class.php:268
791-#: ..\..\templates_adm\chicago\_adminUI.class.php:269
792+#: ..\..\view_admin\_adminUI_general.class.php:820
793+#: ..\..\view_admin\_adminUI_general.class.php:821
794+#: ..\..\view_admin\_adminUI_general.class.php:905
795+#: ..\..\view_admin\_adminUI_general.class.php:906
796+#: ..\..\view_admin\chicago\_adminUI.class.php:268
797+#: ..\..\view_admin\chicago\_adminUI.class.php:269
798 msgid "..."
799 msgstr "..."
800
801@@ -9175,8 +9175,8 @@
802 #: ..\..\install\index.php:520
803 #: ..\..\install\_functions_install.php:193
804 #: ..\..\templates\_profile.disp.php:65
805-#: ..\..\templates_adm\login\_login_form.main.php:129
806-#: ..\..\templates_adm\login\_reg_form.main.php:58
807+#: ..\..\view_admin\login\_login_form.main.php:129
808+#: ..\..\view_admin\login\_reg_form.main.php:58
809 msgid "Password"
810 msgstr "Mot de passe"
811
812@@ -10285,9 +10285,9 @@
813 #: ..\..\inc\users\model\_user.funcs.php:242
814 #: ..\..\inc\_core\__core.init.php:445
815 #: ..\..\inc\_core\__core.init.php:479
816-#: ..\..\templates_adm\_access_denied.main.php:23
817-#: ..\..\templates_adm\_adminUI_general.class.php:1229
818-#: ..\..\templates_adm\_adminUI_general.class.php:1231
819+#: ..\..\view_admin\_access_denied.main.php:23
820+#: ..\..\view_admin\_adminUI_general.class.php:1229
821+#: ..\..\view_admin\_adminUI_general.class.php:1231
822 msgid "Logout"
823 msgstr "Déconnexion"
824
825@@ -11518,7 +11518,7 @@
826 msgstr "Edition de profil utilisateur"
827
828 #: ..\..\inc\_core\__core.init.php:463
829-#: ..\..\templates_adm\login\_reg_disabled.main.php:41
830+#: ..\..\view_admin\login\_reg_disabled.main.php:41
831 msgid "Home"
832 msgstr "Page d'accueil"
833
834@@ -11650,22 +11650,22 @@
835 msgstr "Filtrer la liste"
836
837 #: ..\..\inc\_core\ui\_uiwidget.class.php:810
838-#: ..\..\templates_adm\_adminUI_general.class.php:768
839-#: ..\..\templates_adm\_adminUI_general.class.php:770
840-#: ..\..\templates_adm\_adminUI_general.class.php:853
841-#: ..\..\templates_adm\_adminUI_general.class.php:855
842-#: ..\..\templates_adm\chicago\_adminUI.class.php:216
843-#: ..\..\templates_adm\chicago\_adminUI.class.php:218
844+#: ..\..\view_admin\_adminUI_general.class.php:768
845+#: ..\..\view_admin\_adminUI_general.class.php:770
846+#: ..\..\view_admin\_adminUI_general.class.php:853
847+#: ..\..\view_admin\_adminUI_general.class.php:855
848+#: ..\..\view_admin\chicago\_adminUI.class.php:216
849+#: ..\..\view_admin\chicago\_adminUI.class.php:218
850 msgid "Ascending order"
851 msgstr "Ordre ascendant"
852
853 #: ..\..\inc\_core\ui\_uiwidget.class.php:815
854-#: ..\..\templates_adm\_adminUI_general.class.php:772
855-#: ..\..\templates_adm\_adminUI_general.class.php:774
856-#: ..\..\templates_adm\_adminUI_general.class.php:857
857-#: ..\..\templates_adm\_adminUI_general.class.php:859
858-#: ..\..\templates_adm\chicago\_adminUI.class.php:220
859-#: ..\..\templates_adm\chicago\_adminUI.class.php:222
860+#: ..\..\view_admin\_adminUI_general.class.php:772
861+#: ..\..\view_admin\_adminUI_general.class.php:774
862+#: ..\..\view_admin\_adminUI_general.class.php:857
863+#: ..\..\view_admin\_adminUI_general.class.php:859
864+#: ..\..\view_admin\chicago\_adminUI.class.php:220
865+#: ..\..\view_admin\chicago\_adminUI.class.php:222
866 msgid "Descending order"
867 msgstr "Ordre descendant"
868
869@@ -12891,150 +12891,150 @@
870 msgid "Tag Cloud"
871 msgstr "Nuage de tag"
872
873-#: ..\..\templates_adm\_access_denied.main.php:15
874-#: ..\..\templates_adm\_access_denied.main.php:19
875+#: ..\..\view_admin\_access_denied.main.php:15
876+#: ..\..\view_admin\_access_denied.main.php:19
877 msgid "Access denied"
878 msgstr "Accès refusé"
879
880-#: ..\..\templates_adm\_access_denied.main.php:20
881+#: ..\..\view_admin\_access_denied.main.php:20
882 msgid "Sorry, you have no permission to access this section."
883 msgstr "Désolé, vous n'avez la permission d'accéder à cette section."
884
885-#: ..\..\templates_adm\_access_denied.main.php:25
886+#: ..\..\view_admin\_access_denied.main.php:25
887 msgid "Exit to blogs"
888 msgstr "Retour aux blogs"
889
890-#: ..\..\templates_adm\_adminUI_general.class.php:1262
891-#: ..\..\templates_adm\chicago\_adminUI.class.php:124
892+#: ..\..\view_admin\_adminUI_general.class.php:1262
893+#: ..\..\view_admin\chicago\_adminUI.class.php:124
894 #, fuzzy
895 msgid "WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox."
896 msgstr "AVERTISSEMENT: Internet Explorer 6 peut ne pas être en mesure d'afficher correctement l'habillage d'admin. Nous vous recommandons fortement de passer à IE 7 ou Firefox."
897
898-#: ..\..\templates_adm\_html_header.inc.php:158
899+#: ..\..\view_admin\_html_header.inc.php:158
900 msgid "uncheck all"
901 msgstr "décocher tout"
902
903-#: ..\..\templates_adm\login\_login_form.main.php:43
904+#: ..\..\view_admin\login\_login_form.main.php:43
905 #, php-format
906 msgid "Note: You are already logged in as %s!"
907 msgstr "Note: Vous êtes déjà identifié sous %s!"
908
909-#: ..\..\templates_adm\login\_login_form.main.php:44
910-#: ..\..\templates_adm\login\_reg_complete.main.php:60
911+#: ..\..\view_admin\login\_login_form.main.php:44
912+#: ..\..\view_admin\login\_reg_complete.main.php:60
913 msgid "Continue"
914 msgstr "Continuer"
915
916-#: ..\..\templates_adm\login\_login_form.main.php:53
917+#: ..\..\view_admin\login\_login_form.main.php:53
918 msgid "Login form"
919 msgstr "Identification"
920
921-#: ..\..\templates_adm\login\_login_form.main.php:117
922+#: ..\..\view_admin\login\_login_form.main.php:117
923 msgid "You will have to accept cookies in order to log in."
924 msgstr "Vous devrez accepter les cookies pour pouvoir vous connecter."
925
926-#: ..\..\templates_adm\login\_login_form.main.php:127
927-#: ..\..\templates_adm\login\_lostpass_form.main.php:35
928-#: ..\..\templates_adm\login\_lostpass_form.main.php:46
929+#: ..\..\view_admin\login\_login_form.main.php:127
930+#: ..\..\view_admin\login\_lostpass_form.main.php:35
931+#: ..\..\view_admin\login\_lostpass_form.main.php:46
932 msgid "Lost password ?"
933 msgstr "Mot de passe perdu?"
934
935-#: ..\..\templates_adm\login\_login_form.main.php:137
936+#: ..\..\view_admin\login\_login_form.main.php:137
937 msgid "Log in!"
938 msgstr "S'identifier!"
939
940-#: ..\..\templates_adm\login\_login_form.main.php:142
941+#: ..\..\view_admin\login\_login_form.main.php:142
942 msgid "Log into backoffice!"
943 msgstr "Atteindre l'interface d'admin!"
944
945-#: ..\..\templates_adm\login\_login_form.main.php:173
946+#: ..\..\view_admin\login\_login_form.main.php:173
947 msgid "Please wait..."
948 msgstr "Veuillez attendre..."
949
950-#: ..\..\templates_adm\login\_login_form.main.php:209
951+#: ..\..\view_admin\login\_login_form.main.php:209
952 msgid "Abort login!"
953 msgstr "Abandonner l'identification!"
954
955 # D:\www\b2cvs20\blogs\skins_adm\login\_lostpass_form.main.php:48
956-#: ..\..\templates_adm\login\_lostpass_form.main.php:49
957+#: ..\..\view_admin\login\_lostpass_form.main.php:49
958 msgid "Please enter your login below. Do <strong>NOT</strong> enter your e-mail address!"
959 msgstr "S'il vous plait, entrer votre identifiant ci-dessous. <strong>NE PAS</strong> saisir votre adresse e-mail !"
960
961 # D:\www\b2evo20\blogs\inc\VIEW\login\_lostpass_form.php:49
962-#: ..\..\templates_adm\login\_lostpass_form.main.php:50
963+#: ..\..\view_admin\login\_lostpass_form.main.php:50
964 msgid "An email will be sent to your registered email address immediately."
965 msgstr "Un email va être envoyé à votre adresse email enregistrée immédiatement."
966
967-#: ..\..\templates_adm\login\_lostpass_form.main.php:51
968+#: ..\..\view_admin\login\_lostpass_form.main.php:51
969 msgid "As soon as you receive the email, click on the link therein to change your password."
970 msgstr "Dès que vous recevez l'emai, cliquez sur le lien qu'il contient pour modifier votre mot de passe."
971
972 #. TRANS: Text for submit button to request an activation link by email
973-#: ..\..\templates_adm\login\_lostpass_form.main.php:56
974-#: ..\..\templates_adm\login\_validate_form.main.php:62
975+#: ..\..\view_admin\login\_lostpass_form.main.php:56
976+#: ..\..\view_admin\login\_validate_form.main.php:62
977 msgid "Send me an email now!"
978 msgstr "Envoyez moi un email maintenant!"
979
980-#: ..\..\templates_adm\login\_reg_complete.main.php:34
981+#: ..\..\view_admin\login\_reg_complete.main.php:34
982 msgid "Registration complete"
983 msgstr "Inscription effectuée"
984
985-#: ..\..\templates_adm\login\_reg_disabled.main.php:34
986+#: ..\..\view_admin\login\_reg_disabled.main.php:34
987 msgid "Registration Currently Disabled"
988 msgstr "Inscription actuellement interdite"
989
990-#: ..\..\templates_adm\login\_reg_disabled.main.php:37
991+#: ..\..\view_admin\login\_reg_disabled.main.php:37
992 msgid "User registration is currently not allowed."
993 msgstr "L'inscription de nouveaux utilisateurs n'est pas autorisée actuellement."
994
995-#: ..\..\templates_adm\login\_reg_form.main.php:38
996+#: ..\..\view_admin\login\_reg_form.main.php:38
997 msgid "Register form"
998 msgstr "Formulaire d'inscription"
999
1000-#: ..\..\templates_adm\login\_reg_form.main.php:58
1001+#: ..\..\view_admin\login\_reg_form.main.php:58
1002 msgid "(twice)"
1003 msgstr "(deux fois)"
1004
1005-#: ..\..\templates_adm\login\_reg_form.main.php:62
1006+#: ..\..\view_admin\login\_reg_form.main.php:62
1007 #, php-format
1008 msgid "Minimum %d characters, please."
1009 msgstr "%d caractères minimum, SVP."
1010
1011-#: ..\..\templates_adm\login\_reg_form.main.php:69
1012+#: ..\..\view_admin\login\_reg_form.main.php:69
1013 msgid "Preferred language"
1014 msgstr "Langue préférrée"
1015
1016-#: ..\..\templates_adm\login\_reg_form.main.php:73
1017+#: ..\..\view_admin\login\_reg_form.main.php:73
1018 msgid "Register!"
1019 msgstr "S'inscrire!"
1020
1021-#: ..\..\templates_adm\login\_reg_form.main.php:80
1022+#: ..\..\view_admin\login\_reg_form.main.php:80
1023 msgid "Log into existing account..."
1024 msgstr "S'identifier sur un compte existant..."
1025
1026-#: ..\..\templates_adm\login\_validate_form.main.php:37
1027-#: ..\..\templates_adm\login\_validate_form.main.php:49
1028+#: ..\..\view_admin\login\_validate_form.main.php:37
1029+#: ..\..\view_admin\login\_validate_form.main.php:49
1030 msgid "Email address validation"
1031 msgstr "Validation d'adresse email"
1032
1033-#: ..\..\templates_adm\login\_validate_form.main.php:52
1034+#: ..\..\view_admin\login\_validate_form.main.php:52
1035 msgid "Please confirm your email address below."
1036 msgstr "Merci de confirmer votre adresse email ci-dessous."
1037
1038 # D:\www\b2evo20\blogs\inc\VIEW\login\_validate_form.php:52
1039-#: ..\..\templates_adm\login\_validate_form.main.php:53
1040+#: ..\..\view_admin\login\_validate_form.main.php:53
1041 msgid "An email will be sent to this address immediately."
1042 msgstr "Un email va être envoyé à cette adresse immédiatement."
1043
1044-#: ..\..\templates_adm\login\_validate_form.main.php:54
1045+#: ..\..\view_admin\login\_validate_form.main.php:54
1046 msgid "As soon as you receive the email, click on the link therein to activate your account."
1047 msgstr "Dès que vous recevez l'email, cliquez sur le lien qu'il contient pour activer votre compte."
1048
1049-#: ..\..\templates_adm\login\_validate_form.main.php:76
1050+#: ..\..\view_admin\login\_validate_form.main.php:76
1051 #, php-format
1052 msgid "Since you are an admin user, you can validate your email address (%s) by a single click."
1053 msgstr "Puisque vous êtes administrateur, vous pouvez valider votre adresse email (%s) d'un simple click."
1054
1055-#: ..\..\templates_adm\login\_validate_form.main.php:78
1056+#: ..\..\view_admin\login\_validate_form.main.php:78
1057 msgid "Activate my account!"
1058 msgstr "Activer mon compte!"
1059
1060
1061=== modified file 'locales/messages.pot'
1062--- locales/messages.pot 2010-04-06 13:17:28 +0000
1063+++ locales/messages.pot 2010-04-11 01:32:28 +0000
1064@@ -1,14 +1,14 @@
1065 # SOME DESCRIPTIVE TITLE.
1066-# Copyright (C) 2010 Quam Plures Core Team
1067-# This file is distributed under the same license as the Quam Plures package.
1068+# Copyright (C) YEAR Quam Plures Core Team
1069+# This file is distributed under the same license as the PACKAGE package.
1070 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
1071 #
1072 #, fuzzy
1073 msgid ""
1074 msgstr ""
1075-"Project-Id-Version: Quam Plures v0.0.0\n"
1076+"Project-Id-Version: PACKAGE VERSION\n"
1077 "Report-Msgid-Bugs-To: http://quam-plures.net/\n"
1078-"POT-Creation-Date: 2010-04-03 18:56-0700\n"
1079+"POT-Creation-Date: 2010-03-14 07:26-0700\n"
1080 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1081 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1082 "Language-Team: LANGUAGE <LL@li.org>\n"
1083@@ -38,18 +38,18 @@
1084 #: ..\..\a_notemplate.php:306
1085 #: ..\..\multiblogs.php:250
1086 #: ..\..\inc\items\views\_item_list_full.view.php:106
1087-#: ..\..\templates_adm\_adminUI_general.class.php:816
1088-#: ..\..\templates_adm\_adminUI_general.class.php:901
1089-#: ..\..\templates_adm\chicago\_adminUI.class.php:264
1090+#: ..\..\view_admin\_adminUI_general.class.php:816
1091+#: ..\..\view_admin\_adminUI_general.class.php:901
1092+#: ..\..\view_admin\chicago\_adminUI.class.php:264
1093 msgid "Previous"
1094 msgstr ""
1095
1096 #: ..\..\a_notemplate.php:307
1097 #: ..\..\multiblogs.php:251
1098 #: ..\..\inc\items\views\_item_list_full.view.php:107
1099-#: ..\..\templates_adm\_adminUI_general.class.php:817
1100-#: ..\..\templates_adm\_adminUI_general.class.php:902
1101-#: ..\..\templates_adm\chicago\_adminUI.class.php:265
1102+#: ..\..\view_admin\_adminUI_general.class.php:817
1103+#: ..\..\view_admin\_adminUI_general.class.php:902
1104+#: ..\..\view_admin\chicago\_adminUI.class.php:265
1105 msgid "Next"
1106 msgstr ""
1107
1108@@ -338,9 +338,9 @@
1109 #: ..\..\templates\_msgform.disp.php:153
1110 #: ..\..\templates\_profile.disp.php:48
1111 #: ..\..\templates\_subs.disp.php:46
1112-#: ..\..\templates_adm\login\_reg_complete.main.php:48
1113-#: ..\..\templates_adm\login\_reg_form.main.php:67
1114-#: ..\..\templates_adm\login\_validate_form.main.php:57
1115+#: ..\..\view_admin\login\_reg_complete.main.php:48
1116+#: ..\..\view_admin\login\_reg_form.main.php:67
1117+#: ..\..\view_admin\login\_validate_form.main.php:57
1118 msgid "Email"
1119 msgstr ""
1120
1121@@ -1084,43 +1084,43 @@
1122
1123 #. TRANS: abbrev. for Sunday
1124 #: ..\..\inc\_vars.inc.php:206
1125-#: ..\..\templates_adm\_html_header.inc.php:256
1126+#: ..\..\view_admin\_html_header.inc.php:256
1127 msgid "Sun"
1128 msgstr ""
1129
1130 #. TRANS: abbrev. for Monday
1131 #: ..\..\inc\_vars.inc.php:208
1132-#: ..\..\templates_adm\_html_header.inc.php:256
1133+#: ..\..\view_admin\_html_header.inc.php:256
1134 msgid "Mon"
1135 msgstr ""
1136
1137 #. TRANS: abbrev. for Tuesday
1138 #: ..\..\inc\_vars.inc.php:210
1139-#: ..\..\templates_adm\_html_header.inc.php:256
1140+#: ..\..\view_admin\_html_header.inc.php:256
1141 msgid "Tue"
1142 msgstr ""
1143
1144 #. TRANS: abbrev. for Wednesday
1145 #: ..\..\inc\_vars.inc.php:212
1146-#: ..\..\templates_adm\_html_header.inc.php:256
1147+#: ..\..\view_admin\_html_header.inc.php:256
1148 msgid "Wed"
1149 msgstr ""
1150
1151 #. TRANS: abbrev. for Thursday
1152 #: ..\..\inc\_vars.inc.php:214
1153-#: ..\..\templates_adm\_html_header.inc.php:256
1154+#: ..\..\view_admin\_html_header.inc.php:256
1155 msgid "Thu"
1156 msgstr ""
1157
1158 #. TRANS: abbrev. for Friday
1159 #: ..\..\inc\_vars.inc.php:216
1160-#: ..\..\templates_adm\_html_header.inc.php:256
1161+#: ..\..\view_admin\_html_header.inc.php:256
1162 msgid "Fri"
1163 msgstr ""
1164
1165 #. TRANS: abbrev. for Saturday
1166 #: ..\..\inc\_vars.inc.php:218
1167-#: ..\..\templates_adm\_html_header.inc.php:256
1168+#: ..\..\view_admin\_html_header.inc.php:256
1169 msgid "Sat"
1170 msgstr ""
1171
1172@@ -1162,22 +1162,22 @@
1173 msgstr ""
1174
1175 #: ..\..\inc\_vars.inc.php:238
1176-#: ..\..\templates_adm\_html_header.inc.php:255
1177+#: ..\..\view_admin\_html_header.inc.php:255
1178 msgid "January"
1179 msgstr ""
1180
1181 #: ..\..\inc\_vars.inc.php:239
1182-#: ..\..\templates_adm\_html_header.inc.php:255
1183+#: ..\..\view_admin\_html_header.inc.php:255
1184 msgid "February"
1185 msgstr ""
1186
1187 #: ..\..\inc\_vars.inc.php:240
1188-#: ..\..\templates_adm\_html_header.inc.php:255
1189+#: ..\..\view_admin\_html_header.inc.php:255
1190 msgid "March"
1191 msgstr ""
1192
1193 #: ..\..\inc\_vars.inc.php:241
1194-#: ..\..\templates_adm\_html_header.inc.php:255
1195+#: ..\..\view_admin\_html_header.inc.php:255
1196 msgid "April"
1197 msgstr ""
1198
1199@@ -1187,37 +1187,37 @@
1200 msgstr ""
1201
1202 #: ..\..\inc\_vars.inc.php:244
1203-#: ..\..\templates_adm\_html_header.inc.php:255
1204+#: ..\..\view_admin\_html_header.inc.php:255
1205 msgid "June"
1206 msgstr ""
1207
1208 #: ..\..\inc\_vars.inc.php:245
1209-#: ..\..\templates_adm\_html_header.inc.php:255
1210+#: ..\..\view_admin\_html_header.inc.php:255
1211 msgid "July"
1212 msgstr ""
1213
1214 #: ..\..\inc\_vars.inc.php:246
1215-#: ..\..\templates_adm\_html_header.inc.php:255
1216+#: ..\..\view_admin\_html_header.inc.php:255
1217 msgid "August"
1218 msgstr ""
1219
1220 #: ..\..\inc\_vars.inc.php:247
1221-#: ..\..\templates_adm\_html_header.inc.php:255
1222+#: ..\..\view_admin\_html_header.inc.php:255
1223 msgid "September"
1224 msgstr ""
1225
1226 #: ..\..\inc\_vars.inc.php:248
1227-#: ..\..\templates_adm\_html_header.inc.php:255
1228+#: ..\..\view_admin\_html_header.inc.php:255
1229 msgid "October"
1230 msgstr ""
1231
1232 #: ..\..\inc\_vars.inc.php:249
1233-#: ..\..\templates_adm\_html_header.inc.php:255
1234+#: ..\..\view_admin\_html_header.inc.php:255
1235 msgid "November"
1236 msgstr ""
1237
1238 #: ..\..\inc\_vars.inc.php:250
1239-#: ..\..\templates_adm\_html_header.inc.php:255
1240+#: ..\..\view_admin\_html_header.inc.php:255
1241 msgid "December"
1242 msgstr ""
1243
1244@@ -1243,7 +1243,7 @@
1245
1246 #. TRANS: abbrev. for May
1247 #: ..\..\inc\_vars.inc.php:262
1248-#: ..\..\templates_adm\_html_header.inc.php:255
1249+#: ..\..\view_admin\_html_header.inc.php:255
1250 msgid "May"
1251 msgstr ""
1252
1253@@ -2783,7 +2783,7 @@
1254 msgstr ""
1255
1256 #: ..\..\inc\collections\views\_coll_features.form.php:130
1257-#: ..\..\inc\_core\_template.funcs.php:270
1258+#: ..\..\inc\_core\_template.funcs.php:314
1259 msgid "Subscriptions"
1260 msgstr ""
1261
1262@@ -3243,10 +3243,10 @@
1263 #: ..\..\templates\_profile.disp.php:57
1264 #: ..\..\templates\_subs.disp.php:45
1265 #: ..\..\templates\_user.disp.php:44
1266-#: ..\..\templates_adm\login\_login_form.main.php:119
1267-#: ..\..\templates_adm\login\_lostpass_form.main.php:54
1268-#: ..\..\templates_adm\login\_reg_complete.main.php:47
1269-#: ..\..\templates_adm\login\_reg_form.main.php:52
1270+#: ..\..\view_admin\login\_login_form.main.php:119
1271+#: ..\..\view_admin\login\_lostpass_form.main.php:54
1272+#: ..\..\view_admin\login\_reg_complete.main.php:47
1273+#: ..\..\view_admin\login\_reg_form.main.php:52
1274 msgid "Login"
1275 msgstr ""
1276
1277@@ -3340,7 +3340,7 @@
1278 #: ..\..\inc\locales\_locale_settings.form.php:84
1279 #: ..\..\inc\locales\_locale_settings.form.php:279
1280 #: ..\..\templates\_user.disp.php:61
1281-#: ..\..\templates_adm\login\_reg_form.main.php:69
1282+#: ..\..\view_admin\login\_reg_form.main.php:69
1283 msgid "Locale"
1284 msgstr ""
1285
1286@@ -3647,6 +3647,7 @@
1287 msgstr ""
1288
1289 #: ..\..\inc\collections\views\_coll_seo.form.php:214
1290+#: ..\..\inc\_core\_template.funcs.php:257
1291 msgid "Archive directory"
1292 msgstr ""
1293
1294@@ -3678,6 +3679,7 @@
1295 msgstr ""
1296
1297 #: ..\..\inc\collections\views\_coll_seo.form.php:263
1298+#: ..\..\inc\_core\_template.funcs.php:258
1299 msgid "Category directory"
1300 msgstr ""
1301
1302@@ -3887,6 +3889,7 @@
1303 msgstr ""
1304
1305 #: ..\..\inc\comments\_comments.ctrl.php:191
1306+#: ..\..\inc\_core\_template.funcs.php:296
1307 msgid "Latest comments"
1308 msgstr ""
1309
1310@@ -4039,6 +4042,7 @@
1311
1312 #: ..\..\inc\comments\model\_comment.class.php:1269
1313 #: ..\..\templates\_item_comment.inc.php:48
1314+#: ..\..\templates\_item_comment_wp.inc.php:53
1315 msgid "Comment"
1316 msgstr ""
1317
1318@@ -4098,8 +4102,6 @@
1319 msgstr ""
1320
1321 #: ..\..\inc\comments\views\_comment.form.php:57
1322-#: ..\..\inc\comments\views\_comment_list.inc.php:72
1323-#: ..\..\templates\_comments.disp.php:26
1324 msgid "In response to"
1325 msgstr ""
1326
1327@@ -4188,6 +4190,11 @@
1328 msgid "No Spam Karma"
1329 msgstr ""
1330
1331+#: ..\..\inc\comments\views\_comment_list.inc.php:72
1332+#: ..\..\templates\_comments.disp.php:26
1333+msgid "In response to:"
1334+msgstr ""
1335+
1336 #: ..\..\inc\cron\cronjobs.ctrl.php:58
1337 msgid "Basic test job"
1338 msgstr ""
1339@@ -5843,7 +5850,7 @@
1340 msgstr ""
1341
1342 #: ..\..\inc\files\views\_file_permissions.form.php:66
1343-#: ..\..\templates_adm\_html_header.inc.php:162
1344+#: ..\..\view_admin\_html_header.inc.php:162
1345 msgid "check all"
1346 msgstr ""
1347
1348@@ -6590,11 +6597,11 @@
1349 #: ..\..\inc\items\views\_item_list_full.view.php:104
1350 #: ..\..\inc\_core\__core.init.php:210
1351 #: ..\..\inc\_core\ui\results\_results.class.php:1739
1352-#: ..\..\templates_adm\_adminUI_general.class.php:754
1353-#: ..\..\templates_adm\_adminUI_general.class.php:810
1354-#: ..\..\templates_adm\_adminUI_general.class.php:895
1355-#: ..\..\templates_adm\chicago\_adminUI.class.php:198
1356-#: ..\..\templates_adm\chicago\_adminUI.class.php:258
1357+#: ..\..\view_admin\_adminUI_general.class.php:754
1358+#: ..\..\view_admin\_adminUI_general.class.php:810
1359+#: ..\..\view_admin\_adminUI_general.class.php:895
1360+#: ..\..\view_admin\chicago\_adminUI.class.php:198
1361+#: ..\..\view_admin\chicago\_adminUI.class.php:258
1362 msgid "Pages"
1363 msgstr ""
1364
1365@@ -6912,7 +6919,7 @@
1366 #: ..\..\inc\items\views\_item_list_full.view.php:368
1367 #: ..\..\inc\sessions\views\_stats_goalhits.view.php:135
1368 #: ..\..\inc\sessions\views\_stats_hit_list.view.php:99
1369-#: ..\..\inc\_core\_template.funcs.php:269
1370+#: ..\..\inc\_core\_template.funcs.php:345
1371 #: ..\..\templates\_item_comment_form.inc.php:139
1372 msgid "User"
1373 msgstr ""
1374@@ -6965,17 +6972,19 @@
1375
1376 #: ..\..\inc\items\views\_item_list_full.view.php:108
1377 #: ..\..\inc\items\views\_item_list_full.view.php:109
1378-#: ..\..\templates_adm\_adminUI_general.class.php:820
1379-#: ..\..\templates_adm\_adminUI_general.class.php:821
1380-#: ..\..\templates_adm\_adminUI_general.class.php:905
1381-#: ..\..\templates_adm\_adminUI_general.class.php:906
1382-#: ..\..\templates_adm\chicago\_adminUI.class.php:268
1383-#: ..\..\templates_adm\chicago\_adminUI.class.php:269
1384+#: ..\..\view_admin\_adminUI_general.class.php:820
1385+#: ..\..\view_admin\_adminUI_general.class.php:821
1386+#: ..\..\view_admin\_adminUI_general.class.php:905
1387+#: ..\..\view_admin\_adminUI_general.class.php:906
1388+#: ..\..\view_admin\chicago\_adminUI.class.php:268
1389+#: ..\..\view_admin\chicago\_adminUI.class.php:269
1390 msgid "..."
1391 msgstr ""
1392
1393 #. TRANS: backoffice: each post is prefixed by "date BY author IN categories"
1394 #: ..\..\inc\items\views\_item_list_full.view.php:167
1395+#: ..\..\templates\_item_comment_wp.inc.php:52
1396+#: ..\..\templates\_item_comment_wp.inc.php:65
1397 msgid "by"
1398 msgstr ""
1399
1400@@ -8964,8 +8973,8 @@
1401 #: ..\..\install\index.php:520
1402 #: ..\..\install\_functions_install.php:193
1403 #: ..\..\templates\_profile.disp.php:65
1404-#: ..\..\templates_adm\login\_login_form.main.php:129
1405-#: ..\..\templates_adm\login\_reg_form.main.php:58
1406+#: ..\..\view_admin\login\_login_form.main.php:129
1407+#: ..\..\view_admin\login\_reg_form.main.php:58
1408 msgid "Password"
1409 msgstr ""
1410
1411@@ -10020,9 +10029,9 @@
1412 #: ..\..\inc\users\model\_user.funcs.php:242
1413 #: ..\..\inc\_core\__core.init.php:445
1414 #: ..\..\inc\_core\__core.init.php:479
1415-#: ..\..\templates_adm\_access_denied.main.php:23
1416-#: ..\..\templates_adm\_adminUI_general.class.php:1229
1417-#: ..\..\templates_adm\_adminUI_general.class.php:1231
1418+#: ..\..\view_admin\_access_denied.main.php:23
1419+#: ..\..\view_admin\_adminUI_general.class.php:1229
1420+#: ..\..\view_admin\_adminUI_general.class.php:1231
1421 msgid "Logout"
1422 msgstr ""
1423
1424@@ -10643,12 +10652,12 @@
1425 msgstr ""
1426
1427 #: ..\..\inc\widgets\widgets.ctrl.php:401
1428-#: ..\..\inc\_core\_template.funcs.php:639
1429+#: ..\..\inc\_core\_template.funcs.php:620
1430 msgid "Changes pending"
1431 msgstr ""
1432
1433 #: ..\..\inc\widgets\widgets.ctrl.php:402
1434-#: ..\..\inc\_core\_template.funcs.php:640
1435+#: ..\..\inc\_core\_template.funcs.php:621
1436 msgid "Saving changes"
1437 msgstr ""
1438
1439@@ -10657,7 +10666,7 @@
1440 msgstr ""
1441
1442 #: ..\..\inc\widgets\widgets.ctrl.php:404
1443-#: ..\..\inc\_core\_template.funcs.php:637
1444+#: ..\..\inc\_core\_template.funcs.php:618
1445 msgid "Update cancelled"
1446 msgstr ""
1447
1448@@ -11015,46 +11024,32 @@
1449 msgid "(Note: To get rid of the above validation warnings, you can deactivate unwanted validation rules in your <a %s>Group settings</a>.)"
1450 msgstr ""
1451
1452-#: ..\..\inc\_core\_template.funcs.php:264
1453-msgid "Archive Directory"
1454-msgstr ""
1455-
1456-#: ..\..\inc\_core\_template.funcs.php:265
1457-msgid "Category Directory"
1458-msgstr ""
1459-
1460-#: ..\..\inc\_core\_template.funcs.php:266
1461-msgid "Photo Index"
1462-msgstr ""
1463-
1464-#: ..\..\inc\_core\_template.funcs.php:267
1465-msgid "Send an Email Message"
1466-msgstr ""
1467-
1468-#: ..\..\inc\_core\_template.funcs.php:268
1469-msgid "User Profile"
1470-msgstr ""
1471-
1472-#: ..\..\inc\_core\_template.funcs.php:271
1473-msgid "Latest Comments"
1474-msgstr ""
1475-
1476-#: ..\..\inc\_core\_template.funcs.php:272
1477-msgid "Feedback"
1478-msgstr ""
1479-
1480-#. TRANS: %s is an item title
1481-#: ..\..\inc\_core\_template.funcs.php:311
1482-#: ..\..\inc\_core\_template.funcs.php:323
1483-#, php-format
1484-msgid " on %s"
1485-msgstr ""
1486-
1487-#: ..\..\inc\_core\_template.funcs.php:346
1488+#. TRANS: %s is an item title
1489+#: ..\..\inc\_core\_template.funcs.php:292
1490+#, php-format
1491+msgid "Latest comments on %s"
1492+msgstr ""
1493+
1494+#. TRANS: %s is an item title
1495+#: ..\..\inc\_core\_template.funcs.php:304
1496+#, php-format
1497+msgid "Feedback on %s"
1498+msgstr ""
1499+
1500+#: ..\..\inc\_core\_template.funcs.php:309
1501+#: ..\..\inc\_core\__core.init.php:722
1502+msgid "User profile"
1503+msgstr ""
1504+
1505+#: ..\..\inc\_core\_template.funcs.php:319
1506+msgid "Send an email message"
1507+msgstr ""
1508+
1509+#: ..\..\inc\_core\_template.funcs.php:327
1510 msgid "PREVIEW"
1511 msgstr ""
1512
1513-#: ..\..\inc\_core\_template.funcs.php:638
1514+#: ..\..\inc\_core\_template.funcs.php:619
1515 msgid "Update paused"
1516 msgstr ""
1517
1518@@ -11214,7 +11209,7 @@
1519 msgstr ""
1520
1521 #: ..\..\inc\_core\__core.init.php:463
1522-#: ..\..\templates_adm\login\_reg_disabled.main.php:41
1523+#: ..\..\view_admin\login\_reg_disabled.main.php:41
1524 msgid "Home"
1525 msgstr ""
1526
1527@@ -11285,10 +11280,6 @@
1528 msgid "My profile"
1529 msgstr ""
1530
1531-#: ..\..\inc\_core\__core.init.php:722
1532-msgid "User profile"
1533-msgstr ""
1534-
1535 #: ..\..\inc\_core\__core.init.php:741
1536 msgid "System"
1537 msgstr ""
1538@@ -11348,22 +11339,22 @@
1539 msgstr ""
1540
1541 #: ..\..\inc\_core\ui\_uiwidget.class.php:810
1542-#: ..\..\templates_adm\_adminUI_general.class.php:768
1543-#: ..\..\templates_adm\_adminUI_general.class.php:770
1544-#: ..\..\templates_adm\_adminUI_general.class.php:853
1545-#: ..\..\templates_adm\_adminUI_general.class.php:855
1546-#: ..\..\templates_adm\chicago\_adminUI.class.php:216
1547-#: ..\..\templates_adm\chicago\_adminUI.class.php:218
1548+#: ..\..\view_admin\_adminUI_general.class.php:768
1549+#: ..\..\view_admin\_adminUI_general.class.php:770
1550+#: ..\..\view_admin\_adminUI_general.class.php:853
1551+#: ..\..\view_admin\_adminUI_general.class.php:855
1552+#: ..\..\view_admin\chicago\_adminUI.class.php:216
1553+#: ..\..\view_admin\chicago\_adminUI.class.php:218
1554 msgid "Ascending order"
1555 msgstr ""
1556
1557 #: ..\..\inc\_core\ui\_uiwidget.class.php:815
1558-#: ..\..\templates_adm\_adminUI_general.class.php:772
1559-#: ..\..\templates_adm\_adminUI_general.class.php:774
1560-#: ..\..\templates_adm\_adminUI_general.class.php:857
1561-#: ..\..\templates_adm\_adminUI_general.class.php:859
1562-#: ..\..\templates_adm\chicago\_adminUI.class.php:220
1563-#: ..\..\templates_adm\chicago\_adminUI.class.php:222
1564+#: ..\..\view_admin\_adminUI_general.class.php:772
1565+#: ..\..\view_admin\_adminUI_general.class.php:774
1566+#: ..\..\view_admin\_adminUI_general.class.php:857
1567+#: ..\..\view_admin\_adminUI_general.class.php:859
1568+#: ..\..\view_admin\chicago\_adminUI.class.php:220
1569+#: ..\..\view_admin\chicago\_adminUI.class.php:222
1570 msgid "Descending order"
1571 msgstr ""
1572
1573@@ -12297,11 +12288,11 @@
1574 msgstr ""
1575
1576 #: ..\..\templates\_item_comment.inc.php:62
1577+#: ..\..\templates\_item_comment_wp.inc.php:66
1578 msgid "Trackback"
1579 msgstr ""
1580
1581 #: ..\..\templates\_item_comment_form.inc.php:146
1582-#: ..\..\templates\_msgform.disp.php:153
1583 msgid "Your email address will <strong>not</strong> be revealed on this site."
1584 msgstr ""
1585
1586@@ -12333,6 +12324,10 @@
1587 msgid "Allow users to contact you through a message form (your email will <strong>not</strong> be revealed."
1588 msgstr ""
1589
1590+#: ..\..\templates\_item_comment_wp.inc.php:46
1591+msgid "PREVIEW Comment by"
1592+msgstr ""
1593+
1594 #: ..\..\templates\_item_content.inc.php:38
1595 msgid "Link:"
1596 msgstr ""
1597@@ -12382,6 +12377,10 @@
1598 msgid "Your name."
1599 msgstr ""
1600
1601+#: ..\..\templates\_msgform.disp.php:153
1602+msgid "Your email address. (Will <strong>not</strong> be displayed on this site.)"
1603+msgstr ""
1604+
1605 #: ..\..\templates\_msgform.disp.php:154
1606 msgid "Subject"
1607 msgstr ""
1608@@ -12442,145 +12441,149 @@
1609 msgid "Miscellaneous"
1610 msgstr ""
1611
1612-#: ..\..\templates_adm\_access_denied.main.php:15
1613-#: ..\..\templates_adm\_access_denied.main.php:19
1614+#: ..\..\templates\_wp_compatibility.inc.php:65
1615+msgid "Tag Cloud"
1616+msgstr ""
1617+
1618+#: ..\..\view_admin\_access_denied.main.php:15
1619+#: ..\..\view_admin\_access_denied.main.php:19
1620 msgid "Access denied"
1621 msgstr ""
1622
1623-#: ..\..\templates_adm\_access_denied.main.php:20
1624+#: ..\..\view_admin\_access_denied.main.php:20
1625 msgid "Sorry, you have no permission to access this section."
1626 msgstr ""
1627
1628-#: ..\..\templates_adm\_access_denied.main.php:25
1629+#: ..\..\view_admin\_access_denied.main.php:25
1630 msgid "Exit to blogs"
1631 msgstr ""
1632
1633-#: ..\..\templates_adm\_adminUI_general.class.php:1262
1634-#: ..\..\templates_adm\chicago\_adminUI.class.php:124
1635+#: ..\..\view_admin\_adminUI_general.class.php:1262
1636+#: ..\..\view_admin\chicago\_adminUI.class.php:124
1637 msgid "WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox."
1638 msgstr ""
1639
1640-#: ..\..\templates_adm\_html_header.inc.php:158
1641+#: ..\..\view_admin\_html_header.inc.php:158
1642 msgid "uncheck all"
1643 msgstr ""
1644
1645-#: ..\..\templates_adm\login\_login_form.main.php:43
1646+#: ..\..\view_admin\login\_login_form.main.php:43
1647 #, php-format
1648 msgid "Note: You are already logged in as %s!"
1649 msgstr ""
1650
1651-#: ..\..\templates_adm\login\_login_form.main.php:44
1652-#: ..\..\templates_adm\login\_reg_complete.main.php:60
1653+#: ..\..\view_admin\login\_login_form.main.php:44
1654+#: ..\..\view_admin\login\_reg_complete.main.php:60
1655 msgid "Continue"
1656 msgstr ""
1657
1658-#: ..\..\templates_adm\login\_login_form.main.php:53
1659+#: ..\..\view_admin\login\_login_form.main.php:53
1660 msgid "Login form"
1661 msgstr ""
1662
1663-#: ..\..\templates_adm\login\_login_form.main.php:117
1664+#: ..\..\view_admin\login\_login_form.main.php:117
1665 msgid "You will have to accept cookies in order to log in."
1666 msgstr ""
1667
1668-#: ..\..\templates_adm\login\_login_form.main.php:127
1669-#: ..\..\templates_adm\login\_lostpass_form.main.php:35
1670-#: ..\..\templates_adm\login\_lostpass_form.main.php:46
1671+#: ..\..\view_admin\login\_login_form.main.php:127
1672+#: ..\..\view_admin\login\_lostpass_form.main.php:35
1673+#: ..\..\view_admin\login\_lostpass_form.main.php:46
1674 msgid "Lost password ?"
1675 msgstr ""
1676
1677-#: ..\..\templates_adm\login\_login_form.main.php:137
1678+#: ..\..\view_admin\login\_login_form.main.php:137
1679 msgid "Log in!"
1680 msgstr ""
1681
1682-#: ..\..\templates_adm\login\_login_form.main.php:142
1683+#: ..\..\view_admin\login\_login_form.main.php:142
1684 msgid "Log into backoffice!"
1685 msgstr ""
1686
1687-#: ..\..\templates_adm\login\_login_form.main.php:173
1688+#: ..\..\view_admin\login\_login_form.main.php:173
1689 msgid "Please wait..."
1690 msgstr ""
1691
1692-#: ..\..\templates_adm\login\_login_form.main.php:209
1693+#: ..\..\view_admin\login\_login_form.main.php:209
1694 msgid "Abort login!"
1695 msgstr ""
1696
1697-#: ..\..\templates_adm\login\_lostpass_form.main.php:49
1698+#: ..\..\view_admin\login\_lostpass_form.main.php:49
1699 msgid "Please enter your login below. Do <strong>NOT</strong> enter your e-mail address!"
1700 msgstr ""
1701
1702-#: ..\..\templates_adm\login\_lostpass_form.main.php:50
1703+#: ..\..\view_admin\login\_lostpass_form.main.php:50
1704 msgid "An email will be sent to your registered email address immediately."
1705 msgstr ""
1706
1707-#: ..\..\templates_adm\login\_lostpass_form.main.php:51
1708+#: ..\..\view_admin\login\_lostpass_form.main.php:51
1709 msgid "As soon as you receive the email, click on the link therein to change your password."
1710 msgstr ""
1711
1712 #. TRANS: Text for submit button to request an activation link by email
1713-#: ..\..\templates_adm\login\_lostpass_form.main.php:56
1714-#: ..\..\templates_adm\login\_validate_form.main.php:62
1715+#: ..\..\view_admin\login\_lostpass_form.main.php:56
1716+#: ..\..\view_admin\login\_validate_form.main.php:62
1717 msgid "Send me an email now!"
1718 msgstr ""
1719
1720-#: ..\..\templates_adm\login\_reg_complete.main.php:34
1721+#: ..\..\view_admin\login\_reg_complete.main.php:34
1722 msgid "Registration complete"
1723 msgstr ""
1724
1725-#: ..\..\templates_adm\login\_reg_disabled.main.php:34
1726+#: ..\..\view_admin\login\_reg_disabled.main.php:34
1727 msgid "Registration Currently Disabled"
1728 msgstr ""
1729
1730-#: ..\..\templates_adm\login\_reg_disabled.main.php:37
1731+#: ..\..\view_admin\login\_reg_disabled.main.php:37
1732 msgid "User registration is currently not allowed."
1733 msgstr ""
1734
1735-#: ..\..\templates_adm\login\_reg_form.main.php:38
1736+#: ..\..\view_admin\login\_reg_form.main.php:38
1737 msgid "Register form"
1738 msgstr ""
1739
1740-#: ..\..\templates_adm\login\_reg_form.main.php:58
1741+#: ..\..\view_admin\login\_reg_form.main.php:58
1742 msgid "(twice)"
1743 msgstr ""
1744
1745-#: ..\..\templates_adm\login\_reg_form.main.php:62
1746+#: ..\..\view_admin\login\_reg_form.main.php:62
1747 #, php-format
1748 msgid "Minimum %d characters, please."
1749 msgstr ""
1750
1751-#: ..\..\templates_adm\login\_reg_form.main.php:69
1752+#: ..\..\view_admin\login\_reg_form.main.php:69
1753 msgid "Preferred language"
1754 msgstr ""
1755
1756-#: ..\..\templates_adm\login\_reg_form.main.php:73
1757+#: ..\..\view_admin\login\_reg_form.main.php:73
1758 msgid "Register!"
1759 msgstr ""
1760
1761-#: ..\..\templates_adm\login\_reg_form.main.php:80
1762+#: ..\..\view_admin\login\_reg_form.main.php:80
1763 msgid "Log into existing account..."
1764 msgstr ""
1765
1766-#: ..\..\templates_adm\login\_validate_form.main.php:37
1767-#: ..\..\templates_adm\login\_validate_form.main.php:49
1768+#: ..\..\view_admin\login\_validate_form.main.php:37
1769+#: ..\..\view_admin\login\_validate_form.main.php:49
1770 msgid "Email address validation"
1771 msgstr ""
1772
1773-#: ..\..\templates_adm\login\_validate_form.main.php:52
1774+#: ..\..\view_admin\login\_validate_form.main.php:52
1775 msgid "Please confirm your email address below."
1776 msgstr ""
1777
1778-#: ..\..\templates_adm\login\_validate_form.main.php:53
1779+#: ..\..\view_admin\login\_validate_form.main.php:53
1780 msgid "An email will be sent to this address immediately."
1781 msgstr ""
1782
1783-#: ..\..\templates_adm\login\_validate_form.main.php:54
1784+#: ..\..\view_admin\login\_validate_form.main.php:54
1785 msgid "As soon as you receive the email, click on the link therein to activate your account."
1786 msgstr ""
1787
1788-#: ..\..\templates_adm\login\_validate_form.main.php:76
1789+#: ..\..\view_admin\login\_validate_form.main.php:76
1790 #, php-format
1791 msgid "Since you are an admin user, you can validate your email address (%s) by a single click."
1792 msgstr ""
1793
1794-#: ..\..\templates_adm\login\_validate_form.main.php:78
1795+#: ..\..\view_admin\login\_validate_form.main.php:78
1796 msgid "Activate my account!"
1797 msgstr ""
1798
1799=== modified file 'locales/ru_RU/LC_MESSAGES/messages.po'
1800--- locales/ru_RU/LC_MESSAGES/messages.po 2010-03-14 14:58:16 +0000
1801+++ locales/ru_RU/LC_MESSAGES/messages.po 2010-04-11 01:32:28 +0000
1802@@ -37,18 +37,18 @@
1803 #: ..\..\a_notemplate.php:306
1804 #: ..\..\multiblogs.php:250
1805 #: ..\..\inc\items\views\_item_list_full.view.php:106
1806-#: ..\..\templates_adm\_adminUI_general.class.php:816
1807-#: ..\..\templates_adm\_adminUI_general.class.php:901
1808-#: ..\..\templates_adm\chicago\_adminUI.class.php:264
1809+#: ..\..\view_admin\_adminUI_general.class.php:816
1810+#: ..\..\view_admin\_adminUI_general.class.php:901
1811+#: ..\..\view_admin\chicago\_adminUI.class.php:264
1812 msgid "Previous"
1813 msgstr "Предыдущие"
1814
1815 #: ..\..\a_notemplate.php:307
1816 #: ..\..\multiblogs.php:251
1817 #: ..\..\inc\items\views\_item_list_full.view.php:107
1818-#: ..\..\templates_adm\_adminUI_general.class.php:817
1819-#: ..\..\templates_adm\_adminUI_general.class.php:902
1820-#: ..\..\templates_adm\chicago\_adminUI.class.php:265
1821+#: ..\..\view_admin\_adminUI_general.class.php:817
1822+#: ..\..\view_admin\_adminUI_general.class.php:902
1823+#: ..\..\view_admin\chicago\_adminUI.class.php:265
1824 msgid "Next"
1825 msgstr "Следующие"
1826
1827@@ -338,9 +338,9 @@
1828 #: ..\..\templates\_msgform.disp.php:153
1829 #: ..\..\templates\_profile.disp.php:48
1830 #: ..\..\templates\_subs.disp.php:46
1831-#: ..\..\templates_adm\login\_reg_complete.main.php:48
1832-#: ..\..\templates_adm\login\_reg_form.main.php:67
1833-#: ..\..\templates_adm\login\_validate_form.main.php:57
1834+#: ..\..\view_admin\login\_reg_complete.main.php:48
1835+#: ..\..\view_admin\login\_reg_form.main.php:67
1836+#: ..\..\view_admin\login\_validate_form.main.php:57
1837 msgid "Email"
1838 msgstr "Email"
1839
1840@@ -1091,43 +1091,43 @@
1841
1842 #. TRANS: abbrev. for Sunday
1843 #: ..\..\inc\_vars.inc.php:206
1844-#: ..\..\templates_adm\_html_header.inc.php:256
1845+#: ..\..\view_admin\_html_header.inc.php:256
1846 msgid "Sun"
1847 msgstr "В�"
1848
1849 #. TRANS: abbrev. for Monday
1850 #: ..\..\inc\_vars.inc.php:208
1851-#: ..\..\templates_adm\_html_header.inc.php:256
1852+#: ..\..\view_admin\_html_header.inc.php:256
1853 msgid "Mon"
1854 msgstr "Пн"
1855
1856 #. TRANS: abbrev. for Tuesday
1857 #: ..\..\inc\_vars.inc.php:210
1858-#: ..\..\templates_adm\_html_header.inc.php:256
1859+#: ..\..\view_admin\_html_header.inc.php:256
1860 msgid "Tue"
1861 msgstr "Ð’Ñ‚"
1862
1863 #. TRANS: abbrev. for Wednesday
1864 #: ..\..\inc\_vars.inc.php:212
1865-#: ..\..\templates_adm\_html_header.inc.php:256
1866+#: ..\..\view_admin\_html_header.inc.php:256
1867 msgid "Wed"
1868 msgstr "Ср"
1869
1870 #. TRANS: abbrev. for Thursday
1871 #: ..\..\inc\_vars.inc.php:214
1872-#: ..\..\templates_adm\_html_header.inc.php:256
1873+#: ..\..\view_admin\_html_header.inc.php:256
1874 msgid "Thu"
1875 msgstr "Чт"
1876
1877 #. TRANS: abbrev. for Friday
1878 #: ..\..\inc\_vars.inc.php:216
1879-#: ..\..\templates_adm\_html_header.inc.php:256
1880+#: ..\..\view_admin\_html_header.inc.php:256
1881 msgid "Fri"
1882 msgstr "Пт"
1883
1884 #. TRANS: abbrev. for Saturday
1885 #: ..\..\inc\_vars.inc.php:218
1886-#: ..\..\templates_adm\_html_header.inc.php:256
1887+#: ..\..\view_admin\_html_header.inc.php:256
1888 msgid "Sat"
1889 msgstr "Сб"
1890
1891@@ -1169,22 +1169,22 @@
1892 msgstr "С "
1893
1894 #: ..\..\inc\_vars.inc.php:238
1895-#: ..\..\templates_adm\_html_header.inc.php:255
1896+#: ..\..\view_admin\_html_header.inc.php:255
1897 msgid "January"
1898 msgstr "Январь"
1899
1900 #: ..\..\inc\_vars.inc.php:239
1901-#: ..\..\templates_adm\_html_header.inc.php:255
1902+#: ..\..\view_admin\_html_header.inc.php:255
1903 msgid "February"
1904 msgstr "Февраль"
1905
1906 #: ..\..\inc\_vars.inc.php:240
1907-#: ..\..\templates_adm\_html_header.inc.php:255
1908+#: ..\..\view_admin\_html_header.inc.php:255
1909 msgid "March"
1910 msgstr "Март"
1911
1912 #: ..\..\inc\_vars.inc.php:241
1913-#: ..\..\templates_adm\_html_header.inc.php:255
1914+#: ..\..\view_admin\_html_header.inc.php:255
1915 msgid "April"
1916 msgstr "�прель"
1917
1918@@ -1194,37 +1194,37 @@
1919 msgstr "Май"
1920
1921 #: ..\..\inc\_vars.inc.php:244
1922-#: ..\..\templates_adm\_html_header.inc.php:255
1923+#: ..\..\view_admin\_html_header.inc.php:255
1924 msgid "June"
1925 msgstr "Июнь"
1926
1927 #: ..\..\inc\_vars.inc.php:245
1928-#: ..\..\templates_adm\_html_header.inc.php:255
1929+#: ..\..\view_admin\_html_header.inc.php:255
1930 msgid "July"
1931 msgstr "Июль"
1932
1933 #: ..\..\inc\_vars.inc.php:246
1934-#: ..\..\templates_adm\_html_header.inc.php:255
1935+#: ..\..\view_admin\_html_header.inc.php:255
1936 msgid "August"
1937 msgstr "�вгу�т"
1938
1939 #: ..\..\inc\_vars.inc.php:247
1940-#: ..\..\templates_adm\_html_header.inc.php:255
1941+#: ..\..\view_admin\_html_header.inc.php:255
1942 msgid "September"
1943 msgstr "Сент�брь"
1944
1945 #: ..\..\inc\_vars.inc.php:248
1946-#: ..\..\templates_adm\_html_header.inc.php:255
1947+#: ..\..\view_admin\_html_header.inc.php:255
1948 msgid "October"
1949 msgstr "Окт�брь"
1950
1951 #: ..\..\inc\_vars.inc.php:249
1952-#: ..\..\templates_adm\_html_header.inc.php:255
1953+#: ..\..\view_admin\_html_header.inc.php:255
1954 msgid "November"
1955 msgstr "�о�брь"
1956
1957 #: ..\..\inc\_vars.inc.php:250
1958-#: ..\..\templates_adm\_html_header.inc.php:255
1959+#: ..\..\view_admin\_html_header.inc.php:255
1960 msgid "December"
1961 msgstr "Декабрь"
1962
1963@@ -1250,7 +1250,7 @@
1964
1965 #. TRANS: abbrev. for May
1966 #: ..\..\inc\_vars.inc.php:262
1967-#: ..\..\templates_adm\_html_header.inc.php:255
1968+#: ..\..\view_admin\_html_header.inc.php:255
1969 msgid "May"
1970 msgstr "Май"
1971
1972@@ -3256,10 +3256,10 @@
1973 #: ..\..\templates\_profile.disp.php:57
1974 #: ..\..\templates\_subs.disp.php:45
1975 #: ..\..\templates\_user.disp.php:44
1976-#: ..\..\templates_adm\login\_login_form.main.php:119
1977-#: ..\..\templates_adm\login\_lostpass_form.main.php:54
1978-#: ..\..\templates_adm\login\_reg_complete.main.php:47
1979-#: ..\..\templates_adm\login\_reg_form.main.php:52
1980+#: ..\..\view_admin\login\_login_form.main.php:119
1981+#: ..\..\view_admin\login\_lostpass_form.main.php:54
1982+#: ..\..\view_admin\login\_reg_complete.main.php:47
1983+#: ..\..\view_admin\login\_reg_form.main.php:52
1984 msgid "Login"
1985 msgstr "Логин"
1986
1987@@ -3353,7 +3353,7 @@
1988 #: ..\..\inc\locales\_locale_settings.form.php:84
1989 #: ..\..\inc\locales\_locale_settings.form.php:279
1990 #: ..\..\templates\_user.disp.php:61
1991-#: ..\..\templates_adm\login\_reg_form.main.php:69
1992+#: ..\..\view_admin\login\_reg_form.main.php:69
1993 msgid "Locale"
1994 msgstr "Локаль"
1995
1996@@ -5880,7 +5880,7 @@
1997 msgstr "Разрешени� по умолчанию"
1998
1999 #: ..\..\inc\files\views\_file_permissions.form.php:66
2000-#: ..\..\templates_adm\_html_header.inc.php:162
2001+#: ..\..\view_admin\_html_header.inc.php:162
2002 msgid "check all"
2003 msgstr "отметить в�е"
2004
2005@@ -6634,11 +6634,11 @@
2006 #: ..\..\inc\items\views\_item_list_full.view.php:104
2007 #: ..\..\inc\_core\__core.init.php:210
2008 #: ..\..\inc\_core\ui\results\_results.class.php:1739
2009-#: ..\..\templates_adm\_adminUI_general.class.php:754
2010-#: ..\..\templates_adm\_adminUI_general.class.php:810
2011-#: ..\..\templates_adm\_adminUI_general.class.php:895
2012-#: ..\..\templates_adm\chicago\_adminUI.class.php:198
2013-#: ..\..\templates_adm\chicago\_adminUI.class.php:258
2014+#: ..\..\view_admin\_adminUI_general.class.php:754
2015+#: ..\..\view_admin\_adminUI_general.class.php:810
2016+#: ..\..\view_admin\_adminUI_general.class.php:895
2017+#: ..\..\view_admin\chicago\_adminUI.class.php:198
2018+#: ..\..\view_admin\chicago\_adminUI.class.php:258
2019 msgid "Pages"
2020 msgstr "Страницы"
2021
2022@@ -7011,12 +7011,12 @@
2023
2024 #: ..\..\inc\items\views\_item_list_full.view.php:108
2025 #: ..\..\inc\items\views\_item_list_full.view.php:109
2026-#: ..\..\templates_adm\_adminUI_general.class.php:820
2027-#: ..\..\templates_adm\_adminUI_general.class.php:821
2028-#: ..\..\templates_adm\_adminUI_general.class.php:905
2029-#: ..\..\templates_adm\_adminUI_general.class.php:906
2030-#: ..\..\templates_adm\chicago\_adminUI.class.php:268
2031-#: ..\..\templates_adm\chicago\_adminUI.class.php:269
2032+#: ..\..\view_admin\_adminUI_general.class.php:820
2033+#: ..\..\view_admin\_adminUI_general.class.php:821
2034+#: ..\..\view_admin\_adminUI_general.class.php:905
2035+#: ..\..\view_admin\_adminUI_general.class.php:906
2036+#: ..\..\view_admin\chicago\_adminUI.class.php:268
2037+#: ..\..\view_admin\chicago\_adminUI.class.php:269
2038 msgid "..."
2039 msgstr "..."
2040
2041@@ -9024,8 +9024,8 @@
2042 #: ..\..\install\index.php:520
2043 #: ..\..\install\_functions_install.php:193
2044 #: ..\..\templates\_profile.disp.php:65
2045-#: ..\..\templates_adm\login\_login_form.main.php:129
2046-#: ..\..\templates_adm\login\_reg_form.main.php:58
2047+#: ..\..\view_admin\login\_login_form.main.php:129
2048+#: ..\..\view_admin\login\_reg_form.main.php:58
2049 msgid "Password"
2050 msgstr "Пароль"
2051
2052@@ -10109,9 +10109,9 @@
2053 #: ..\..\inc\users\model\_user.funcs.php:242
2054 #: ..\..\inc\_core\__core.init.php:445
2055 #: ..\..\inc\_core\__core.init.php:479
2056-#: ..\..\templates_adm\_access_denied.main.php:23
2057-#: ..\..\templates_adm\_adminUI_general.class.php:1229
2058-#: ..\..\templates_adm\_adminUI_general.class.php:1231
2059+#: ..\..\view_admin\_access_denied.main.php:23
2060+#: ..\..\view_admin\_adminUI_general.class.php:1229
2061+#: ..\..\view_admin\_adminUI_general.class.php:1231
2062 msgid "Logout"
2063 msgstr "Выход"
2064
2065@@ -11300,7 +11300,7 @@
2066 msgstr "Изменить профиль пользовател�"
2067
2068 #: ..\..\inc\_core\__core.init.php:463
2069-#: ..\..\templates_adm\login\_reg_disabled.main.php:41
2070+#: ..\..\view_admin\login\_reg_disabled.main.php:41
2071 msgid "Home"
2072 msgstr "В начало"
2073
2074@@ -11431,22 +11431,22 @@
2075 msgstr "Фильтровать �пи�ок"
2076
2077 #: ..\..\inc\_core\ui\_uiwidget.class.php:810
2078-#: ..\..\templates_adm\_adminUI_general.class.php:768
2079-#: ..\..\templates_adm\_adminUI_general.class.php:770
2080-#: ..\..\templates_adm\_adminUI_general.class.php:853
2081-#: ..\..\templates_adm\_adminUI_general.class.php:855
2082-#: ..\..\templates_adm\chicago\_adminUI.class.php:216
2083-#: ..\..\templates_adm\chicago\_adminUI.class.php:218
2084+#: ..\..\view_admin\_adminUI_general.class.php:768
2085+#: ..\..\view_admin\_adminUI_general.class.php:770
2086+#: ..\..\view_admin\_adminUI_general.class.php:853
2087+#: ..\..\view_admin\_adminUI_general.class.php:855
2088+#: ..\..\view_admin\chicago\_adminUI.class.php:216
2089+#: ..\..\view_admin\chicago\_adminUI.class.php:218
2090 msgid "Ascending order"
2091 msgstr "Пор�док по возра�танию"
2092
2093 #: ..\..\inc\_core\ui\_uiwidget.class.php:815
2094-#: ..\..\templates_adm\_adminUI_general.class.php:772
2095-#: ..\..\templates_adm\_adminUI_general.class.php:774
2096-#: ..\..\templates_adm\_adminUI_general.class.php:857
2097-#: ..\..\templates_adm\_adminUI_general.class.php:859
2098-#: ..\..\templates_adm\chicago\_adminUI.class.php:220
2099-#: ..\..\templates_adm\chicago\_adminUI.class.php:222
2100+#: ..\..\view_admin\_adminUI_general.class.php:772
2101+#: ..\..\view_admin\_adminUI_general.class.php:774
2102+#: ..\..\view_admin\_adminUI_general.class.php:857
2103+#: ..\..\view_admin\_adminUI_general.class.php:859
2104+#: ..\..\view_admin\chicago\_adminUI.class.php:220
2105+#: ..\..\view_admin\chicago\_adminUI.class.php:222
2106 msgid "Descending order"
2107 msgstr "Пор�док по убыванию"
2108
2109@@ -12682,147 +12682,147 @@
2110 msgid "Tag Cloud"
2111 msgstr "Облако тегов"
2112
2113-#: ..\..\templates_adm\_access_denied.main.php:15
2114-#: ..\..\templates_adm\_access_denied.main.php:19
2115+#: ..\..\view_admin\_access_denied.main.php:15
2116+#: ..\..\view_admin\_access_denied.main.php:19
2117 msgid "Access denied"
2118 msgstr "До�туп запрещен"
2119
2120-#: ..\..\templates_adm\_access_denied.main.php:20
2121+#: ..\..\view_admin\_access_denied.main.php:20
2122 msgid "Sorry, you have no permission to access this section."
2123 msgstr "Извините, у ва� нет прав на до�туп к �той �екции."
2124
2125-#: ..\..\templates_adm\_access_denied.main.php:25
2126+#: ..\..\view_admin\_access_denied.main.php:25
2127 msgid "Exit to blogs"
2128 msgstr "Перейти к блогам"
2129
2130-#: ..\..\templates_adm\_adminUI_general.class.php:1262
2131-#: ..\..\templates_adm\chicago\_adminUI.class.php:124
2132+#: ..\..\view_admin\_adminUI_general.class.php:1262
2133+#: ..\..\view_admin\chicago\_adminUI.class.php:124
2134 #, fuzzy
2135 msgid "WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox."
2136 msgstr "В�ИМ��ИЕ: Internet Explorer 6 может не правильно отображать �ту тему панели управлени�. Мы на�то�тельно рекоммендуем вам обновить Internet Explorer до �едьмой вер�ии или и�пользовать Firefox."
2137
2138-#: ..\..\templates_adm\_html_header.inc.php:158
2139+#: ..\..\view_admin\_html_header.inc.php:158
2140 msgid "uncheck all"
2141 msgstr "�н�ть отметки �о в�ех"
2142
2143-#: ..\..\templates_adm\login\_login_form.main.php:43
2144+#: ..\..\view_admin\login\_login_form.main.php:43
2145 #, php-format
2146 msgid "Note: You are already logged in as %s!"
2147 msgstr "Примечание: Вы уже вошли как %s!"
2148
2149-#: ..\..\templates_adm\login\_login_form.main.php:44
2150-#: ..\..\templates_adm\login\_reg_complete.main.php:60
2151+#: ..\..\view_admin\login\_login_form.main.php:44
2152+#: ..\..\view_admin\login\_reg_complete.main.php:60
2153 msgid "Continue"
2154 msgstr "Продолжить"
2155
2156-#: ..\..\templates_adm\login\_login_form.main.php:53
2157+#: ..\..\view_admin\login\_login_form.main.php:53
2158 msgid "Login form"
2159 msgstr "Форма входа"
2160
2161-#: ..\..\templates_adm\login\_login_form.main.php:117
2162+#: ..\..\view_admin\login\_login_form.main.php:117
2163 msgid "You will have to accept cookies in order to log in."
2164 msgstr "Ваш браузер должен принимать cookie, чтобы войти."
2165
2166-#: ..\..\templates_adm\login\_login_form.main.php:127
2167-#: ..\..\templates_adm\login\_lostpass_form.main.php:35
2168-#: ..\..\templates_adm\login\_lostpass_form.main.php:46
2169+#: ..\..\view_admin\login\_login_form.main.php:127
2170+#: ..\..\view_admin\login\_lostpass_form.main.php:35
2171+#: ..\..\view_admin\login\_lostpass_form.main.php:46
2172 msgid "Lost password ?"
2173 msgstr "Потер�ли пароль ?"
2174
2175-#: ..\..\templates_adm\login\_login_form.main.php:137
2176+#: ..\..\view_admin\login\_login_form.main.php:137
2177 msgid "Log in!"
2178 msgstr "Войти!"
2179
2180-#: ..\..\templates_adm\login\_login_form.main.php:142
2181+#: ..\..\view_admin\login\_login_form.main.php:142
2182 msgid "Log into backoffice!"
2183 msgstr "Войти в панель управлени�!"
2184
2185-#: ..\..\templates_adm\login\_login_form.main.php:173
2186+#: ..\..\view_admin\login\_login_form.main.php:173
2187 msgid "Please wait..."
2188 msgstr "Пожалуй�та, подождите..."
2189
2190-#: ..\..\templates_adm\login\_login_form.main.php:209
2191+#: ..\..\view_admin\login\_login_form.main.php:209
2192 msgid "Abort login!"
2193 msgstr "Прервать вход!"
2194
2195-#: ..\..\templates_adm\login\_lostpass_form.main.php:49
2196+#: ..\..\view_admin\login\_lostpass_form.main.php:49
2197 msgid "Please enter your login below. Do <strong>NOT</strong> enter your e-mail address!"
2198 msgstr "Пожалуй�та, введите ваш логин ниже. <strong>�Е</strong> вводите ваш email адре�!"
2199
2200-#: ..\..\templates_adm\login\_lostpass_form.main.php:50
2201+#: ..\..\view_admin\login\_lostpass_form.main.php:50
2202 msgid "An email will be sent to your registered email address immediately."
2203 msgstr "Пи�ьмо будет отправлено на ваш зареги�трированный адре� немедленно."
2204
2205-#: ..\..\templates_adm\login\_lostpass_form.main.php:51
2206+#: ..\..\view_admin\login\_lostpass_form.main.php:51
2207 msgid "As soon as you receive the email, click on the link therein to change your password."
2208 msgstr "Как только вы получите пи�ьмо, пройдите по ��ылке дл� изменени� вашего парол�."
2209
2210 #. TRANS: Text for submit button to request an activation link by email
2211-#: ..\..\templates_adm\login\_lostpass_form.main.php:56
2212-#: ..\..\templates_adm\login\_validate_form.main.php:62
2213+#: ..\..\view_admin\login\_lostpass_form.main.php:56
2214+#: ..\..\view_admin\login\_validate_form.main.php:62
2215 msgid "Send me an email now!"
2216 msgstr "Отправить мне пи�ьмо �ейча�!"
2217
2218-#: ..\..\templates_adm\login\_reg_complete.main.php:34
2219+#: ..\..\view_admin\login\_reg_complete.main.php:34
2220 msgid "Registration complete"
2221 msgstr "Реги�траци� завершена"
2222
2223-#: ..\..\templates_adm\login\_reg_disabled.main.php:34
2224+#: ..\..\view_admin\login\_reg_disabled.main.php:34
2225 msgid "Registration Currently Disabled"
2226 msgstr "Реги�траци� в на�то�щее врем� запрещена"
2227
2228-#: ..\..\templates_adm\login\_reg_disabled.main.php:37
2229+#: ..\..\view_admin\login\_reg_disabled.main.php:37
2230 msgid "User registration is currently not allowed."
2231 msgstr "Реги�траци� пользователей в на�то�щее врем� запрещена."
2232
2233-#: ..\..\templates_adm\login\_reg_form.main.php:38
2234+#: ..\..\view_admin\login\_reg_form.main.php:38
2235 msgid "Register form"
2236 msgstr "Форма реги�трации"
2237
2238-#: ..\..\templates_adm\login\_reg_form.main.php:58
2239+#: ..\..\view_admin\login\_reg_form.main.php:58
2240 msgid "(twice)"
2241 msgstr "(дважды)"
2242
2243-#: ..\..\templates_adm\login\_reg_form.main.php:62
2244+#: ..\..\view_admin\login\_reg_form.main.php:62
2245 #, php-format
2246 msgid "Minimum %d characters, please."
2247 msgstr "Минимум %d �имволов, пожалуй�та."
2248
2249-#: ..\..\templates_adm\login\_reg_form.main.php:69
2250+#: ..\..\view_admin\login\_reg_form.main.php:69
2251 msgid "Preferred language"
2252 msgstr "Предпочитаемый �зык"
2253
2254-#: ..\..\templates_adm\login\_reg_form.main.php:73
2255+#: ..\..\view_admin\login\_reg_form.main.php:73
2256 msgid "Register!"
2257 msgstr "Зареги�трировать��!"
2258
2259-#: ..\..\templates_adm\login\_reg_form.main.php:80
2260+#: ..\..\view_admin\login\_reg_form.main.php:80
2261 msgid "Log into existing account..."
2262 msgstr "Войти в �уще�твующий аккаунт..."
2263
2264-#: ..\..\templates_adm\login\_validate_form.main.php:37
2265-#: ..\..\templates_adm\login\_validate_form.main.php:49
2266+#: ..\..\view_admin\login\_validate_form.main.php:37
2267+#: ..\..\view_admin\login\_validate_form.main.php:49
2268 msgid "Email address validation"
2269 msgstr "Подтверждение email адре�а"
2270
2271-#: ..\..\templates_adm\login\_validate_form.main.php:52
2272+#: ..\..\view_admin\login\_validate_form.main.php:52
2273 msgid "Please confirm your email address below."
2274 msgstr "Пожалуй�та, подтвердите ваш email адре� ниже."
2275
2276-#: ..\..\templates_adm\login\_validate_form.main.php:53
2277+#: ..\..\view_admin\login\_validate_form.main.php:53
2278 msgid "An email will be sent to this address immediately."
2279 msgstr "Пи�ьмо будет отправлено на �тот адре� немедленно."
2280
2281-#: ..\..\templates_adm\login\_validate_form.main.php:54
2282+#: ..\..\view_admin\login\_validate_form.main.php:54
2283 msgid "As soon as you receive the email, click on the link therein to activate your account."
2284 msgstr "Как только вы получите пи�ьмо, пройдите по ��ылке дл� активации вашего аккаунта."
2285
2286-#: ..\..\templates_adm\login\_validate_form.main.php:76
2287+#: ..\..\view_admin\login\_validate_form.main.php:76
2288 #, php-format
2289 msgid "Since you are an admin user, you can validate your email address (%s) by a single click."
2290 msgstr "Так-как вы �вл�ете�ь админи�тратором, вы можете подтвердить ваш email адре� (%s) одним кликом."
2291
2292-#: ..\..\templates_adm\login\_validate_form.main.php:78
2293+#: ..\..\view_admin\login\_validate_form.main.php:78
2294 msgid "Activate my account!"
2295 msgstr "�ктивировать мой аккаунт!"
2296
2297
2298=== modified file 'locales/tr_TR/LC_MESSAGES/messages.po'
2299--- locales/tr_TR/LC_MESSAGES/messages.po 2010-03-14 14:58:16 +0000
2300+++ locales/tr_TR/LC_MESSAGES/messages.po 2010-04-11 01:32:28 +0000
2301@@ -37,18 +37,18 @@
2302 #: ..\..\a_notemplate.php:306
2303 #: ..\..\multiblogs.php:250
2304 #: ..\..\inc\items\views\_item_list_full.view.php:106
2305-#: ..\..\templates_adm\_adminUI_general.class.php:816
2306-#: ..\..\templates_adm\_adminUI_general.class.php:901
2307-#: ..\..\templates_adm\chicago\_adminUI.class.php:264
2308+#: ..\..\view_admin\_adminUI_general.class.php:816
2309+#: ..\..\view_admin\_adminUI_general.class.php:901
2310+#: ..\..\view_admin\chicago\_adminUI.class.php:264
2311 msgid "Previous"
2312 msgstr "Önceki"
2313
2314 #: ..\..\a_notemplate.php:307
2315 #: ..\..\multiblogs.php:251
2316 #: ..\..\inc\items\views\_item_list_full.view.php:107
2317-#: ..\..\templates_adm\_adminUI_general.class.php:817
2318-#: ..\..\templates_adm\_adminUI_general.class.php:902
2319-#: ..\..\templates_adm\chicago\_adminUI.class.php:265
2320+#: ..\..\view_admin\_adminUI_general.class.php:817
2321+#: ..\..\view_admin\_adminUI_general.class.php:902
2322+#: ..\..\view_admin\chicago\_adminUI.class.php:265
2323 msgid "Next"
2324 msgstr "Sonraki"
2325
2326@@ -338,9 +338,9 @@
2327 #: ..\..\templates\_msgform.disp.php:153
2328 #: ..\..\templates\_profile.disp.php:48
2329 #: ..\..\templates\_subs.disp.php:46
2330-#: ..\..\templates_adm\login\_reg_complete.main.php:48
2331-#: ..\..\templates_adm\login\_reg_form.main.php:67
2332-#: ..\..\templates_adm\login\_validate_form.main.php:57
2333+#: ..\..\view_admin\login\_reg_complete.main.php:48
2334+#: ..\..\view_admin\login\_reg_form.main.php:67
2335+#: ..\..\view_admin\login\_validate_form.main.php:57
2336 msgid "Email"
2337 msgstr "Email"
2338
2339@@ -1094,43 +1094,43 @@
2340
2341 #. TRANS: abbrev. for Sunday
2342 #: ..\..\inc\_vars.inc.php:206
2343-#: ..\..\templates_adm\_html_header.inc.php:256
2344+#: ..\..\view_admin\_html_header.inc.php:256
2345 msgid "Sun"
2346 msgstr "Pzr"
2347
2348 #. TRANS: abbrev. for Monday
2349 #: ..\..\inc\_vars.inc.php:208
2350-#: ..\..\templates_adm\_html_header.inc.php:256
2351+#: ..\..\view_admin\_html_header.inc.php:256
2352 msgid "Mon"
2353 msgstr "P.tes"
2354
2355 #. TRANS: abbrev. for Tuesday
2356 #: ..\..\inc\_vars.inc.php:210
2357-#: ..\..\templates_adm\_html_header.inc.php:256
2358+#: ..\..\view_admin\_html_header.inc.php:256
2359 msgid "Tue"
2360 msgstr "Salı"
2361
2362 #. TRANS: abbrev. for Wednesday
2363 #: ..\..\inc\_vars.inc.php:212
2364-#: ..\..\templates_adm\_html_header.inc.php:256
2365+#: ..\..\view_admin\_html_header.inc.php:256
2366 msgid "Wed"
2367 msgstr "Çrş"
2368
2369 #. TRANS: abbrev. for Thursday
2370 #: ..\..\inc\_vars.inc.php:214
2371-#: ..\..\templates_adm\_html_header.inc.php:256
2372+#: ..\..\view_admin\_html_header.inc.php:256
2373 msgid "Thu"
2374 msgstr "PrÅŸ"
2375
2376 #. TRANS: abbrev. for Friday
2377 #: ..\..\inc\_vars.inc.php:216
2378-#: ..\..\templates_adm\_html_header.inc.php:256
2379+#: ..\..\view_admin\_html_header.inc.php:256
2380 msgid "Fri"
2381 msgstr "Cuma"
2382
2383 #. TRANS: abbrev. for Saturday
2384 #: ..\..\inc\_vars.inc.php:218
2385-#: ..\..\templates_adm\_html_header.inc.php:256
2386+#: ..\..\view_admin\_html_header.inc.php:256
2387 msgid "Sat"
2388 msgstr "C.tes"
2389
2390@@ -1172,22 +1172,22 @@
2391 msgstr "C"
2392
2393 #: ..\..\inc\_vars.inc.php:238
2394-#: ..\..\templates_adm\_html_header.inc.php:255
2395+#: ..\..\view_admin\_html_header.inc.php:255
2396 msgid "January"
2397 msgstr "Ocak"
2398
2399 #: ..\..\inc\_vars.inc.php:239
2400-#: ..\..\templates_adm\_html_header.inc.php:255
2401+#: ..\..\view_admin\_html_header.inc.php:255
2402 msgid "February"
2403 msgstr "Åžubat"
2404
2405 #: ..\..\inc\_vars.inc.php:240
2406-#: ..\..\templates_adm\_html_header.inc.php:255
2407+#: ..\..\view_admin\_html_header.inc.php:255
2408 msgid "March"
2409 msgstr "Mart"
2410
2411 #: ..\..\inc\_vars.inc.php:241
2412-#: ..\..\templates_adm\_html_header.inc.php:255
2413+#: ..\..\view_admin\_html_header.inc.php:255
2414 msgid "April"
2415 msgstr "Nisan"
2416
2417@@ -1197,37 +1197,37 @@
2418 msgstr "Mayıs"
2419
2420 #: ..\..\inc\_vars.inc.php:244
2421-#: ..\..\templates_adm\_html_header.inc.php:255
2422+#: ..\..\view_admin\_html_header.inc.php:255
2423 msgid "June"
2424 msgstr "Haziran"
2425
2426 #: ..\..\inc\_vars.inc.php:245
2427-#: ..\..\templates_adm\_html_header.inc.php:255
2428+#: ..\..\view_admin\_html_header.inc.php:255
2429 msgid "July"
2430 msgstr "Temmuz"
2431
2432 #: ..\..\inc\_vars.inc.php:246
2433-#: ..\..\templates_adm\_html_header.inc.php:255
2434+#: ..\..\view_admin\_html_header.inc.php:255
2435 msgid "August"
2436 msgstr "AÄŸustos"
2437
2438 #: ..\..\inc\_vars.inc.php:247
2439-#: ..\..\templates_adm\_html_header.inc.php:255
2440+#: ..\..\view_admin\_html_header.inc.php:255
2441 msgid "September"
2442 msgstr "Eylül"
2443
2444 #: ..\..\inc\_vars.inc.php:248
2445-#: ..\..\templates_adm\_html_header.inc.php:255
2446+#: ..\..\view_admin\_html_header.inc.php:255
2447 msgid "October"
2448 msgstr "Ekim"
2449
2450 #: ..\..\inc\_vars.inc.php:249
2451-#: ..\..\templates_adm\_html_header.inc.php:255
2452+#: ..\..\view_admin\_html_header.inc.php:255
2453 msgid "November"
2454 msgstr "Kasım"
2455
2456 #: ..\..\inc\_vars.inc.php:250
2457-#: ..\..\templates_adm\_html_header.inc.php:255
2458+#: ..\..\view_admin\_html_header.inc.php:255
2459 msgid "December"
2460 msgstr "Aralık"
2461
2462@@ -1253,7 +1253,7 @@
2463
2464 #. TRANS: abbrev. for May
2465 #: ..\..\inc\_vars.inc.php:262
2466-#: ..\..\templates_adm\_html_header.inc.php:255
2467+#: ..\..\view_admin\_html_header.inc.php:255
2468 msgid "May"
2469 msgstr "May"
2470
2471@@ -3273,10 +3273,10 @@
2472 #: ..\..\templates\_profile.disp.php:57
2473 #: ..\..\templates\_subs.disp.php:45
2474 #: ..\..\templates\_user.disp.php:44
2475-#: ..\..\templates_adm\login\_login_form.main.php:119
2476-#: ..\..\templates_adm\login\_lostpass_form.main.php:54
2477-#: ..\..\templates_adm\login\_reg_complete.main.php:47
2478-#: ..\..\templates_adm\login\_reg_form.main.php:52
2479+#: ..\..\view_admin\login\_login_form.main.php:119
2480+#: ..\..\view_admin\login\_lostpass_form.main.php:54
2481+#: ..\..\view_admin\login\_reg_complete.main.php:47
2482+#: ..\..\view_admin\login\_reg_form.main.php:52
2483 msgid "Login"
2484 msgstr "Kullanıcı"
2485
2486@@ -3370,7 +3370,7 @@
2487 #: ..\..\inc\locales\_locale_settings.form.php:84
2488 #: ..\..\inc\locales\_locale_settings.form.php:279
2489 #: ..\..\templates\_user.disp.php:61
2490-#: ..\..\templates_adm\login\_reg_form.main.php:69
2491+#: ..\..\view_admin\login\_reg_form.main.php:69
2492 msgid "Locale"
2493 msgstr "Dil"
2494
2495@@ -5915,7 +5915,7 @@
2496 msgstr "Varsayılan izinler"
2497
2498 #: ..\..\inc\files\views\_file_permissions.form.php:66
2499-#: ..\..\templates_adm\_html_header.inc.php:162
2500+#: ..\..\view_admin\_html_header.inc.php:162
2501 msgid "check all"
2502 msgstr "hepsini iÅŸaretle"
2503
2504@@ -6683,11 +6683,11 @@
2505 #: ..\..\inc\items\views\_item_list_full.view.php:104
2506 #: ..\..\inc\_core\__core.init.php:210
2507 #: ..\..\inc\_core\ui\results\_results.class.php:1739
2508-#: ..\..\templates_adm\_adminUI_general.class.php:754
2509-#: ..\..\templates_adm\_adminUI_general.class.php:810
2510-#: ..\..\templates_adm\_adminUI_general.class.php:895
2511-#: ..\..\templates_adm\chicago\_adminUI.class.php:198
2512-#: ..\..\templates_adm\chicago\_adminUI.class.php:258
2513+#: ..\..\view_admin\_adminUI_general.class.php:754
2514+#: ..\..\view_admin\_adminUI_general.class.php:810
2515+#: ..\..\view_admin\_adminUI_general.class.php:895
2516+#: ..\..\view_admin\chicago\_adminUI.class.php:198
2517+#: ..\..\view_admin\chicago\_adminUI.class.php:258
2518 msgid "Pages"
2519 msgstr "Sayfalar"
2520
2521@@ -7075,12 +7075,12 @@
2522
2523 #: ..\..\inc\items\views\_item_list_full.view.php:108
2524 #: ..\..\inc\items\views\_item_list_full.view.php:109
2525-#: ..\..\templates_adm\_adminUI_general.class.php:820
2526-#: ..\..\templates_adm\_adminUI_general.class.php:821
2527-#: ..\..\templates_adm\_adminUI_general.class.php:905
2528-#: ..\..\templates_adm\_adminUI_general.class.php:906
2529-#: ..\..\templates_adm\chicago\_adminUI.class.php:268
2530-#: ..\..\templates_adm\chicago\_adminUI.class.php:269
2531+#: ..\..\view_admin\_adminUI_general.class.php:820
2532+#: ..\..\view_admin\_adminUI_general.class.php:821
2533+#: ..\..\view_admin\_adminUI_general.class.php:905
2534+#: ..\..\view_admin\_adminUI_general.class.php:906
2535+#: ..\..\view_admin\chicago\_adminUI.class.php:268
2536+#: ..\..\view_admin\chicago\_adminUI.class.php:269
2537 msgid "..."
2538 msgstr "..."
2539
2540@@ -9141,8 +9141,8 @@
2541 #: ..\..\install\index.php:520
2542 #: ..\..\install\_functions_install.php:193
2543 #: ..\..\templates\_profile.disp.php:65
2544-#: ..\..\templates_adm\login\_login_form.main.php:129
2545-#: ..\..\templates_adm\login\_reg_form.main.php:58
2546+#: ..\..\view_admin\login\_login_form.main.php:129
2547+#: ..\..\view_admin\login\_reg_form.main.php:58
2548 msgid "Password"
2549 msgstr "Åžifre"
2550
2551@@ -10236,9 +10236,9 @@
2552 #: ..\..\inc\users\model\_user.funcs.php:242
2553 #: ..\..\inc\_core\__core.init.php:445
2554 #: ..\..\inc\_core\__core.init.php:479
2555-#: ..\..\templates_adm\_access_denied.main.php:23
2556-#: ..\..\templates_adm\_adminUI_general.class.php:1229
2557-#: ..\..\templates_adm\_adminUI_general.class.php:1231
2558+#: ..\..\view_admin\_access_denied.main.php:23
2559+#: ..\..\view_admin\_adminUI_general.class.php:1229
2560+#: ..\..\view_admin\_adminUI_general.class.php:1231
2561 msgid "Logout"
2562 msgstr "Çıkış"
2563
2564@@ -11459,7 +11459,7 @@
2565 msgstr "Profilinizi düzenleyin"
2566
2567 #: ..\..\inc\_core\__core.init.php:463
2568-#: ..\..\templates_adm\login\_reg_disabled.main.php:41
2569+#: ..\..\view_admin\login\_reg_disabled.main.php:41
2570 msgid "Home"
2571 msgstr "Anasayfa"
2572
2573@@ -11590,22 +11590,22 @@
2574 msgstr "Listeyi filtrele"
2575
2576 #: ..\..\inc\_core\ui\_uiwidget.class.php:810
2577-#: ..\..\templates_adm\_adminUI_general.class.php:768
2578-#: ..\..\templates_adm\_adminUI_general.class.php:770
2579-#: ..\..\templates_adm\_adminUI_general.class.php:853
2580-#: ..\..\templates_adm\_adminUI_general.class.php:855
2581-#: ..\..\templates_adm\chicago\_adminUI.class.php:216
2582-#: ..\..\templates_adm\chicago\_adminUI.class.php:218
2583+#: ..\..\view_admin\_adminUI_general.class.php:768
2584+#: ..\..\view_admin\_adminUI_general.class.php:770
2585+#: ..\..\view_admin\_adminUI_general.class.php:853
2586+#: ..\..\view_admin\_adminUI_general.class.php:855
2587+#: ..\..\view_admin\chicago\_adminUI.class.php:216
2588+#: ..\..\view_admin\chicago\_adminUI.class.php:218
2589 msgid "Ascending order"
2590 msgstr "Artan diziliÅŸ"
2591
2592 #: ..\..\inc\_core\ui\_uiwidget.class.php:815
2593-#: ..\..\templates_adm\_adminUI_general.class.php:772
2594-#: ..\..\templates_adm\_adminUI_general.class.php:774
2595-#: ..\..\templates_adm\_adminUI_general.class.php:857
2596-#: ..\..\templates_adm\_adminUI_general.class.php:859
2597-#: ..\..\templates_adm\chicago\_adminUI.class.php:220
2598-#: ..\..\templates_adm\chicago\_adminUI.class.php:222
2599+#: ..\..\view_admin\_adminUI_general.class.php:772
2600+#: ..\..\view_admin\_adminUI_general.class.php:774
2601+#: ..\..\view_admin\_adminUI_general.class.php:857
2602+#: ..\..\view_admin\_adminUI_general.class.php:859
2603+#: ..\..\view_admin\chicago\_adminUI.class.php:220
2604+#: ..\..\view_admin\chicago\_adminUI.class.php:222
2605 msgid "Descending order"
2606 msgstr "Azalan diziliÅŸ"
2607
2608@@ -12863,147 +12863,147 @@
2609 msgid "Tag Cloud"
2610 msgstr "Etiket bulutu"
2611
2612-#: ..\..\templates_adm\_access_denied.main.php:15
2613-#: ..\..\templates_adm\_access_denied.main.php:19
2614+#: ..\..\view_admin\_access_denied.main.php:15
2615+#: ..\..\view_admin\_access_denied.main.php:19
2616 msgid "Access denied"
2617 msgstr "EriÅŸim engellendi"
2618
2619-#: ..\..\templates_adm\_access_denied.main.php:20
2620+#: ..\..\view_admin\_access_denied.main.php:20
2621 msgid "Sorry, you have no permission to access this section."
2622 msgstr "Üzgünüz, bu kısma erişmek için izniniz yok."
2623
2624-#: ..\..\templates_adm\_access_denied.main.php:25
2625+#: ..\..\view_admin\_access_denied.main.php:25
2626 msgid "Exit to blogs"
2627 msgstr "Bloglara çık"
2628
2629-#: ..\..\templates_adm\_adminUI_general.class.php:1262
2630-#: ..\..\templates_adm\chicago\_adminUI.class.php:124
2631+#: ..\..\view_admin\_adminUI_general.class.php:1262
2632+#: ..\..\view_admin\chicago\_adminUI.class.php:124
2633 #, fuzzy
2634 msgid "WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox."
2635 msgstr "UYARI: Internet Explorer 6 bu yönetici temasını düzgünce gösteremiyor olabilir.IE 7 veya Firefox'a geçmenizi şiddetle tavsiye ediyoruz."
2636
2637-#: ..\..\templates_adm\_html_header.inc.php:158
2638+#: ..\..\view_admin\_html_header.inc.php:158
2639 msgid "uncheck all"
2640 msgstr "tüm işaretleri kaldır"
2641
2642-#: ..\..\templates_adm\login\_login_form.main.php:43
2643+#: ..\..\view_admin\login\_login_form.main.php:43
2644 #, php-format
2645 msgid "Note: You are already logged in as %s!"
2646 msgstr "Dikkat: Zaten %s olarak giriş yapmışsınız!"
2647
2648-#: ..\..\templates_adm\login\_login_form.main.php:44
2649-#: ..\..\templates_adm\login\_reg_complete.main.php:60
2650+#: ..\..\view_admin\login\_login_form.main.php:44
2651+#: ..\..\view_admin\login\_reg_complete.main.php:60
2652 msgid "Continue"
2653 msgstr "Devam et"
2654
2655-#: ..\..\templates_adm\login\_login_form.main.php:53
2656+#: ..\..\view_admin\login\_login_form.main.php:53
2657 msgid "Login form"
2658 msgstr "GiriÅŸ formu"
2659
2660-#: ..\..\templates_adm\login\_login_form.main.php:117
2661+#: ..\..\view_admin\login\_login_form.main.php:117
2662 msgid "You will have to accept cookies in order to log in."
2663 msgstr "Giriş yapabilmek için kurabiyelerinizin (cookie) açık olması gerekir."
2664
2665-#: ..\..\templates_adm\login\_login_form.main.php:127
2666-#: ..\..\templates_adm\login\_lostpass_form.main.php:35
2667-#: ..\..\templates_adm\login\_lostpass_form.main.php:46
2668+#: ..\..\view_admin\login\_login_form.main.php:127
2669+#: ..\..\view_admin\login\_lostpass_form.main.php:35
2670+#: ..\..\view_admin\login\_lostpass_form.main.php:46
2671 msgid "Lost password ?"
2672 msgstr "Åžifremi unuttum ?"
2673
2674-#: ..\..\templates_adm\login\_login_form.main.php:137
2675+#: ..\..\view_admin\login\_login_form.main.php:137
2676 msgid "Log in!"
2677 msgstr "GiriÅŸ yap!"
2678
2679-#: ..\..\templates_adm\login\_login_form.main.php:142
2680+#: ..\..\view_admin\login\_login_form.main.php:142
2681 msgid "Log into backoffice!"
2682 msgstr "Arkaofis'e giriÅŸ yap!"
2683
2684-#: ..\..\templates_adm\login\_login_form.main.php:173
2685+#: ..\..\view_admin\login\_login_form.main.php:173
2686 msgid "Please wait..."
2687 msgstr "Lütfen bekleyin..."
2688
2689-#: ..\..\templates_adm\login\_login_form.main.php:209
2690+#: ..\..\view_admin\login\_login_form.main.php:209
2691 msgid "Abort login!"
2692 msgstr "GiriÅŸi iptal et!"
2693
2694-#: ..\..\templates_adm\login\_lostpass_form.main.php:49
2695+#: ..\..\view_admin\login\_lostpass_form.main.php:49
2696 msgid "Please enter your login below. Do <strong>NOT</strong> enter your e-mail address!"
2697 msgstr "Lütfen aşağıya giriş isminizi girin. Email adresinizi <strong>GIRMEYIN</strong> !"
2698
2699-#: ..\..\templates_adm\login\_lostpass_form.main.php:50
2700+#: ..\..\view_admin\login\_lostpass_form.main.php:50
2701 msgid "An email will be sent to your registered email address immediately."
2702 msgstr "Kayıt olduğunuz email adresinize hemen bir email gönderilecek."
2703
2704-#: ..\..\templates_adm\login\_lostpass_form.main.php:51
2705+#: ..\..\view_admin\login\_lostpass_form.main.php:51
2706 msgid "As soon as you receive the email, click on the link therein to change your password."
2707 msgstr "Maili alır almaz, şifrenizi değiştirmek için içindeki linke tıklayın."
2708
2709 #. TRANS: Text for submit button to request an activation link by email
2710-#: ..\..\templates_adm\login\_lostpass_form.main.php:56
2711-#: ..\..\templates_adm\login\_validate_form.main.php:62
2712+#: ..\..\view_admin\login\_lostpass_form.main.php:56
2713+#: ..\..\view_admin\login\_validate_form.main.php:62
2714 msgid "Send me an email now!"
2715 msgstr "Şimdi email gönder!"
2716
2717-#: ..\..\templates_adm\login\_reg_complete.main.php:34
2718+#: ..\..\view_admin\login\_reg_complete.main.php:34
2719 msgid "Registration complete"
2720 msgstr "Kayıt tamamlandı"
2721
2722-#: ..\..\templates_adm\login\_reg_disabled.main.php:34
2723+#: ..\..\view_admin\login\_reg_disabled.main.php:34
2724 msgid "Registration Currently Disabled"
2725 msgstr "Kayıtlarımız şu an için devre dışıdır."
2726
2727-#: ..\..\templates_adm\login\_reg_disabled.main.php:37
2728+#: ..\..\view_admin\login\_reg_disabled.main.php:37
2729 msgid "User registration is currently not allowed."
2730 msgstr "Yeni kullanıcı kayıdına şu an için izin verilmemektedir."
2731
2732-#: ..\..\templates_adm\login\_reg_form.main.php:38
2733+#: ..\..\view_admin\login\_reg_form.main.php:38
2734 msgid "Register form"
2735 msgstr "Kayıt formu"
2736
2737-#: ..\..\templates_adm\login\_reg_form.main.php:58
2738+#: ..\..\view_admin\login\_reg_form.main.php:58
2739 msgid "(twice)"
2740 msgstr "(iki kez)"
2741
2742-#: ..\..\templates_adm\login\_reg_form.main.php:62
2743+#: ..\..\view_admin\login\_reg_form.main.php:62
2744 #, php-format
2745 msgid "Minimum %d characters, please."
2746 msgstr "En az %d karakter lütfen."
2747
2748-#: ..\..\templates_adm\login\_reg_form.main.php:69
2749+#: ..\..\view_admin\login\_reg_form.main.php:69
2750 msgid "Preferred language"
2751 msgstr "Tercih edilen dil"
2752
2753-#: ..\..\templates_adm\login\_reg_form.main.php:73
2754+#: ..\..\view_admin\login\_reg_form.main.php:73
2755 msgid "Register!"
2756 msgstr "Ãœye ol!"
2757
2758-#: ..\..\templates_adm\login\_reg_form.main.php:80
2759+#: ..\..\view_admin\login\_reg_form.main.php:80
2760 msgid "Log into existing account..."
2761 msgstr "Mevcut hesabımla giriş yap.."
2762
2763-#: ..\..\templates_adm\login\_validate_form.main.php:37
2764-#: ..\..\templates_adm\login\_validate_form.main.php:49
2765+#: ..\..\view_admin\login\_validate_form.main.php:37
2766+#: ..\..\view_admin\login\_validate_form.main.php:49
2767 msgid "Email address validation"
2768 msgstr "E-mail adresi doÄŸrulama"
2769
2770-#: ..\..\templates_adm\login\_validate_form.main.php:52
2771+#: ..\..\view_admin\login\_validate_form.main.php:52
2772 msgid "Please confirm your email address below."
2773 msgstr "Lütfen aşağıdaki email adresinizi doğrulayın"
2774
2775-#: ..\..\templates_adm\login\_validate_form.main.php:53
2776+#: ..\..\view_admin\login\_validate_form.main.php:53
2777 msgid "An email will be sent to this address immediately."
2778 msgstr "Bu adrese hemen bir email yollanacaktır."
2779
2780-#: ..\..\templates_adm\login\_validate_form.main.php:54
2781+#: ..\..\view_admin\login\_validate_form.main.php:54
2782 msgid "As soon as you receive the email, click on the link therein to activate your account."
2783 msgstr "Email ile size ulaşır ulaşmaz, gönderilen linke tıklayarak hesabınızı aktive edin"
2784
2785-#: ..\..\templates_adm\login\_validate_form.main.php:76
2786+#: ..\..\view_admin\login\_validate_form.main.php:76
2787 #, php-format
2788 msgid "Since you are an admin user, you can validate your email address (%s) by a single click."
2789 msgstr "Yönetici oldugunuzdan hesabınızı tek tuşla (%s) aktifleştirebilirsiniz."
2790
2791-#: ..\..\templates_adm\login\_validate_form.main.php:78
2792+#: ..\..\view_admin\login\_validate_form.main.php:78
2793 msgid "Activate my account!"
2794 msgstr "Hesabımı etkinleştir!"
2795
2796
2797=== modified file 'plugins/smilies_plugin/_smilies.plugin.php'
2798--- plugins/smilies_plugin/_smilies.plugin.php 2010-03-14 14:58:16 +0000
2799+++ plugins/smilies_plugin/_smilies.plugin.php 2010-04-11 01:32:28 +0000
2800@@ -320,7 +320,7 @@
2801 * Initiates the smiley array if not already initiated
2802 *
2803 * Attempts to use template specific smileys where available
2804- * - templates_adm/template/rsc/smilies/
2805+ * - view_admin/template/rsc/smilies/
2806 * - templates/template/smilies/
2807 *
2808 * Attempts to fallback to default smilies
2809
2810=== removed directory 'templates_adm'
2811=== removed file 'templates_adm/_access_denied.main.php'
2812--- templates_adm/_access_denied.main.php 2009-12-12 16:12:01 +0000
2813+++ templates_adm/_access_denied.main.php 1970-01-01 00:00:00 +0000
2814@@ -1,31 +0,0 @@
2815-<?php
2816-/**
2817- * This page displays an error message if the user is denied access to the admin section
2818- *
2819- * @package pond
2820- */
2821-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2822-
2823-header('HTTP/1.0 403 Forbidden');
2824-header_content_type( 'text/html' );
2825-?>
2826-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2827-<html xmlns="http://www.w3.org/1999/xhtml">
2828- <head>
2829- <title><?php echo T_('Access denied') ?></title>
2830- </head>
2831-<body>
2832- <div style="background-color:#fee; border: 1px solid red; text-align:center;">
2833- <h1><?php echo T_('Access denied') ?></h1>
2834- <p><?php echo T_('Sorry, you have no permission to access this section.') ?></p>
2835- </div>
2836- <p style="text-align:center;"><?php
2837- echo '<a href="'.$htsrv_url_sensitive.'login.php?action=logout&amp;redirect_to='.rawurlencode(url_rel_to_same_host($ReqHost.$ReqURI, $htsrv_url_sensitive)).'">'.T_('Logout').'</a>
2838- &bull;
2839- <a href="'.$baseurl.'">'.T_('Exit to blogs').'</a>';
2840- ?></p>
2841-</body>
2842-</html>
2843-<?php
2844- exit(0);
2845-?>
2846\ No newline at end of file
2847
2848=== removed file 'templates_adm/_adminUI_general.class.php'
2849--- templates_adm/_adminUI_general.class.php 2010-01-02 08:34:34 +0000
2850+++ templates_adm/_adminUI_general.class.php 1970-01-01 00:00:00 +0000
2851@@ -1,1290 +0,0 @@
2852-<?php
2853-/**
2854- * This file implements the Admin UI class.
2855- * Admin templates should derive from this class and override {@link get_template()}
2856- * for example.
2857- *
2858- * This file is part of the Quam Plures project - {@link http://quamplures.net/}.
2859- * See also {@link https://launchpad.net/quam-plures}.
2860- *
2861- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
2862- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}.
2863- * Parts of this file are copyright (c)2005 by Daniel HAHLER - {@link http://thequod.de/contact}.
2864- *
2865- * @license http://quamplures.net/license.html GNU General Public License (GPL)
2866- *
2867- * {@internal Open Source relicensing agreement:
2868- * Daniel HAHLER grants Francois PLANQUE the right to license
2869- * Daniel HAHLER's contributions to this file and the b2evolution project
2870- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
2871- * }}
2872- *
2873- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
2874- * @author blueyed: Daniel HAHLER
2875- * @author fplanque: Francois PLANQUE.
2876- *
2877- * @todo dh> Refactor to allow easier contributions!
2878- *
2879- * @package pond
2880- */
2881-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2882-
2883-
2884-load_class( '_core/ui/_menu.class.php' );
2885-
2886-
2887-/**
2888- * The general Admin UI class. It provides functions to handle the UI part of the
2889- * Backoffice.
2890- *
2891- * Admin templates should derive from this class and override {@link get_template()}
2892- * for example.
2893- *
2894- * @todo CODE DOCUMENTATION!!!
2895- *
2896- * @package pond
2897- */
2898-class AdminUI_general extends Menu
2899-{
2900- /**
2901- * Visual path seperator (used in html title, ..)
2902- *
2903- * @var string
2904- */
2905- var $pathSeparator = ' &rsaquo; ';
2906-
2907- /*-------------------------------------------------------------------*/
2908- /*- The members below should not get overridden in a derived class. -*/
2909-
2910- /**
2911- * The path of the current selected menu entry.
2912- * Array of strings.
2913- * The top level entry is at position 0. Selected submenu entries follow.
2914- *
2915- * Use {@link get_path()} or {@link get_path_range()} to access it.
2916- * Use {@link set_path()}, {@link append_path_level()} or {@link set_path_level()} to set it.
2917- *
2918- * @access protected
2919- * @var array
2920- */
2921- var $path = array();
2922-
2923- /**
2924- * The properties of the path entries.
2925- * Numbered Array of arrays.
2926- * The top level entry is at position 0. Selected submenu entries follow.
2927- *
2928- * Use {@link get_prop_for_path()} or {@link get_properties_for_path()} to access it
2929- * Use {@link set_path()}, {@link append_path_level()} or {@link set_path_level()} to set it.
2930- *
2931- * @access protected
2932- * @var array
2933- */
2934- var $pathProps = array();
2935-
2936- /**
2937- * The explicit title for the page.
2938- * @var string
2939- */
2940- var $title;
2941-
2942- /**
2943- * The explicit title for the titlearea (<h1>).
2944- * @var string
2945- */
2946- var $title_titlearea;
2947- var $title_titlearea_appendix = '';
2948-
2949- /**
2950- * Collection List buttons: title for 'all' button
2951- * @var string
2952- */
2953- var $coll_list_all_title = NULL;
2954- /**
2955- * Collection List buttons: url for 'all' button
2956- * @var string
2957- */
2958- var $coll_list_all_url = '';
2959- /**
2960- * Collection List buttons: permission name to test on to decide wether or not to display buttons
2961- * @var string
2962- */
2963- var $coll_list_permname = NULL;
2964- /**
2965- * Collection List buttons: minimum level required to display button
2966- * @var mixed
2967- */
2968- var $coll_list_permlevel = 1;
2969- /**
2970- * Collection List buttons: params of the url used for the buttons
2971- * @var array
2972- */
2973- var $coll_list_url_params = array();
2974- /**
2975- * Collection List buttons: javascript to execute on click of a button
2976- * @var string
2977- */
2978- var $coll_list_onclick = NULL;
2979-
2980-
2981- /**
2982- * Constructor.
2983- */
2984- function AdminUI_general()
2985- {
2986- global $mode; // TODO: make it a real property
2987- global $htsrv_url, $baseurl;
2988-
2989- $this->mode = $mode;
2990-
2991- $this->init_templates();
2992- }
2993-
2994-
2995- /**
2996- * This function should init the templates - like adding Javascript through the {@link add_headline()} method.
2997- */
2998- function init_templates()
2999- {
3000- }
3001-
3002-
3003- /**
3004- * Add menu entries to the beginning of the list for given path.
3005- *
3006- * @param NULL|string|array The path to add the entries to.
3007- * @param array Menu entries to add (key (string) => entry (array)).
3008- * @uses add_menu_entries()
3009- */
3010- function unshift_menu_entries( $path, $entries )
3011- {
3012- // Get a reference to the node in the menu list.
3013- $node = & $this->get_node_by_path( $path, true );
3014-
3015- $node['entries'] = array_reverse( $node['entries'] );
3016-
3017- $this->add_menu_entries( $path, $entries );
3018-
3019- $node['entries'] = array_reverse( $node['entries'] );
3020- }
3021-
3022-
3023- /**
3024- * Get the <title> of the page.
3025- *
3026- * This is either {@link $title} or will be constructed from title/text properties
3027- * of the path entries.
3028- *
3029- * @param boolean If true, the fallback will be in reversed order
3030- * @return string
3031- */
3032- function get_title( $reversedDefault = false )
3033- {
3034- if( isset($this->title) )
3035- { // Explicit title has been set:
3036- return $this->title;
3037- }
3038- else
3039- { // Fallback: implode title/text properties of the path
3040- $titles = $this->get_properties_for_path( $this->path, array( 'title', 'text' ) );
3041- if( $reversedDefault )
3042- { // We have asked for reverse order of the path elements:
3043- $titles = array_reverse($titles);
3044- }
3045- return implode( $this->pathSeparator, $titles );
3046- }
3047- }
3048-
3049-
3050- /**
3051- * Get the title for the titlearea (<h1>).
3052- *
3053- * This is the current path in the site structure
3054- *
3055- * @return string
3056- */
3057- function get_title_for_titlearea()
3058- {
3059- if( ! isset( $this->title_titlearea ) )
3060- { // Construct path:
3061- $titles = array();
3062- foreach( $this->path as $i => $lPath )
3063- {
3064- if( false !== ($title_text = $this->get_prop_for_path( $i, array( 'title', 'text' ) )) )
3065- {
3066- $titles[] = '<a href="'.$this->get_prop_for_path( $i, array( 'href' ) ).'">'.$title_text.'</a>';
3067- }
3068- }
3069-
3070- $this->title_titlearea = implode( $this->pathSeparator, $titles );
3071- }
3072-
3073- return $this->title_titlearea.$this->title_titlearea_appendix;
3074- }
3075-
3076-
3077- /**
3078- * Append a string at the end of the existing titlearea.
3079- *
3080- * We actually keep the appended stuff separate from the main title, because the main title
3081- * might in some occasions not be known immediately.
3082- *
3083- * @param string What to append to the titlearea
3084- */
3085- function append_to_titlearea( $string )
3086- {
3087- $this->title_titlearea_appendix .= $this->pathSeparator.$string;
3088- }
3089-
3090-
3091- /**
3092- * Get the title for HTML <title> tag.
3093- *
3094- * If no explicit title has been specified, auto construct one from path.
3095- *
3096- * @return string
3097- */
3098- function get_html_title()
3099- {
3100- global $app_shortname;
3101-
3102- $r = $app_shortname.$this->pathSeparator;
3103-
3104- if( $htmltitle = $this->get_prop_for_node( $this->path, array( 'htmltitle' ) ) )
3105- { // Explicit htmltitle set:
3106- $r .= $htmltitle;
3107- }
3108- else
3109- { // No explicit title set, construct Title from path
3110- $r .= #preg_replace( '/:$/', '',
3111- $this->get_title()
3112- #)
3113- ;
3114- }
3115-
3116- return $r;
3117- }
3118-
3119-
3120- /**
3121- * Get a list of properties for a given path for a set of property names to check.
3122- * The result is a list of properties for each node down the path.
3123- *
3124- * The property names must be given in $prop_by_ref, ordered by preference.
3125- *
3126- * @param string|array The path. See {@link get_node_by_path()}.
3127- * @param array Alternative names of the property to receive (ordered by priority).
3128- * @return array List of the properties.
3129- */
3130- function get_properties_for_path( $path, $prop_by_pref )
3131- {
3132- if( !is_array($path) )
3133- {
3134- $path = array( $path );
3135- }
3136- $r = array();
3137-
3138- $prevPath = array();
3139- foreach( $path as $i => $lPath )
3140- {
3141- if( false !== ($prop = $this->get_prop_for_path( $i, $prop_by_pref )) )
3142- {
3143- $r[] = $prop;
3144- }
3145-
3146- $prevPath[] = $lPath;
3147- }
3148-
3149- return $r;
3150- }
3151-
3152-
3153- /**
3154- * Get a property of a node, given by path.
3155- *
3156- * @param string|array The path. See {@link get_node_by_path()}.
3157- * @param array Alternative names of the property to receive (ordered by priority).
3158- * @return mixed|false False if property is not set for the node, otherwise its value.
3159- */
3160- function get_prop_for_node( $path, $prop_by_pref )
3161- {
3162- $node = & $this->get_node_by_path( $path );
3163-
3164- foreach( $prop_by_pref as $lProp )
3165- {
3166- if( isset($node[$lProp]) )
3167- {
3168- return $node[$lProp];
3169- }
3170- }
3171-
3172- return false;
3173- }
3174-
3175-
3176- /**
3177- * Get a property for a specific path entry.
3178- *
3179- * @param int The numeric index of the path entry to query (0 is first).
3180- * @param array A list of properties to check, ordered by priority.
3181- * @return mixed|false The first found property or false if it does not exist
3182- */
3183- function get_prop_for_path( $depth, $prop_by_pref )
3184- {
3185- if( $pathWithProps = $this->get_path( $depth, true ) )
3186- {
3187- foreach( $prop_by_pref as $lProp )
3188- {
3189- if( isset($pathWithProps['props'][$lProp]) )
3190- {
3191- // echo "<br>path depth $depth property $lProp = ".$pathWithProps['props'][$lProp];
3192- return $pathWithProps['props'][$lProp];
3193- }
3194- }
3195- }
3196-
3197- return false;
3198- }
3199-
3200-
3201- /**
3202- * Display doctype + <head>...</head> section
3203- */
3204- function disp_html_head()
3205- {
3206- global $admintemplates_path;
3207- require $admintemplates_path.'_html_header.inc.php';
3208- }
3209-
3210-
3211- /**
3212- * Dsiplay the top of the HTML <body>...
3213- *
3214- * Typically includes title, menu, messages, etc.
3215- *
3216- * @param boolean Whether to display messages.
3217- */
3218- function disp_body_top( $display_messages = true )
3219- {
3220- global $templates_path, $mode, $Messages;
3221-
3222- /**
3223- * @var Hit
3224- */
3225- global $Hit;
3226-
3227- // #body_win and .body_firefox (for example) can be used to customize CSS per plaform/browser
3228- echo '<body id="body_'.$Hit->get_agent_platform().'" class="body_'.$Hit->get_agent_name().'">'."\n";
3229-
3230- if( !empty( $mode ) )
3231- {
3232- $mode = preg_replace( '¤[^a-z]¤', '', $mode ); // sanitize
3233- echo '<div id="'.$mode.'_wrapper">';
3234-
3235- if( $display_messages )
3236- { // Display info & error messages
3237- $Messages->display( NULL, NULL, true, 'all', NULL, NULL, 'action_messages' );
3238- }
3239- return;
3240- }
3241-
3242- require $templates_path.'_toolbar.inc.php';
3243-
3244- echo "\n";
3245- if( is_logged_in() )
3246- {
3247- echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
3248- }
3249- else
3250- {
3251- echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
3252- }
3253- echo "\n<!-- Start of template_wrapper -->\n";
3254-
3255- echo $this->get_body_top();
3256- }
3257-
3258-
3259- /**
3260- * Display body bottom, debug info and close </html>
3261- */
3262- function disp_global_footer()
3263- {
3264- global $admintemplates_path, $mode;
3265-
3266- require $admintemplates_path.'_html_footer.inc.php';
3267- }
3268-
3269-
3270- /**
3271- * Display the start of a payload block
3272- *
3273- * Note: it is possible to display several payload blocks on a single page.
3274- * The first block uses the "sub" template, the others "block".
3275- *
3276- * @see disp_payload_end()
3277- */
3278- function disp_payload_begin()
3279- {
3280- global $Plugins;
3281-
3282- if( empty($this->displayed_sub_begin) )
3283- {
3284- $Plugins->trigger_event( 'AdminBeginPayload' );
3285-
3286- // Display submenu (this also opens a div class="panelblock" or class="panelblocktabs")
3287-
3288- //echo ' disp_submenu-BEGIN ';
3289- $path = array( $this->get_path(0) );
3290- $r = $this->get_html_menu( $path, 'sub' );
3291-
3292- echo $this->replace_vars( $r );
3293- //echo ' disp_submenu-END ';
3294-
3295- $this->displayed_sub_begin = 1;
3296- }
3297- else
3298- {
3299- $template = $this->get_template( 'block' );
3300-
3301- echo $template['begin'];
3302- }
3303- }
3304-
3305-
3306- /**
3307- * Display the end of a payload block
3308- *
3309- * Note: it is possible to display several payload blocks on a single page.
3310- * The first block uses the "sub" template, the others "block".
3311- * @see disp_payload_begin()
3312- */
3313- function disp_payload_end()
3314- {
3315- if( empty($this->displayed_sub_end) )
3316- {
3317- $name = 'sub';
3318- $this->displayed_sub_end = 1;
3319- }
3320- else
3321- {
3322- $name = 'block';
3323- }
3324-
3325- $template = $this->get_template( $name );
3326-
3327- echo $template['end'];
3328- }
3329-
3330-
3331- /**
3332- * Display a view
3333- *
3334- * Note: doing the require inside of a function has the side effect of forcing the view
3335- * to declare any global object it wants to use. This can be a little tedious but on the
3336- * other hand it has the advantage of clearly showing what objects are used and makes it
3337- * easier to audit the views in order to determine if they include more business logic
3338- * than they ought to.
3339- *
3340- * @param string
3341- * @param array params to be used in the view (optional)
3342- */
3343- function disp_view( $view_name, $view_params = array() )
3344- {
3345- global $inc_path;
3346-
3347- // THESE ARE THE GLOBALS WE WANT TO MAKE AVAILABLE TO ALL VIEWS:
3348- global $action;
3349- global $ctrl;
3350-
3351- global $DB; // Note: not sure it's agood idea to let the views hit on the db...
3352-
3353- global $current_User;
3354-
3355-
3356- require $inc_path.$view_name;
3357- }
3358-
3359-
3360- /**
3361- * Set params for blog list.
3362- *
3363- * @param string name of required permission needed to display the blog in the list
3364- * @param string level of required permission needed to display the blog in the list
3365- * @param string Url format string for elements, with %d for blog number.
3366- * @param string Title for "all" button
3367- * @param string URL for "all" button
3368- * @param string onclick attribute format string, with %s for blog number. (NOTE: %s so that we can use this.value when selected through list)
3369- */
3370- function set_coll_list_params( $permname = 'blog_ismember', $permlevel = 1, $url_params = array(),
3371- $all_title = NULL, $all_url = '', $onclick = NULL )
3372- {
3373- $this->coll_list_all_title = $all_title;
3374- $this->coll_list_all_url = $all_url;
3375- $this->coll_list_permname = $permname;
3376- $this->coll_list_permlevel = $permlevel;
3377- $this->coll_list_url_params = $url_params;
3378- $this->coll_list_onclick = $onclick;
3379- }
3380-
3381-
3382- /**
3383- * Returns list of buttons for available Collections (aka Blogs) to work on.
3384- *
3385- * @return string HTML
3386- */
3387- function get_bloglist_buttons( $title = '' )
3388- {
3389- global $current_User, $blog, $pagenow;
3390-
3391- $max_buttons = 7;
3392-
3393- if( empty( $this->coll_list_permname ) )
3394- { // We have not requested a list of blogs to be displayed
3395- return;
3396- }
3397-
3398- // Prepare url params:
3399- $url_params = '?';
3400- $form_params = '';
3401- foreach( $this->coll_list_url_params as $name => $value )
3402- {
3403- $url_params .= $name.'='.$value.'&amp;';
3404- $form_params .= '<input type="hidden" name="'.$name.'" value="'.$value.'" />';
3405- }
3406-
3407- $template = $this->get_template( 'CollectionList' );
3408-
3409- $BlogCache = & get_Cache( 'BlogCache' );
3410-
3411- $blog_array = $BlogCache->load_user_blogs( $this->coll_list_permname, $this->coll_list_permlevel );
3412-
3413-
3414- $buttons = '';
3415- $select_options = '';
3416- $count = 0;
3417- $current_is_displayed = false;
3418-
3419- foreach( $blog_array as $l_blog_ID )
3420- { // Loop through all blogs that match the requested permission:
3421-
3422- $l_Blog = & $BlogCache->get_by_ID( $l_blog_ID );
3423-
3424- $count++;
3425-
3426- if( $count < $max_buttons
3427- || ($current_is_displayed && $count == $max_buttons )
3428- || $l_blog_ID == $blog )
3429- { // Not too many yet OR current blog, add blog as a button:
3430- $buttons .= $template[ $l_blog_ID == $blog ? 'beforeEachSel' : 'beforeEach' ];
3431-
3432- $buttons .= '<a href="'.$url_params.'blog='.$l_blog_ID
3433- .'" class="'.( $l_blog_ID == $blog ? 'CurrentBlog' : 'OtherBlog' ).'"';
3434-
3435- if( !is_null($this->coll_list_onclick) )
3436- { // We want to include an onclick attribute:
3437- $buttons .= ' onclick="'.sprintf( $this->coll_list_onclick, $l_blog_ID ).'"';
3438- }
3439-
3440- $buttons .= '>'.$l_Blog->dget( 'shortname', 'htmlbody' ).'</a> ';
3441-
3442- if( $l_blog_ID == $blog )
3443- {
3444- $current_is_displayed = true;
3445- $buttons .= $template['afterEachSel'];
3446- }
3447- else
3448- {
3449- $buttons .= $template['afterEach'];
3450- }
3451- }
3452-
3453- // Add item select list:
3454- $select_options .= '<option value="'.$l_blog_ID.'"';
3455- if( $l_blog_ID == $blog )
3456- {
3457- $select_options .= ' selected="selected"';
3458- }
3459- $select_options .= '>'.$l_Blog->dget( 'shortname', 'formvalue' ).'</option>';
3460- }
3461-
3462- $r = $template['before'];
3463-
3464- $r .= $title;
3465-
3466- if( !empty($this->coll_list_all_title) )
3467- { // We want to add an "all" button
3468- $r .= $template[ $blog == 0 ? 'beforeEachSel' : 'beforeEach' ];
3469- $r .= '<a href="'.$this->coll_list_all_url
3470- .'" class="'.( $blog == 0 ? 'CurrentBlog' : 'OtherBlog' ).'">'
3471- .$this->coll_list_all_title.'</a> ';
3472- $r .= $template[ $blog == 0 ? 'afterEachSel' : 'afterEach' ];
3473- }
3474-
3475- $r .= $template['buttons_start'];
3476- $r .= $buttons;
3477- $r .= $template['buttons_end'];
3478-
3479-
3480- $r .= $template['select_start'];
3481- if( $count > $max_buttons )
3482- { // We could not display all blogs as buttons
3483- $r .= '<form action="'.$pagenow.'" method="get">';
3484- $r .= $form_params;
3485- $r .= '<select name="blog" onchange="';
3486- if( empty( $this->coll_list_onclick ) )
3487- { // Just submit...
3488- $r .= 'this.form.submit();';
3489- }
3490- else
3491- {
3492- $r .= sprintf( $this->coll_list_onclick, 'this.value' );
3493- }
3494- $r .= '">'.$select_options.'</select>';
3495- $r .= '<noscript><input type="submit" value="Go" /></noscript></form>';
3496- }
3497- $r .= $template['select_end'];
3498-
3499-
3500- $r .= $template['after'];
3501-
3502- return $r;
3503- }
3504-
3505-
3506- /**
3507- * Get a template by name.
3508- *
3509- * This is a method (and not a member array) to allow dynamic generation and T_()
3510- *
3511- * @param string Name of the template ('main', 'sub')
3512- * @param integer Nesting level (start at 0)
3513- * @return array Associative array which defines layout and optionally properties.
3514- */
3515- function get_template( $name, $level = 0 )
3516- {
3517- switch( $name )
3518- {
3519- case 'main':
3520- return array(
3521- 'before' => '<div id="mainmenu"><ul>',
3522- 'after' => '</ul></div>',
3523- 'beforeEach' => '<li>',
3524- 'afterEach' => '</li>',
3525- 'beforeEachSel' => '<li class="current">',
3526- 'afterEachSel' => '</li>',
3527- 'beforeEachSelWithSub' => '<li class="parent">',
3528- 'afterEachSelWithSub' => '</li>',
3529- '_props' => array(
3530- /**
3531- * @todo Move to new template (recurse for subentries if an entry is selected)
3532- 'recurseSelected' => true,
3533- */
3534- ),
3535- );
3536- break;
3537-
3538-
3539- case 'sub':
3540- // a payload block with embedded submenu
3541- return array(
3542- 'before' => '<div class="pt">'
3543- ."\n".'<ul class="hack">'
3544- ."\n<li><!-- Yes, this empty UL is needed! It's a DOUBLE hack for correct CSS display --></li>"
3545- // TODO: this hack MAY NOT be needed when not using pixels instead of decimal ems or exs in the CSS
3546- ."\n</ul>"
3547- ."\n".'<div class="panelblocktabs">'
3548- ."\n".'<ul class="tabs">',
3549- 'after' => "</ul>\n"
3550- .'<span style="float:right">$global_icons$</span>'
3551- ."</div>\n</div>"
3552- ."\n".'<div class="tabbedpanelblock">',
3553- 'empty' => '<div class="panelblock">',
3554- 'beforeEach' => '<li>',
3555- 'afterEach' => '</li>',
3556- 'beforeEachSel' => '<li class="current">',
3557- 'afterEachSel' => '</li>',
3558- 'end' => '</div>', // used to end payload block that opened submenu
3559- );
3560-
3561-
3562- case 'menu3':
3563- // level 3 submenu:
3564- return array(
3565- 'before' => '<div class="menu3">&raquo;',
3566- 'after' => '</div>',
3567- 'empty' => '',
3568- 'beforeEach' => '<span class="option3">',
3569- 'afterEach' => '</span>',
3570- 'beforeEachSel' => '<span class="current">',
3571- 'afterEachSel' => '</span>',
3572- );
3573-
3574-
3575- case 'block':
3576- // an additional payload block, anywhere after the one with the submenu. Used by disp_payload_begin()/disp_payload_end()
3577- return array(
3578- 'begin' => '<div class="panelblock">',
3579- 'end' => "\n</div>",
3580- );
3581-
3582-
3583- case 'CollectionList':
3584- // Template for a list of Collections (Blogs)
3585- return array(
3586- 'before' => '<div id="coll_list"><ul>',
3587- 'after' => '</ul></div>',
3588- 'buttons_start' => '',
3589- 'buttons_end' => '',
3590- 'beforeEach' => '<li>',
3591- 'afterEach' => '</li>',
3592- 'beforeEachSel' => '<li class="current">',
3593- 'afterEachSel' => '</li>',
3594- 'select_start' => '<li class="collection_select">',
3595- 'select_end' => '</li>',
3596- );
3597-
3598-
3599- case 'Results':
3600- // Results list:
3601- return array(
3602- 'page_url' => '', // All generated links will refer to the current page
3603- 'before' => '<div class="results">',
3604- 'header_start' => '<div class="results_nav">',
3605- 'header_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$',
3606- 'header_text_single' => '',
3607- 'header_end' => '</div>',
3608- 'list_start' => '<table class="grouped" cellspacing="0">'."\n\n",
3609- 'head_start' => "<thead>\n",
3610- 'head_title' => '<tr><th colspan="$nb_cols$" class="title"><span style="float:right">$global_icons$</span>$title$</th>'
3611- ."\n</tr>\n",
3612- 'filters_start' => '<tr class="filters"><td colspan="$nb_cols$">',
3613- 'filters_end' => '</td></tr>',
3614- 'line_start_head' => '<tr>', // TODO: fusionner avec colhead_start_first; mettre a jour admin_UI_general; utiliser colspan="$headspan$"
3615- 'colhead_start' => '<th $class_attrib$>',
3616- 'colhead_start_first' => '<th class="firstcol $class$">',
3617- 'colhead_start_last' => '<th class="lastcol $class$">',
3618- 'colhead_end' => "</th>\n",
3619- 'sort_asc_off' => '<img src="../admin/img/grey_arrow_up.gif" alt="A" title="'.T_('Ascending order')
3620- .'" height="12" width="11" />',
3621- 'sort_asc_on' => '<img src="../admin/img/black_arrow_up.gif" alt="A" title="'.T_('Ascending order')
3622- .'" height="12" width="11" />',
3623- 'sort_desc_off' => '<img src="../admin/img/grey_arrow_down.gif" alt="D" title="'.T_('Descending order')
3624- .'" height="12" width="11" />',
3625- 'sort_desc_on' => '<img src="../admin/img/black_arrow_down.gif" alt="D" title="'.T_('Descending order')
3626- .'" height="12" width="11" />',
3627- 'basic_sort_off' => '',
3628- 'basic_sort_asc' => get_icon( 'ascending' ),
3629- 'basic_sort_desc' => get_icon( 'descending' ),
3630- 'head_end' => "</thead>\n\n",
3631- 'tfoot_start' => "<tfoot>\n",
3632- 'tfoot_end' => "</tfoot>\n\n",
3633- 'body_start' => "<tbody>\n",
3634- 'line_start' => '<tr class="even">'."\n",
3635- 'line_start_odd' => '<tr class="odd">'."\n",
3636- 'line_start_last' => '<tr class="even lastline">'."\n",
3637- 'line_start_odd_last' => '<tr class="odd lastline">'."\n",
3638- 'col_start' => '<td $class_attrib$>',
3639- 'col_start_first' => '<td class="firstcol $class$">',
3640- 'col_start_last' => '<td class="lastcol $class$">',
3641- 'col_end' => "</td>\n",
3642- 'line_end' => "</tr>\n\n",
3643- 'grp_line_start' => '<tr class="group">'."\n",
3644- 'grp_line_start_odd' => '<tr class="odd">'."\n",
3645- 'grp_line_start_last' => '<tr class="lastline">'."\n",
3646- 'grp_line_start_odd_last' => '<tr class="odd lastline">'."\n",
3647- 'grp_col_start' => '<td $class_attrib$ $colspan_attrib$>',
3648- 'grp_col_start_first' => '<td class="firstcol $class$" $colspan_attrib$>',
3649- 'grp_col_start_last' => '<td class="lastcol $class$" $colspan_attrib$>',
3650- 'grp_col_end' => "</td>\n",
3651- 'grp_line_end' => "</tr>\n\n",
3652- 'body_end' => "</tbody>\n\n",
3653- 'total_line_start' => '<tr class="total">'."\n",
3654- 'total_col_start' => '<td $class_attrib$>',
3655- 'total_col_start_first' => '<td class="firstcol $class$">',
3656- 'total_col_start_last' => '<td class="lastcol $class$">',
3657- 'total_col_end' => "</td>\n",
3658- 'total_line_end' => "</tr>\n\n",
3659- 'list_end' => "</table>\n\n",
3660- 'footer_start' => '<div class="results_nav">',
3661- 'footer_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$'
3662- /* T_('Page $scroll_list$ out of $total_pages$ $prev$ | $next$<br />'. */
3663- /* '<strong>$total_pages$ Pages</strong> : $prev$ $list$ $next$' */
3664- /* .' <br />$first$ $list_prev$ $list$ $list_next$ $last$ :: $prev$ | $next$') */,
3665- 'footer_text_single' => '',
3666- 'footer_text_no_limit' => '', // Text if theres no LIMIT and therefor only one page anyway
3667- 'prev_text' => T_('Previous'),
3668- 'next_text' => T_('Next'),
3669- 'no_prev_text' => '',
3670- 'no_next_text' => '',
3671- 'list_prev_text' => T_('...'),
3672- 'list_next_text' => T_('...'),
3673- 'list_span' => 11,
3674- 'scroll_list_range' => 5,
3675- 'footer_end' => "</div>\n\n",
3676- 'no_results_start' => '<table class="grouped" cellspacing="0">'."\n\n"
3677- .'<tr><th class="title"><span style="float:right">$global_icons$</span>'
3678- .'$title$</th></tr>'."\n",
3679- 'no_results_end' => '<tr class="lastline"><td class="firstcol lastcol">$no_results$</td></tr>'
3680- .'</table>'."\n\n",
3681- 'after' => '</div>',
3682- 'sort_type' => 'basic'
3683- );
3684-
3685- case 'compact_results':
3686- // Results list:
3687- return array(
3688- 'page_url' => '', // All generated links will refer to the current page
3689- 'before' => '<div class="compact_results">',
3690- 'header_start' => '',
3691- 'header_text' => '',
3692- 'header_text_single' => '',
3693- 'header_end' => '',
3694- 'list_start' => '<table class="grouped" cellspacing="0">'."\n\n",
3695- 'head_start' => "<thead>\n",
3696- 'head_title' => '',
3697- 'filters_start' => '<tr class="filters"><td colspan="$nb_cols$">',
3698- 'filters_end' => '</td></tr>',
3699- 'line_start_head' => '<tr>', // TODO: fusionner avec colhead_start_first; mettre a jour admin_UI_general; utiliser colspan="$headspan$"
3700- 'colhead_start' => '<th $class_attrib$>',
3701- 'colhead_start_first' => '<th class="firstcol $class$">',
3702- 'colhead_start_last' => '<th class="lastcol $class$">',
3703- 'colhead_end' => "</th>\n",
3704- 'sort_asc_off' => '<img src="../admin/img/grey_arrow_up.gif" alt="A" title="'.T_('Ascending order')
3705- .'" height="12" width="11" />',
3706- 'sort_asc_on' => '<img src="../admin/img/black_arrow_up.gif" alt="A" title="'.T_('Ascending order')
3707- .'" height="12" width="11" />',
3708- 'sort_desc_off' => '<img src="../admin/img/grey_arrow_down.gif" alt="D" title="'.T_('Descending order')
3709- .'" height="12" width="11" />',
3710- 'sort_desc_on' => '<img src="../admin/img/black_arrow_down.gif" alt="D" title="'.T_('Descending order')
3711- .'" height="12" width="11" />',
3712- 'basic_sort_off' => '',
3713- 'basic_sort_asc' => get_icon( 'ascending' ),
3714- 'basic_sort_desc' => get_icon( 'descending' ),
3715- 'head_end' => "</thead>\n\n",
3716- 'tfoot_start' => "<tfoot>\n",
3717- 'tfoot_end' => "</tfoot>\n\n",
3718- 'body_start' => "<tbody>\n",
3719- 'line_start' => '<tr class="even">'."\n",
3720- 'line_start_odd' => '<tr class="odd">'."\n",
3721- 'line_start_last' => '<tr class="even lastline">'."\n",
3722- 'line_start_odd_last' => '<tr class="odd lastline">'."\n",
3723- 'col_start' => '<td $class_attrib$>',
3724- 'col_start_first' => '<td class="firstcol $class$">',
3725- 'col_start_last' => '<td class="lastcol $class$">',
3726- 'col_end' => "</td>\n",
3727- 'line_end' => "</tr>\n\n",
3728- 'grp_line_start' => '<tr class="group">'."\n",
3729- 'grp_line_start_odd' => '<tr class="odd">'."\n",
3730- 'grp_line_start_last' => '<tr class="lastline">'."\n",
3731- 'grp_line_start_odd_last' => '<tr class="odd lastline">'."\n",
3732- 'grp_col_start' => '<td $class_attrib$ $colspan_attrib$>',
3733- 'grp_col_start_first' => '<td class="firstcol $class$" $colspan_attrib$>',
3734- 'grp_col_start_last' => '<td class="lastcol $class$" $colspan_attrib$>',
3735- 'grp_col_end' => "</td>\n",
3736- 'grp_line_end' => "</tr>\n\n",
3737- 'body_end' => "</tbody>\n\n",
3738- 'total_line_start' => '<tr class="total">'."\n",
3739- 'total_col_start' => '<td $class_attrib$>',
3740- 'total_col_start_first' => '<td class="firstcol $class$">',
3741- 'total_col_start_last' => '<td class="lastcol $class$">',
3742- 'total_col_end' => "</td>\n",
3743- 'total_line_end' => "</tr>\n\n",
3744- 'list_end' => "</table>\n\n",
3745- 'footer_start' => '<div class="results_nav">',
3746- 'footer_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$'
3747- /* T_('Page $scroll_list$ out of $total_pages$ $prev$ | $next$<br />'. */
3748- /* '<strong>$total_pages$ Pages</strong> : $prev$ $list$ $next$' */
3749- /* .' <br />$first$ $list_prev$ $list$ $list_next$ $last$ :: $prev$ | $next$') */,
3750- 'footer_text_single' => '',
3751- 'footer_text_no_limit' => '', // Text if theres no LIMIT and therefor only one page anyway
3752- 'prev_text' => T_('Previous'),
3753- 'next_text' => T_('Next'),
3754- 'no_prev_text' => '',
3755- 'no_next_text' => '',
3756- 'list_prev_text' => T_('...'),
3757- 'list_next_text' => T_('...'),
3758- 'list_span' => 11,
3759- 'scroll_list_range' => 5,
3760- 'footer_end' => "</div>\n\n",
3761- 'no_results_start' => '<table class="grouped" cellspacing="0">'."\n\n",
3762- 'no_results_end' => '<tr class="lastline"><td class="firstcol lastcol">$no_results$</td></tr>'
3763- .'</table>'."\n\n",
3764- 'after' => '</div>',
3765- 'sort_type' => 'basic'
3766- );
3767-
3768-
3769- case 'blockspan_form':
3770- // blockspan Form settings:
3771- return array(
3772- 'layout' => 'blockspan', // Temporary dirty hack
3773- 'formstart' => '',
3774- 'title_fmt' => '$title$'."\n", // TODO: icons
3775- 'no_title_fmt' => '', // "
3776- 'fieldstart' => '<span class="block" $ID$>',
3777- 'labelstart' => '',
3778- 'labelend' => "\n",
3779- 'labelempty' => '',
3780- 'inputstart' => '',
3781- 'infostart' => '',
3782- 'inputend' => "\n",
3783- 'fieldend' => '</span>'.get_icon( 'pixel' )."\n",
3784- 'buttonsstart' => '',
3785- 'buttonsend' => "\n",
3786- 'formend' => '',
3787- );
3788-
3789- case 'compact_form':
3790- case 'Form':
3791- // Default Form settings:
3792- return array(
3793- 'layout' => 'fieldset',
3794- 'formstart' => '',
3795- 'title_fmt' => '<span style="float:right">$global_icons$</span><h2>$title$</h2>'."\n",
3796- 'no_title_fmt' => '<span style="float:right">$global_icons$</span>'."\n",
3797- 'fieldset_begin' => '<fieldset $fieldset_attribs$>'."\n"
3798- .'<legend $title_attribs$>$fieldset_title$</legend>'."\n",
3799- 'fieldset_end' => '</fieldset>'."\n",
3800- 'fieldstart' => '<fieldset $ID$>'."\n",
3801- 'labelstart' => '<div class="label">',
3802- 'labelend' => "</div>\n",
3803- 'labelempty' => '<div class="label"></div>', // so that IE6 aligns DIV.input correcctly
3804- 'inputstart' => '<div class="input">',
3805- 'infostart' => '<div class="info">',
3806- 'inputend' => "</div>\n",
3807- 'fieldend' => "</fieldset>\n\n",
3808- 'buttonsstart' => '<fieldset><div class="input">',
3809- 'buttonsend' => "</div></fieldset>\n\n",
3810- 'formend' => '',
3811- );
3812-
3813- case 'file_browser':
3814- return array(
3815- 'block_start' => '<div class="block_item"><h3><span style="float:right">$global_icons$</span>$title$</h3>',
3816- 'block_end' => '</div>',
3817- );
3818-
3819- case 'block_item':
3820- return array(
3821- 'block_start' => '<div class="block_item"><h3><span style="float:right">$global_icons$</span>$title$</h3>',
3822- 'block_end' => '</div>',
3823- );
3824-
3825- case 'side_item':
3826- return array(
3827- 'block_start' => '<div class="browse_side_item"><h3><span style="float:right">$global_icons$</span>$title$</h3>',
3828- 'block_end' => '</div>',
3829- );
3830-
3831- default:
3832- debug_die( 'Unknown $name for AdminUI::get_template(): '.var_export($name, true) );
3833- }
3834- }
3835-
3836-
3837- /**
3838- * Get a path key by numeric key. Starts with 0.
3839- *
3840- * @param integer The numeric index of the path (0 is first).
3841- * @param boolean Also return properties?
3842- * @return string|array|false (depends on $withProps)
3843- */
3844- function get_path( $which, $withProps = false )
3845- {
3846- if( $which === 'last' )
3847- {
3848- $which = count($this->path)-1;
3849- }
3850- if( !isset($this->path[$which]) )
3851- {
3852- return false;
3853- }
3854-
3855- if( $withProps )
3856- {
3857- return array(
3858- 'path' => $this->path[$which],
3859- 'props' => isset( $this->pathProps[$which] ) ? $this->pathProps[$which] : array(),
3860- );
3861- }
3862-
3863- return $this->path[$which];
3864- }
3865-
3866-
3867- /**
3868- * Get the list of path keys in a given range.
3869- *
3870- * @param integer start index
3871- * @param integer|NULL end index (NULL means same as start index)
3872- * @return array List of path keys.
3873- */
3874- function get_path_range( $start, $end = NULL )
3875- {
3876- if( is_null($end) )
3877- {
3878- $end = $start;
3879- }
3880-
3881- $r = array();
3882- for( $i = $start; $i <= $end; $i++ )
3883- {
3884- $r[] = isset($this->path[$i]) ? $this->path[$i] : NULL;
3885- }
3886-
3887- return $r;
3888- }
3889-
3890-
3891- /**
3892- * Set a specific path level (specific depth).
3893- *
3894- * First level is 0, then the first subpath/submenu is level 1, etc.
3895- *
3896- * E.g., if plugins.php gets called, there could be a call to
3897- * $AdminUI->set_path_level( 0, 'plugins' ), which selects this entry from the menu.
3898- * If a specific tab is called inside of plugins.php, there could be a call to
3899- * $AdminUI->set_path_level( 1, $tab )
3900- *
3901- * Though, it is recommended to call the wrapper functions:
3902- * - {@link append_path_level()}
3903- * - {@link set_path()}
3904- *
3905- * This also marks the parent node as selected and checks for permissions.
3906- *
3907- * @param integer Path level to set (starts at 0)
3908- * @param array Either the key of the path or an array(keyname, propsArray).
3909- * @param array Properties for this path entry.
3910- * @return boolean DEPRECATED True if perm granted, false if not (and we're not exiting).
3911- */
3912- function set_path_level( $level, $pathKey, $pathProps = array() )
3913- {
3914- // Get the parent node (the level above this one):
3915- if( $level == 0 )
3916- { // first level in menu-path: parent node is NULL
3917- $parentNode = & $this->get_node_by_path( NULL );
3918- }
3919- else
3920- { // parent node is the trunk from root to previous level
3921- $parentNode = & $this->get_node_by_path( $this->get_path_range( 0, $level-1 ) );
3922- }
3923- if( ! $parentNode )
3924- { // parent node does not exist:
3925- return false;
3926- }
3927-
3928- // Store the selected entry name in the parent node:
3929- $parentNode['selected'] = $pathKey;
3930-
3931- $this->path[$level] = $pathKey;
3932- $this->pathProps[$level] = $pathProps;
3933-
3934- // pre_dump( 'set_path_level: ', $level, $pathKey, $this->pathProps[$level] );
3935-
3936- return true;
3937- }
3938-
3939-
3940- /**
3941- * Append a selected menu entry to the current path of selected entries.
3942- *
3943- * @param string|array Either the key of the path or an array(keyname, propsArray).
3944- */
3945- function append_path_level( $path, $pathProps = array() )
3946- {
3947- $search_path = $this->path;
3948- $search_path[] = $path;
3949- // auto-detect path props from menu entries
3950- if( $node = & $this->get_node_by_path( $search_path ) )
3951- {
3952- $pathProps = array_merge( $node, $pathProps );
3953- }
3954-
3955- // Set the path level right after the last existing one:
3956- return $this->set_path_level( count($this->path), $path, $pathProps );
3957- }
3958-
3959-
3960- /**
3961- * Set the full selected path.
3962- *
3963- * For example, this selects the tab/submenu 'plugins' in the main menu 'options':
3964- * <code>
3965- * set_path( 'options', 'plugins' );
3966- * </code>
3967- *
3968- * Use {@link append_path_level()} to append a single path element.
3969- *
3970- * This is an easy stub for {@link set_path_level()}.
3971- *
3972- * @param string|array,... VARIABLE NUMBER OF ARGUMENTS. Each is either the key of a path entry or an array(keyname, propsArray).
3973- */
3974- function set_path( )
3975- {
3976- $args = func_get_args();
3977-
3978- $i = 0;
3979- $prevPath = array(); // Remember the path we have walked through
3980-
3981- // Loop though all path levels to set:
3982- foreach( $args as $arg )
3983- {
3984- if( is_array($arg) )
3985- { // Path name and properties given
3986- list( $pathName, $pathProps ) = $arg;
3987- }
3988- else
3989- { // Just the path name
3990- $pathName = $arg;
3991- $pathProps = array();
3992- }
3993-
3994- $this->init_menus();
3995-
3996- if( $node = & $this->get_node_by_path( array_merge( $prevPath, array($pathName) ) ) )
3997- { // the node exists in the menu entries: merge the properties
3998- $pathProps = array_merge( $node, $pathProps );
3999- }
4000-
4001- if( ! $this->set_path_level( $i++, $pathName, $pathProps ) )
4002- {
4003- return false;
4004- }
4005-
4006- $prevPath[] = $pathName;
4007- }
4008-
4009- return true;
4010- }
4011-
4012-
4013- /**
4014- * Init the menus.
4015- *
4016- * Do this as late as possible. Especially after determining the blog ID we work on.
4017- * This allows to check for proper permissions and build correct cross navigation links.
4018- *
4019- * Note: The menu structure is determined by the modules and the plugins.
4020- * Individual Admin templates can still override the whole menu. In a cumbersome way though.
4021- */
4022- function init_menus()
4023- {
4024- global $Plugins;
4025-
4026- if( !empty($this->_menus) )
4027- { // Already initialized!
4028- return;
4029- }
4030-
4031- // Let the modules construct the menu:
4032- // Part 1:
4033- modules_call_method( 'build_menu_1' );
4034-
4035- // Part 2:
4036- modules_call_method( 'build_menu_2' );
4037-
4038- // Call AdminAfterMenuInit to notify Plugins that the menu is initialized
4039- // E.g. the livehits_plugin and weather_plugin use it for adding a menu entry.
4040- $Plugins->trigger_event( 'AdminAfterMenuInit' );
4041- }
4042-
4043-
4044- /**
4045- * Get the top of the HTML <body>.
4046- *
4047- * @return string
4048- */
4049- function get_body_top()
4050- {
4051- return '';
4052- }
4053-
4054-
4055- /**
4056- * Get the end of the HTML <body>. Close open divs, etc...
4057- *
4058- * @return string
4059- */
4060- function get_body_bottom()
4061- {
4062- return '';
4063- }
4064-
4065-
4066- /**
4067- * GLOBAL HEADER - APP TITLE, LOGOUT, ETC.
4068- *
4069- * @return string
4070- */
4071- function get_page_head()
4072- {
4073- global $app_shortname, $app_version, $current_User, $htsrv_url_sensitive, $admin_url, $baseurl, $rsc_url;
4074-
4075- $r = '
4076- <div id="header">
4077- <div id="headinfo">
4078- <span id="headfunctions">'
4079- // Note: if we log in with another user, we may not have the perms to come back to the same place any more, thus: redirect to admin home.
4080- .'<a href="'.$htsrv_url_sensitive.'login.php?action=logout&amp;redirect_to='.rawurlencode(url_rel_to_same_host($admin_url, $htsrv_url_sensitive)).'">'.T_('Logout').'</a>
4081- <img src="'.$rsc_url.'icons/close.gif" width="14" height="14" border="0" class="top" alt="" title="'
4082- .T_('Logout').'" /></a>
4083- </span>
4084-
4085- '.$app_shortname.' v <strong>'.$app_version.'</strong>
4086- </div>
4087-
4088- <h1>'.$this->get_title_for_titlearea().'</h1>
4089- </div>
4090- ';
4091-
4092- return $r;
4093- }
4094-
4095-
4096- /**
4097- * Get the footer text
4098- *
4099- * @return string
4100- */
4101- function get_footer_contents()
4102- {
4103- global $app_footer_text, $copyright_text;
4104-
4105- global $Hit;
4106-
4107- $r = '';
4108-
4109- if( $Hit->is_winIE() )
4110- {
4111- $r .= '<!--[if lt IE 7]>
4112-<div style="text-align:center; color:#f00; font-weight:bold; margin:1ex;">'.
4113- T_('WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox.').'</div>
4114-<![endif]-->';
4115- }
4116-
4117- $r .= '<div class="footer">'.$app_footer_text.' &ndash; '.$copyright_text."</div>\n\n";
4118-
4119- return $r;
4120- }
4121-
4122-
4123- /**
4124- * Get colors for page elements that can't be controlled by CSS (charts)
4125- *
4126- * @return string
4127- */
4128- function get_color( $what )
4129- {
4130- switch( $what )
4131- {
4132- case 'payload_background':
4133- return 'f1f6f8';
4134- break;
4135- }
4136- debug_die( 'unknown color' );
4137- }
4138-}
4139-
4140-
4141-?>
4142
4143=== removed file 'templates_adm/_html_footer.inc.php'
4144--- templates_adm/_html_footer.inc.php 2010-01-02 08:34:34 +0000
4145+++ templates_adm/_html_footer.inc.php 1970-01-01 00:00:00 +0000
4146@@ -1,77 +0,0 @@
4147-<?php
4148-/**
4149- * This file displays the admin page footer.
4150- *
4151- * This file is part of Quam Plures - {@link http://quamplures.net/}
4152- * See also {@link https://launchpad.net/quam-plures}.
4153- *
4154- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
4155- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
4156- *
4157- * {@internal License choice
4158- * - If you have received this file as part of a package, please find the license.txt file in
4159- * the same folder or the closest folder above for complete license terms.
4160- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
4161- * then you must choose one of the following licenses before using the file:
4162- * - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
4163- * - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
4164- * }}
4165- *
4166- * {@internal Open Source relicensing agreement:
4167- * }}
4168- *
4169- * @package pond
4170- */
4171-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
4172-
4173-if( $mode != 'iframe' )
4174-{
4175- /**
4176- * Icon Legend
4177- */
4178- if( $IconLegend = & get_IconLegend() )
4179- { // Display icon legend, if activated by user
4180- $IconLegend->display_legend();
4181- }
4182-
4183- echo $this->get_footer_contents();
4184-
4185- // CALL PLUGINS NOW:
4186- global $Plugins;
4187- $Plugins->trigger_event( 'AdminAfterPageFooter', array() );
4188-
4189-
4190- // Close open divs, etc...
4191- echo $this->get_body_bottom();
4192-}
4193-
4194-if( $this->get_path(0) == 'files'
4195- || $this->get_path_range(0,1) == array( 'blogs', 'perm' )
4196- || $this->get_path_range(0,1) == array( 'blogs', 'permgroup' ) )
4197-{ // init checkall JS functions
4198- ?>
4199- <script type="text/javascript">
4200- initcheckall();
4201- <?php
4202- if( $this->get_path(0) == 'files' )
4203- {
4204- global $checkall;
4205- ?> setcheckallspan(0<?php if( isset($checkall) ) echo ', '.(int)$checkall; ?>); <?php
4206- }
4207- ?>
4208- </script>
4209- <?php
4210-}
4211-
4212-// fp TODO: check if this makes sense here
4213-include_footerlines(); // enables translation strings for js
4214-
4215-?>
4216-
4217-<!-- End of template_wrapper -->
4218-</div>
4219-
4220-</body>
4221-</html>
4222-<?php
4223-?>
4224
4225=== removed file 'templates_adm/_html_header.inc.php'
4226--- templates_adm/_html_header.inc.php 2010-01-02 08:34:34 +0000
4227+++ templates_adm/_html_header.inc.php 1970-01-01 00:00:00 +0000
4228@@ -1,286 +0,0 @@
4229-<?php
4230-/**
4231- * This file displays the first part of the page menu (before the page title).
4232- *
4233- * This file is part of Quam Plures - {@link http://quamplures.net/}
4234- * See also {@link https://launchpad.net/quam-plures}.
4235- *
4236- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
4237- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
4238- * Parts of this file are copyright (c)2005-2006 by PROGIDISTRI - {@link http://progidistri.com/}.
4239- *
4240- * {@internal License choice
4241- * - If you have received this file as part of a package, please find the license.txt file in
4242- * the same folder or the closest folder above for complete license terms.
4243- * - If you have received this file individually (e-g: from http://evocms.cvs.sourceforge.net/)
4244- * then you must choose one of the following licenses before using the file:
4245- * - GNU General Public License 2 (GPL) - http://www.opensource.org/licenses/gpl-license.php
4246- * - Mozilla Public License 1.1 (MPL) - http://www.opensource.org/licenses/mozilla1.1.php
4247- * }}
4248- *
4249- * {@internal Open Source relicensing agreement:
4250- * PROGIDISTRI S.A.S. grants Francois PLANQUE the right to license
4251- * PROGIDISTRI S.A.S.'s contributions to this file and the b2evolution project
4252- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
4253- * }}
4254- *
4255- * @author blueyed
4256- * @author fplanque
4257- * @author mbruneau: Marc BRUNEAU / PROGIDISTRI
4258- *
4259- * @package pond
4260- */
4261-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
4262-
4263-global $io_charset, $rsc_url, $UserSettings, $Debuglog, $Plugins, $generating_static;
4264-global $month, $month_abbrev, $weekday, $weekday_abbrev; /* for localized calendar */
4265-global $debug, $Hit;
4266-
4267-header_content_type( 'text/html' );
4268-?>
4269-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
4270-<html xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
4271-<head>
4272- <title><?php echo $this->get_html_title(); ?></title>
4273- <?php
4274- global $robots_index, $robots_follow;
4275- $robots_index = false;
4276- $robots_follow = false;
4277- robots_tag();
4278-
4279- global $rsc_path, $rsc_url, $htsrv_url;
4280-
4281- add_js_headline( "// Paths used by JS functions:
4282- var imgpath_expand = '".get_icon( 'expand', 'url' )."';
4283- var imgpath_collapse = '".get_icon( 'collapse', 'url' )."';
4284- var htsrv_url = '$htsrv_url';" );
4285-
4286- add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
4287-
4288- require_js( '#jqueryUI#' );
4289-
4290- require_js( 'form_extensions.js'); // script allowing to check and uncheck all boxes in forms -- TODO: jQueryfy
4291-
4292- require_js( 'extracats.js' );
4293- require_js( 'dynamic_select.js' );
4294- require_js( 'admin.js' );
4295-
4296-
4297- global $UserSettings;
4298- if( $UserSettings->get('control_form_abortions') )
4299- { // Activate bozo validator
4300- require_js( 'bozo_validator.js' );
4301- }
4302-
4303- if( $UserSettings->get('focus_on_first_input') )
4304- { // Activate focus on first form <input type="text">:
4305- add_js_headline( 'jQuery( function() { focus_on_first_input() } )' );
4306- }
4307-
4308- global $Debuglog;
4309- $Debuglog->add( 'Admin-Path: '.var_export($this->path, true) );
4310-
4311- if( $this->get_path(0) == 'files'
4312- || ($this->get_path_range(0,1) == array('blogs', 'perm') )
4313- || ($this->get_path_range(0,1) == array('blogs', 'permgroup') ) )
4314- {{{ // -- Inject javascript ----------------
4315- // gets initialized in _footer.php
4316-
4317- $begin_script = <<<JS
4318- <script type="text/javascript">
4319- <!--
4320- var allchecked = Array();
4321- var idprefix;
4322-JS;
4323- add_headline( $begin_script );
4324-
4325- switch( $this->get_path(0) )
4326- {
4327- case 'files':
4328- /**
4329- * Toggles status of a bunch of checkboxes in a form
4330- *
4331- * @param string the form name
4332- * @param string the checkbox(es) element(s) name
4333- * @param string number/name of the checkall set to use. Defaults to 0 and is needed when there are several "checkall-sets" on one page.
4334- */
4335- $toggleCheckboxes_script = "
4336- function toggleCheckboxes(the_form, the_elements, set_name )
4337- {
4338- if( typeof set_name == 'undefined' )
4339- {
4340- set_name = 0;
4341- }
4342- if( allchecked[set_name] ) allchecked[set_name] = false;
4343- else allchecked[set_name] = true;
4344-
4345- var elems = document.forms[the_form].elements[the_elements];
4346- if( !elems )
4347- {
4348- return;
4349- }
4350- var elems_cnt = (typeof(elems.length) != 'undefined') ? elems.length : 0;
4351- if (elems_cnt)
4352- {
4353- for (var i = 0; i < elems_cnt; i++)
4354- {
4355- elems[i].checked = allchecked[nr];
4356- } // end for
4357- }
4358- else
4359- {
4360- elems.checked = allchecked[nr];
4361- }
4362- setcheckallspan( set_name );
4363- }
4364-";
4365- add_headline( $toggleCheckboxes_script );
4366- break;
4367- }
4368-
4369- // --- general functions ----------------
4370- /**
4371- * replaces the text of the checkall-html-ID for set_name
4372- *
4373- * @param integer|string number or name of the checkall "set" to use
4374- * @param boolean force setting to true/false
4375- */
4376- $setcheckallspan_script = "
4377- function setcheckallspan( set_name, set )
4378- {
4379- if( typeof(allchecked[set_name]) == 'undefined' || typeof(set) != 'undefined' )
4380- { // init
4381- allchecked[set_name] = set;
4382- }
4383-
4384- if( allchecked[set_name] )
4385- {
4386- var replace = document.createTextNode('" . TS_('uncheck all') . "');
4387- }
4388- else
4389- {
4390- var replace = document.createTextNode('" . TS_('check all') . "');
4391- }
4392-
4393- if( document.getElementById( idprefix+'_'+String(set_name) ) )
4394- {
4395- document.getElementById( idprefix+'_'+String(set_name) ).replaceChild(replace, document.getElementById( idprefix+'_'+String(set_name) ).firstChild);
4396- }
4397- //else alert('no element with id '+idprefix+'_'+String(set_name));
4398- }
4399-";
4400- add_headline( $setcheckallspan_script );
4401- /**
4402- * inits the checkall functionality.
4403- *
4404- * @param string the prefix of the IDs where the '(un)check all' text should be set
4405- * @param boolean initial state of the text (if there is no checkbox with ID htmlid + '_state_' + nr)
4406- */ $initcheckall_script = <<<JS
4407- function initcheckall( htmlid, init )
4408- {
4409- // initialize array
4410- allchecked = Array();
4411- idprefix = typeof(htmlid) == 'undefined' ? 'checkallspan' : htmlid;
4412-
4413- for( var lform = 0; lform < document.forms.length; lform++ )
4414- {
4415- for( var lelem = 0; lelem < document.forms[lform].elements.length; lelem++ )
4416- {
4417- if( document.forms[lform].elements[lelem].id.indexOf( idprefix ) == 0 )
4418- {
4419- var index = document.forms[lform].elements[lelem].name.substring( idprefix.length+2, document.forms[lform].elements[lelem].name.length );
4420- if( document.getElementById( idprefix+'_state_'+String(index)) )
4421- {
4422- setcheckallspan( index, document.getElementById( idprefix+'_state_'+String(index)).checked );
4423- }
4424- else
4425- {
4426- setcheckallspan( index, init );
4427- }
4428- }
4429- }
4430- }
4431- }
4432- //-->
4433- </script>
4434-JS;
4435- add_headline( $initcheckall_script );
4436- }}}
4437-
4438- if( $Hit->is_winIE() )
4439- {
4440- add_headline( '<!--[if lt IE 7]>
4441-<style type="text/css">
4442-/* IE: fix extra space */
4443-div.template_wrapper_loggedin {
4444- margin-top: 0;
4445- padding-top: 0;
4446-}
4447-</style>
4448-<![endif]-->' );
4449- }
4450-
4451- // fp> TODO: ideally all this should only be included when the datepicker will be needed
4452- // dh> The Datepicker could dynamically load this CSS in document.ready?!
4453- // Afwas> Done. Keeping this conversation for reference. The performance may be an issue.
4454- // require_css( 'ui.datepicker.css' );
4455-
4456- // Autoselect "change date" is the date is changed. fp> TODO: This has NOTHING TO DO in the generic header!!!
4457- add_js_headline( 'jQuery(function(){
4458- jQuery(\'#item_issue_date, #item_issue_time\').change(function(){
4459- jQuery(\'#set_issue_date_to\').attr("checked", "checked")
4460- })
4461- })' );
4462-
4463- // Add event to the item title field to update document title and init it (important when switching tabs/blogs):
4464- global $js_doc_title_prefix;
4465- if( isset($js_doc_title_prefix) )
4466- { // dynamic document.title handling:
4467- $base_title = preg_quote( trim($js_doc_title_prefix) /* e.g. FF2 trims document.title */ );
4468- add_js_headline( 'jQuery(function(){
4469- var generateTitle = function()
4470- {
4471- currentPostTitle = jQuery(\'#post_title\').val()
4472- document.title = document.title.replace(/(' . $base_title . ').*$/, \'$1 \'+currentPostTitle)
4473- }
4474- generateTitle()
4475- jQuery(\'#post_title\').keyup(generateTitle)
4476- })' );
4477- }
4478-
4479-
4480- $datefmt = locale_datefmt();
4481- $datefmt = str_replace( array( 'd', 'm', 'Y' ), array( 'dd', 'mm', 'yy' ), $datefmt );
4482- add_js_headline( 'jQuery(function(){
4483- var monthNames = [\'' . T_( 'January' ) . '\',\'' . T_( 'February' ) . '\', \'' . T_( 'March' ) . '\', \'' . T_( 'April' ) . '\', \'' . T_( 'May' ) . '\', \'' . T_( 'June' ) . '\', \'' . T_( 'July' ) . '\', \'' . T_( 'August' ) . '\', \'' . T_( 'September' ) . '\', \'' . T_( 'October' ) . '\', \'' . T_( 'November' ) . '\', \'' . T_( 'December' ) . '\']
4484- var dayNamesMin = [\'' . T_( 'Sun' ) . '\', \'' . T_( 'Mon' ) . '\', \'' . T_( 'Tue' ) . '\', \'' . T_( 'Wed' ) . '\', \'' . T_( 'Thu' ) . '\', \'' . T_( 'Fri' ) . '\', \'' . T_( 'Sat' ) . '\']
4485- var docHead = document.getElementsByTagName(\'head\')[0];
4486- for (i=0;i<dayNamesMin.length;i++)
4487- dayNamesMin[i] = dayNamesMin[i].substr(0, 2)
4488-
4489- jQuery(".form_date_input").datepicker({
4490- beforeShow: function(){ // Dynamically add stylesheet just before display
4491- jQuery(document.createElement(\'link\'))
4492- .attr({type: \'text/css\', href: \'' . $rsc_url . 'css/ui.datepicker.css\', rel: \'stylesheet\', media: \'screen\'})
4493- .appendTo(docHead)
4494- },
4495- dateFormat: \'' . $datefmt . '\',
4496- monthNames: monthNames,
4497- dayNamesMin: dayNamesMin,
4498- firstDay: '.locale_startofweek().',
4499- onClose: function(){ // Dynamically removing stylesheet, prevents duplicates
4500- jQuery(docHead).find("link[href=\'' . $rsc_url . 'css/ui.datepicker.css\']").remove();
4501- }
4502- })
4503- })' );
4504-
4505- // CALL PLUGINS NOW:
4506- global $Plugins;
4507- $Plugins->trigger_event( 'AdminEndHtmlHead', array() );
4508-
4509- include_headlines(); // Add javascript and css files included by plugins and template
4510-?>
4511-</head>
4512-
4513-<?php
4514-?>
4515
4516=== removed directory 'templates_adm/chicago'
4517=== removed file 'templates_adm/chicago/_adminUI.class.php'
4518--- templates_adm/chicago/_adminUI.class.php 2010-02-02 02:56:23 +0000
4519+++ templates_adm/chicago/_adminUI.class.php 1970-01-01 00:00:00 +0000
4520@@ -1,381 +0,0 @@
4521-<?php
4522-/**
4523- * This file implements the Admin UI class.
4524- * Alternate admin templates should derive from this class.
4525- *
4526- * This file is part of the Quam Plures project - {@link http://quamplures.net/}.
4527- * See also {@link https://launchpad.net/quam-plures}.
4528- *
4529- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
4530- * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}.
4531- * Parts of this file are copyright (c)2005 by Daniel HAHLER - {@link http://thequod.de/contact}.
4532- *
4533- * @license http://quamplures.net/license.html GNU General Public License (GPL)
4534- *
4535- * {@internal Open Source relicensing agreement:
4536- * Daniel HAHLER grants Francois PLANQUE the right to license
4537- * Daniel HAHLER's contributions to this file and the b2evolution project
4538- * under any OSI approved OSS license (http://www.opensource.org/licenses/).
4539- * }}
4540- *
4541- * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
4542- * @author blueyed: Daniel HAHLER
4543- *
4544- * @package pond
4545- */
4546-if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
4547-
4548-/**
4549- * Includes
4550- */
4551-require_once dirname(__FILE__).'/../_adminUI_general.class.php';
4552-
4553-
4554-/**
4555- * We define a special template for the main menu.
4556- *
4557- * @package pond
4558- */
4559-class AdminUI extends AdminUI_general
4560-{
4561- /**
4562- * This function should init the templates - like adding Javascript through the {@link add_headline()} method.
4563- */
4564- function init_templates()
4565- {
4566- // This is included before controller specifc require_css() calls:
4567- require_css( 'templates_adm/chicago/chicago.css', true );
4568- }
4569-
4570-
4571- /**
4572- * GLOBAL HEADER - APP TITLE, LOGOUT, ETC.
4573- *
4574- * @return string
4575- */
4576- function get_page_head()
4577- {
4578- $r = '
4579- <div id="header">'
4580- // Display MAIN menu:
4581- .$this->get_html_menu().'
4582- </div>
4583- ';
4584-
4585- return $r;
4586- }
4587-
4588-
4589- /**
4590- *
4591- *
4592- * @return string
4593- */
4594- function get_body_top()
4595- {
4596- global $Messages, $mode;
4597-
4598- $r = '<div class="wrapper">';
4599-
4600- if( empty($mode) )
4601- {
4602- $r .= $this->get_page_head();
4603- }
4604-
4605- $r .= $this->get_bloglist_buttons();
4606-
4607- $r .= '<div class="panelbody">'
4608- ."\n\n";
4609-
4610- // Display info & error messages
4611- $r .= $Messages->display( NULL, NULL, false, 'all', NULL, NULL, 'action_messages' );
4612-
4613- return $r;
4614- }
4615-
4616-
4617- /**
4618- * Get the end of the HTML <body>. Close open divs, etc...
4619- *
4620- * @return string
4621- */
4622- function get_body_bottom()
4623- {
4624- return "\n</div>\n</div>\n";
4625- }
4626-
4627-
4628- /**
4629- * Get the footer text
4630- */
4631- function get_footer_contents()
4632- {
4633- global $app_footer_text, $copyright_text, $app_name, $app_homepage;
4634- global $rsc_url;
4635-
4636- global $Hit;
4637-
4638- $r = '<div class="footer">';
4639-
4640- if( $Hit->is_winIE() )
4641- {
4642- $r .= '<!--[if lt IE 7]>
4643-<div style="text-align:center; color:#f00; font-weight:bold;">'.
4644- T_('WARNING: Internet Explorer 6 may not able to display this admin template properly. We strongly recommend you upgrade to IE 7 or Firefox.').'</div>
4645-<![endif]-->';
4646- }
4647-
4648- $r .= '<a href="'.$app_homepage.'" class="footer_logo"><img src="'.$rsc_url.'img/adminfooter-logo.png" alt="Powered by '.$app_name.'" width="142" height="43" longdesc="'.$app_homepage.'" /></a>';
4649-
4650-
4651- $r .= '<div class="copyright">';
4652-
4653- $r .= $app_footer_text.' &ndash; '.$copyright_text."</div></div>\n\n";
4654-
4655- return $r;
4656- }
4657-
4658-
4659- /**
4660- * Get a template by name and depth.
4661- *
4662- * Templates can handle multiple depth levels
4663- *
4664- * This is a method (and not a member array) to allow dynamic generation and T_()
4665- *
4666- * @param string Name of the template ('main', 'sub')
4667- * @param integer Nesting level (start at 0)
4668- * @return array Associative array which defines layout and optionally properties.
4669- */
4670- function get_template( $name, $depth = 0 )
4671- {
4672- global $rsc_url;
4673-
4674- $pb_begin1 = '<div class="pblock">';
4675- $pb_begin2 = '<div class="pan_left"><div class="pan_right"><div class="pan_top"><div class="pan_tl"><div class="pan"><div class="panelblock">';
4676- $pb_end = '</div></div></div></div></div></div>
4677- <div class="pan_bot"><div class="pan_bl"><div class="pan_br"></div></div></div></div>';
4678-
4679- switch( $name )
4680- {
4681- case 'sub':
4682- // a payload block with embedded submenu
4683- return array(
4684- 'before' => $pb_begin1
4685- .'<span style="float:right">$global_icons$</span>'
4686- .'<table class="tabs" cellspacing="0"><tr>'
4687- .'<td class="first"></td>',
4688-
4689- 'after' => '<td class="last"></td>'
4690- ."</tr></table>\n"
4691- .$pb_begin2,
4692-
4693- 'empty' => $pb_begin1.$pb_begin2,
4694-
4695- 'beforeEach' => '<td class="option">',
4696- 'afterEach' => '</td>',
4697- 'beforeEachSel' => '<td class="current">',
4698- 'afterEachSel' => '</td>',
4699-
4700- 'end' => $pb_end, // used to end payload block that opened submenu
4701- );
4702-
4703-
4704- case 'block':
4705- // an additional payload block, anywhere after the one with the submenu. Used by disp_payload_begin()/disp_payload_end()
4706- return array(
4707- 'begin' => $pb_begin1.$pb_begin2,
4708- 'end' => $pb_end,
4709- );
4710-
4711-
4712- case 'Results':
4713- // Results list:
4714- return array(
4715- 'page_url' => '', // All generated links will refer to the current page
4716- 'before' => '<div class="results">',
4717- 'header_start' => '<div class="results_nav">',
4718- 'header_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$',
4719- 'header_text_single' => '',
4720- 'header_end' => '</div>',
4721- 'list_start' => '',
4722- 'head_start' => '',
4723- 'head_title' => '<div class="fieldset_title"><div class="fieldset_title_right"><div class="fieldset_title_bg">
4724- <span style="float:right">$global_icons$</span>$title$
4725- </div></div></div>'
4726- ."\n\n"
4727- .'<table class="grouped" cellspacing="0">'
4728- ."\n<thead>\n",
4729- 'filters_start' => '<tr class="filters"><td colspan="$nb_cols$">',
4730- 'filters_end' => '</td></tr>',
4731- 'line_start_head' => '<tr class="clickable_headers">', // TODO: fusionner avec colhead_start_first; mettre a jour admin_UI_general; utiliser colspan="$headspan$"
4732- 'colhead_start' => '<th $class_attrib$>',
4733- 'colhead_start_first' => '<th class="firstcol $class$">',
4734- 'colhead_start_last' => '<th class="lastcol $class$">',
4735- 'colhead_end' => "</th>\n",
4736- 'sort_asc_off' => '<img src="../admin/img/grey_arrow_up.gif" alt="A" title="'.T_('Ascending order')
4737- .'" height="12" width="11" />',
4738- 'sort_asc_on' => '<img src="../admin/img/black_arrow_up.gif" alt="A" title="'.T_('Ascending order')
4739- .'" height="12" width="11" />',
4740- 'sort_desc_off' => '<img src="../admin/img/grey_arrow_down.gif" alt="D" title="'.T_('Descending order')
4741- .'" height="12" width="11" />',
4742- 'sort_desc_on' => '<img src="../admin/img/black_arrow_down.gif" alt="D" title="'.T_('Descending order')
4743- .'" height="12" width="11" />',
4744- 'basic_sort_off' => '',
4745- 'basic_sort_asc' => get_icon( 'ascending' ),
4746- 'basic_sort_desc' => get_icon( 'descending' ),
4747- 'head_end' => "</thead>\n\n",
4748- 'tfoot_start' => "<tfoot>\n",
4749- 'tfoot_end' => "</tfoot>\n\n",
4750- 'body_start' => "<tbody>\n",
4751- 'line_start' => '<tr class="even">'."\n",
4752- 'line_start_odd' => '<tr class="odd">'."\n",
4753- 'line_start_last' => '<tr class="even lastline">'."\n",
4754- 'line_start_odd_last' => '<tr class="odd lastline">'."\n",
4755- 'col_start' => '<td $class_attrib$>',
4756- 'col_start_first' => '<td class="firstcol $class$">',
4757- 'col_start_last' => '<td class="lastcol $class$">',
4758- 'col_end' => "</td>\n",
4759- 'line_end' => "</tr>\n\n",
4760- 'grp_line_start' => '<tr class="group">'."\n",
4761- 'grp_line_start_odd' => '<tr class="odd">'."\n",
4762- 'grp_line_start_last' => '<tr class="lastline">'."\n",
4763- 'grp_line_start_odd_last' => '<tr class="odd lastline">'."\n",
4764- 'grp_col_start' => '<td $class_attrib$ $colspan_attrib$>',
4765- 'grp_col_start_first' => '<td class="firstcol $class$" $colspan_attrib$>',
4766- 'grp_col_start_last' => '<td class="lastcol $class$" $colspan_attrib$>',
4767- 'grp_col_end' => "</td>\n",
4768- 'grp_line_end' => "</tr>\n\n",
4769- 'body_end' => "</tbody>\n\n",
4770- 'total_line_start' => '<tr class="total">'."\n",
4771- 'total_col_start' => '<td $class_attrib$>',
4772- 'total_col_start_first' => '<td class="firstcol $class$">',
4773- 'total_col_start_last' => '<td class="lastcol $class$">',
4774- 'total_col_end' => "</td>\n",
4775- 'total_line_end' => "</tr>\n\n",
4776- 'list_end' => "</table>\n\n",
4777- 'footer_start' => '<div class="results_nav">',
4778- 'footer_text' => '<strong>'.T_('Pages').'</strong>: $prev$ $first$ $list_prev$ $list$ $list_next$ $last$ $next$'
4779- /* T_('Page $scroll_list$ out of $total_pages$ $prev$ | $next$<br />'. */
4780- /* '<strong>$total_pages$ Pages</strong> : $prev$ $list$ $next$' */
4781- /* .' <br />$first$ $list_prev$ $list$ $list_next$ $last$ :: $prev$ | $next$') */,
4782- 'footer_text_single' => '',
4783- 'footer_text_no_limit' => '', // Text if theres no LIMIT and therefor only one page anyway
4784- 'prev_text' => T_('Previous'),
4785- 'next_text' => T_('Next'),
4786- 'no_prev_text' => '',
4787- 'no_next_text' => '',
4788- 'list_prev_text' => T_('...'),
4789- 'list_next_text' => T_('...'),
4790- 'list_span' => 11,
4791- 'scroll_list_range' => 5,
4792- 'footer_end' => "</div>\n\n",
4793- 'no_results_start' => '<div class="fieldset_title"><div class="fieldset_title_right"><div class="fieldset_title_bg">
4794- <span style="float:right">$global_icons$</span>$title$
4795- </div></div></div>'."\n\n"
4796- .'<table class="grouped" cellspacing="0">'."\n",
4797- 'no_results_end' => '<tr class="lastline"><td class="firstcol lastcol">$no_results$</td></tr>'
4798- .'</table>'."\n\n",
4799- 'after' => '</div>',
4800- 'sort_type' => 'basic'
4801- );
4802-
4803-
4804- case 'compact_form':
4805- // Compact Form settings:
4806- return array(
4807- 'layout' => 'chicago', // Temporary dirty hack
4808- 'formstart' => '<div class="fieldset_title"><div class="fieldset_title_right">',
4809-
4810- 'title_fmt' => '<div class="fieldset_title_bg" $title_attribs$><span style="float:right">$global_icons$</span>$title$</div></div></div><fieldset>'."\n",
4811- 'no_title_fmt' => '<div class="fieldset_title_bg" $title_attribs$><span style="float:right">$global_icons$</span>&nbsp;</div></div></div><fieldset>'."\n",
4812- 'fieldset_begin' => '<div class="fieldset_wrapper$class$" id="$id$"><h2 $title_attribs$>$fieldset_title$</h2>',
4813- 'fieldset_end' => '</div>',
4814- 'fieldstart' => '<fieldset $ID$>'."\n",
4815- 'labelstart' => '<div class="label">',
4816- 'labelend' => "</div>\n",
4817- 'labelempty' => '<div class="label"></div>', // so that IE6 aligns DIV.input correcctly
4818- 'inputstart' => '<div class="input">',
4819- 'infostart' => '<div class="info">',
4820- 'inputend' => "</div>\n",
4821- 'fieldend' => "</fieldset>\n\n",
4822- 'buttonsstart' => '<fieldset><div class="input">',
4823- 'buttonsend' => "</div></fieldset>\n\n",
4824- 'formend' => '</fieldset>'."\n",
4825- );
4826-
4827-
4828- case 'Form':
4829- // Default Form settings:
4830- return array(
4831- 'layout' => 'chicago', // Temporary dirty hack
4832- 'formstart' => '',
4833- 'title_fmt' => '<span style="float:right">$global_icons$</span><h2>$title$</h2>'."\n",
4834- 'no_title_fmt' => '<span style="float:right">$global_icons$</span>'."\n",
4835- 'fieldstart' => '<fieldset $ID$>'."\n",
4836- 'fieldset_begin' => '<div class="fieldset_wrapper$class$" id="$id$"><div class="fieldset_title"><div class="fieldset_title_right">
4837- <div class="fieldset_title_bg" $title_attribs$>$fieldset_title$</div></div></div>
4838- <fieldset $fieldset_attribs$>'."\n",
4839- 'fieldset_end' => '</fieldset></div>'."\n",
4840- 'labelstart' => '<div class="label">',
4841- 'labelend' => "</div>\n",
4842- 'labelempty' => '<div class="label"></div>', // so that IE6 aligns DIV.input correcctly
4843- 'inputstart' => '<div class="input">',
4844- 'infostart' => '<div class="info">',
4845- 'inputend' => "</div>\n",
4846- 'fieldend' => "</fieldset>\n\n",
4847- 'buttonsstart' => '<fieldset><div class="input">',
4848- 'buttonsend' => "</div></fieldset>\n\n",
4849- 'formend' => '',
4850- );
4851-
4852-
4853- case 'file_browser':
4854- return array(
4855- 'block_start' => '<div class="block_item_wrap"><div class="fieldset_title"><div class="fieldset_title_right"><div class="fieldset_title_bg">
4856- <span style="float:right">$global_icons$</span>$title$
4857- </div></div></div>',
4858- 'block_end' => '</div>',
4859- );
4860-
4861- case 'block_item':
4862- return array(
4863- 'block_start' => '<div class="block_item_wrap"><div class="fieldset_title"><div class="fieldset_title_right"><div class="fieldset_title_bg">
4864- <span style="float:right">$global_icons$</span>$title$
4865- </div></div></div>
4866- <div class="block_item">',
4867- 'block_end' => '</div></div>',
4868- );
4869-
4870- case 'side_item':
4871- return array(
4872- 'block_start' => '<div class="browse_side_item_wrap"><div class="fieldset_title"><div class="fieldset_title_right"><div class="fieldset_title_bg">
4873- <span style="float:right">$global_icons$</span>$title$
4874- </div></div></div>
4875- <div class="browse_side_item">',
4876- 'block_end' => '</div></div>',
4877- );
4878-
4879- default:
4880- // Delegate to parent class:
4881- return parent::get_template( $name, $depth );
4882- }
4883- }
4884-
4885- /**
4886- * Get colors for page elements that can't be controlled by CSS (charts)
4887- */
4888- function get_color( $what )
4889- {
4890- switch( $what )
4891- {
4892- case 'payload_background':
4893- return 'f1f6f8';
4894- break;
4895- }
4896- debug_die( 'unknown color' );
4897- }
4898-}
4899-
4900-
4901-?>
4902
4903=== removed file 'templates_adm/chicago/chicago.css'
4904--- templates_adm/chicago/chicago.css 2010-03-18 03:08:12 +0000
4905+++ templates_adm/chicago/chicago.css 1970-01-01 00:00:00 +0000
4906@@ -1,941 +0,0 @@
4907-/**
4908- * Backoffice main Cascading Style Sheets definitions for Chicago style.
4909- *
4910- * Quam Plures - {@link http://quamplures.net/}
4911- * Released under GNU GPL License - {@link http://quamplures.net/license.html}
4912- * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
4913- * @copyright (c)2003-2005 by Francois PLANQUE - {@link http://fplanque.net/}
4914- *
4915- * @package admin
4916- */
4917-@import url("../../rsc/css/basic.css"); /* Import basic styles */
4918-@import url("../../rsc/css/results.css"); /* Import results/tables styles */
4919-@import url("../../rsc/css/item_base.css"); /* TODO: remove when templates have params */
4920-@import url("../../rsc/css/fileman.css"); /* TODO: move to appropriate controller - Import filemanager styles */
4921-@import url("../../rsc/css/admin.global.css"); /* Import basic admin styles */
4922-
4923-body {
4924- margin: 0;
4925- padding: 0;
4926- background-color: #ced8de;
4927- color: #000;
4928- font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
4929- font-size: 84%;
4930-}
4931-
4932-.wrapper {
4933- background: #fff url(img/foot24.png) repeat-x bottom;
4934- padding-top: 10px;
4935-}
4936-#upload_wrapper {
4937- background: #fff url(img/foot24.png) repeat-x bottom;
4938- padding-top: 1px;
4939-}
4940-
4941-/*
4942- * General styles
4943- */
4944-a {
4945- color: #00a;
4946- text-decoration: none;
4947-}
4948-a:hover {
4949- text-decoration: underline;
4950-}
4951-
4952-
4953-/*
4954- * Main menu
4955- */
4956-#mainmenu {
4957- margin: 0;
4958- border-top: 1px solid #fafafa;
4959- background: url(img/bluebar_shadow.gif) repeat-x bottom;
4960- padding: 0px 0 4px 0;
4961- font-size: 92%;
4962-}
4963-#mainmenu ul {
4964- background: #9db0bc url(img/bluebar24.png) repeat-x 1px;
4965- margin: 0;
4966- padding: 0 14px;
4967- height: 23px;
4968-}
4969-
4970-/*
4971- * Blog list menu
4972- */
4973-#coll_list {
4974- clear: both;
4975- background: url(img/whitebar_shadow.gif) repeat-x bottom;
4976- padding: 0 0 5px 0;
4977- font-size: 92%;
4978-}
4979-#coll_list ul {
4980- background: #9f9f9f url(img/whitebar24.png) repeat-x 1px;
4981- margin: 0;
4982- padding: 0 14px;
4983- height: 23px;
4984-}
4985-
4986-#mainmenu li,
4987-#coll_list li {
4988- list-style: none;
4989- float: left;
4990- height: 21px;
4991-}
4992-
4993-#mainmenu li a,
4994-#coll_list li a {
4995- float: left; /* This line needed by IE6, not necessary for IE7 */
4996- display: block;
4997- height: 15px;
4998- padding: 4px 9px;
4999- color: #000;
5000- font-weight: bold;
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches