Project

General

Profile

« Previous | Next » 

Revision 1668

Added by Dietmar over 12 years ago

! settigs.php add fields dev_infos and page_icon_dir
+ add developer info to footer
! update class.admin.php, footer.htt

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
17 Apr-2012 Build 1668 Dietmar Woellbrink (Luisehahne)
15
! settigs.php add fields dev_infos and page_icon_dir
16
+ add developer info to footer
17
! update class.admin.php, footer.htt
14 18
17 Apr-2012 Build 1667 Dietmar Woellbrink (Luisehahne)
15 19
+ add folder /templates/round/title_images to work with page_icon
16 20
17 Apr-2012 Build 1666 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/skel/themes/htt/footer.htt
13 13
	</td>
14 14
</tr>
15 15
</table>
16
<!-- BEGIN show_debug_block -->
17
<div style="position: relative; width:998px;margin:15px auto;" class="shadow">
18
	<div style="padding:10px;left:0; z-index:10; background-color:#dddddd;color:#dd0000;">
19
		Memory Limit: {FILESIZE}&nbsp;|&nbsp;
20
		Used Memory: {MEMORY}&nbsp;|&nbsp;
21
		<span class="">SQL-Queries executed: {QUERIES}&nbsp;|&nbsp;</span>
22
		Included&nbsp;{INCLUDES}&nbsp;files &nbsp;|&nbsp;{TXT_SUM_FILESIZE}{SUM_FILESIZE}
23
	<!-- BEGIN show_block_list -->
24
		<ul style="margin-left: 27px; margin-top: 0;">
25
		<!-- BEGIN include_block_list -->
26
			<li style="color: #336699; list-style:decimal-leading-zero;">{INCLUDES_ARRAY} ({FILESIZE})</li>
27
		<!-- END include_block_list -->
28
		</ul>
29
	<!-- END show_block_list -->
30
	</div>
31
</div>
32
<!-- END show_debug_block -->
16 33
{BACKEND_BODY_MODULE_JS}
17 34
</body>
18 35
</html>
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
6 6

  
7 7
{FTAN}
8 8

  
9
<table summary="" cellpadding="3" cellspacing="0" border="0" align="center" width="100%" class="settings_table">
9
<table summary="" width="957" cellpadding="3" cellspacing="0" border="0" align="center" class="settings_table" style="table-layout: fixed;">
10 10
<tr>
11
	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
11
	<td colspan="5"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
12 12
</tr>
13 13
<tr>
14 14
	<td class="setting_name">{TEXT_WEBSITE_TITLE}:</td>
15
	<td class="setting_value" colspan="2">
15
	<td class="setting_value" colspan="4">
16 16
		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
17 17
	</td>
18 18
</tr>
19 19
<tr>
20 20
	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
21
	<td class="setting_value" colspan="2">
21
	<td class="setting_value" colspan="4">
22 22
		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
23 23
	</td>
24 24
</tr>
25 25
<tr>
26 26
	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
27
	<td class="setting_value" colspan="2">
27
	<td class="setting_value" colspan="4">
28 28
		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
29 29
	</td>
30 30
</tr>
31 31
<tr>
32 32
	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
33
	<td class="setting_value" colspan="2">
33
	<td class="setting_value" colspan="4">
34 34
		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
35 35
	</td>
36 36
</tr>
37 37
<tr>
38 38
	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
39
	<td class="setting_value" colspan="2">
39
	<td class="setting_value" colspan="4">
40 40
		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
41 41
	</td>
42 42
</tr>
43 43
<!-- BEGIN show_page_level_limit_block -->
44 44
<tr{DISPLAY_ADVANCED}>
45 45
	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
46
	<td class="setting_value" colspan="2">
46
	<td class="setting_value" colspan="4">
47 47
		<select name="page_level_limit">
48 48
		<!-- BEGIN page_level_limit_list_block -->
49 49
			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
......
54 54
<!-- END show_page_level_limit_block -->
55 55
<tr>
56 56
	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
57
	<td class="setting_value" colspan="2">
57
	<td class="setting_value" colspan="4">
58 58
		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
59 59
		<label for="page_trash_inline">{TEXT_ENABLED}</label>
