Project

General

Profile

« Previous | Next » 

Revision 1549

Added by Dietmar almost 13 years ago

christmas time corrected wrong files

View differences:

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

  
13 13
=========================== add small Features 2.8.2 ==========================
14
19 Dez-2011 Build 1549 Dietmar Woellbrink (Luisehahne)
15
! christmas time corrected wrong files
14 16
19 Dez-2011 Build 1548 Dietmar Woellbrink (Luisehahne)
15 17
- remove quickSkin /temp/folder/ for a later solution
16 18
18 Dez-2011 Build 1547 Dietmar Woellbrink (Luisehahne)
branches/2.8.x/wb/admin/themes/templates/settings.htt
9 9
	<td colspan="3"><h2>{HEADING_GENERAL_SETTINGS}</h2></td>
10 10
</tr>
11 11
<tr>
12
	<td class="setting_name" width="200">{TEXT_WEBSITE_TITLE}:</td>
13
	<td class="setting_value" colspan="3" width="700">
12
	<td class="setting_name">{TEXT_WEBSITE_TITLE}:</td>
13
	<td class="setting_value" colspan="2">
14 14
		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
15 15
	</td>
16 16
</tr>
17 17
<tr>
18 18
	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
19
	<td class="setting_value" colspan="3">
19
	<td class="setting_value" colspan="2">
20 20
		<textarea name="website_description" cols="50" rows="3">{WEBSITE_DESCRIPTION}</textarea>
21 21
	</td>
22 22
</tr>
23 23
<tr>
24 24
	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
25
	<td class="setting_value" colspan="3">
25
	<td class="setting_value" colspan="2">
26 26
		<textarea name="website_keywords" cols="50" rows="3" >{WEBSITE_KEYWORDS}</textarea>
27 27
	</td>
28 28
</tr>
29 29
<tr>
30 30
	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
31
	<td class="setting_value" colspan="3">
31
	<td class="setting_value" colspan="2">
32 32
		<textarea name="website_header" cols="50" rows="3">{WEBSITE_HEADER}</textarea>
33 33
	</td>
34 34
</tr>
35 35
<tr>
36 36
	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
37
	<td class="setting_value" colspan="3">
37
	<td class="setting_value" colspan="2">
38 38
		<textarea name="website_footer" cols="50" rows="3">{WEBSITE_FOOTER}</textarea>
39 39
	</td>
40 40
</tr>
41 41
<tr{DISPLAY_ADVANCED}>
42
	<td class="setting_name" width="200">{TEXT_PAGE_LEVEL_LIMIT}:</td>
43
	<td class="setting_value" colspan="3" width="700">
42
	<td class="setting_name">{TEXT_PAGE_LEVEL_LIMIT}:</td>
43
	<td class="setting_value" colspan="2">
44 44
		<select name="page_level_limit">
45 45
		<!-- BEGIN page_level_limit_list_block -->
46 46
			<option value="{NUMBER}"{SELECTED}>{NUMBER}</option>
......
50 50
</tr>
51 51
<tr>
52 52
	<td class="setting_name">{TEXT_PAGE_TRASH}:</td>
53
	<td class="setting_value" colspan="3">
53
	<td class="setting_value" colspan="2">
54 54
		<input type="radio" name="page_trash" id="page_trash_disabled" style="width: 14px; height: 14px;" value="disabled"{PAGE_TRASH_DISABLED} />
55 55
		<label for="page_trash_disabled">{TEXT_DISABLED}</label>
56 56
		<input type="radio" name="page_trash" id="page_trash_inline" style="width: 14px; height: 14px;" value="inline"{PAGE_TRASH_INLINE} />
......
63 63
</tr>
64 64
<tr{DISPLAY_ADVANCED}>
65 65
        <td class="setting_name">{TEXT_PAGE_LANGUAGES}:</td>
66
        <td class="setting_value" colspan="3">
66
        <td class="setting_value" colspan="2">
67 67
                <input type="radio" name="page_languages" id="page_languages_true" style="width: 14px; height: 14px;" value="true"{PAGE_LANGUAGES_ENABLED} />
68 68
                <label for="page_languages_true">{TEXT_ENABLED}</label>
