From ad2f802a3fc9ddcfad611946679ec0cf0f02f438 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 7 Feb 2007 06:10:34 +0000 Subject: [PATCH] Updated css und div framework. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5699 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/setup.php | 2 +- html/themes/default/style.css | 72 ++++++++++---------- plugins/admin/users/class_userManagement.inc | 5 +- setup/setup_frame.tpl | 43 ++++++------ 4 files changed, 65 insertions(+), 57 deletions(-) diff --git a/html/setup.php b/html/setup.php index 882fce245..37494eba1 100644 --- a/html/setup.php +++ b/html/setup.php @@ -101,7 +101,7 @@ require_once("../setup/main.inc"); print_red(NULL); $smarty->assign("date", date("l, dS F Y H:i:s O")); -$header= "".$smarty->fetch(get_template_path('headers.tpl')); +$header= "".$smarty->fetch(get_template_path('setup_headers.tpl')); /* show web frontend */ $smarty->assign("contents" , $display); $smarty->assign("navigation", $_SESSION['setup']->get_navigation_html()); diff --git a/html/themes/default/style.css b/html/themes/default/style.css index b3e22780b..e82fb7d8d 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -787,13 +787,13 @@ td.tbrhead { body.setup_body { background-image: none; background-color: #979797; - margin: 6px; + margin: 10px; + min-width:1020px; } /* The setup complete setup dialog */ div.setup_dialog { background-color: #F0F0F0; - width:100%; border-right: solid 2px #444444; border-bottom: solid 2px #666666; } @@ -806,6 +806,22 @@ div.setup_header { padding:7px; } +/* Setup content header container */ +div.setup_plug_header_container { +} + +/* Setup content container */ +div.setup_contents_container { + float:left; +} + +/* Setup footer */ +div.setup_bottom { + clear: left; + background-color:#DDDDDD; + border-top: solid 1px #D0D0D0; +} + /******* @@ -817,28 +833,18 @@ div.setup_header { ********/ -/* Container 1 for content and header content */ -div.setup_header_and_content_container_1 { - border-left: solid 1px #AAAAAA; -} - -/* Container 2 for content and header content */ -div.setup_header_and_content_container_2 { - padding:0px; - border-top: solid 1px #AAAAAA; -} - /* Header col */ div.setup_plug_header { - border-top: solid 1px #DDDDDD; - border-bottom: solid 1px #DDDDDD; margin: 1px; padding: 5px; + border-top: solid 2px #D0D0D0; + border-bottom: solid 2px #D0D0D0; + margin-left:202px; + background-color:#E3E3E3 } /* Content col */ -div.setup_content { - border-top: solid 1px #AAAAAA; +div.setup_contents { padding: 5px; } @@ -850,27 +856,25 @@ div.default { /* Navigation col */ div.setup_navigation { - border-right: solid 1px #DDDDDD; - width:180px; + width:200px; + clear:bottom; + background-color:#E8E8E8; + border-right: solid 1px #D0D0D0; + float:left ; + padding-left: 2px;; + padding-right: 2px;; + height:90%; } -/* The navigation container */ -div.setup_navigation_border { - background-color: #FFF; - padding: 1px; - border-right: solid 1px #BBBBBB; - border-bottom: solid 1px #BBBBBB; - border-left: solid 1px #DDDDDD; - border-top: solid 1px #DDDDDD; -} /* Navigation title */ div.setup_navigation_title { font-size: 1.7em; - background: #D2F6C2 ; + background: #D8D8D8 ; text-decoration:none; width:100%; - margin-bottom: 7px; + padding-top:8px; + padding-bottom:8px; border-right: solid 1px #AAAAAA; border-bottom: solid 1px #BBBBBB; } @@ -879,20 +883,18 @@ div.setup_navigation_title { a.navigation_element, div.navigation_element { background: #E8E8E8; text-decoration:none; - width:100%; - float: left; - margin-bottom: 4px; border-right: solid 1px #AAAAAA; border-bottom: solid 1px #BBBBBB; + float:left; + width:100%; } /* The box used for each setup step */ a.navigation_element_active, div.navigation_element_active { background: #E8E8E8; text-decoration:none; + float:left; width:100%; - float: left; - margin-bottom: 4px; border-right: solid 1px #AAAAAA; border-bottom: solid 1px #BBBBBB; } diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 115302643..4e7337c8f 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -836,7 +836,8 @@ class userManagement extends plugin $dn= $this->list[trim($s_entry)]['dn']; /* Check acl */ - $acl_all = $ui->has_complete_category_acls($this->selectedBase,"users") ; + $ui = get_userinfo(); + $acl_all = $ui->has_complete_category_acls($this->DivListUsers->selectedBase,"users") ; if(preg_match("/(c.*w|w.*c)/",$acl_all)){ $obj = new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn); $obj->set_acl_base($dn); @@ -856,7 +857,7 @@ class userManagement extends plugin $dn= $this->list[trim($s_entry)]['dn']; /* Check acl */ - $acl_all = $ui->has_complete_category_acls($this->selectedBase,"users") ; + $acl_all = $ui->has_complete_category_acls($this->DivListUsers->selectedBase,"users") ; if(preg_match("/(c.*w|w.*c)/",$acl_all)){ $obj= new usertabs($this->config, $this->config->data['TABS']['USERTABS'], $dn); $obj->set_acl_base($dn); diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl index 747c641d4..d03c9baa3 100644 --- a/setup/setup_frame.tpl +++ b/setup/setup_frame.tpl @@ -1,29 +1,34 @@ - + {$php_errors}