60 60
		<input type="radio" name="page_trash" id="page_trash_disabled" style="width: 14px; height: 14px;" value="disabled"{PAGE_TRASH_DISABLED} />
......
68 68
<!-- BEGIN show_checkbox_1_block -->
69 69
<tr{DISPLAY_ADVANCED}>
70 70
        <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
71
        <td class="setting_value" colspan="2">
71
        <td class="setting_value" colspan="4">
72 72
                <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
73 73
                <label for="page_languages_true">{TEXT_ENABLED}</label>
74 74
                <input type="radio" name="page_languages" id="page_languages_false" style="width: 14px; height: 14px;" value="false"{PAGE_LANGUAGES_DISABLED} />
......
77 77
</tr>
78 78
<tr{DISPLAY_ADVANCED}>
79 79
	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
80
	<td class="setting_value" colspan="2">
80
	<td class="setting_value" colspan="4">
81 81
		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
82 82
		<label for="multiple_menus_true">{TEXT_ENABLED}</label>
83 83
		<input type="radio" name="multiple_menus" id="multiple_menus_false" style="width: 14px; height: 14px;" value="false"{MULTIPLE_MENUS_DISABLED} />
......
87 87
<!-- END show_checkbox_1_block -->
88 88
<tr>
89 89
	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
90
	<td class="setting_value" colspan="2">
90
	<td class="setting_value" colspan="4">
91 91
		<input type="radio" name="home_folders" id="home_folders_true" style="width: 14px; height: 14px;" value="true"{HOME_FOLDERS_ENABLED} />
92 92
		<label for="home_folders_true">{TEXT_ENABLED}</label>
93 93
		<input type="radio" name="home_folders" id="home_folders_false" style="width: 14px; height: 14px;" value="false"{HOME_FOLDERS_DISABLED} />
......
97 97
<!-- BEGIN show_checkbox_2_block -->
98 98
<tr{DISPLAY_ADVANCED}>
99 99
	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
100
	<td class="setting_value" colspan="2">
100
	<td class="setting_value" colspan="4">
101 101
		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
102 102
		<label for="manage_sections_true">{TEXT_ENABLED}</label>
103 103
		<input type="radio" name="manage_sections" id="manage_sections_false" style="width: 14px; height: 14px;" value="false"{MANAGE_SECTIONS_DISABLED} />
......
106 106
</tr>
107 107
<tr{DISPLAY_ADVANCED}>
108 108
	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
109
	<td class="setting_value" colspan="2">
109
	<td class="setting_value" colspan="4">
110 110
		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
111 111
		<label for="section_blocks_true">{TEXT_ENABLED}</label>
112 112
		<input type="radio" name="section_blocks" id="section_blocks_false" style="width: 14px; height: 14px;" value="false"{SECTION_BLOCKS_DISABLED} />
......
116 116
<!-- END show_checkbox_2_block -->
117 117
<tr>
118 118
	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
119
	<td class="setting_value" colspan="2">
119
	<td class="setting_value" colspan="4">
120 120
		<input type="radio" name="intro_page" id="intro_page_true" style="width: 14px; height: 14px;" value="true"{INTRO_PAGE_ENABLED} />
121 121
		<label for="intro_page_true">{TEXT_ENABLED}</label>
122 122
		<input type="radio" name="intro_page" id="intro_page_false" style="width: 14px; height: 14px;" value="false"{INTRO_PAGE_DISABLED} />
......
126 126
<!-- BEGIN show_checkbox_3_block -->
127 127
<tr{DISPLAY_ADVANCED}>
128 128
	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
129
	<td class="setting_value" colspan="2">
129
	<td class="setting_value" colspan="4">
130 130
		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
131 131
		<label for="homepage_redirection_true">{TEXT_ENABLED}</label>
132 132
		<input type="radio" name="homepage_redirection" id="homepage_redirection_false" style="width: 14px; height: 14px;" value="false"{HOMEPAGE_REDIRECTION_DISABLED} />
......
135 135
</tr>
136 136
<tr{DISPLAY_ADVANCED}>
137 137
	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
138
	<td class="setting_value" colspan="2">
138
	<td class="setting_value" colspan="4">
139 139
		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
140 140
		<label for="smart_login_true">{TEXT_ENABLED}</label>