69 69
                <input type="radio" name="page_languages" id="page_languages_false" style="width: 14px; height: 14px;" value="false"{PAGE_LANGUAGES_DISABLED} />
......
72 72
</tr>
73 73
<tr{DISPLAY_ADVANCED}>
74 74
	<td class="setting_name">{TEXT_MULTIPLE_MENUS}:</td>
75
	<td class="setting_value" colspan="3">
75
	<td class="setting_value" colspan="2">
76 76
		<input type="radio" name="multiple_menus" id="multiple_menus_true" style="width: 14px; height: 14px;" value="true"{MULTIPLE_MENUS_ENABLED} />
77 77
		<label for="multiple_menus_true">{TEXT_ENABLED}</label>
78 78
		<input type="radio" name="multiple_menus" id="multiple_menus_false" style="width: 14px; height: 14px;" value="false"{MULTIPLE_MENUS_DISABLED} />
......
81 81
</tr>
82 82
<tr>
83 83
	<td class="setting_name">{TEXT_HOME_FOLDERS}:</td>
84
	<td class="setting_value" colspan="3">
84
	<td class="setting_value" colspan="2">
85 85
		<input type="radio" name="home_folders" id="home_folders_true" style="width: 14px; height: 14px;" value="true"{HOME_FOLDERS_ENABLED} />
86 86
		<label for="home_folders_true">{TEXT_ENABLED}</label>
87 87
		<input type="radio" name="home_folders" id="home_folders_false" style="width: 14px; height: 14px;" value="false"{HOME_FOLDERS_DISABLED} />
......
90 90
</tr>
91 91
<tr{DISPLAY_ADVANCED}>
92 92
	<td class="setting_name">{TEXT_MANAGE_SECTIONS}:</td>
93
	<td class="setting_value" colspan="3">
93
	<td class="setting_value" colspan="2">
94 94
		<input type="radio" name="manage_sections" id="manage_sections_true" style="width: 14px; height: 14px;" value="true"{MANAGE_SECTIONS_ENABLED} />
95 95
		<label for="manage_sections_true">{TEXT_ENABLED}</label>
96 96
		<input type="radio" name="manage_sections" id="manage_sections_false" style="width: 14px; height: 14px;" value="false"{MANAGE_SECTIONS_DISABLED} />
......
99 99
</tr>
100 100
<tr{DISPLAY_ADVANCED}>
101 101
	<td class="setting_name">{TEXT_SECTION_BLOCKS}:</td>
102
	<td class="setting_value" colspan="3">
102
	<td class="setting_value" colspan="2">
103 103
		<input type="radio" name="section_blocks" id="section_blocks_true" style="width: 14px; height: 14px;" value="true"{SECTION_BLOCKS_ENABLED} />
104 104
		<label for="section_blocks_true">{TEXT_ENABLED}</label>
105 105
		<input type="radio" name="section_blocks" id="section_blocks_false" style="width: 14px; height: 14px;" value="false"{SECTION_BLOCKS_DISABLED} />
......
108 108
</tr>
109 109
<tr>
110 110
	<td class="setting_name">{TEXT_INTRO_PAGE}:</td>
111
	<td class="setting_value" colspan="3">
111
	<td class="setting_value" colspan="2">
112 112
		<input type="radio" name="intro_page" id="intro_page_true" style="width: 14px; height: 14px;" value="true"{INTRO_PAGE_ENABLED} />
113 113
		<label for="intro_page_true">{TEXT_ENABLED}</label>
114 114
		<input type="radio" name="intro_page" id="intro_page_false" style="width: 14px; height: 14px;" value="false"{INTRO_PAGE_DISABLED} />
......
117 117
</tr>
118 118
<tr{DISPLAY_ADVANCED}>
119 119
	<td class="setting_name">{TEXT_HOMEPAGE_REDIRECTION}:</td>
120
	<td class="setting_value" colspan="3">
120
	<td class="setting_value" colspan="2">
121 121
		<input type="radio" name="homepage_redirection" id="homepage_redirection_true" style="width: 14px; height: 14px;" value="true"{HOMEPAGE_REDIRECTION_ENABLED} />
122 122
		<label for="homepage_redirection_true">{TEXT_ENABLED}</label>
