Author: thanh.do Date: 2009-11-17 22:12:34 -0500 (Tue, 17 Nov 2009) New Revision: 631 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css Log: GTNPORTAL-181: Redesign the Site and Group site page taking space Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2009-11-17 21:25:51 UTC (rev 630) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UINavigationGrid.gtmpl 2009-11-18 03:12:34 UTC (rev 631) @@ -8,24 +8,26 @@ %> <div id="$uicomponent.id" class="FeedBox"> - <% for(navigation in navigations) { + <% + boolean isEvenRow = true; + for(navigation in navigations) { description = (navigation.getDescription()==null)? "" : navigation.getDescription(); deleteLink = parent.event("DeleteNavigation",String.valueOf(navigation.getId())); editProperties = parent.event("EditProperties",String.valueOf(navigation.getId())); editLink = parent.event("EditNavigation",String.valueOf(navigation.getId()));%> - <table class="ManagementBlock" style="table-layout: fixed"> + <table class="ManagementBlock <%=isEvenRow ? "EvenRow":"OddRow"%>" style="table-layout: fixed"> <tr> <td class="Image"><img src="/exoadmin/skin/navigation/webui/component/background/GroupImage.png" alt="" /></td> <td class="Content"> <div class="Label" title="$navigation.ownerId"><%= OrganizationUtils.getGroupLabel(navigation.ownerId) %></div> - <div><strong>Description: <%= description%></strong></div> + <div>Description: <%= description%></div> </td> <td class="ActionBlock"> <a href="<%=editLink%>" class="EditNavIcon">Edit Navigation</a> - <a href="<%=editProperties%>" class="EditNavIcon">Edit Properties</a> + <a href="<%=editProperties%>" class="EditProIcon">Edit Properties</a> <a href="<%=deleteLink%>" class="DeleteIcon">Delete Navigation</a> </td> </tr> </table> - <% } %> + <% isEvenRow = !isEvenRow;} %> </div> Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-17 21:25:51 UTC (rev 630) +++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/navigation/webui/component/DefaultStylesheet.css 2009-11-18 03:12:34 UTC (rev 631) @@ -24,11 +24,20 @@ } .UIManagement .ManagementBlock { - height: 75px; - background: white url('background/ContentBg.gif') repeat-x bottom; + background: url('background/BgEvenRow.gif') repeat-x left top; + height: 54px; + margin-bottom: 1px; _width: 97%; } +.UIManagement .EvenRow { + background: url('background/BgEvenRow.gif') repeat-x left top; +} + +.UIManagement .OddRow { + background: url('background/BgOddRow.gif') repeat-x left top; +} + .UIManagement table.ManagementBlock td { vertical-align: middle; white-space: nowrap; @@ -39,13 +48,13 @@ background: url('background/LineBg.gif') no-repeat right center; /* orientation=lt */ background: url('background/LineBg-rt.gif') no-repeat left center; /* orientation=rt */ padding: 0px 15px; - width: 30%; + width: 27%; overflow: hidden; white-space: normal; } .UIPortalNavigationPortlet .UIManagement table.ManagementBlock td.Content { - width: 14%; + width: 27%; } .UIManagement table.ManagementBlock td.Content strong { @@ -54,18 +63,18 @@ } .UIManagement .ManagementBlock .Image { - width: 90px; - line-height: 75px; + _width: 8%; + line-height: 54px; padding-left: 20px; /* orientation=lt */ padding-right: 20px; /* orientation=rt */ } .UIManagement .ManagementBlock .Image img { - width: 80px; + width: 41px; } .UIManagement .ManagementBlock .Label { - color: #0077d4; + color: #000; font-weight: bold; } @@ -84,21 +93,56 @@ margin: 0px 0px 0px 35px; /* orientation=rt */ } +.UIManagement .ManagementBlock .ActionBlock a:hover { + color: #9b9b9b; +} + .UIManagement .ManagementBlock .EditLayoutIcon { background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */ background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */ } .UIManagement .ManagementBlock .EditNavIcon { - background: url('background/MiniIcon.gif') no-repeat left -17px; /* orientation=lt */ - background: url('background/MiniIcon-rt.gif') no-repeat right -17px; /* orientation=rt */ + background: url('background/MiniIcon.gif') no-repeat left -25px; /* orientation=lt */ + background: url('background/MiniIcon-rt.gif') no-repeat right -25px; /* orientation=rt */ } .UIManagement .ManagementBlock .DeleteIcon { - background: url('background/MiniIcon.gif') no-repeat left -34px; /* orientation=lt */ - background: url('background/MiniIcon-rt.gif') no-repeat right -34px; /* orientation=rt */ + background: url('background/MiniIcon.gif') no-repeat left -50px; /* orientation=lt */ + background: url('background/MiniIcon-rt.gif') no-repeat right -50px; /* orientation=rt */ } +.UIManagement .ManagementBlock .EditProIcon{ + background: url('background/MiniIcon.gif') no-repeat left 0px; /* orientation=lt */ + background: url('background/MiniIcon-rt.gif') no-repeat right 0px; /* orientation=rt */ +} + +.UIManagement .UIAction .ButtonLeft { + background: url('background/Button.gif') no-repeat left top; + padding-left: 5px; +} + +.UIManagement .UIAction .ButtonRight { + background: url('background/Button.gif') no-repeat right top; + padding-right: 5px; +} + +.UIManagement .UIAction .ButtonMiddle { + background: url('background/Button.gif') repeat-x left -24px; + font-size: 11px; + line-height: 24px; + padding: 0px 10px; +} + +.UIManagement .UIAction .ButtonMiddle a { + font-weight: normal; +} + +.UIManagement .UIAction .ButtonMiddle a:hover { + color: #9b9b9b; +} + + /***********************UIAddGroupNavigation************************/ .UIAddGroupNavigation {