You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/09/23 06:04:20 UTC

svn commit: r291071 - in /incubator/roller/branches/roller_2.0/web: bookmarks/ planet/ theme/ theme/sun/ theme/tan/ weblog/ website/

Author: snoopdave
Date: Thu Sep 22 21:04:08 2005
New Revision: 291071

URL: http://svn.apache.org/viewcvs?rev=291071&view=rev
Log:
UI style/layout tweaks

Modified:
    incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
    incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp
    incubator/roller/branches/roller_2.0/web/theme/roller.css
    incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
    incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
    incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
    incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
    incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp

Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp Thu Sep 22 21:04:08 2005
@@ -4,6 +4,8 @@
     <div class="menu-tr">
         <div class="menu-tl">
             
+<div class="sidebarInner">
+
             <h3><fmt:message key="mainPage.actions" /></h3>
             <hr size="1" noshade="noshade" />
             
@@ -30,6 +32,7 @@
 
 			<br />
 			<br />
+</div>
             
         </div>
     </div>

Modified: incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp Thu Sep 22 21:04:08 2005
@@ -10,6 +10,7 @@
 
 <div class="sidebarBody">
 
+<div class="sidebarInner">
   <c:if test="${not empty topBlogs}"> <%-- to prevent invalid XHTML --%>
     <ul style="list-style-type:none; padding-left:2px; margin: 0px">
         <c:forEach var="blog" items="${topBlogs}">
@@ -30,6 +31,7 @@
   </c:if>  
 
  <br />	
+</div>
 
 </div>
 

Modified: incubator/roller/branches/roller_2.0/web/theme/roller.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/roller.css?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Thu Sep 22 21:04:08 2005
@@ -82,26 +82,31 @@
     float: right; 
     padding: 4px 15px 4px 15px;
 }
+.bannerBox {
+    height: 78px;
+    width: 100%;
+    background:#f00;
+}
 #footer {
     margin: 10px 0px 0px 0px;
     border-top: 1px grey solid;
 }