123 123
		<input type="radio" name="homepage_redirection" id="homepage_redirection_false" style="width: 14px; height: 14px;" value="false"{HOMEPAGE_REDIRECTION_DISABLED} />
......
126 126
</tr>
127 127
<tr{DISPLAY_ADVANCED}>
128 128
	<td class="setting_name">{TEXT_SMART_LOGIN}:</td>
129
	<td class="setting_value" colspan="3">
129
	<td class="setting_value" colspan="2">
130 130
		<input type="radio" name="smart_login" id="smart_login_true" style="width: 14px; height: 14px;" value="true"{SMART_LOGIN_ENABLED} />
131 131
		<label for="smart_login_true">{TEXT_ENABLED}</label>
132 132
		<input type="radio" name="smart_login" id="smart_login_false" style="width: 14px; height: 14px;" value="false"{SMART_LOGIN_DISABLED} />
......
135 135
</tr>
136 136
<tr>
137 137
	<td class="setting_name">{TEXT_LOGIN}:</td>
138
	<td class="setting_value" colspan="3">
138
	<td class="setting_value" colspan="2">
139 139
		<input type="radio" name="frontend_login" id="frontend_login_true" style="width: 14px; height: 14px;" value="true"{PRIVATE_ENABLED} />
140 140
		<label for="frontend_login_true">{TEXT_ENABLED}</label>
141 141
		<input type="radio" name="frontend_login" id="frontend_login_false" style="width: 14px; height: 14px;" value="false"{PRIVATE_DISABLED} />
......
144 144
</tr>
145 145
<tr{DISPLAY_ADVANCED}>
146 146
	<td class="setting_name">{TEXT_REDIRECT_AFTER}:</td>
147
	<td class="setting_value" colspan="3">
147
	<td class="setting_value" colspan="2">
148 148
		<input type="text" name="redirect_timer" value="{REDIRECT_TIMER}" style="width:50%;" />
149 149
		<label>&nbsp;&nbsp;( <strong>-1</strong> = {TEXT_DISABLED}, <strong>0 -10000</strong> )</label><br />
150 150
	</td>
151 151
</tr>
152 152
<tr>
153 153
	<td class="setting_name">{TEXT_SIGNUP}:</td>
154
	<td class="setting_value" colspan="3">
154
	<td class="setting_value" colspan="2">
155 155
		<select name="frontend_signup">
156 156
			<option value="false">{TEXT_DISABLED}</option>
157 157
			<!-- BEGIN group_list_block -->
......
162 162
</tr>
163 163
<tr{DISPLAY_ADVANCED}>
164 164
	<td class="setting_name">{TEXT_PHP_ERROR_LEVEL}:</td>
165
	<td class="setting_value" colspan="3">
165
	<td class="setting_value" colspan="2">
166 166
		<select name="er_level">
167 167
			<option value="">{TEXT_PLEASE_SELECT}...</option>
168 168
			<!-- BEGIN error_reporting_list_block -->
......
173 173
</tr>
174 174
<tr{DISPLAY_ADVANCED}>
175 175
	<td class="setting_name">{TEXT_WYSIWYG_STYLE}:</td>
176
	<td class="setting_value" colspan="3"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
176
	<td class="setting_value" colspan="2"><input type="text" name="wysiwyg_style" value="{WYSIWYG_STYLE}" /></td>
177 177
</tr>
178 178
<tr{DISPLAY_ADVANCED}>
179 179
	<td class="setting_name">{TEXT_WYSIWYG_EDITOR}:</td>
180
	<td class="setting_value" colspan="3">
180
	<td class="setting_value" colspan="2">
181 181
		<select name="wysiwyg_editor">
182 182
		<!-- BEGIN editor_list_block -->
183 183
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
186 186
	</td>
187 187
</tr>
188 188
<tr>
189
	<td>&nbsp;</td>
190
	<td>
189
	<td class="setting_name">&nbsp;</td>
190
	<td class="setting_value_permissions">
191 191
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
192 192
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
193 193
	</td>
194
	<td style="text-align: right;">
194
	<td class="setting_value_permissions" style="text-align: right;">
195 195
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
196 196
	</td>
