Revision 1731
Added by Dietmar about 12 years ago
branches/2.8.x/CHANGELOG | ||
---|---|---|
13 | 13 |
|
14 | 14 |
|
15 | 15 |
|
16 |
31 Aug-2012 Build 1731 Dietmar Woellbrink (Luisehahne) |
|
17 |
+ add Page extended to settings, |
|
18 |
! to show experten mode in page settings |
|
19 |
! shows some more settings like icon dir |
|
16 | 20 |
31 Aug-2012 Build 1730 Dietmar Woellbrink (Luisehahne) |
17 | 21 |
+ add gobal javascript var LANGUAGE |
18 | 22 |
30 Aug-2012 Build 1729 Dietmar Woellbrink (Luisehahne) |
branches/2.8.x/wb/upgrade-script.php | ||
---|---|---|
439 | 439 |
*/ |
440 | 440 |
echo "Adding page_icon_dir to settings table"; |
441 | 441 |
$cfg = array( |
442 |
'page_icon_dir' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'),
|
|
442 |
'page_extended' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'),
|
|
443 | 443 |
); |
444 | 444 |
|
445 | 445 |
echo (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />"); |
446 |
/********************************************************** |
|
447 |
* - Adding page_extended to settings table |
|
448 |
*/ |
|
449 |
echo "Adding ppage_extended to settings table"; |
|
450 |
$cfg = array( |
|
451 |
'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'), |
|
452 |
); |
|
446 | 453 |
|
454 |
echo (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />"); |
|
455 |
|
|
447 | 456 |
/********************************************************** |
448 | 457 |
* - Adding dev_infos to settings table |
449 | 458 |
*/ |
branches/2.8.x/wb/admin/skel/themes/htt/settings.htt | ||
---|---|---|
585 | 585 |
<label for="dev_infos_false">{TEXT_DISABLED}</label> |
586 | 586 |
</span> |
587 | 587 |
</div> |
588 |
<div class="mbox sub-row"> |
|
589 |
<label class="setting_name">{TEXT_PAGE_EXTENDED}:</label> |
|
590 |
<span> |
|
591 |
<input class="radio" type="radio" name="page_extended" id="page_extended_true" value="true"{PAGE_EXTENDED_ENABLED} /> |
|
592 |
<label for="page_extended_true">{TEXT_ENABLED}</label> |
|
593 |
</span> |
|
594 |
<span> |
|
595 |
<input class="radio" type="radio" name="page_extended" id="page_extended_false" value="false"{PAGE_EXTENDED_DISABLED} /> |
|
596 |
<label for="page_extended_false">{TEXT_DISABLED}</label> |
|
597 |
</span> |
|
598 |
</div> |
|
588 | 599 |
|
589 | 600 |
<div class="mbox sub-row"> |
590 | 601 |
<label class="setting_name">{TEXT_PAGES_DIRECTORY}:</label> |
branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt | ||
---|---|---|
32 | 32 |
<label for="page_title">{TEXT_PAGE_TITLE}:</label> |
33 | 33 |
<input type="text" id="page_title" name="page_title" value="{PAGE_TITLE}" /> |
34 | 34 |
</div> |
35 |
<div> |
|
35 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
36 | 36 |
<label for="page_icon" {p_page_icon_dir} style="background-image: url({THEME_URL}/icons/help_16.png);" >{TEXT_PAGE_ICON}: |
37 | 37 |
</label> |
38 | 38 |
<select id="page_icon" name="page_icon"> |
... | ... | |
46 | 46 |
<label for="menu_title">{TEXT_MENU_TITLE}:</label> |
47 | 47 |
<input type="text" id="menu_title" name="menu_title" value="{MENU_TITLE}" /> |
48 | 48 |
</div> |
49 |
<div> |
|
49 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
50 | 50 |
<label for="menu_icon_0" {p_menu_icon0_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_0}:</label> |
51 | 51 |
<select id="menu_icon_0" name="menu_icon_0"> |
52 | 52 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
... | ... | |
55 | 55 |
<!-- END menu_icon0_list_block --> |
56 | 56 |
</select> |
57 | 57 |
</div> |
58 |
<div> |
|
58 |
<div class="{PAGE_EXTENDED_HIDE}">
|
|
59 | 59 |
<label for="menu_icon_1" {p_menu_icon1_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_1}:</label> |
60 | 60 |
<select id="menu_icon_1" name="menu_icon_1"> |
61 | 61 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
... | ... | |
154 | 154 |
<!-- BEGIN admin_group_show_list_block --> |
155 | 155 |
<div class="page-settings-centercol"> <!-- center column --> |
156 | 156 |
<b>{TEXT_ADMINISTRATORS}</b><hr /> |
157 |
<u>{TEXT_GROUP}</u><br />
|
|
157 |
<p class="page_group" style="text-decoration: underline;">{TEXT_GROUP}</p>
|
|
158 | 158 |
<!-- *** List of groups which can administrate this page *** --> |
159 |
<ul style="list-style-type: none; margin: 0; padding: 0;"> |
|
159 |
<div class="page_group" style="height: 112px;max-height: 112px; margin: 0; padding: 5px 0 5px 0; overflow: auto;"> |
|
160 |
<div style="overflow: hidden;"> |
|
161 |
<ul style="list-style-type: none; margin: 0; padding: 5px 0 5px 0;"> |
|
160 | 162 |
<!-- BEGIN admin_group_list_block --> |
161 | 163 |
<li> |
162 | 164 |
<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} /> |
... | ... | |
164 | 166 |
</li> |
165 | 167 |
<!-- END admin_group_list_block --> |
166 | 168 |
</ul> |
169 |
</div> |
|
170 |
</div> |
|
167 | 171 |
<hr /> |
168 |
<u>{TEXT_USER}</u><br />
|
|
172 |
<p class="page_user" style="text-decoration: underline;">{TEXT_USER}</p>
|
|
169 | 173 |
<!-- *** List of users which can administrate this page *** --> |
170 | 174 |
<select name="admin_users[]" multiple="multiple" size="{USER_LIST_SIZE}"> |
171 | 175 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
... | ... | |
178 | 182 |
|
179 | 183 |
<div id="allowed_viewers" class="page-settings-rightcol" style="{DISPLAY_VIEWERS}"> <!-- right column --> |
180 | 184 |
<b>{TEXT_ALLOWED_VIEWERS}</b><hr /> |
181 |
<u>{TEXT_GROUP}</u><br />
|
|
185 |
<p style="text-decoration: underline;">{TEXT_GROUP}</p>
|
|
182 | 186 |
<!-- *** List of groups which can see this page *** --> |
183 |
<ul style="list-style-type:none;margin:0;padding:0;"> |
|
187 |
<div class="page_group" style="height: 112px;max-height: 112px; margin: 2px 0 2px 0; padding: 5px 0 5px 0; overflow: auto;"> |
|
188 |
<div style="overflow: hidden;"> |
|
189 |
<ul style="list-style-type:none;margin:0;padding: 5px 0 5px 0;"> |
|
184 | 190 |
<!-- BEGIN viewer_group_list_block --> |
185 | 191 |
<li> |
186 | 192 |
<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} /> |
... | ... | |
188 | 194 |
</li> |
189 | 195 |
<!-- END viewer_group_list_block --> |
190 | 196 |
</ul> |
197 |
</div> |
|
198 |
</div> |
|
191 | 199 |
<hr /> |
192 |
<u>{TEXT_USER}</u><br />
|
|
200 |
<p class="page_user" style="text-decoration: underline;">{TEXT_USER}</p>
|
|
193 | 201 |
<!-- *** List of users which can see this page *** --> |
194 | 202 |
<select name="viewing_users[]" multiple="multiple" size="{USER_LIST_SIZE}"> |
195 | 203 |
<option value="0">--- {TEXT_NO_SELECTION} ---</option> |
branches/2.8.x/wb/admin/pages/settings.php | ||
---|---|---|
187 | 187 |
$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']); |
188 | 188 |
$sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY)); |
189 | 189 |
$sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir); |
190 |
$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED == 'true') ? '' : 'hide'; |
|
190 | 191 |
// $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); |
191 | 192 |
$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); |
192 | 193 |
|
194 |
$oTpl->set_var('PAGE_EXTENDED_HIDE', $bIconDirHide); |
|
193 | 195 |
$oTpl->set_var('p_page_icon_dir', p($sHelp,$mLang->TEXT_PAGE_ICON_DIR)); |
194 | 196 |
$oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR)); |
195 | 197 |
$oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR)); |
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', '1730');
|
|
54 |
if(!defined('REVISION')) define('REVISION', '1731');
|
|
55 | 55 |
if(!defined('SP')) define('SP', ''); |
branches/2.8.x/wb/admin/settings/save.php | ||
---|---|---|
154 | 154 |
} |
155 | 155 |
|
156 | 156 |
$allow_tags_in_fields = array('website_header', 'website_footer','website_signature'); |
157 |
$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature'); |
|
157 |
$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature,page_icon_dir');
|
|
158 | 158 |
$disallow_in_fields = array('pages_directory', 'media_directory','wb_version'); |
159 | 159 |
|
160 | 160 |
// Query current settings in the db, then loop through them and update the db with the new value |
... | ... | |
256 | 256 |
if($database->is_error()) { |
257 | 257 |
$admin->print_error($database->get_error, $js_back ); |
258 | 258 |
} else { |
259 |
$admin->print_success($MESSAGE['SETTINGS']['SAVED'], $js_back );
|
|
259 |
$admin->print_success($MESSAGE['SETTINGS_SAVED'], $js_back );
|
|
260 | 260 |
} |
261 | 261 |
$admin->print_footer(); |
branches/2.8.x/wb/admin/settings/languages/EN.php | ||
---|---|---|
6 | 6 |
****************************************************************************************/ |
7 | 7 |
|
8 | 8 |
$TEXT['WEBSITE_SIGNATURE'] = 'Contact Signature'; |
9 |
$TEXT['PAGE_EXTENDED'] = 'Extended Pagesettings'; |
branches/2.8.x/wb/admin/settings/languages/DE.php | ||
---|---|---|
7 | 7 |
|
8 | 8 |
|
9 | 9 |
$TEXT['WEBSITE_SIGNATURE'] = 'Kontakt Signature'; |
10 |
$TEXT['PAGE_EXTENDED'] = 'Erweiterte Seiteneinstellungen'; |
branches/2.8.x/wb/admin/settings/index.php | ||
---|---|---|
503 | 503 |
// Work-out if developer infos feature is enabled |
504 | 504 |
if(defined('DEV_INFOS') && DEV_INFOS == true) |
505 | 505 |
{ |
506 |
$template->set_var('DEV_INFOS_ENABLED', $checked); |
|
506 |
//$template->set_var('DEV_INFOS_ENABLED', $checked);
|
|
507 | 507 |
$template->set_var(array( |
508 | 508 |
'DEV_INFOS_ENABLED' => $checked, |
509 | 509 |
'DEV_INFOS_DISABLED' => '', |
510 | 510 |
)); |
511 | 511 |
} else { |
512 |
$template->set_var('DEV_INFOS_DISABLED', $checked); |
|
512 |
//$template->set_var('DEV_INFOS_DISABLED', $checked);
|
|
513 | 513 |
$template->set_var(array( |
514 | 514 |
'DEV_INFOS_DISABLED' => $checked, |
515 | 515 |
'DEV_INFOS_ENABLED' => '', |
516 | 516 |
)); |
517 | 517 |
} |
518 | 518 |
|
519 |
// Work-out if developer infos feature is enabled |
|
520 |
if(defined('PAGE_EXTENDED') && PAGE_EXTENDED == true) |
|
521 |
{ |
|
522 |
//$template->set_var('DEV_INFOS_ENABLED', $checked); |
|
523 |
$template->set_var(array( |
|
524 |
'PAGE_EXTENDED_ENABLED' => $checked, |
|
525 |
'PAGE_EXTENDED_DISABLED' => '', |
|
526 |
)); |
|
527 |
} else { |
|
528 |
//$template->set_var('PAGE_EXTENDED_DISABLED', $checked); |
|
529 |
$template->set_var(array( |
|
530 |
'PAGE_EXTENDED_DISABLED' => $checked, |
|
531 |
'PAGE_EXTENDED_ENABLED' => '', |
|
532 |
)); |
|
533 |
} |
|
534 |
|
|
519 | 535 |
// Work-out if manage sections feature is enabled |
520 | 536 |
if(MANAGE_SECTIONS) |
521 | 537 |
{ |
branches/2.8.x/wb/install/save.php | ||
---|---|---|
479 | 479 |
." ('wbmailer_smtp_password', '')," |
480 | 480 |
." ('fingerprint_with_ip_octets', '2')," |
481 | 481 |
." ('secure_form_module', '')," |
482 |
." ('groups_updated', time()," |
|
483 |
." ('page_extended', 'true')," |
|
482 | 484 |
." ('mediasettings', '')"; |
483 | 485 |
$database->query($settings_rows); |
484 | 486 |
|
Also available in: Unified diff
+ add Page extended to settings,
! to show experten mode in page settings
! shows some more settings like icon dir