141 141
		<input type="radio" name="smart_login" id="smart_login_false" style="width: 14px; height: 14px;" value="false"{SMART_LOGIN_DISABLED} />
......
145 145
<!-- END show_checkbox_3_block -->
146 146
<tr>
147 147
	<td class="setting_name">{TEXT_LOGIN}:</td>
148
	<td class="setting_value" colspan="2">
148
	<td class="setting_value" colspan="4">
149 149
		<input type="radio" name="frontend_login" id="frontend_login_true" style="width: 14px; height: 14px;" value="true"{PRIVATE_ENABLED} />
150 150
		<label for="frontend_login_true">{TEXT_ENABLED}</label>
151 151
		<input type="radio" name="frontend_login" id="frontend_login_false" style="width: 14px; height: 14px;" value="false"{PRIVATE_DISABLED} />
......
155 155
<!-- BEGIN show_redirect_timer_block -->
156 156
<tr{DISPLAY_ADVANCED}>
157 157
	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
158
	<td class="setting_value" colspan="2">
158
	<td class="setting_value" colspan="4">
159 159
		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" style="width:50%;" />
160 160
		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
161 161
	</td>
......
163 163
<!-- END show_redirect_timer_block -->
164 164
<tr>
165 165
	<td class="setting_name">{TEXT_SIGNUP}:</td>
166
	<td class="setting_value" colspan="2">
166
	<td class="setting_value" colspan="4">
167 167
		<select name="frontend_signup">
168 168
			<option value="false">{TEXT_DISABLED}</option>
169 169
			<!-- BEGIN group_list_block -->
......
175 175
<!-- BEGIN show_php_error_level_block -->
176 176
<tr{DISPLAY_ADVANCED}>
177 177
	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
178
	<td class="setting_value" colspan="2">
178
	<td class="setting_value" colspan="4">
179 179
		<select name="er_level">
180 180
			<option value="">{TEXT_PLEASE_SELECT}...</option>
181 181
			<!-- BEGIN error_reporting_list_block -->
......
188 188
<!-- BEGIN show_wysiwyg_block -->
189 189
<tr{DISPLAY_ADVANCED}>
190 190
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
191
	<td class="setting_value" colspan="2"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
191
	<td class="setting_value" colspan="4"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
192 192
</tr>
193 193
<tr{DISPLAY_ADVANCED}>
194 194
	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
195
	<td class="setting_value" colspan="2">
195
	<td class="setting_value" colspan="4">
196 196
		<select name="wysiwyg_editor">
197 197
		<!-- BEGIN editor_list_block -->
198 198
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
203 203
<!-- END show_wysiwyg_block -->
204 204
<tr>
205 205
	<td class="setting_name">&nbsp;</td>
206
	<td class="setting_value_permissions">
206
	<td colspan="2" class="setting_value_permissions">
207 207
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
208 208
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
209 209
	</td>
210
	<td class="setting_value_permissions" style="text-align: right;">
210
	<td colspan="2" class="setting_value_permissions" style="text-align: right;">
211 211
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
212 212
	</td>
213 213
</tr>
214 214
<tr>
215
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
215
	<td colspan="5" style="padding-top: 10px;"><h2>{HEADING_DEFAULT_SETTINGS}</h2></td>
216 216
</tr>
217 217
<tr>
218 218
	<td class="setting_name">{TEXT_LANGUAGE}:</td>
219
	<td class="setting_value" colspan="2">
219
	<td class="setting_value" colspan="4">
220 220
		<select name="default_language">
221 221
			<!-- BEGIN language_list_block -->
222 222
			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
......
227 227
<!-- BEGIN show_charset_block -->
228 228
<tr{DISPLAY_ADVANCED}>
229 229
	<td class="setting_name">{TEXT_CHARSET}:</td>
230
	<td class="setting_value" colspan="2">
230
	<td class="setting_value" colspan="4">
231 231
		<select name="default_charset">
232 232
			<option value="">{TEXT_PLEASE_SELECT}...</option>
233 233
			<!-- BEGIN charset_list_block -->
......
239 239
<!-- END show_charset_block -->
240 240
<tr>
241 241
	<td class="setting_name">{TEXT_TIMEZONE}:</td>
242
	<td class="setting_value" colspan="2">
242
	<td class="setting_value" colspan="4">
243 243
		<select name="default_timezone">