197 197
</tr>
......
200 200
</tr>
201 201
<tr>
202 202
	<td class="setting_name">{TEXT_LANGUAGE}:</td>
203
	<td class="setting_value" colspan="3">
203
	<td class="setting_value" colspan="2">
204 204
		<select name="default_language">
205 205
			<!-- BEGIN language_list_block -->
206 206
			<option value="{CODE}"{SELECTED} style="background: url({FLAG}.png) no-repeat center left; padding-left: 20px;">{NAME} ({CODE})</option>
......
210 210
</tr>
211 211
<tr{DISPLAY_ADVANCED}>
212 212
	<td class="setting_name">{TEXT_CHARSET}:</td>
213
	<td class="setting_value" colspan="3">
213
	<td class="setting_value" colspan="2">
214 214
		<select name="default_charset">
215 215
			<option value="">{TEXT_PLEASE_SELECT}...</option>
216 216
			<!-- BEGIN charset_list_block -->
......
221 221
</tr>
222 222
<tr>
223 223
	<td class="setting_name">{TEXT_TIMEZONE}:</td>
224
	<td class="setting_value" colspan="3">
224
	<td class="setting_value" colspan="2">
225 225
		<select name="default_timezone">
226 226
			<option value="0">{TEXT_PLEASE_SELECT}...</option>
227 227
			<!-- BEGIN timezone_list_block -->
......
232 232
</tr>
233 233
<tr>
234 234
	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
235
	<td class="setting_value" colspan="3">
235
	<td class="setting_value" colspan="2">
236 236
		<select name="default_date_format">
237 237
			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
238 238
			<!-- BEGIN date_format_list_block -->
......
243 243
</tr>
244 244
<tr>
245 245
	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
246
	<td class="setting_value" colspan="3">
246
	<td class="setting_value" colspan="2">
247 247
		<select name="default_time_format">
248 248
			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
249 249
			<!-- BEGIN time_format_list_block -->
......
254 254
</tr>
255 255
<tr>
256 256
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
257
	<td class="setting_value" colspan="3">
257
	<td class="setting_value" colspan="2">
258 258
		<select name="default_template">
259 259
		<!-- BEGIN template_list_block -->
260 260
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
264 264
</tr>
265 265
<tr>
266 266
	<td class="setting_name">{TEXT_THEME}:</td>
267
	<td class="setting_value" colspan="3">
267
	<td class="setting_value" colspan="2">
268 268
		<select name="default_theme">
269 269
		<!-- BEGIN theme_list_block -->
270 270
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
273 273
	</td>
274 274
</tr>
275 275
<tr>
276
	<td>&nbsp;</td>
277
	<td>
276
	<td class="setting_name">&nbsp;</td>
277
	<td class="setting_value_permissions">
278 278
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
279 279
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
280 280
	</td>
281
	<td style="text-align: right;">
281
	<td class="setting_value_permissions" style="text-align: right;">
282 282
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
283 283
	</td>
284 284
</tr>
......
287 287
</tr>
288 288
<tr>
289 289
	<td class="setting_name">{TEXT_VISIBILITY}:</td>
290
	<td class="setting_value" colspan="3">
290
	<td class="setting_value" colspan="2">
291 291
		<select name="search">
292 292
			<option value="public">{TEXT_PUBLIC}</option>
293 293
			<option value="private" {PRIVATE_SEARCH}>{TEXT_PRIVATE}</option>
......
298 298
</tr>
299 299
<tr>
300 300
	<td class="setting_name">{TEXT_TEMPLATE}:</td>
301
	<td class="setting_value" colspan="3">
301
	<td class="setting_value" colspan="2">
302 302
		<select name="search_template">
303 303
		<!-- BEGIN search_template_list_block -->
304 304
			<option value="{FILE}"{SELECTED}>{NAME}</option>
......
308 308
</tr>
309 309
<tr{DISPLAY_ADVANCED}>
310 310
	<td class="setting_name">{TEXT_HEADER}:</td>
311
	<td class="setting_value" colspan="3">
311
	<td class="setting_value" colspan="2">
312 312
		<textarea name="search_header" style="height: 100px;" cols="50" rows="3">{SEARCH_HEADER}</textarea>
313 313
	</td>
