diff --git a/.gitignore b/.gitignore index 01478d2c9b5..01a43f2fb9a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ cloud-*.tar.bz2 *.log *.pyc build.number +api.log.*.gz cloud.log.*.* diff --git a/ui/css/main.css b/ui/css/main.css index b47b93875f8..6542133ffbb 100644 --- a/ui/css/main.css +++ b/ui/css/main.css @@ -1744,6 +1744,38 @@ a:hover { list-style:none } +.searchpanel_advancebutton { + width:55px; + height:12px; + float:left; + margin:0; + padding:7px 0 0 0; + color:#FFF; + font-size:10px; + text-align:left; + font-weight:normal; + cursor:pointer; + cursor:hand; +} + +.searchpanel_advancebutton.off { + color:#FFF; +} + +.searchpanel_advancebutton.on { + background: url(../images/advance_highlighted.gif) no-repeat top left; + color:#333; +} + +.adv_searchpopup_highlighted_advancesearch { + width:55px; + height:19px; + float:right; + background: url(../images/advance_highlighted.gif) no-repeat top left; + margin:0 57px 0 0; + padding:0; +} + .searchpanel a{ width:40px; color:#FFF; @@ -1817,7 +1849,7 @@ a:hover { height:auto; float:left; position:absolute; - top:5px; + top:22px; left:8px; margin:0; padding:0; @@ -1825,53 +1857,17 @@ a:hover { } .adv_searchpopup_top { - width:268px; - height:40px; - float:left; - margin:0; - padding:0; - overflow:hidden; -} - -.adv_searchpopup_topbuttonbox { - width:268px; - height:19px; - float:left; - margin:0; - padding:0; -} - -.adv_searchpopup_highlighted_advancesearch { - width:55px; - height:19px; - float:right; - background: url(../images/advance_highlighted.gif) no-repeat top left; - margin:0 57px 0 0; - padding:0; -} - -.adv_searchpopup_highlighted_advancesearch p{ - width:auto; - height:auto; - float:left; - font-size:10px; - text-align:left; - color:#333; - font-weight:normal; - margin:3px 0 0 5px; - display:inline; - padding:0; -} -.adv_searchpopup_topheaderbox { width:268px; height:21px; float:left; background: url(../images/advancesearchpopup_top.png) no-repeat top left; margin:0; padding:0; + overflow:hidden; } -.adv_searchpopup_topheaderbox h2{ + +.adv_searchpopup_top h2{ width:200px; height:auto; float:left; diff --git a/ui/index.jsp b/ui/index.jsp index 23a2a86dc79..4d0572fb8c6 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -1,1047 +1,1047 @@ -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> - -<% long now = System.currentTimeMillis(); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <fmt:message key="label.cloud.console"/> - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + +<% long now = System.currentTimeMillis(); %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <fmt:message key="label.cloud.console"/> + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp index 53d4a546c28..95978821355 100644 --- a/ui/jsp/account.jsp +++ b/ui/jsp/account.jsp @@ -756,10 +756,7 @@