diff --git a/code/extensions/LeftAndMainSubsites.php b/code/extensions/LeftAndMainSubsites.php index 7cc5c0e..e829340 100644 --- a/code/extensions/LeftAndMainSubsites.php +++ b/code/extensions/LeftAndMainSubsites.php @@ -85,7 +85,8 @@ class LeftAndMainSubsites extends Extension { $currentSubsiteID = Subsite::currentSubsiteID(); if($list->Count() > 1) { - $output = ''; foreach($list as $subsite) { $selected = $subsite->ID == $currentSubsiteID ? ' selected="selected"' : ''; @@ -93,13 +94,14 @@ class LeftAndMainSubsites extends Extension { $output .= "\n"; } - $output .= ''; + $output .= ''; Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); return $output; } else if($list->Count() == 1) { if($list->First()->DefaultSite==false) { - $output = ''; $output .= "\n"; foreach($list as $subsite) { $selected = $subsite->ID == $currentSubsiteID ? ' selected="selected"' : ''; @@ -107,7 +109,7 @@ class LeftAndMainSubsites extends Extension { $output .= "\n"; } - $output .= ''; + $output .= ''; Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js'); return $output; diff --git a/css/LeftAndMain_Subsites.css b/css/LeftAndMain_Subsites.css index 0c6a54f..14f4914 100644 --- a/css/LeftAndMain_Subsites.css +++ b/css/LeftAndMain_Subsites.css @@ -24,18 +24,38 @@ padding: 3px; } -.cms-login-status.subsites { - padding-bottom: 7px; +.cms-menu .cms-subsites{ + padding:3px 0px 15px; +} +.cms-menu .cms-subsites .field.dropdown{ + padding-bottom:0; + margin-bottom:0; } -#SubsitesSelect, -#SubsitesSelect option { - font-size: 12px; +/* Custom chzn styles for dark blue background */ +.cms-subsites .chzn-container-single .chzn-single, +.cms-subsites .chzn-container-active .chzn-single { + border: 1px solid #152338; + background:#213557; + -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); } - #SubsitesSelect { - width: 145px; - padding: 3px; - } +.cms-menu .cms-subsites .dropdown span{ + padding-left:5px; +} +.cms-subsites .chzn-container-single .chzn-single div b{ + background: url(../images/chosen-sprite-light.png) 3px 0 no-repeat; +} +.cms-subsites .chzn-container .chzn-drop{ + padding-left:5px; + background:#213557; + border: 1px solid #152338; + border-top:0; + color:#fff; + -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125); + box-shadow: inset 1px 0 0 rgba(255,255,255,.125); +} + #AddSubsiteLink { display: block; diff --git a/images/chosen-sprite-light.png b/images/chosen-sprite-light.png new file mode 100644 index 0000000..e00cf36 Binary files /dev/null and b/images/chosen-sprite-light.png differ diff --git a/templates/LeftAndMain_Menu.ss b/templates/LeftAndMain_Menu.ss index 168dd90..2d34b0b 100644 --- a/templates/LeftAndMain_Menu.ss +++ b/templates/LeftAndMain_Menu.ss @@ -19,7 +19,7 @@ <% end_with %> -
+
$SubsiteList