314 314
</tr>
315 315
<tr{DISPLAY_ADVANCED}>
316 316
	<td class="setting_name">{TEXT_RESULTS_HEADER}:</td>
317
	<td class="setting_value" colspan="3">
317
	<td class="setting_value" colspan="2">
318 318
		<textarea name="search_results_header" cols="50" rows="3">{SEARCH_RESULTS_HEADER}</textarea>
319 319
	</td>
320 320
</tr>
321 321
<tr{DISPLAY_ADVANCED}>
322 322
	<td class="setting_name">{TEXT_RESULTS_LOOP}:</td>
323
	<td class="setting_value" colspan="3">
323
	<td class="setting_value" colspan="2">
324 324
		<textarea name="search_results_loop" cols="50" rows="3">{SEARCH_RESULTS_LOOP}</textarea>
325 325
	</td>
326 326
</tr>
327 327
<tr{DISPLAY_ADVANCED}>
328 328
	<td class="setting_name">{TEXT_RESULTS_FOOTER}:</td>
329
	<td class="setting_value" colspan="3">
329
	<td class="setting_value" colspan="2">
330 330
		<textarea name="search_results_footer" cols="50" rows="3">{SEARCH_RESULTS_FOOTER}</textarea>
331 331
	</td>
332 332
</tr>
333 333
<tr{DISPLAY_ADVANCED}>
334 334
	<td class="setting_name">{TEXT_NO_RESULTS}:</td>
335
	<td class="setting_value" colspan="3">
335
	<td class="setting_value" colspan="2">
336 336
		<input type="text" name="search_no_results" value="{SEARCH_NO_RESULTS}" />
337 337
	</td>
338 338
</tr>
339 339
<tr{DISPLAY_ADVANCED}>
340 340
	<td class="setting_name">{TEXT_FOOTER}:</td>
341
	<td class="setting_value" colspan="3">
341
	<td class="setting_value" colspan="2">
342 342
		<textarea name="search_footer" cols="50" rows="3">{SEARCH_FOOTER}</textarea>
343 343
	</td>
344 344
</tr>
345 345
<tr{DISPLAY_ADVANCED}>
346 346
	<td class="setting_name">{TEXT_MODULE_ORDER}:</td>
347
	<td class="setting_value" colspan="3">
347
	<td class="setting_value" colspan="2">
348 348
		<input type="text" name="search_module_order" value="{SEARCH_MODULE_ORDER}" />
349 349
	</td>
350 350
</tr>
351 351
<tr{DISPLAY_ADVANCED}>
352 352
	<td class="setting_name">{TEXT_MAX_EXCERPT}:</td>
353
	<td class="setting_value" colspan="3">
353
	<td class="setting_value" colspan="2">
354 354
		<input type="text" name="search_max_excerpt" value="{SEARCH_MAX_EXCERPT}" />
355 355
	</td>
356 356
</tr>
357 357
<tr{DISPLAY_ADVANCED}>
358 358
	<td class="setting_name">{TEXT_TIME_LIMIT}:</td>
359
	<td class="setting_value" colspan="3">
359
	<td class="setting_value" colspan="2">
360 360
		<input type="text" name="search_time_limit" value="{SEARCH_TIME_LIMIT}" />
361 361
	</td>
362 362
</tr>
363 363
<tr>
364
	<td>&nbsp;</td>
365
	<td>
364
	<td class="setting_name">&nbsp;</td>
365
	<td class="setting_value_permissions">
366 366
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
367 367
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
368 368
	</td>
369
	<td style="text-align: right;">
369
	<td class="setting_value_permissions" style="text-align: right;">
370 370
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
371 371
	</td>
372 372
</tr>
......
375 375
</tr>
376 376
<tr>
377 377
	<td class="setting_name">{TEXT_SERVER_OPERATING_SYSTEM}:</td>
378
	<td class="setting_value" colspan="3">
378
	<td class="setting_value" colspan="2">
379 379
		<input type="radio" name="operating_system" id="operating_system_linux" onclick="javascript: change_os('linux');" style="width: 14px; height: 14px;" value="linux"{LINUX_SELECTED} />
380 380
		<label for="operating_system_linux" onclick="javascript: change_os('linux');">{TEXT_LINUX_UNIX_BASED}</label>