-.sidebarFade, .sidebarFade_hotblogs, .sidebarFade_search, {
-    padding: 0px; 
-    width: 100%;
+.sidebarBodyHead h3, .searchSidebarBody h3 {
+   padding: 5px;
 }
-.sidebarBodyHead h3, .sidebarBodyHead p, .sidebarFade h3, .sidebarFade p {
-   padding: 0px 4px 0px 4px;
+.sidebarInner {
+   padding: 5px;
 }
 .sidebarBody ul {
    margin: 0px;
-   padding-left: 0.5em;  
+   padding-left: 5px; 
 }
 .sidebarBody li {
    list-style-position: inside;
    list-style-image: url(images/dash.gif);
    margin-left: 0em;
    padding-left: 0.5em;  
+   padding-top: 3px;
 }
 div.entriesBoxInner {
    padding: 5px;
@@ -546,11 +551,6 @@
 }
 .padleft {
     padding-left: 8px;
-}
-.bannerBox {
-    height: 78px;
-    width: 100%;
-    background:#f00;
 }
 /* Transparent PNG fix for IE, thanks to Kenneth M. Kolano */
 #logoshadow {

Modified: incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/colors.css?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/sun/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/sun/colors.css Thu Sep 22 21:04:08 2005
@@ -89,6 +89,10 @@
 td.actions {
     background: #e9e9e9;
 }
+input.searchButton {
+    color: white;
+    background: #e77100;
+}
 .sidebarBodyHead {
     background: #3d5c71;
     color: white;
@@ -108,10 +112,6 @@
 }
 .searchSidebarBody {
     background: #d1d766;
-}
-input.searchButton {
-    color: white;
-    background: #e77100;
 }
 
 /* ------------------------------------------------------------------------ */

Modified: incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/colors.css?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tan/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tan/colors.css Thu Sep 22 21:04:08 2005
@@ -10,15 +10,6 @@
 .bannerBox {
     background: url("two-banner.gif") repeat-x top;
 }
-.sidebarFade {
-    background: #f5f0e6;
-}
-.sidebarFade_hotblogs {
-    background: #f5f0e6;
-}
-.sidebarFade_search {
-    background: #f5f0e6;
-}
 .bannerStatusBox {
     background: #ad3431;
     color: white;
@@ -67,17 +58,17 @@
 div.controlToggle {
     background: url("two-togglegrey.gif") repeat-x top; 
 }
+div.entriesBox {
+   background: #f5f0e6;
+}
 div.entryTitleBox {
    color: white; 
    background: #c6ab74; 
 }
 div.entryBox {
    border-bottom: 1px #c8af7b solid;
-   background: #f5f0e6;
-   margin: 0px 0px 0px 0px;
 }
 div.entryTitleBox {
-   padding: 4px;
    font-size: medium;
 }
 div.entryBoxPinned {
@@ -91,6 +82,30 @@
 }
 div.yourWeblogBox {
    border-top: 1px #c6ab74 solid;
+}
+input.searchButton {
+    color: white;
+    background: #ad3431;
+}
+.sidebarBodyHead {
+    background: #ad3431;
+    color: white;
+}
+.searchSidebarBodyHead h3 {
+    color: black;
+}
+.sidebarBodyHead h3 {
+    color: white;
+}
+.sidebarFade, div.sidebarBody {
+    background: #f5f0e6;
+    color: #666666;
+}
+.searchSidebarHead {
+    background: #f5f0e6;
+}
+.searchSidebarBody {
+    background: #f5f0e6;
 }
 
 /* ------------------------------------------------------------------------ */

Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Thu Sep 22 21:04:08 2005
@@ -4,6 +4,7 @@
     <div class="menu-tr">
         <div class="menu-tl">
             
+<div class="sidebarInner">
             <h3><fmt:message key="mainPage.actions" /></h3>
             <hr size="1" noshade="noshade" />
             
@@ -18,6 +19,7 @@
 			</p>
 			
 			<br />
+</div>
 			
         </div>
     </div>

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Thu Sep 22 21:04:08 2005
@@ -9,6 +9,8 @@
     <div class="menu-tr">
         <div class="menu-tl">
         
+<div class="sidebarInner">
+
 <h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
 
 <c:if test="${empty model.recentPendingEntries}">
@@ -77,7 +79,8 @@
 
 <br />
 <br />
-                
+</div>
+       
         </div>
     </div>
 </div>

Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp Thu Sep 22 21:04:08 2005
@@ -9,6 +9,8 @@
     <div class="menu-tr">
         <div class="menu-tl">
 
+<div class="sidebarInner">
+        
 <h3><fmt:message key="weblogEntryQuery.sidebarTitle" /></h3>
 <hr size="1" noshade="noshade" />
 
@@ -104,6 +106,7 @@
 
 <br />
 <br />
+</div> <!-- sidebarInner -->
 
         </div>
     </div>

Modified: incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp Thu Sep 22 21:04:08 2005
@@ -4,6 +4,8 @@
     <div class="menu-tr">
         <div class="menu-tl">
             
+        <div class="sidebarInner">
+
             <h3><fmt:message key="mainPage.actions" /></h3>
             <hr size="1" noshade="noshade" />
             <img src='<c:url value="/images/ComposeMail16.gif"/>' alt="mail-icon" align="bottom" />
@@ -17,7 +19,7 @@
             <fmt:message key="memberPermissions.whyInvite" />       
 			<br />
 			<br />
-					
+        </div>					
         </div>
     </div>
 </div>	
@@ -29,6 +31,7 @@
     <div class="menu-tr">
         <div class="menu-tl">
             <div class="sidebarBody">
+            <div class="sidebarInner">
             
             <h3>
                 <fmt:message key="memberPermissions.permissionsHelpTitle" />
@@ -38,7 +41,7 @@
             <fmt:message key="memberPermissions.permissionHelp" />	
 		    <br />
 		    <br />
-		    
+        </div>		    
             </div>
         </div>
     </div>

Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Thu Sep 22 21:04:08 2005
@@ -4,6 +4,7 @@
     <div class="menu-tr">
         <div class="menu-tl">
             
+<div class="sidebarInner">
              <h3><fmt:message key="yourWebsites.actions" /></h3>
              <hr size="1" noshade="noshade" />
           
@@ -43,6 +44,8 @@
             
 			<br />
 			
+</div>
+        
         </div>
     </div>
 </div>	

Modified: incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp?rev=291071&r1=291070&r2=291071&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/edit-pages-sidebar.jsp Thu Sep 22 21:04:08 2005
@@ -4,6 +4,7 @@
     <div class="menu-tr">
         <div class="menu-tl">
             
+<div class="sidebarInner">
              <h3><fmt:message key="pagesForm.addNewPage" /></h3>
              <hr size="1" noshade="noshade" />
              
@@ -18,6 +19,7 @@
              </html:form>
              <br />
              
+</div>
         </div>
     </div>
 </div>