Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1730)
+++ branches/2.8.x/CHANGELOG	(revision 1731)
@@ -13,6 +13,10 @@
 
 
 
+31 Aug-2012 Build 1731 Dietmar Woellbrink (Luisehahne)
++ add Page extended to settings, 
+! to show experten mode in page settings
+! shows some more settings like icon dir
 31 Aug-2012 Build 1730 Dietmar Woellbrink (Luisehahne)
 + add gobal javascript var LANGUAGE
 30 Aug-2012 Build 1729 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1730)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1731)
@@ -439,11 +439,20 @@
  */
 echo "Adding page_icon_dir to settings table";
 $cfg = array(
-	'page_icon_dir' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'),
+	'page_extended' => (defined('PAGE_ICON_DIR') ? PAGE_ICON_DIR : '/templates/*/title_images'),
 );
 
 echo (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+/**********************************************************
+ *  - Adding page_extended to settings table
+ */
+echo "Adding ppage_extended to settings table";
+$cfg = array(
+	'page_extended' => (defined('PAGE_EXTENDED') ? PAGE_EXTENDED : 'true'),
+);
 
+echo (db_update_key_value( 'settings', $cfg ) ? " $OK<br />" : " $FAIL!<br />");
+
 /**********************************************************
  *  - Adding dev_infos to settings table
  */
Index: branches/2.8.x/wb/admin/skel/themes/htt/settings.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/settings.htt	(revision 1730)
+++ branches/2.8.x/wb/admin/skel/themes/htt/settings.htt	(revision 1731)
@@ -585,6 +585,17 @@
                 <label for="dev_infos_false">{TEXT_DISABLED}</label>
 			</span>
 		</div>
+		<div class="mbox sub-row">
+	 		<label class="setting_name">{TEXT_PAGE_EXTENDED}:</label>
+			<span>
+				<input class="radio" type="radio" name="page_extended" id="page_extended_true" value="true"{PAGE_EXTENDED_ENABLED} />
+                <label for="page_extended_true">{TEXT_ENABLED}</label>
+			</span>
+			<span>
+				<input class="radio" type="radio" name="page_extended" id="page_extended_false" value="false"{PAGE_EXTENDED_DISABLED} />
+                <label for="page_extended_false">{TEXT_DISABLED}</label>
+			</span>
+		</div>
 
 		<div class="mbox sub-row">
 	 		<label class="setting_name">{TEXT_PAGES_DIRECTORY}:</label>
Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt
===================================================================
--- branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt	(revision 1730)
+++ branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt	(revision 1731)
@@ -32,7 +32,7 @@
 				<label for="page_title">{TEXT_PAGE_TITLE}:</label>
 				<input type="text" id="page_title" name="page_title" value="{PAGE_TITLE}" />
 			</div>
-			<div>
+			<div class="{PAGE_EXTENDED_HIDE}">
 				<label for="page_icon" {p_page_icon_dir} style="background-image: url({THEME_URL}/icons/help_16.png);" >{TEXT_PAGE_ICON}:
 				</label>
 				<select id="page_icon" name="page_icon">
@@ -46,7 +46,7 @@
 				<label for="menu_title">{TEXT_MENU_TITLE}:</label>
 				<input type="text" id="menu_title" name="menu_title" value="{MENU_TITLE}" />
 			</div>
-			<div>
+			<div class="{PAGE_EXTENDED_HIDE}">
 				<label for="menu_icon_0" {p_menu_icon0_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_0}:</label>
 					<select id="menu_icon_0" name="menu_icon_0">
 					<option value="0">--- {TEXT_NO_SELECTION} ---</option>
@@ -55,7 +55,7 @@
 				<!-- END menu_icon0_list_block -->
 				</select>
 			</div>
-			<div>
+			<div class="{PAGE_EXTENDED_HIDE}">
 				<label for="menu_icon_1" {p_menu_icon1_dir} style="background-image: url({THEME_URL}/icons/help_16.png);">{TEXT_MENU_ICON_1}:</label>
 					<select id="menu_icon_1" name="menu_icon_1">
 					<option value="0">--- {TEXT_NO_SELECTION} ---</option>
@@ -154,9 +154,11 @@
 	<!-- BEGIN admin_group_show_list_block -->
 		<div class="page-settings-centercol"> <!-- center column -->
 			<b>{TEXT_ADMINISTRATORS}</b><hr />
-			<u>{TEXT_GROUP}</u><br />
+			<p class="page_group" style="text-decoration: underline;">{TEXT_GROUP}</p>
 <!-- *** List of groups which can administrate this page *** -->
-			<ul style="list-style-type: none; margin: 0; padding: 0;">
+            <div class="page_group" style="height: 112px;max-height: 112px; margin: 0; padding: 5px 0 5px 0; overflow: auto;">
+            <div style="overflow: hidden;">
+			<ul style="list-style-type: none; margin: 0; padding: 5px 0 5px 0;">
 			<!-- BEGIN admin_group_list_block -->
 				<li>
 					<input type="checkbox" name="admin_groups[]" id="admin_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
@@ -164,8 +166,10 @@
 				</li>
 			<!-- END admin_group_list_block -->
 			</ul>
+            </div>
+            </div>
 			<hr />
-			<u>{TEXT_USER}</u><br />
+			<p class="page_user" style="text-decoration: underline;">{TEXT_USER}</p>
 <!-- *** List of users which can administrate this page *** -->
 			<select name="admin_users[]" multiple="multiple" size="{USER_LIST_SIZE}">
 				<option value="0">--- {TEXT_NO_SELECTION} ---</option>
@@ -178,9 +182,11 @@
 
 		<div id="allowed_viewers" class="page-settings-rightcol" style="{DISPLAY_VIEWERS}"> <!-- right column -->
 			<b>{TEXT_ALLOWED_VIEWERS}</b><hr />
-			<u>{TEXT_GROUP}</u><br />
+			<p style="text-decoration: underline;">{TEXT_GROUP}</p>
 <!-- *** List of groups which can see this page *** -->
-			<ul style="list-style-type:none;margin:0;padding:0;">
+            <div class="page_group" style="height: 112px;max-height: 112px; margin: 2px 0 2px 0; padding: 5px 0 5px 0; overflow: auto;">
+            <div style="overflow: hidden;">
+			<ul style="list-style-type:none;margin:0;padding: 5px 0 5px 0;">
 			<!-- BEGIN viewer_group_list_block -->
 				<li>
 					<input type="checkbox" name="viewing_groups[]" id="viewing_group_{ID}" value="{ID}"{CHECKED}{DISABLED} />
@@ -188,8 +194,10 @@
 				</li>
 			<!-- END viewer_group_list_block -->
 			</ul>
+            </div>
+            </div>
 			<hr />
-			<u>{TEXT_USER}</u><br />
+			<p class="page_user" style="text-decoration: underline;">{TEXT_USER}</p>
 <!-- *** List of users which can see this page *** -->
 			<select name="viewing_users[]" multiple="multiple" size="{USER_LIST_SIZE}">
 				<option value="0">--- {TEXT_NO_SELECTION} ---</option>
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1730)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1731)
@@ -187,9 +187,11 @@
 	$sTemplate = ($aCurrentPage['template'] == '' ? DEFAULT_TEMPLATE : $aCurrentPage['template']);
 	$sIconDir = str_replace('\\', '/', ((defined('PAGE_ICON_DIR') && PAGE_ICON_DIR != '') ? PAGE_ICON_DIR : MEDIA_DIRECTORY));
 	$sIconDir = str_replace('/*', '/'.$sTemplate, $sIconDir);