381 381
		<input type="radio" name="operating_system" id="operating_system_windows" onclick="javascript: change_os('windows');" style="width: 14px; height: 14px;" value="windows"{WINDOWS_SELECTED} />
......
384 384
</tr>
385 385
<tr>
386 386
	<td class="setting_name"><div id="{BASIC_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">&nbsp;</div></td>
387
	<td class="setting_value" colspan="3">
387
	<td class="setting_value" colspan="2">
388 388
		<div id="{BASIC_FILE_PERMS_ID}2" style="margin: 0; padding: 0;">
389 389
			<input type="checkbox" name="world_writeable" id="world_writeable" style="width: 14px; height: 14px;" value="true"{WORLD_WRITEABLE_SELECTED} />
390 390
			<label for="world_writeable">
......
398 398

  
399 399
<tr{DISPLAY_ADVANCED}>
400 400
	<td class="setting_name"><div id="{ADVANCED_FILE_PERMS_ID}1" style="margin: 0; padding: 0;">{TEXT_FILESYSTEM_PERMISSIONS}:</div></td>
401
	<td class="setting_value" id="file_mode" align="left">
402
		<table summary="" cellpadding="2" cellspacing="0" border="0" width="90%" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
401
	<td class="setting_value_permissions" id="file_mode">
402
		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" style="border-right: 1px solid #ddd;" id="{ADVANCED_FILE_PERMS_ID}2">
403 403
		<tr>
404 404
			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_FILES}: {STRING_FILE_MODE}</td>
405 405
		</tr>
......
442 442
		</tr>
443 443
		</table>
444 444
	</td>
445
	<td class="setting_value" id="dir_mode" style="text-align: right;">
446
		<table summary="" cellpadding="2" cellspacing="0" border="0" width="90%" id="{ADVANCED_FILE_PERMS_ID}3">
445
	<td class="setting_value_permissions" id="dir_mode" style="text-align: right;">
446
		<table summary="" cellpadding="2" cellspacing="0" width="90%" border="0" id="{ADVANCED_FILE_PERMS_ID}3">
447 447
		<tr>
448 448
			<td colspan="3" style="text-align: center; font-weight: bold;">{TEXT_DIRECTORIES}: {STRING_DIR_MODE}</td>
449 449
		</tr>
......
489 489
</tr>
490 490
<tr{DISPLAY_ADVANCED}>
491 491
	<td class="setting_name">{TEXT_PAGES_DIRECTORY}:</td>
492
	<td class="setting_value" colspan="3"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
492
	<td class="setting_value" colspan="2"><input type="text" name="pages_directory" value="{PAGES_DIRECTORY}" /></td>
493 493
</tr>
494 494
<tr{DISPLAY_ADVANCED}>
495 495
	<td class="setting_name">{TEXT_MEDIA_DIRECTORY}:</td>
496
	<td class="setting_value" colspan="3"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
496
	<td class="setting_value" colspan="2"><input type="text" name="media_directory" value="{MEDIA_DIRECTORY}" /></td>
497 497
</tr>
498 498
<tr{DISPLAY_ADVANCED}>
499 499
	<td class="setting_name">{TEXT_PAGE_EXTENSION}:</td>
500
	<td class="setting_value" colspan="3"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
500
	<td class="setting_value" colspan="2"><input type="text" name="page_extension" value="{PAGE_EXTENSION}" /></td>
501 501
</tr>
502 502
<tr{DISPLAY_ADVANCED}>
503 503
	<td class="setting_name">{TEXT_PAGE_SPACER}:</td>
504
	<td class="setting_value" colspan="3"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
504
	<td class="setting_value" colspan="2"><input type="text" name="page_spacer" value="{PAGE_SPACER}" /></td>
505 505
</tr>
506 506
<tr{DISPLAY_ADVANCED}>
507 507
	<td class="setting_name">{TEXT_RENAME_FILES_ON_UPLOAD}:</td>
508
	<td class="setting_value" colspan="3"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
508
	<td class="setting_value" colspan="2"><input type="text" name="rename_files_on_upload" value="{RENAME_FILES_ON_UPLOAD}" /></td>