244 244
			<option value="0">{TEXT_PLEASE_SELECT}...</option>
245 245
			<!-- BEGIN timezone_list_block -->
......
250 250
</tr>
251 251
<tr>
252 252
	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
253
	<td class="setting_value" colspan="2">
253
	<td class="setting_value" colspan="4">
254 254
		<select name="default_date_format">
255 255
			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
256 256
			<!-- BEGIN date_format_list_block -->
......
261 261
</tr>
262 262
<tr>
263 263
	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
264
	<td class="setting_value" colspan="2">
264
	<td class="setting_value" colspan="4">
265 265
		<select name="default_time_format">
266 266
			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
267 267
			<!-- BEGIN time_format_list_block -->
......
272 272
</tr>
273 273
<tr>
274 274
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
275
	<td class="setting_value" colspan="2">
275
	<td class="setting_value" colspan="4">
276 276
		<select name="default_template">
277 277
		<!-- BEGIN template_list_block -->
278 278
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
282 282
</tr>
283 283
<tr>
284 284
	<td class="setting_name">{TEXT_THEME}:</td>
285
	<td class="setting_value" colspan="2">
285
	<td class="setting_value" colspan="4">
286 286
		<select name="default_theme">
287 287
		<!-- BEGIN theme_list_block -->
288 288
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
292 292
</tr>
293 293
<tr>
294 294
	<td class="setting_name">&nbsp;</td>
295
	<td class="setting_value_permissions">
295
	<td colspan="2" class="setting_value_permissions">
296 296
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
297 297
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
298 298
	</td>
299
	<td class="setting_value_permissions" style="text-align: right;">
299
	<td colspan="2" class="setting_value_permissions" style="text-align: right;">
300 300
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
301 301
	</td>
302 302
</tr>
303 303
<tr>
304
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
304
	<td colspan="5" style="padding-top: 10px;"><h2>{HEADING_SEARCH_SETTINGS}</h2></td>
305 305
</tr>
306 306
<tr>
307 307
	<td class="setting_name">{TEXT_VISIBILITY}:</td>
308
	<td class="setting_value" colspan="2">
308
	<td class="setting_value" colspan="4">
309 309
		<select name="search">
310 310
			<option value="public">{TEXT_PUBLIC}</option>
311 311
			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
......
316 316
</tr>
317 317
<tr>
318 318
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
319
	<td class="setting_value" colspan="2">
319
	<td class="setting_value" colspan="4">
320 320
		<select name="search_template">
321 321
		<!-- BEGIN search_template_list_block -->
322 322
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
327 327
<!-- BEGIN show_search_block -->
328 328
<tr{DISPLAY_ADVANCED}>
329 329
	<td class="setting_name">{TEXT_HEADER}:</td>
330
	<td class="setting_value" colspan="2">
330
	<td class="setting_value" colspan="4">
331 331
		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
332 332
	</td>
333 333
</tr>
334 334
<tr{DISPLAY_ADVANCED}>
335 335
	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
336
	<td class="setting_value" colspan="2">
336
	<td class="setting_value" colspan="4">
337 337
		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
338 338
	</td>
339 339
</tr>
340 340
<tr{DISPLAY_ADVANCED}>
341 341
	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
342
	<td class="setting_value" colspan="2">
342
	<td class="setting_value" colspan="4">
343 343
		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
344 344
	</td>
345 345
</tr>
346 346
<tr{DISPLAY_ADVANCED}>
347 347
	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
348
	<td class="setting_value" colspan="2">
348
	<td class="setting_value" colspan="4">
349 349
		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
350 350
	</td>
351 351
</tr>
352 352
<tr{DISPLAY_ADVANCED}>
353 353
	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
354
	<td class="setting_value" colspan="2">
354
	<td class="setting_value" colspan="4">
355 355
		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
356 356
	</td>
357 357
</tr>
358 358
<tr{DISPLAY_ADVANCED}>
359 359
	<td class="setting_name">{TEXT_FOOTER}:</td>
360
	<td class="setting_value" colspan="2">
360
	<td class="setting_value" colspan="4">
361 361
		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
362 362
	</td>
363 363
</tr>
364 364
<tr{DISPLAY_ADVANCED}>
365 365
	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
366
	<td class="setting_value" colspan="2">
