Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1824) +++ branches/2.8.x/CHANGELOG (revision 1825) @@ -13,6 +13,9 @@ +20 Nov-2012 Build 1825 Dietmar Woellbrink (Luisehahne) +! update page settings, add save & back Button, add extended hide/show + redesign the page settings for a better overview 20 Nov-2012 Build 1824 Dietmar Woellbrink (Luisehahne) ! update media in look to the changes in user management 20 Nov-2012 Build 1823 Dietmar Woellbrink (Luisehahne) Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt (revision 1824) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_modify.htt (revision 1825) @@ -1,21 +1,32 @@ - - - - -

{HEADING_MODIFY_PAGE}

ID: {PAGE_ID} - {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - {SETTINGS_LINK_BEFORE}{TEXT_CHANGE_SETTINGS}{SETTINGS_LINK_AFTER} +
+ + + + + + + + + + + + + + +

{HEADING_MODIFY_PAGE}

PID: {PAGE_ID} + {TEXT_CURRENT_PAGE}:{PAGE_TITLE}
+ {SETTINGS_LINK_BEFORE}{TEXT_CHANGE_SETTINGS}{SETTINGS_LINK_AFTER} - - {SECTIONS_LINK_BEFORE}{TEXT_MANAGE_SECTIONS}{SECTIONS_LINK_AFTER} + - + {SECTIONS_LINK_BEFORE}{TEXT_MANAGE_SECTIONS}{SECTIONS_LINK_AFTER}
- - {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + + {TEXT_LAST_MODIFIED} {MODIFIED_BY}, {MODIFIED_WHEN}
- +
\ No newline at end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/addons.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/addons.htt (revision 1824) +++ branches/2.8.x/wb/admin/skel/themes/htt/addons.htt (revision 1825) @@ -5,32 +5,34 @@ 		{URL_ADVANCED}
- - - -
- +
+ +
0 {MODULES}

{MODULES_OVERVIEW}
- +
+ +
{TEMPLATES} {TEMPLATES}

{TEMPLATES_OVERVIEW}
+ +
{LANGUAGES} {LANGUAGES}

{LANGUAGES_OVERVIEW}
@@ -78,7 +80,4 @@
- - - \ No newline at end of file Index: branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt =================================================================== --- branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1824) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_sections.htt (revision 1825) @@ -1,87 +1,103 @@
- - - - - + + + +

{HEADING_MANAGE_SECTIONS}

ID: {PAGE_ID}{TEXT_CURRENT_PAGE}:{PAGE_TITLE} - - +
+ + + + + + + + + + + + + +

{HEADING_MANAGE_SECTIONS}

PID: {PAGE_ID} + {TEXT_CURRENT_PAGE}:{PAGE_TITLE}
{MODIFY_LINK_BEFORE}{HEADING_MODIFY_PAGE}{MODIFY_LINK_AFTER} - {SETTINGS_LINK_BEFORE}{TEXT_CHANGE_SETTINGS}{SETTINGS_LINK_AFTER}
- - {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + + {TEXT_LAST_MODIFIED} {MODIFIED_BY}, {MODIFIED_WHEN}
+
-
- {FTAN} - - - - - - - - - - + +{FTAN} + +
{TEXT_TYPE}{TEXT_BLOCK} {TEXT_PUBL_START_DATE}{TEXT_PUBL_END_DATE}{TEXT_ACTIONS}ID{TEXT_PID}
+ + + + + + + + + + + + - - + + - + - + - + - + - + - + - + - + - - + + - - - -
{TEXT_TYPE}{TEXT_BLOCK} {TEXT_PUBL_START_DATE}{TEXT_PUBL_END_DATE}{TEXT_ACTIONS}ID{TEXT_PID}
- - - {VAR_SECTION_ID} -
+ + + {VAR_SECTION_ID} + {LINK_MODIFY_URL_VAR_MODUL_NAME}{LINK_MODIFY_URL_VAR_MODUL_NAME} -   - +   + - {TEXT_CALENDAR} - {TEXT_DELETE_DATE} - + {TEXT_CALENDAR} + {TEXT_DELETE_DATE} + - {TEXT_CALENDAR} - {TEXT_DELETE_DATE} - + {TEXT_CALENDAR} + {TEXT_DELETE_DATE} + {VAR_MOVE_UP_URL}{VAR_MOVE_UP_URL}{VAR_MOVE_DOWN_URL}{VAR_MOVE_DOWN_URL} - - {TEXT_DELETE} - - + + {TEXT_DELETE} + + {VAR_SECTION_ID}{VAR_SECTION_ID}{POSITION}
{POSITION}
-
- -
+
+
+ +

{TEXT_ADD_SECTION}

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 1824) +++ branches/2.8.x/wb/admin/skel/themes/htt/pages_settings.htt (revision 1825) @@ -1,26 +1,34 @@ - - - - - -

{HEADING_MODIFY_PAGE_SETTINGS}

ID: {PAGE_ID} - {TEXT_CURRENT_PAGE}: - {PAGE_TITLE} - - +
+ + + + + + + + + + + + + +

{HEADING_MODIFY_PAGE_SETTINGS}

PID: {PAGE_ID} + {TEXT_CURRENT_PAGE}:{PAGE_TITLE}
{MODIFY_LINK_BEFORE}{TEXT_MODIFY_PAGE}{MODIFY_LINK_AFTER} - {SECTIONS_LINK_BEFORE}{TEXT_MANAGE_SECTIONS}{SECTIONS_LINK_AFTER}
- - {TEXT_LAST_MODIFIED} {MODIFIED_BY} ({MODIFIED_BY_USERNAME}), {MODIFIED_WHEN} + + {TEXT_LAST_MODIFIED} {MODIFIED_BY}, {MODIFIED_WHEN}
+
{FTAN} @@ -27,6 +35,7 @@
+
{TEXT_SECTION_GENERAL}
@@ -79,6 +88,8 @@
+
+
{TEXT_SECTION_ORGANISATION}
@@ -116,6 +127,8 @@
+
+
{TEXT_SECTION_CONTENT}
@@ -144,11 +157,14 @@
+
+
+
{TEXT_SECTION_SECURITY}
- @@ -157,10 +173,10 @@
- - +
-
+
+
{TEXT_ADMINISTRATORS}

{TEXT_GROUP}

@@ -179,16 +195,20 @@

{TEXT_USER}

- +
+
- -
+
+
+
{TEXT_ALLOWED_VIEWERS}

{TEXT_GROUP}

@@ -207,7 +227,7 @@

{TEXT_USER}

- @@ -214,10 +234,17 @@
+
+
+
+
+
- - + + + +
Index: branches/2.8.x/wb/admin/pages/settings.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings.php (revision 1824) +++ branches/2.8.x/wb/admin/pages/settings.php (revision 1825) @@ -15,11 +15,18 @@ * */ // Create new admin object -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); -$admin = new admin('Pages', 'pages_settings'); +if(!defined('WB_URL')) +{ + $config_file = realpath('../../config.php'); + if(file_exists($config_file) && !defined('WB_URL')) + { + require($config_file); + } +} +if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); } +$admin = new admin('Pages', 'pages_settings'); /*-- Parent page list ------------------------------------------------------------------*/ function parent_list($parent) { @@ -129,6 +136,12 @@ $oTpl->set_file('page', 'pages_settings.htt'); $oTpl->set_block('page', 'main_block', 'main'); $oTpl->set_var('FTAN', $admin->getFTAN()); +// $sShowIconDirText = $TEXT['EXPAND'].' '; + $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; + if($page_extend = $database->get_one($sql)) {} + + $sShowIconDirText = ($page_extend=='1') ? $TEXT['HIDE_ADVANCED'] : $TEXT['SHOW_ADVANCED']; + $oTpl->set_var(array( 'PAGE_ID' => $aCurrentPage['page_id'], 'PAGE_IDKEY' => $admin->getIDKEY($aCurrentPage['page_id']), @@ -141,6 +154,8 @@ 'MODIFIED_BY' => $user['display_name'], 'MODIFIED_BY_USERNAME' => $user['username'], 'MODIFIED_WHEN' => $modified_ts, + 'TEXT_SAVE_BACK' => $TEXT['SAVE'].' & '.$TEXT['BACK'], + 'TEXT_EXTENDED' => $sShowIconDirText, 'ADMIN_URL' => ADMIN_URL, 'WB_URL' => WB_URL, 'THEME_URL' => THEME_URL @@ -176,7 +191,7 @@ 'SECTIONS_LINK_AFTER' => '', 'DISPLAY_MANAGE_SECTIONS' => 'link', )); - }else { + } else { // $oTpl->set_block('show_manage_sections', ''); $oTpl->set_var(array( 'SECTIONS_LINK_BEFORE' => '', @@ -192,7 +207,7 @@ $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) ? '' : 'hide'; + $bIconDirHide = ($page_extend=='1') ? '' : 'hide'; // $oTpl->set_var('ICON_DIR', WB_REL.$sIconDir); $sHelp = replaceVars($mLang->HELP_PAGE_IMAGE_DIR, array('icon_dir'=>WB_REL.$sIconDir ) ); @@ -332,7 +347,7 @@ $oTpl->set_block('admin_group_show_list_block', 'admin_user_list_block', 'admin_user_list'); $sAllowedAdminUsers = trim(implode(',',$aAdminUsers)); $sAllowedAdminUsers = $sAllowedAdminUsers ? $sAllowedAdminUsers : '-1'; - $sql = 'SELECT `user_id`, `display_name` ' + $sql = 'SELECT `user_id`, `display_name`,`username` ' . 'FROM `'.TABLE_PREFIX.'users` ' . 'WHERE `active`=1 ' . 'ORDER BY (`user_id` NOT IN('.$sAllowedAdminUsers.')), `display_name`'; @@ -341,7 +356,7 @@ if($aUser['user_id'] == 1) { continue; } $oTpl->set_var(array( 'ID' => $aUser['user_id'], - 'NAME' => $aUser['display_name'], + 'NAME' => $aUser['display_name'].' ('.$aUser['username'].')', 'SELECTED' => (in_array($aUser['user_id'], $aAdminUsers) ? $sSelected : ''), )); $oTpl->parse('admin_user_list', 'admin_user_list_block', true); @@ -362,7 +377,7 @@ $oTpl->set_block('main_block', 'viewer_user_list_block', 'viewer_user_list'); $sAllowedViewingUsers = trim(implode(',',$aViewingUsers)); $sAllowedViewingUsers = $sAllowedViewingUsers ? $sAllowedViewingUsers : '-1'; - $sql = 'SELECT `user_id`, `display_name` ' + $sql = 'SELECT `user_id`, `display_name`,`username` ' . 'FROM `'.TABLE_PREFIX.'users` ' . 'WHERE `active`=1 ' . 'ORDER BY (`user_id` NOT IN('.$sAllowedViewingUsers.')), `display_name`'; @@ -371,7 +386,7 @@ if($aUser['user_id'] == 1) { continue; } $oTpl->set_var(array( 'ID' => $aUser['user_id'], - 'NAME' => $aUser['display_name'], + 'NAME' => $aUser['display_name'].' ('.$aUser['username'].')', 'SELECTED' => (in_array($aUser['user_id'], $aViewingUsers) ? $sSelected : ''), )); $oTpl->parse('viewer_user_list', 'viewer_user_list_block', true); Index: branches/2.8.x/wb/admin/pages/settings_save.php =================================================================== --- branches/2.8.x/wb/admin/pages/settings_save.php (revision 1824) +++ branches/2.8.x/wb/admin/pages/settings_save.php (revision 1825) @@ -14,11 +14,17 @@ * @lastmodified $Date$ * */ -/* */ // Create new admin object and print admin header -require('../../config.php'); -require_once(WB_PATH.'/framework/class.admin.php'); +if(!defined('WB_URL')) +{ + $config_file = realpath('../../config.php'); + if(file_exists($config_file) && !defined('WB_URL')) + { + require($config_file); + } +} +if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); } $lang_dir = dirname(__FILE__).'/languages/'; $lang = file_exists($lang_dir.LANGUAGE.'.php') ? LANGUAGE : 'EN'; @@ -26,7 +32,6 @@ // suppress to print the header, so no new FTAN will be set $admin = new admin('Pages', 'pages_settings',false); - $pagetree_url = ADMIN_URL.'/pages/index.php'; // Get page id @@ -56,11 +61,46 @@ $admin->print_header(); $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'],$target_url); } + // After check print the header $admin->print_header(); +if(isset($_POST['extended_submit'])) { + $sql = 'SELECT `value` FROM `'.TABLE_PREFIX.'settings` WHERE `name` = \'page_exented\''; + if( ($page_exented = $database->get_one($sql)) != '' ) { + $sql = 'UPDATE '; + $sql_where = 'WHERE `name` = \'page_exented\''; + } else { + $sql = 'INSERT INTO '; + $sql_where = ''; + } + $val = (((($page_exented=='1') ? $page_exented : 0)) + 1) % 2; + + $sql .= '`'.TABLE_PREFIX.'settings` '; + $sql .= 'SET `name` = \'page_exented\', '; + $sql .= '`value` = \''.$val.'\' '.$sql_where; + + if($database->query($sql)) { + // redirect to backend +echo "

If the script could not be start automatically.\n" . + "Please click on this link to start the script!

\n"; +echo ""; + + } else { + $admin->print_error($database->get_error(), $target_url ); + } +} + // Include the WB functions file -require_once(WB_PATH.'/framework/functions.php'); +if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); } // Get values $page_title = str_replace(array("[[", "]]"), '', htmlspecialchars($admin->get_post_escaped('page_title'))); @@ -335,7 +375,10 @@ // using standard function by core, function fix_page_trail($page_id) { - global $database,$admin,$target_url,$MESSAGE; + global $database,$admin,$target_url,$pagetree_url,$MESSAGE; + + $target_url = (isset($_POST['back_submit'])) ? $pagetree_url : $target_url; + // Work out level $level = level_count($page_id); // Work out root parent Index: branches/2.8.x/wb/admin/pages/page_settings.js =================================================================== --- branches/2.8.x/wb/admin/pages/page_settings.js (revision 1824) +++ branches/2.8.x/wb/admin/pages/page_settings.js (revision 1825) @@ -1,7 +1,9 @@ function toggle_viewers() { if(document.settings.visibility.value == 'private' || document.settings.visibility.value == 'registered') { + document.getElementById('viewers').style.display = 'block'; document.getElementById('allowed_viewers').style.display = 'block'; } else { + document.getElementById('viewers').style.display = 'none'; document.getElementById('allowed_viewers').style.display = 'none'; } } Index: branches/2.8.x/wb/admin/pages/sections.php =================================================================== --- branches/2.8.x/wb/admin/pages/sections.php (revision 1824) +++ branches/2.8.x/wb/admin/pages/sections.php (revision 1825) @@ -16,7 +16,14 @@ */ // Include config file -require('../../config.php'); +if(!defined('WB_URL')) +{ + $config_file = realpath('../../config.php'); + if(file_exists($config_file) && !defined('WB_URL')) + { + require($config_file); + } +} // Make sure people are allowed to access this page if(MANAGE_SECTIONS != 'enabled') @@ -27,12 +34,13 @@ /* */ $debug = false; // to show position and section_id If(!defined('DEBUG')) { define('DEBUG',$debug);} -// Include the WB functions file -require_once(WB_PATH.'/framework/functions.php'); // Create new admin object -require_once(WB_PATH.'/framework/class.admin.php'); +if(!class_exists('admin', false)){ include(WB_PATH.'/framework/class.admin.php'); } $admin = new admin('Pages', 'pages_view', false); +// Include the WB functions file +if(!function_exists('directory_list')) { require(WB_PATH.'/framework/functions.php'); } + $action = 'show'; // Get page id $requestMethod = '_'.strtoupper($_SERVER['REQUEST_METHOD']); @@ -384,7 +392,7 @@ 'LINK_MODIFY_URL_VAR_MODUL_NAME' => $edit_page, 'NAME' => htmlentities(strip_tags($block[1])), 'VALUE' => 1, - 'SET_NONE_DISPLAY_OPTION' => '' + 'SET_NONE_DISPLAY_OPTION' => '' ) ); } Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1824) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1825) @@ -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', '1824'); +if(!defined('REVISION')) define('REVISION', '1825'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/templates/wb_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1824) +++ branches/2.8.x/wb/templates/wb_theme/css/screen.css (revision 1825) @@ -3,7 +3,7 @@ html{ font-family :Verdana, "Trebuchet MS", Arial, Helvetica, sans-serif; font-size :100.1%; font-weight :normal; color :#333333; overflow :auto; overflow-y :scroll; } body{ margin :0 auto; padding :0px; background :#a8bccb; text-align :left; font-size :0.8em; } /* */ -div.main { border :0px none #666666; margin :0px auto 1em auto; min-width :60em; max-width :90em; font-size :1.0em; padding :10px 15px; width :83%; overflow :hidden; } +div.main { border :0px none #666666; margin :0px auto 1em auto; min-width :75em; max-width :90em; font-size :1.0em; padding :10px 15px; width :83%; overflow :hidden; } .td { clear :both; font-size :1.0em; margin :0 auto; text-align :center; width :100%; } div.main .table { background :url(../images/bgtitle.png) #ffffff repeat-x; margin :0 auto; overflow :auto; width :100%; } .wrapper { position :relative; display :block; overflow :auto; width :inherit; } @@ -17,11 +17,7 @@ .input_large { width :300px; } .input_full { width :100%; } /* */ -table { - border-collapse :separate; - width :100%; - table-layout:fixed; -} +table { border-collapse :collapse; width :100%; table-layout :fixed; } table.layout { table-layout :auto; } table.header { margin :auto; width :100%; } table.header td { min-width :10%; } @@ -101,9 +97,13 @@ .center{ text-align :center; } .hidden { visibility :hidden; } .left{ text-align :left; } +.right{ text-align :right; } +.middle { vertical-align :middle; } +.top { vertical-align :top; } +.nowrap { white-space :nowrap; } .hide, .none { display :none; height :0; } #hide1, #hide2, #hide3 { display :none; } -.right{ text-align :right; vertical-align :middle; } +/* */ .rBold{ text-align :right; font-weight :bold; vertical-align :middle; } .rightTop{ text-align :right; vertical-align :top; } .bold{ font-weight :bold; } @@ -119,19 +119,13 @@ .note { border :2px #448844 solid; padding :10px; margin :10px auto; background :#eeffee; color :#004400; } .important { border :2px #888844 solid; padding :10px; margin-bottom :1em; background :#ffffee; color :#444400; } .warning { border :2px #884444 solid; padding :10px; margin-bottom :1em; background :#ffeeee; color :#440000; } -.graphic { border :4px solid #fdfdfd; height :50px; padding-left :3px; width :50px; } -.graphic img { background-color :#ffffff; border :1px solid #d0d0d0; padding :4px; vertical-align :middle; width :50px; height :50px; } - -.section { - background-color :#fdfdfd; - border :1px solid #999999; - font-size :0.9em; - height :85px; - margin :5px; - padding :0; - width :98%; -} -.description { padding :4px 0 0; text-align :left; } +.graphic { border :0px solid #fdfdfd; height :52px; padding-left :3px; width :70px; } +.graphic img { background-color :transparent; border :1px solid #d0d0d0; padding :2px; vertical-align :middle; width :50px; height :50px; } +.section { background-color :transparent; font-size :0.9em; margin-bottom :15px; padding :5px; height :85px; } +table.section { border-collapse :separate; width :100%; table-layout :fixed; border-spacing :0px; border :1px solid #999999; } +.section tr td.graphic { border-right :2px solid #cccccc; width :60px; height :50px; padding :5px; margin :0; } +.section tbody tr { padding :5px; } +.description { padding :4px 0 0 10px; text-align :left; } .title { text-align :left; padding :4px 5px 0px 3px; font-weight :bold; font-size :1.2em; margin-bottom :5px; } span.title { display :block; } .tool_table td { text-align :left; vertical-align :top; } @@ -140,7 +134,7 @@ /* new tablelayout without table attribute */ div.settings_table { margin :0 auto; width :90%; } form.settings_table { border :1px none #eeee; font-family :verdana,arial,helvetica,sans-serif; margin :5px auto; padding :5px; } - form.settings_table fieldset { border :1px none #eeeeee; display :block; line-height :1.0em; margin :1px auto; padding :3px 0px 3px 0px; } + form.settings_table fieldset { border :2px none #eeeeee; display :block; line-height :1.0em; margin :1px auto; padding :3px 0px 3px 0px; } input[type="file"] { width :100%; border :1px solid #000000; background-color :#ccccff; } legend.settings_table , form.settings_table legend { border :none; color :#006699; font-size :140%; margin :5px; padding :0; } @@ -192,6 +186,10 @@ table.permission_box tbody { text-align :left; } table.permission_box td label { text-align :left; vertical-align :text-top; font-size :0.8em; } /* */ +div.page-info table { border-collapse :collapse; width :100%; table-layout :fixed; margin-bottom :10px; } +div.page-info .id { width :80px; } +div.page-info .description { width :30%; } +div.page-info table tbody td { padding :5px; background :#f0f0f0; } div.pages_list { font-size :0.6em; width :100%; } table.pages_list table td, table.pages_view td { font-size :1.2em; padding :0 2px; vertical-align :middle; margin :0 auto; height :30px; } @@ -214,25 +212,12 @@ /**/ .list_page_title, .list_menu_title, .header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; } - .header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, -.list_pubdate_end { - text-align :left; - white-space :nowrap; - width :185px; -} -.header_list_sections_actions { - text-align :left; - width :30px; -} -.header_list_type { - font-size :1em; - padding :4px 0; - text-align :left; - width :30%; -} +.list_pubdate_end { text-align :left; white-space :nowrap; width :185px; } +.header_list_sections_actions { text-align :left; width :30px; } +.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :34%; } .jsadmin_drag img { cursor :pointer; margin-top :0px; padding :0px 0; vertical-align :baseline; } .list_actions { height :20px; padding :0 1px; text-align :left; width :20px; } .list_page_code, @@ -248,12 +233,11 @@ .page_list_show li { display :block; } .pages_list .icon_col td img { border-style :none; display :inline; float :left; padding-right :7px; } -.pages_list { } +.pages_list { } .icon_col td img { border-style :none; display :inline; float :left; padding-right :7px; } .pages_list table { background-color :#dcdcdc; font-size :1.3em; margin :0 auto; table-layout :fixed; width :100%; } .pages_list ul { font-weight :normal; margin :0; padding :0px; } .pages_list ul li { list-style-type :none; margin :1px 0; padding :0; vertical-align :baseline; } - .sectionrow { font-size :1.1em; height :30px; table-layout :fixed; } .sectionrow a:link { color :#003366; font-weight :bold; text-decoration :none; } .sectionrow a:hover { color :#6699ff; } @@ -266,8 +250,8 @@ .value_page_code { color :#006400; font-weight :400; width :240px; } .section-info { margin :1em auto; } /* depending styles for /admin/pages_settings */ -div.page-settings { font-size :0.9em; border :none; text-align :left; } - div.page-settings div.caption { font-size :1em; font-weight :bold; padding :3px 0 0px 0; margin :0; padding :0; border :none; margin-bottom :10px; border-bottom :groove 2px #a8bccb; } +div.page-settings { font-size :0.9em; border :none; text-align :left; overflow :hidden; } + div.page-settings div.caption { font-size :1em; font-weight :bold; padding :3px 0 0px 0; margin :0; padding :0; border :0px none; margin-bottom :10px; border-bottom :groove 2px #a8bccb; width :100%; } div.page-settings label { display :inline-block; } div.page-settings input, div.page-settings textarea, @@ -275,13 +259,19 @@ div.page-settings select { } div.page-settings textarea { height :5em; } div.page-settings [type=checkbox] { width :2.5em; } -div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 2px #a8bccb; } + div.page-settings [type=reset], + div.page-settings [type=submit] { padding :2px; width :auto; } +div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; border 0 solid 1px #a8bccb :; } +div.page-settings-leftcol div.page-settings-tab { border :solid 1px #a8bccb; padding :8px; margin-bottom :8px; } div.page-settings-leftcol div { padding :2px 0 3px 0; vertical-align :top; } div.page-settings-leftcol label { width :170px; vertical-align :top; } -div.page-settings-righttoprow { margin-left :417px; padding :10px; } +div.page-settings-righttoprow { margin-left :0px; padding :10px; border :solid 0px #a8bccb; } div.page-settings-righttoprow label { width :110px; vertical-align :top; } -div.page-settings-centercol { float :left; padding :10px 20px 10px 20px; border-right :groove 2px #a8bccb; } -div.page-settings-rightcol { float :left; padding :10px 20px 10px 10px; border :none; } +div.page-settings-centercol { float :left; padding :10px; border-right :groove 0px #a8bccb; width :40%; } +div.page-settings-right { float :none; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; border :solid 0px #a8bccb; margin-left :417px; min-width :40em; } +div.page-settings-right div.content { border :solid 1px #a8bccb; min-width :10em; } +div.page-settings-right div.page-settings-tab { border :solid 1px #a8bccb; padding :8px; margin-bottom :8px; } +div.page-settings-rightcol { float :none; padding :0px; border :none; } h1, h2, h3, h4, h5, h6 { color :#003366; display :block; font-weight :normal; margin :0.5em auto; padding-bottom :5px; } h6 { font-size :100%; } /* end depending styles for /admin/pages_settings */ @@ -292,8 +282,9 @@ #overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; line-height :1em; padding :1px; font-size :120%; } div.page-settings span.overlib { width :20px; margin-left :-20px; } /* */ -div.page_group { height :180px; max-height :260px; margin :0; padding :0; overflow :auto; } +div.page_group { height :174px; max-height :260px; margin :0; padding :0; overflow :auto; } div.page_group div { overflow :hidden; } +div.page-settings select.page_user { width :100%; min-width :160px; } div.page-settings p.page_user, div.page-settings p.page_group { } /* */ Index: branches/2.8.x/wb/templates/argos_theme/css/screen.css =================================================================== --- branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1824) +++ branches/2.8.x/wb/templates/argos_theme/css/screen.css (revision 1825) @@ -1,6 +1,6 @@ * html body * { overflow :auto; } html { font-family :"trebuchet MS", verdana, arial, sans-serif; font-size :100.1%; overflow-y :scroll; :; } -body,td,th,input,textarea { font-family :verdana,arial,helvetica,sans-serif; font-size :12px; color : #666666; } +body,td,th,input,textarea { font-family :verdana,arial,helvetica,sans-serif; font-size :12px; color :#666666; } body { background :url(../images/background.jpg) #f9f9f9 0 0 repeat-x; margin :0; text-align :center; } img { border :0px; } #admin_header { text-align :center; width :948px; height :105px; margin :0 auto; padding :10px 0 0 0; } @@ -22,8 +22,8 @@ .menu a span { display :block; background :url(../images/tabr.jpg) #28609b no-repeat right top; padding :6px 9px 6px 6px; } .menu a:hover, .menu a:hover span { background-color :#28609b; text-decoration :none; } .menu .current a, .menu a:hover { border-bottom :3px solid #d25e59; } -#content_container { text-align :center; width : 948px; clear :both; margin :0 auto; } -.content { margin :0; padding :20px 0; width : 948px; text-align :left; vertical-align :top; } +#content_container { text-align :center; width :948px; clear :both; margin :0 auto; } +.content { margin :0; padding :20px 0; width :948px; text-align :left; vertical-align :top; } hr { margin :15px 0; color :#003366; height :1px; } .center { text-align :center; } form { margin :0; } @@ -33,7 +33,10 @@ .img_noborder img { border :0; } iframe { border :1px solid #35373a; } div.box { font-size :11px; width :100%; text-align :right; margin :-10px 0 0 0; } -.section { margin-top :10px; padding :0; border :1px solid #999999; height :75px; width :100%; background-color :#fdfdfd; } +.section { margin-top :10px; padding :5px; border :0px solid #999999; height :85px; width :100%; background-color :#fdfdfd; } +table.section { border-collapse :separate; width :100%; table-layout :fixed; border-spacing :0px; border :1px solid #999999; } +.section tr td.graphic { border-right :2px solid #cccccc; width :70px; height :50px; padding :10px 0px; margin :0; } +.section tbody tr { padding :5px; } .note { color :#666666; font-size :11px; } .bold { font-weight :bold; } .rBold { font-weight :bold; text-align :right; } @@ -66,7 +69,7 @@ .pages_list .icon_col td img { display :block; border-style :none; float :left; padding-right :7px; } .pages_list table { width :900px; } table.pages_view { width :900px; } -table.pages_view tr, tr.sectionrow { background :#f0f0f0; line-height :2.2em; } +table.pages_view tr, tr.sectionrow { line-height :2.2em; } table.pages_view tr:hover, tr.sectionrow:hover { background :#eaeff6; } tr.sectionrow { padding :0 10px; } tr.sectionrow td { border-top :3px solid #f9f9f9; } @@ -114,11 +117,11 @@ div.mbox span, div.mbox textarea, div.mbox input { display :block; float :left; margin :3px auto; } -div.mbox label { padding-right : 5px; } +div.mbox label { padding-right :5px; } div.mbox br { clear :both; } div.mbox span { white-space :nowrap; } div.mbox [type="radio"], -div.mbox [type="checkbox"] { width : 1.5em; } +div.mbox [type="checkbox"] { width :1.5em; } /**/ div.mbox label.radio { text-align :left; padding-right :20px; width :100px; } /* END of mbox - definition ************************************************* */ @@ -127,7 +130,7 @@ div.mbox.dev-info { background :#dddddd; color :#990066; font-size :0.9em; overflow :auto; height :auto; white-space :normal; margin :0 auto 3em; position :relative; } div.mbox.dev-info div span { margin-bottom :1px; } /* */ -.msg-box { background :#e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align : left; } +.msg-box { background :#e5ffe6; border :0.2em #009900 solid; color :#336600; margin-bottom :1em; padding :0.63em; text-align :left; } .error-box { background :#ffeeee; border :0.2em #884444 solid; color :#440000; margin-bottom :1em; padding :0.63em; text-align :center; } .msg-box p, .error-box p { font-size :120%; } @@ -137,13 +140,16 @@ .center{ text-align :center; } .hidden { visibility :hidden; } .left{ text-align :left; } -.bold{ font-weight :bold; } -.grey { color :#999999; } +.right{ text-align :right; } +.middle { vertical-align :middle; } +.top { vertical-align :top; } +.nowrap { white-space :nowrap; } .hide, .none { display :none; height :0; } #hide1, #hide2, #hide3 { display :none; } +/* */ .right{ text-align :right; } -.row_0 { background-color :#fff; } -.row_1 { background-color :#eee; } +.row_0 { background-color :#ffffff; } +.row_1 { background-color :#eeeeee; } .rounded { border-radius :10px; -khtml-border-radius :10px; -webkit-border-radius :10px; -moz-border-radius :10px; } /* set div layers in dead tables */ .info { padding :10px; margin-bottom :0.5em; background :#f8f8f8; color :#666666; font-size :91.7%; } @@ -150,10 +156,10 @@ .note { border :2px #448844 solid; padding :10px; margin :10px auto; background :#eeffee; color :#004400; } .important { border :2px #888844 solid; padding :10px; margin-bottom :1em; background :#ffffee; color :#444400; } .warning { border :2px #884444 solid; padding :10px; margin-bottom :1em; background :#ffeeee; color :#440000; } -.section { background-color :#FDFDFD; border :1px solid #999999; font-size :0.9em; height :85px; margin :5px; padding :0; width :98%; } -.graphic { border :4px none #FDFDFD; height :50px; padding-left :3px; width :50px; } -.graphic img { background-color :#FFFFFF; border :1px none #D0D0D0; padding :4px; vertical-align :middle; width :50px; height :50px; } -.description { padding :4px 0 0; text-align :left; } +.section { background-color :transparent; font-size :0.9em; margin-bottom :15px; padding :5px; height :85px; } +.graphic { border :0px solid #fdfdfd; height :52px; padding-left :3px; width :70px; } +.graphic img { background-color :#ffffff; border :1px none #d0d0d0; padding :4px; vertical-align :middle; width :50px; height :50px; } +.description { padding :4px 5px 0; text-align :left; } .title { text-align :left; padding :4px 5px 0px 3px; font-weight :bold; font-size :1.2em; margin-bottom :5px; } span.title { display :block; } .tool_table td { text-align :left; vertical-align :top; } @@ -163,37 +169,32 @@ div.settings_table { margin :0 auto; width :90%; } form.settings_table { border :1px none #eeee; font-family :verdana,arial,helvetica,sans-serif; margin :5px auto; padding :5px; } form.settings_table fieldset { border :1px none #eeeeee; display :block; line-height :1.0em; margin-bottom :1px; padding :3px 0px 3px 0px; } - form input[type="file"] { width :80%; border :1px solid black; background-color :#ccccff; } + form input[type="file"] { width :80%; border :1px solid #000000; background-color :#ccccff; } legend.settings_table , form.settings_table legend { border :none; color :#006699; font-size :140%; margin :1em; padding :0; } form.settings_table div.sub-row { background-color :transparent !important; background-color :#eeeeee; } - form.settings_table label { text-align :right; margin : 1px auto; } - form.settings_table label.setting_name { clear :left; color :#333333; vertical-align :top; display :block; margin :3px auto; min-height :1.6em; float :left; padding-right :5px; width :25%; } + form.settings_table label { text-align :right; margin :1px auto; } + form.settings_table label.setting_name { clear :left; color :#333333; vertical-align :top; display :block; margin :3px auto; min-height :1.6em; float :left; padding-right :5px; width :30%; } form.settings_table fieldset div.input { padding :0; margin :0 auto; vertical-align :top; overflow :hidden; display :inline; line-height :2em; min-height :1em; list-style-type :none; width :60%; } form.settings_table fieldset div.input input.radio { margin :0.8em auto; border :none; padding-left :6px; } form.settings_table fieldset div.input label { margin :6px auto; padding-left :6px; min-height :1em; width :35%; float :none; display :inline; vertical-align :top; } form.settings_table input[type="text"], - form.settings_table input[type="password"] { border :1px solid #666666; margin : 0px auto; padding-left : 5px; width :72%; } + form.settings_table input[type="password"] { border :1px solid #666666; margin :0px auto; padding-left :5px; width :72%; } form.settings_table input.radio { border :1px none #666666; margin :0px auto; padding-left :0.5em; height :1em; } - form.settings_table input[type="button"].button { border :1px solid #666666; color :#000000; text-align :left; font-weight :bold; background-color :#dddddd; margin : 2px auto; padding :2px 0px 2px 6px; width : 70%; } - form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :72%; } + form.settings_table input[type="button"].button { border :1px solid #666666; color :#000000; text-align :left; font-weight :bold; background-color :#dddddd; margin :2px auto; padding :2px 0px 2px 6px; width :70%; } + form.settings_table textarea { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width : 60%; } form.settings_table select { border :1px solid #666666; margin :3px auto; padding-left :0.5em; min-height :1em; width :73%; } /* */ div.content_box form { } -div.sub-row { background-color :#eeeeee; margin : 1px auto; overflow :hidden; padding :0; } +div.sub-row { background-color :#eeeeee; margin :1px auto; overflow :hidden; padding :0; } div.col_content { margin-right :0.5em; padding :2px 0; } .content_box { position :relative; margin :0px auto; padding :0; } .content_box form { background :transparent; height :auto; } - .content_box li { - float :left; - padding :0 10px; - list-style-type :none; - display :block; -} + .content_box li { float :left; padding :0 10px; list-style-type :none; display :block; } .content_box ul { padding :0 0 0 15px; margin :0 auto; width :100%; } .content_box h5.title { color :#339bff; font-weight :bold; font-size :1.2em; margin :0 auto; text-align :left; } - .content_box h5.title a:link { color :#0067ca; } - .content_box h5.title a:hover { color : #0099ff; } + .content_box h5.title a:link { color :#0067ca; } + .content_box h5.title a:hover { color :#0099ff; } .content_box h5.noscript { font-size :1.2em; padding :5px 0px 5px 0px; } .content_box div.noscript { height :auto; width :100%; padding :5px; background :none no-repeat left; } /* */ @@ -200,11 +201,11 @@ button { padding :2px; } button.link { padding :0px; background-color :transparent; display :inline; vertical-align :middle; border :0px none; cursor :pointer; } button span.title { font-size :1.3em; display :inline; font-weight :100; color :#007ac8; letter-spacing :1px; } -.curved { border : 1px solid #666666; } +.curved { border :1px solid #666666; } /* */ -textarea { resize:both; } /* none|horizontal|vertical|both */ -textarea.vert { resize:vertical; } -textarea.noResize { resize:none; } +textarea { /* none|horizontal|vertical|both */ resize :both; } +textarea.vert { resize :vertical; } +textarea.noResize { resize :none; } #file_mode, #dir_mode { width :290px; height :auto; margin-right :0.5em; font-size :1em; } #file_mode table, @@ -217,6 +218,10 @@ table.permission_box tbody { text-align :left; } table.permission_box td label { text-align :left; vertical-align :text-top; font-size :0.8em; } /* */ +div.page-info table { border-collapse :collapse; width :948px; table-layout :fixed; margin-bottom :10px; } +div.page-info .id { width :80px; } +div.page-info .description { width :30%; } +div.page-info table tbody td { padding :5px; background :#f0f0f0; } div.pages_list { font-size :0.6em; width :100%; } table.pages_list table td, table.pages_view td { font-size :1.2em; padding :0 2px; vertical-align :middle; margin :0 auto; height :30px; } @@ -236,14 +241,14 @@ .header_list_page_id { padding-right :15px; text-align :right; width :30px; } .header_list_page_title, .list_page_title { width :350px; } -.list_page_title, .list_menu_title, .header_list_menu_title, .header_list_type { text-align :left; vertical-align : middle; } +.list_page_title, .list_menu_title, .header_list_menu_title, .header_list_type { text-align :left; vertical-align :middle; } .header_list_pubdate_start, .header_list_pubdate_end, .list_pubdate_start, .list_pubdate_end { text-align :left; white-space :nowrap; width :185px; } .header_list_sections_actions { text-align :left; width :30px; } -.header_list_type { font-size :1em; padding :4px 0; text-align :left; } -.jsadmin_drag img { cursor :pointer; margin-top : 0px; padding : 0px 0; vertical-align : baseline; } +.header_list_type { font-size :1em; padding :4px 0; text-align :left; width :34%; } +.jsadmin_drag img { cursor :pointer; margin-top :0px; padding :0px 0; vertical-align :baseline; } .list_actions { height :20px; padding :0 1px; text-align :left; width :20px; } .list_page_code, .list_page_language { width :240px; } @@ -251,8 +256,8 @@ .list_pubdate_end input[type="text"] { width :120px; } .list_section_id, .list_page_id, -.header_list_section_id { padding :0 3px; text-align :right; vertical-align : middle; width :2em; } -.modify_link { display :inline; padding :0 2px; vertical-align : middle; } +.header_list_section_id { padding :0 3px; text-align :right; vertical-align :middle; width :2em; } +.modify_link { display :inline; padding :0 2px; vertical-align :middle; } .page_list { display :none; } img.page_list_rights { border :none; float :left; margin :0 auto; padding :0 2px; } .page_list_show li { display :block; } @@ -260,7 +265,7 @@ .icon_col td img { border-style :none; display :inline; float :left; padding-right :7px; } .pages_list table { background-color :#dcdcdc; font-size :1.3em; margin :0 auto; table-layout :fixed; width :100%; } .pages_list ul { font-weight :normal; margin :0; padding :0px; } -.pages_list ul li { list-style-type :none; margin :1px 0; padding : 0; vertical-align :baseline; } +.pages_list ul li { list-style-type :none; margin :1px 0; padding :0; vertical-align :baseline; } .sectionrow { font-size :1.1em; height :30px; } .sectionrow a:link { color :#003366; font-weight :bold; text-decoration :none; } .sectionrow a:hover { color :#6699ff; } @@ -267,11 +272,9 @@ .sections_list, .pages_list_header { background :#dddddd; line-height :1.5em; font-size :1em; text-align :left; height :25px; font-weight :bold; padding-left :10px; } .value_page_code { color :#006400; font-weight :400; width :240px; } -.section-info { - margin :1em auto; -} +.section-info { margin :1em auto; } /* depending styles for /admin/pages_settings */ -div.page-settings { font-size :0.9em; border :none; text-align :left; } +div.page-settings { font-size :0.9em; border :none; text-align :left; width :948px; } div.page-settings div.caption { font-size :1em; font-weight :bold; padding :3px 0 0px 0; margin :0; padding :0; border :none; margin-bottom :10px; border-bottom :groove 2px #a8bccb; } div.page-settings label { display :inline-block; } div.page-settings input, @@ -280,27 +283,37 @@ div.page-settings select { } div.page-settings textarea { height :5em; } div.page-settings [type=checkbox] { width :2.5em; } -div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 2px #a8bccb; } + div.page-settings [type=reset], + div.page-settings [type=submit] { padding :2px; width :auto; } +div.page-settings-leftcol { float :left; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; } +div.page-settings-leftcol div.page-settings-tab { border :solid 1px #a8bccb; padding :8px; margin-bottom :8px; } div.page-settings-leftcol div { padding :2px 0 3px 0; vertical-align :top; } div.page-settings-leftcol label { width :170px; vertical-align :top; } -div.page-settings-righttoprow { margin-left :417px; padding :10px; } +div.page-settings-righttoprow { margin-left :0px; padding :10px; border :solid 0px #a8bccb; } div.page-settings-righttoprow label { width :110px; vertical-align :top; } -div.page-settings-centercol { float :left; padding :10px 20px 10px 20px; border-right :groove 2px #a8bccb; } -div.page-settings-rightcol { float :left; padding :10px 20px 10px 10px; border :none; } -h1, h2, h3, h4, h5, h6 { color :#003366; display :block; font-weight : normal; margin :0.5em auto; padding-bottom :5px; } -h6 { font-size : 105%; } +div.page-settings-centercol { float :left; padding :10px; border-right :groove 0px #a8bccb; width :210px; } +div.page-settings-right { float :none; padding :10px 10px 10px 10px; border-right :groove 0px #a8bccb; border :solid 0px #a8bccb; margin-left :417px; width :500px; } +div.page-settings-right div.content { border :solid 1px #a8bccb; width :210px; padding :5px; } +div.page-settings-centercol div#viewers { border :solid 1px #a8bccb; width :210px; padding :5px; } +div.page-settings-right div.page-settings-tab { border :solid 1px #a8bccb; padding :8px; margin-bottom :8px; } +div.page-settings-rightcol { float :none; padding :0px; border :none; } +h1, h2, h3, h4, h5, h6 { color :#003366; display :block; font-weight :normal; margin :0.5em auto; padding-bottom :5px; } +h6 { font-size :105%; } /* end depending styles for /admin/pages_settings */ -div.page-settings-leftcol label { background-repeat :no-repeat; background-position :right; text-align :right; padding-right :17px; font-weight :bold; width :156px; } +div.page-settings-leftcol label { background-repeat :no-repeat; background-position :right; text-align :right; padding-right :17px; font-weight :bold; width :156px; } div.page-settings-leftcol label a:link { text-decoration :none; color :#003366; } -div.page-settings-leftcol label a:hover { color : #006699; text-decoration : underline; } -div.page-settings-leftcol textarea { resize :vertical; } +div.page-settings-leftcol label a:hover { color :#006699; text-decoration :underline; } +div.page-settings-leftcol textarea { resize :vertical; } #overDiv { max-width :450px; background-position :center; background-attachment :fixed; text-align :left; line-height :1em; padding :1px; font-size :120%; } div.page-settings span.overlib { width :20px; margin-left :-20px; } /* */ -div.page_group { height: 180px;max-height: 260px; margin: 0; padding: 0; overflow: auto; } -div.page_group div { overflow: hidden; } +div.page_group { height :168px; max-height :260px; margin :0; padding :0; overflow :auto; } +div.page_group div { overflow :hidden; } +div.page-settings select.page_user { width :210px; } +div.page-settings div.page_user, +div.page-settings div.page_group { padding :0px; } div.page-settings p.page_user, -div.page-settings p.page_group { } +div.page-settings p.page_group { } /* */ .header_title, .setting_value input, .setting_value select, .setting_value textarea, .value_input input, .value_input text, .value_input select, .form_submit, .input_full { width :80%; } .content_box { text-align :left; } @@ -311,7 +324,7 @@ div.col_content ul li { font-size :86%; margin :auto 2px; } .c33, div.col_width33 { width :33.333%; } -.c50, div.col_width50 { width : 47%; } +.c50, div.col_width50 { width :47%; } .c60, div.col_width60 { width :60%; } .h65 { min-height :65px; overflow :auto; } .h80 { height :80px; line-height :1.3em; }