509 509
</tr>
510 510
<tr{DISPLAY_ADVANCED}>
511 511
	<td class="setting_name">{TEXT_SESSION_IDENTIFIER}:</td>
512
	<td class="setting_value" colspan="3"><input type="text" name="app_name" value="{APP_NAME}" /></td>
512
	<td class="setting_value" colspan="2"><input type="text" name="app_name" value="{APP_NAME}" /></td>
513 513
</tr>
514 514
<tr{DISPLAY_ADVANCED}>
515 515
	<td class="setting_name">{TEXT_SEC_ANCHOR}:</td>
516
	<td class="setting_value" colspan="3"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
516
	<td class="setting_value" colspan="2"><input type="text" name="sec_anchor" value="{SEC_ANCHOR}" /></td>
517 517
</tr>
518 518
<!-- BASIC MAILER SETTINGS -->
519 519
<tr>
......
524 524
</tr>
525 525
<tr>
526 526
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_MAIL}:</td>
527
	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="server_email" value="{SERVER_EMAIL}" /></td>
527
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="server_email" value="{SERVER_EMAIL}" /></td>
528 528
</tr>
529 529
<tr>
530 530
	<td class="setting_name">{TEXT_WBMAILER_DEFAULT_SENDER_NAME}:</td>
531
	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
531
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_default_sendername" value="{WBMAILER_DEFAULT_SENDERNAME}" /></td>
532 532
</tr>
533 533
<tr>
534 534
	<td class="setting_name">{TEXT_WBMAILER_FUNCTION}:</td>
535
	<td class="setting_value" colspan="3">
535
	<td class="setting_value" colspan="2">
536 536
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');" style="width: 14px; height: 14px;" value="phpmail"{PHPMAIL_SELECTED} />
537 537
		<label for="wbmailer_routine_phpmail" onclick="javascript: change_wbmailer('phpmail');">{TEXT_WBMAILER_PHP}</label>
538 538
		<input type="radio" name="wbmailer_routine" id="wbmailer_routine_smtp" onclick="javascript: change_wbmailer('smtp');" style="width: 14px; height: 14px;" value="smtp"{SMTPMAIL_SELECTED} />
......
545 545
</tr>
546 546
<tr id="row_wbmailer_smtp_host"{SMTP_VISIBILITY}>
547 547
	<td class="setting_name">{TEXT_WBMAILER_SMTP_HOST}:</td>
548
	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
548
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_host" value="{WBMAILER_SMTP_HOST}" /></td>
549 549
</tr>
550 550
<tr id="row_wbmailer_smtp_auth_mode"{SMTP_VISIBILITY}>
551 551
	<td class="setting_name">{TEXT_WBMAILER_SMTP_AUTH}:</td>
552
	<td class="setting_value" colspan="3">
552
	<td class="setting_value" colspan="2">
553 553
		<input type="checkbox" name="wbmailer_smtp_auth" id="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth();" style="width: 14px; height: 14px;" value="true"{SMTP_AUTH_SELECTED} />
554 554
		<label for="wbmailer_smtp_auth" onclick="javascript: toggle_wbmailer_auth(this.value);">({TEXT_WBMAILER_SMTP_AUTH_NOTICE})</label>
555 555
	</td>
556 556
</tr>
557 557
<tr id="row_wbmailer_smtp_username"{SMTP_VISIBILITY_AUTH}>
558 558
	<td class="setting_name">{TEXT_WBMAILER_SMTP_USERNAME}:</td>
559
	<td class="setting_value" colspan="3"><input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
559
	<td class="setting_value" colspan="2"><input type="text" style="width: 250px" name="wbmailer_smtp_username" value="{WBMAILER_SMTP_USERNAME}" /></td>
560 560
</tr>
561 561
<tr id="row_wbmailer_smtp_password"{SMTP_VISIBILITY_AUTH}>
562 562
	<td class="setting_name">{TEXT_WBMAILER_SMTP_PASSWORD}:</td>
563
	<td class="setting_value" colspan="3"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
563
	<td class="setting_value" colspan="2"><input type="password" style="width: 250px" name="wbmailer_smtp_password" value="{WBMAILER_SMTP_PASSWORD}" /></td>
564 564
</tr>
565 565
<tr>
566
	<td>&nbsp;</td>