366
	<td class="setting_value" colspan="4">
367 367
		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
368 368
	</td>
369 369
</tr>
370 370
<tr{DISPLAY_ADVANCED}>
371 371
	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
372
	<td class="setting_value" colspan="2">
372
	<td class="setting_value" colspan="4">
373 373
		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
374 374
	</td>
375 375
</tr>
376 376
<tr{DISPLAY_ADVANCED}>
377 377
	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
378
	<td class="setting_value" colspan="2">
378
	<td class="setting_value" colspan="4">
379 379
		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
380 380
	</td>
381 381
</tr>
......
383 383
<!-- BEGIN show_access_block -->
384 384
<tr>
385 385
	<td class="setting_name">&nbsp;</td>
386
	<td class="setting_value_permissions">
386
	<td colspan="2" class="setting_value_permissions">
387 387
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
388 388
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
389 389
	</td>
390
	<td class="setting_value_permissions" style="text-align: right;">
390
	<td colspan="2" class="setting_value_permissions" style="text-align: right;">
391 391
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
392 392
	</td>
393 393
</tr>
394 394
<tr>
395
	<td colspan="3" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
395
	<td colspan="5" style="padding-top: 10px;"><h2>{HEADING_SERVER_SETTINGS}</h2></td>
396 396
</tr>
397 397
<tr>
398 398
	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
399
	<td class="setting_value" colspan="2">
399
	<td colspan="4" class="setting_value">
400 400
		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
401 401
		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
402 402
		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
......
405 405
</tr>
406 406
<tr>
407 407
	<td class="setting_name"><div id="{BASIC_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">&nbsp;</div></td>
408
	<td class="setting_value" colspan="2">
408
	<td colspan="4" class="setting_value" colspan="2">
409 409
		<div id="{BASIC_FILE_PERMS_ID}2" style="margin: 0; padding: 0;">
410 410
			<input type="checkbox" name="world_writeable" id="world_writeable" style="width: 14px; height: 14px;" value="true"{WORLD_WRITEABLE_SELECTED} />
411 411
			<label for="world_writeable">
......
418 418
</tr>
419 419
<tr{DISPLAY_ADVANCED}>
420 420
	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
421
	<td class="setting_value_permissions" id="file_mode">
421
	<td colspan="2" class="setting_value_permissions" id="file_mode">
422 422
		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
423 423
		<tr>
424
			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}: {STRING_FILE_MODE}</td>
424
			<td colspan="2" style="text-align: center; font-weight: bold;">{TEXT_FILES}: {STRING_FILE_MODE}</td>
425 425
		</tr>
426 426
		<tr>
427 427
			<td>{TEXT_USER}:</td>
......
462 462
		</tr>
463 463
		</table>
464 464
	</td>
465
	<td class="setting_value_permissions" id="dir_mode" style="text-align: right;">
465
	<td colspan="2" class="setting_value_permissions" id="dir_mode" style="text-align: right;">
466 466
		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" id="{ADVANCED_FILE_PERMS_ID}3">
467 467
		<tr>
468
			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}: {STRING_DIR_MODE}</td>
468
			<td colspan="2" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}: {STRING_DIR_MODE}</td>
469 469
		</tr>
470 470
		<tr>
471 471
			<td>{TEXT_USER}:</td>
......
508 508
	</td>
509 509
</tr>
510 510
<tr{DISPLAY_ADVANCED}>
511
<td colspan="5"><hr /></td>
512
</tr>
513
<tr{DISPLAY_ADVANCED}>
514
        <td class="setting_name">{TEXT_DEV_INFOS}:</td>
515
        <td class="setting_value" colspan="2">
516
                <input type="radio" name="dev_infos" id="dev_infos_true" style="width: 14px; height: 14px;" value="true"{DEV_INFOS_ENABLED} />
517
                <label for="dev_infos_true">{TEXT_ENABLED}</label>
518
                <input type="radio" name="dev_infos" id="dev_infos_false" style="width: 14px; height: 14px;" value="false"{DEV_INFOS_DISABLED} />
519
                <label for="dev_infos_false">{TEXT_DISABLED}</label>
520
		</td>
521
</tr>
522
<tr{DISPLAY_ADVANCED}>
511 523
	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