+	$bIconDirHide = (defined('PAGE_EXTENDED') && PAGE_EXTENDED == 'true') ? '' : 'hide';
 //	$oTpl->set_var('ICON_DIR', WB_REL.$sIconDir);
 	$sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) );
 
+	$oTpl->set_var('PAGE_EXTENDED_HIDE',  $bIconDirHide);
 	$oTpl->set_var('p_page_icon_dir',  p($sHelp,$mLang->TEXT_PAGE_ICON_DIR));
 	$oTpl->set_var('p_menu_icon0_dir', p($sHelp,$mLang->TEXT_MENU_ICON_0_DIR));
 	$oTpl->set_var('p_menu_icon1_dir', p($sHelp,$mLang->TEXT_MENU_ICON_1_DIR));
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1730)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1731)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1730');
+if(!defined('REVISION')) define('REVISION', '1731');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/admin/settings/save.php
===================================================================
--- branches/2.8.x/wb/admin/settings/save.php	(revision 1730)
+++ branches/2.8.x/wb/admin/settings/save.php	(revision 1731)
@@ -154,7 +154,7 @@
 }
 
 $allow_tags_in_fields = array('website_header', 'website_footer','website_signature');
-$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature');
+$allow_empty_values = array('website_header','website_footer','sec_anchor','pages_directory','page_spacer','website_signature,page_icon_dir');
 $disallow_in_fields = array('pages_directory', 'media_directory','wb_version');
 
 // Query current settings in the db, then loop through them and update the db with the new value