567
	<td>
566
	<td class="setting_name">&nbsp;</td>
567
	<td class="setting_value_permissions">
568 568
		<input type="submit" name="submit" value="{TEXT_SAVE}" class="save" />
569 569
		<input type="reset" name="reset" value="{TEXT_RESET}" class="reset" />
570 570
	</td>
571
	<td style="text-align: right;">
571
	<td class="setting_value_permissions" style="text-align: right;">
572 572
		<button title="{MODE_SWITCH_WARNING}" onclick="window.location = '{ADVANCED_LINK}'; return false;" class="{DISPLAY_ADVANCED_BUTTON}">{ADVANCED_BUTTON}</button>
573 573
	</td>
574 574
</tr>
branches/2.8.x/wb/admin/interface/version.php
52 52

  
53 53
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
54 54
if(!defined('VERSION')) define('VERSION', '2.8.2');
55
if(!defined('REVISION')) define('REVISION', '1548');
55
if(!defined('REVISION')) define('REVISION', '1549');
56 56
if(!defined('SP')) define('SP', 'SP2');
branches/2.8.x/wb/framework/class.database.php
305 305

  
306 306
} /// end of class database
307 307

  
308
define('MYSQL_SEEK_FIRST', 0);
309
define('MYSQL_SEEK_LAST', -1);
310

  
308 311
class mysql {
309 312

  
310 313
	// Run a query
......
324 327
		return mysql_fetch_array($this->result, $typ);
325 328
	}
326 329

  
330
	function rewind()
331
	{
332
		return $this->seekRow();
333
	}
334

  
335
	function seekRow( $position = MYSQL_SEEK_FIRST )
336
	{
337
		$pmax = $this->numRows() - 1;
338
		$p = (($position < 0 || $position > $pmax) ? $pmax : $position);
339
		return mysql_data_seek($this->result, $p);
340
	}
341

  
327 342
	// Get error
328 343
	function error() {
329 344
		if(isset($this->error)) {
branches/2.8.x/wb/templates/wb_theme/theme.css
45 45
.section { margin-top :10px; padding :0px; border :1px solid #999999; font-size :1em; width :100%; background-color :#fdfdfd; height :75px; }
46 46
.sections_header { width :100%; margin-bottom :10px; border :none; background-color :#f0f0f0; height :50px; }
47 47
.sections_header td { padding :5px; }
48
.setting_name { width :20%; }
49
.setting_value { width :30%; }
48
.setting_name { width :20%; min-width :200px;  }
49
.setting_value { width :80%; }
50
.setting_value_permissions { width :50%; min-width :400px; }
50 51
.setting_value textarea { height :50px; }
51 52
.title { width :90%; padding :3px 5px 0px 0px; color :#003366; font-weight :bold; font-size :14px; text-align :left; height :16px; }
52 53
.tool_table ul { margin :0; padding :0; margin-left :20px; margin-bottom :2px; }
branches/2.8.x/wb/templates/argos_theme/theme.css
58 58
.modify_link { padding :4px 0 0 7px; }
59 59
.settings_table td { vertical-align :top; text-align :left; padding :5px; }
60 60
.setting_name { width :10%; min-width :180px; }
61
.setting_value { width :50%; }
61
.setting_value { width :90%; }
62
.setting_value_permissions { width :50%; min-width :400px; }
62 63
.setting_value input, .setting_value select, .setting_value textarea { width :100%; }
63 64
.setting_value textarea { height :50px; }
64 65
#admintools ul { padding :0; margin :0; }
branches/2.8.x/wb/install/save.php
493 493
	." ('string_file_mode', '$file_mode'),"
494 494
	." ('string_dir_mode', '$dir_mode'),"
495 495
	." ('wbmailer_routine', 'phpmail'),"
496
	." ('server_email', 'admin@yourdomain.com'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
496
	." ('server_email', '$admin_email'),"		// avoid that mail provider (e.g. mail.com) reject mails like yourname@mail.com
497 497
	." ('wbmailer_default_sendername', 'WB Mailer'),"
498 498
	." ('wbmailer_smtp_host', ''),"
499 499
	." ('wbmailer_smtp_auth', ''),"

Also available in: Unified diff