512
	<td class="setting_value" colspan="2"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
524
	<td class="setting_value" colspan="4"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
513 525
</tr>
514 526
<tr{DISPLAY_ADVANCED}>
527
	<td class="setting_name">{TEXT_PAGE_ICON_DIR}:</td>
528
	<td class="setting_value" colspan="4">
529
		<input class="c33" type="text" id="page_icon_dir" name="page_icon_dir" value="{PAGE_ICON_DIR}" />
530
	</td>
531
</tr>
532
<tr{DISPLAY_ADVANCED}>
515 533
	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
516
	<td class="setting_value" colspan="2"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
534
	<td class="setting_value" colspan="4"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
517 535
</tr>
518 536
<tr{DISPLAY_ADVANCED}>
519 537
	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
520
	<td class="setting_value" colspan="2"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
538
	<td class="setting_value" colspan="4"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
521 539
</tr>
522 540
<tr{DISPLAY_ADVANCED}>
523 541
	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
524
	<td class="setting_value" colspan="2"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
542
	<td class="setting_value" colspan="4"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
525 543
</tr>
526 544
<tr{DISPLAY_ADVANCED}>
527 545
	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
528
	<td class="setting_value" colspan="2"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
546
	<td class="setting_value" colspan="4"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
529 547
</tr>
530 548
<tr{DISPLAY_ADVANCED}>
531 549
	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
532
	<td class="setting_value" colspan="2"><input type="text" name="app_name" value="{APP_NAME}" /></td>
550
	<td class="setting_value" colspan="4"><input type="text" name="app_name" value="{APP_NAME}" /></td>
533 551
</tr>
534 552
<tr{DISPLAY_ADVANCED}>
535 553
	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
536
	<td class="setting_value" colspan="2"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
554
	<td class="setting_value" colspan="4"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
537 555
</tr>
538 556
<!-- BASIC MAILER SETTINGS -->
539 557
<tr>
540
	<td colspan="3" style="padding-top: 10px;">
558
	<td colspan="5" style="padding-top: 10px;">
541 559
		<h2>{HEADING_WBMAILER_SETTINGS}</h2>
542 560
		<p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_DEFAULT_SETTINGS_NOTICE}</p>
543 561
	</td>
544 562
</tr>
545 563
<tr>
546 564
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</td>
547
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="server_email" value="{SERVER_EMAIL}" /></td>
565
	<td class="setting_value" colspan="4"><input type="text" style="width: 350px" name="server_email" value="{SERVER_EMAIL}" /></td>
548 566
</tr>
549 567
<tr>
550 568
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:</td>
551
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
569
	<td class="setting_value" colspan="4"><input type="text" style="width: 350px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
552 570
</tr>
553 571
<tr>
554 572
	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
555
	<td class="setting_value" colspan="2">
573
	<td class="setting_value" colspan="4">
556 574
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
557 575
		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
558 576
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
......
561 579
</tr>
562 580
<!-- MORE ADVANCED SMTP MAILER SETTINGS -->
563 581
<tr id="row_wbmailer_smtp_settings"{SMTP_VISIBILITY}>
564
	<td colspan="3" style="padding-top: 10px;"><p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p></td>
582
	<td colspan="4" style="padding-top: 10px;"><p style="line-height: 1.4em; margin-top: 0;">{TEXT_WBMAILER_NOTICE}</p></td>
565 583
</tr>
566 584
<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
567 585
	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
568
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
586
	<td colspan="4" class="setting_value"><input type="text" style="width: 350px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
569 587
</tr>
570 588
<!--  -->
571 589
<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
572 590
	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
573
	<td class="setting_value" colspan="2">
591
	<td class="setting_value" colspan="4">
574 592
		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true" disabled="disabled" {SMTP_AUTH_SELECTED} />
575 593
		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
576 594
	</td>
......
578 596

  
579 597
<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY}>
580 598
	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
581
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
599
	<td class="setting_value" colspan="4"><input type="text" style="width: 350px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
582 600
</tr>
583 601
<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY}>
584 602
	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
585
	<td class="setting_value" colspan="2"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
603
	<td class="setting_value" colspan="4"><input type="password" style="width: 350px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
586 604
</tr>
587 605
<!-- END show_access_block -->
588 606
<tr>
589 607
	<td class="setting_name">&nbsp;</td>
