diff --git a/css/layout.css b/css/layout.css index 768bc7f5..89777ec0 100644 --- a/css/layout.css +++ b/css/layout.css @@ -46,7 +46,7 @@ body.stillLoading select { } #left { position: absolute; - top: 35px; + top: 45px; left: 3px; width: 205px; height: 91%; @@ -57,7 +57,7 @@ body.stillLoading select { #right, #rightbottom { position: absolute; left: 208px; - top: 35px; + top: 45px; height: 91%; width: 600px; overflow: auto; @@ -104,15 +104,10 @@ body.stillLoading select { background-color : #0075C9; background-repeat : repeat-x !important; background-position: 0px 0px; - - - } #rightbottom div.light { - background-image: url(../images/textures/obar-light.png) !important; - } @@ -163,8 +158,8 @@ body.stillLoading select { float: left; padding: 0 6px; font-size: 14px; - letter-spacing: -0.4px; - font-family: Verdana, Arial, Sans-serif; + letter-spacing: -0.1px; + font-family: "Helvetica Neue", Helvetica, Arial, Sans-serif; font-weight: normal; line-height: 32px; color: #fff; @@ -219,24 +214,18 @@ html>body #top #Logo { position: absolute; bottom: 0; left: 0; - border-top: 3px solid #d4d0c8; - background-color:#81858d; - height: 18px; + height: 23px; overflow:hidden; - background-image:url(../images/textures/bottom.png); - + background: #4d4e5a url(../images/textures/footerBg.gif) repeat-x left top; } #bottom .holder { - text-align: center; - padding-top : 3px; + padding-top: 5px; padding-left : 3px; padding-right : 6px; font-size: 10px; color: white; - border-top: 1px solid #555555; - } #bottom #logInStatus { @@ -247,10 +236,13 @@ html>body #top #Logo { text-decoration: underline; } #bottom #logInStatus a:hover { - color: #CDC9C1; + color: #fff; text-decoration: underline; } - + #bottom #logInStatus a#LogoutLink { + background: url(../images/logout.gif) no-repeat right bottom; + padding-right: 20px; + } #bottom #switchView { float: left; @@ -259,53 +251,36 @@ html>body #top #Logo { #bottom .bottomTabs a { display: block; float : left; - height : 13px; - padding-left : 12px; - padding-right : 12px; + height : 23px; + line-height: 25px; + padding-left : 6px; + padding-right : 6px; position:relative; - top : -3px; - border : 1px solid #65686e; + top : -5px; border-top : none; cursor:pointer; - background-color: #cdc9c1; - color : #333333; - -moz-border-radius-bottomright : 4px; - -moz-border-radius-bottomleft : 4px; + text-decoration: none; + color : #fff; } #bottom .bottomTabs div.blank { display: block; float : left; - height : 13px; - padding-left : 12px; - padding-right : 12px; - position:relative; - top : -3px; - border : 1px solid #65686e; - border-top : none; cursor:pointer; - background-color: #cdc9c1; - color : #333333; - - border : none; background-color: transparent; - padding-right: 2px; + padding-right: 4px; + font-weight: bold; + line-height: 13px; + font-size: 11px; padding-left: 2px; - padding-top : 2px; color:#FFFFFF; } - - #bottom .bottomTabs a.current { - background-color : #d4d0c8; - padding-top : 1px; - top : -5px; - height : 15px; - font-weight:bold; - font-size : 11px; - border : 1px solid #555555; cursor: auto; } + #bottom .bottomTabs a:hover { + background: url(../images/mainmenu/hover.gif) repeat-x center center; + } /** LEFT PANEL **/ diff --git a/images/mainmenu/logo-smallwhite.png b/images/mainmenu/logo-smallwhite.png deleted file mode 100755 index 4a5b6395..00000000 Binary files a/images/mainmenu/logo-smallwhite.png and /dev/null differ diff --git a/images/mainmenu/members.png b/images/mainmenu/members.png deleted file mode 100755 index 0bf8e337..00000000 Binary files a/images/mainmenu/members.png and /dev/null differ diff --git a/images/mainmenu/mgmt.png b/images/mainmenu/mgmt.png deleted file mode 100755 index 7f249743..00000000 Binary files a/images/mainmenu/mgmt.png and /dev/null differ diff --git a/images/textures/footerBg.gif b/images/textures/footerBg.gif new file mode 100644 index 00000000..d1099e8a Binary files /dev/null and b/images/textures/footerBg.gif differ diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss index e2af35e8..3591d044 100644 --- a/templates/LeftAndMain.ss +++ b/templates/LeftAndMain.ss @@ -39,7 +39,7 @@ Silverstripe CMS -  $ApplicationName <% _t('APPVERSIONTEXT2',"version that you are currently running, technically it's the CVS branch") %>">$CMSVersion       <% control CurrentMember %> - <% _t('LOGGEDINAS','Logged in as') %> $FirstName $Surname - <% _t('EDITPROFILE','Profile') %> - <% _t('LOGOUT','log out') %> + <% _t('LOGGEDINAS','Logged in as') %> $FirstName $Surname - <% _t('EDITPROFILE','Profile') %> - <% _t('LOGOUT','log out') %> <% end_control %> @@ -49,10 +49,13 @@ <% else %>
<% _t('SWITCHTO','Switch to:') %>
<% end_if %> - <% _t('EDIT','Edit') %> - <% _t('DRAFTS','Draft Site') %> + <% if class = CMSMain %> + <% else %> + <% _t('EDIT','Edit') %> + <% end_if %> + <% _t('DRAFTS','Draft Site') %>
- <% _t('PUBLIS','Published Site') %> + <% _t('PUBLIS','Published Site') %>