@@ -256,6 +256,6 @@
 if($database->is_error()) {
 	$admin->print_error($database->get_error, $js_back );
 } else {
-	$admin->print_success($MESSAGE['SETTINGS']['SAVED'], $js_back );
+	$admin->print_success($MESSAGE['SETTINGS_SAVED'], $js_back );
 }
 $admin->print_footer();
Index: branches/2.8.x/wb/admin/settings/languages/EN.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/EN.php	(revision 1730)
+++ branches/2.8.x/wb/admin/settings/languages/EN.php	(revision 1731)
@@ -6,3 +6,4 @@
  ****************************************************************************************/
 
 $TEXT['WEBSITE_SIGNATURE'] = 'Contact Signature';
+$TEXT['PAGE_EXTENDED'] = 'Extended Pagesettings';
Index: branches/2.8.x/wb/admin/settings/languages/DE.php
===================================================================
--- branches/2.8.x/wb/admin/settings/languages/DE.php	(revision 1730)
+++ branches/2.8.x/wb/admin/settings/languages/DE.php	(revision 1731)
@@ -7,3 +7,4 @@
 
 
 $TEXT['WEBSITE_SIGNATURE'] = 'Kontakt Signature';
+$TEXT['PAGE_EXTENDED'] = 'Erweiterte Seiteneinstellungen';
Index: branches/2.8.x/wb/admin/settings/index.php
===================================================================
--- branches/2.8.x/wb/admin/settings/index.php	(revision 1730)
+++ branches/2.8.x/wb/admin/settings/index.php	(revision 1731)
@@ -503,13 +503,13 @@
 	// Work-out if developer infos feature is enabled
 	if(defined('DEV_INFOS') && DEV_INFOS == true)
 	{
-		$template->set_var('DEV_INFOS_ENABLED', $checked);
+		//$template->set_var('DEV_INFOS_ENABLED', $checked);
     	$template->set_var(array(
 				'DEV_INFOS_ENABLED' => $checked,
 				'DEV_INFOS_DISABLED' => '',
 				));
 	} else {
-		$template->set_var('DEV_INFOS_DISABLED', $checked);
+		//$template->set_var('DEV_INFOS_DISABLED', $checked);
     	$template->set_var(array(
 				'DEV_INFOS_DISABLED' => $checked,
 				'DEV_INFOS_ENABLED' => '',
@@ -516,6 +516,22 @@
 				));
 	}
 
+	// Work-out if developer infos feature is enabled
+	if(defined('PAGE_EXTENDED') && PAGE_EXTENDED == true)
+	{
+		//$template->set_var('DEV_INFOS_ENABLED', $checked);
+    	$template->set_var(array(
+				'PAGE_EXTENDED_ENABLED' => $checked,
+				'PAGE_EXTENDED_DISABLED' => '',
+				));
+	} else {
+		//$template->set_var('PAGE_EXTENDED_DISABLED', $checked);
+    	$template->set_var(array(
+				'PAGE_EXTENDED_DISABLED' => $checked,
+				'PAGE_EXTENDED_ENABLED' => '',
+				));
+	}
+
 	// Work-out if manage sections feature is enabled
 	if(MANAGE_SECTIONS)
 	{
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 1730)
+++ branches/2.8.x/wb/install/save.php	(revision 1731)
@@ -479,6 +479,8 @@
 	." ('wbmailer_smtp_password', ''),"
 	." ('fingerprint_with_ip_octets', '2'),"
 	." ('secure_form_module', ''),"
+	." ('groups_updated', time(),"
+	." ('page_extended', 'true'),"
 	." ('mediasettings', '')";
 	$database->query($settings_rows);