590
	<td class="setting_value_permissions">
608
	<td colspan="2" class="setting_value_permissions">
591 609
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
592 610
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
593 611
	</td>
594
	<td class="setting_value_permissions" style="text-align: right;">
612
	<td colspan="2" class="setting_value_permissions" style="text-align: right;">
595 613
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
596 614
	</td>
597 615
</tr>
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1667');
54
if(!defined('REVISION')) define('REVISION', '1668');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/admin/settings/index.php
397 397
		$template->set_var('WINDOWS_SELECTED', ' checked="checked"');
398 398
	}
399 399

  
400
	// Work-out if developer infos feature is enabled
401
	if(defined('DEV_INFOS') && DEV_INFOS == true)
402
	{
403
		$template->set_var('DEV_INFOS_ENABLED', ' checked="checked"');
404
	} else {
405
		$template->set_var('DEV_INFOS_DISABLED', ' checked="checked"');
406
	}
407

  
400 408
	// Work-out if manage sections feature is enabled
401 409
	if(MANAGE_SECTIONS)
402 410
	{
......
581 589

  
582 590
	$template->set_var(array(
583 591
						'PAGES_DIRECTORY' => PAGES_DIRECTORY,
592
						'PAGE_ICON_DIR'   => PAGE_ICON_DIR,
584 593
						'MEDIA_DIRECTORY' => MEDIA_DIRECTORY,
585 594
						'PAGE_EXTENSION' => PAGE_EXTENSION,
586 595
						'PAGE_SPACER' => PAGE_SPACER,
......
653 662
					'TEXT_REDIRECT_AFTER' => $TEXT['REDIRECT_AFTER'],
654 663
					'TEXT_SIGNUP' => $TEXT['SIGNUP'],
655 664
					'TEXT_PHP_ERROR_LEVEL' => $TEXT['PHP_ERROR_LEVEL'],
665
					'TEXT_MULTILINGUAL' => $TEXT['MULTILINGUAL'],
666
					'TEXT_DEV_INFOS' => $TEXT['DEV_INFOS'],
656 667
					'TEXT_PAGES_DIRECTORY' => $TEXT['PAGES_DIRECTORY'],
668
					'TEXT_PAGE_ICON_DIR' => $TEXT['PAGE_ICON_DIR'],
657 669
					'TEXT_MEDIA_DIRECTORY' => $TEXT['MEDIA_DIRECTORY'],
658 670
					'TEXT_PAGE_EXTENSION' => $TEXT['PAGE_EXTENSION'],
659 671
					'TEXT_PAGE_SPACER' => $TEXT['PAGE_SPACER'],
branches/2.8.x/wb/framework/class.admin.php
187 187
	
188 188
	// Print the admin footer
189 189
		function print_footer($activateJsAdmin = false) {
190
		global $database;
190 191
		// include the required file for Javascript admin
191 192
		if($activateJsAdmin != false) {
192 193
			if(file_exists(WB_PATH.'/modules/jsadmin/jsadmin_backend_include.php')){
......
204 205
						'ADMIN_URL' => ADMIN_URL,
205 206
						'THEME_URL' => THEME_URL,
206 207
			 ) );
208

  
209
		$footer_template->set_block('footer_block', 'show_debug_block', 'show_debug');
210

  
211
		$bDebug = (defined('DEBUG') ? true : false);
212
		$bDevInfo = (defined('DEV_INFOS') && (DEV_INFOS == true) && (1 == $this->get_user_id()) ? true : false);
213
//         if( $debug && (1 == $this->get_user_id()))
214
        if( $bDevInfo )
215
		{
216
			$footer_template->set_var('MEMORY', number_format(memory_get_peak_usage(), 0, ',', '.').'&nbsp;Byte' );
217
			$footer_template->set_var('QUERIES', $database->getQueryCount );
218
			// $footer_template->set_var('QUERIES', 'disabled' );
219
	        $included_files =  get_included_files();
220
			$footer_template->set_var('INCLUDES', sizeof($included_files) );
221

  
222
			$sum_filesize = 0;
223
			$footer_template->set_block('show_debug_block', 'show_block_list', 'show_list');
224
			$footer_template->set_block('show_block_list', 'include_block_list', 'include_list');
225
			// $debug = true;
226
			foreach($included_files as $filename)
227
			{
228
				if($bDebug)
229
				{
230
					$footer_template->set_var('INCLUDES_ARRAY', str_replace(WB_PATH, '',$filename) );
231
					$footer_template->set_var('FILESIZE', number_format(filesize($filename), 0, ',', '.').'&nbsp;Byte');
232
					$footer_template->parse('include_list', 'include_block_list', true);
233
				}
234
				$sum_filesize += filesize($filename);
235
			}
236
			$footer_template->parse('show_list', 'show_block_list', true);
237

  
238
			if($bDebug)
239
			{
240
				$footer_template->parse('include_list', '');
241
				$footer_template->parse('show_list', '');
242
			}
243

  
244
			$footer_template->set_var('FILESIZE', ini_get('memory_limit'));
245
			$footer_template->set_var('TXT_SUM_FILESIZE', 'Summary size of included files:&nbsp;');
246
			$footer_template->set_var('SUM_FILESIZE', number_format($sum_filesize, 0, ',', '.').'&nbsp;Byte');
247
			$footer_template->parse('show_debug', 'show_debug_block', true);
248
        } else {
249
			$footer_template->parse('show_debug', '');
250
        }
207 251
		$footer_template->parse('header', 'footer_block', false);
208 252
		$footer_template->pparse('output', 'page');
209 253
	}
branches/2.8.x/wb/templates/wb_theme/templates/footer.htt
13 13
	</td>
14 14
</tr>
15 15
</table>
16
<!-- BEGIN show_debug_block -->
17
<div style="position: relative; width:998px;margin:15px auto;" class="shadow">
18
	<div style="padding:10px;left:0; margin-bottom:25px; z-index:10; background-color:#dddddd;color:#dd0000;">
19
		Memory Limit: {FILESIZE}&nbsp;|&nbsp;
20
		Used Memory: {MEMORY}&nbsp;|&nbsp;
21
		<span class="">SQL-Queries executed: {QUERIES}&nbsp;|&nbsp;</span>
22
		Included&nbsp;{INCLUDES}&nbsp;files &nbsp;|&nbsp;{TXT_SUM_FILESIZE}{SUM_FILESIZE}
23
	<!-- BEGIN show_block_list -->
24
		<ul style="margin-left: 27px; margin-top: 0;">
25
		<!-- BEGIN include_block_list -->
26
			<li style="color: #336699; list-style:decimal-leading-zero;">{INCLUDES_ARRAY} ({FILESIZE})</li>
27
		<!-- END include_block_list -->
28
		</ul>
29
	<!-- END show_block_list -->
30
	</div>
31
</div>
32
<!-- END show_debug_block -->
16 33
{BACKEND_BODY_MODULE_JS}
17 34
</body>
18 35
</html>
branches/2.8.x/wb/templates/argos_theme/templates/footer.htt
14 14
    </td>
15 15
  </tr>
16 16
</table>
17
<!-- BEGIN show_debug_block -->
18
<div style="position: relative; width:998px;margin:15px auto;" class="shadow">
19
	<div style="padding:10px;left:0; margin-bottom:25px; z-index:10; background-color:#dddddd;color:#dd0000;">
20
		Memory Limit: {FILESIZE}&nbsp;|&nbsp;
21
		Used Memory: {MEMORY}&nbsp;|&nbsp;
22
		<span class="">SQL-Queries executed: {QUERIES}&nbsp;|&nbsp;</span>
23
		Included&nbsp;{INCLUDES}&nbsp;files &nbsp;|&nbsp;{TXT_SUM_FILESIZE}{SUM_FILESIZE}
24
	<!-- BEGIN show_block_list -->
25
		<ul style="margin-left: 27px; margin-top: 0;">
26
		<!-- BEGIN include_block_list -->
27
			<li style="color: #336699; list-style:decimal-leading-zero;">{INCLUDES_ARRAY} ({FILESIZE})</li>
28
		<!-- END include_block_list -->
29
		</ul>
30
	<!-- END show_block_list -->
31
	</div>
17 32
</div>
33
<!-- END show_debug_block -->
18 34
{BACKEND_BODY_MODULE_JS}
19 35
</body>
20 36
</html>

Also available in: Unified diff