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/16 22:50:08 UTC
svn commit: r289650 - in /incubator/roller/branches/roller_2.0/web: ./
WEB-INF/ WEB-INF/classes/ theme/ theme/blue/ theme/tan/
Author: snoopdave
Date: Fri Sep 16 13:49:53 2005
New Revision: 289650
URL: http://svn.apache.org/viewcvs?rev=289650&view=rev
Log:
More UI tweaks
Added:
incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp
Removed:
incubator/roller/branches/roller_2.0/web/theme/css-sidebar-high.jsp
incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp
Modified:
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/main.jsp
incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
incubator/roller/branches/roller_2.0/web/theme/tan/two-banner.gif
incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties Fri Sep 16 13:49:53 2005
@@ -568,8 +568,8 @@
mainPage.actions=Actions
mainPage.status=Status
mainPage.weblog=Working in weblog
-mainPage.loggedInAs=User:
-mainPage.currentWebsite=Weblog:
+mainPage.loggedInAs=Logged in as
+mainPage.currentWebsite=Editing weblog
mainPage.sidebarHelpTitle=What is this?
mainPage.adminWarning=You have <b>Global Admin</b><br /> permission, use it wisely.
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml Fri Sep 16 13:49:53 2005
@@ -8,7 +8,7 @@
<put name="banner" value="/theme/banner.jsp" />
<put name="bannerStatus" value="/theme/bannerStatus.jsp" />
<put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/css-sidebar-high.jsp" />
+ <put name="styles" value="/theme/css-banner.jsp" />
<put name="content" value="${content}" />
<put name="search" value="/theme/search.jsp" />
<put name="sidebar" value="/theme/empty.jsp" />
@@ -16,10 +16,9 @@
</definition>
<definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.jsp">
- <put name="banner" value="/theme/banner.jsp" />
<put name="bannerStatus" value="/theme/bannerStatus.jsp" />
<put name="head" value="/theme/head.jsp" />
- <put name="styles" value="/theme/css-sidebar-high.jsp" />
+ <put name="styles" value="/theme/empty.jsp" />
<put name="messages" value="/theme/messages.jsp" />
<put name="content" value="${content}" />
<put name="sidebar" value="/theme/empty.jsp" />
@@ -93,17 +92,17 @@
<definition name=".WeblogEdit" extends=".tiles-editorpage" >
<put name="content" value="/weblog/WeblogEdit.jsp" />
<put name="sidebar" value="/weblog/WeblogEditSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".WeblogQuery" extends=".tiles-editorpage" >
<put name="content" value="/weblog/WeblogQuery.jsp" />
<put name="sidebar" value="/weblog/WeblogQuerySidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".CategoriesForm" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CategoriesForm.jsp" />
<put name="sidebar" value="/weblog/CategoriesSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".referers" extends=".tiles-editorpage" >
<put name="content" value="/weblog/referers.jsp" />
@@ -111,7 +110,7 @@
<definition name=".BookmarksForm" extends=".tiles-editorpage" >
<put name="content" value="/bookmarks/BookmarksForm.jsp" />
<put name="sidebar" value="/bookmarks/BookmarksSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".upload-file" extends=".tiles-editorpage" >
<put name="content" value="/website/upload-file.jsp" />
@@ -147,12 +146,12 @@
<definition name=".edit-pages" extends=".tiles-editorpage" >
<put name="content" value="/website/edit-pages.jsp" />
<put name="sidebar" value="/website/edit-pages-sidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".MemberPermissions" extends=".tiles-editorpage" >
<put name="content" value="/website/MemberPermissions.jsp" />
<put name="sidebar" value="/website/MemberPermissionsSidebar.jsp" />
- <put name="styles" value="/theme/css-sidebar-low.jsp" />
+ <put name="styles" value="/theme/css-sidebar.jsp" />
</definition>
<definition name=".CustomPingTargets" extends=".tiles-editorpage" >
<put name="content" value="/weblog/CustomPingTargets.jsp" />
@@ -228,9 +227,6 @@
</definition>
<definition name=".error" extends=".tiles-simplepage" >
<put name="content" value="/error.jsp" />
-</definition>
-<definition name=".login" extends=".tiles-simplepage" >
- <put name="content" value="/login.jsp" />
</definition>
<definition name=".error403" extends=".tiles-simplepage" >
<put name="content" value="/error403.jsp" />
Modified: incubator/roller/branches/roller_2.0/web/main.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Fri Sep 16 13:49:53 2005
@@ -52,7 +52,6 @@
</div>
</c:forEach>
- <br />
</c:if>
<c:forEach var="post" items="${recentPosts}">
Modified: incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/bannerStatus.jsp Fri Sep 16 13:49:53 2005
@@ -18,7 +18,7 @@
<% } %>
<c:if test="${!empty model.website}" >
- | <fmt:message key="mainPage.currentWebsite" />
+ - <fmt:message key="mainPage.currentWebsite" />
<b><a href='<c:out value="${model.baseURL}" />/page/<c:out value="${model.website.handle}" />'>
<c:out value="${model.website.handle}" />
</a></b>
Modified: incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/colors.css?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/blue/colors.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/blue/colors.css Fri Sep 16 13:49:53 2005
@@ -65,16 +65,18 @@
div.controlToggle {
background: url("two-togglegrey.png") repeat-x top;
}
-div.entryTitleBox {
- background: #9192b0;
- color: white;
-}
div.entryBox {
- border: 1px #9192b0 solid;
+ border-bottom: 1px #573dea solid;
+ background: #e5e5e5;
+ margin: 0px 0px 0px 0px;
+}
+div.entryTitleBox {
+ padding: 4px;
+ font-size: medium;
}
div.entryBoxPinned {
background: #e5e5e5;
- border: 1px #c0c0c0 solid;
+ border-bottom: 1px #573dea solid;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
color: #573dea;
Added: incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp?rev=289650&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp Fri Sep 16 13:49:53 2005
@@ -0,0 +1,11 @@
+#centercontent {
+ margin: 15px 260px 0px 15px;
+}
+#rightcontent {
+ position: absolute;
+ top: 130px;
+ right: 15px;
+ width: 230px;
+}
+
+
Modified: incubator/roller/branches/roller_2.0/web/theme/layout.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/layout.css?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Fri Sep 16 13:49:53 2005
@@ -6,7 +6,7 @@
width: 100%;
}
#banner {
- height: 105px;
+ height: 30px;
margin: 0px;
padding: 0px 0px 0px 0px;
}
@@ -18,7 +18,7 @@
}
#rightcontent {
position: absolute;
- top: 120px;
+ top: 40px;
right: 15px;
width: 230px;
}
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=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Fri Sep 16 13:49:53 2005
@@ -115,7 +115,7 @@
}
div.entryBoxPinned {
padding: 4px;
- margin: 4px 0px 4px 0px;
+ margin: 0px 0px 0px 0px;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
font-size: small;
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=289650&r1=289649&r2=289650&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 Fri Sep 16 13:49:53 2005
@@ -11,13 +11,13 @@
background: url("two-banner.gif") repeat-x top;
}
.sidebarfade {
- background: url("two-sidebarfade.gif") repeat-x bottom;
+ background: #f5f0e6;
}
.sidebarfade_hotblogs {
- background: url("two-sidebarfade.gif") repeat-x bottom;
+ background: #f5f0e6;
}
.sidebarfade_search {
- background: url("two-sidebarfade.gif") repeat-x bottom;
+ background: #f5f0e6;
}
.bannerStatusBox {
background: #ad3431;
@@ -68,15 +68,21 @@
background: url("two-togglegrey.gif") repeat-x top;
}
div.entryTitleBox {
- background: #c6ab74;
color: white;
+ background: #c6ab74;
}
div.entryBox {
- border: 1px #c6ab74 solid;
+ border-bottom: 1px #c8af7b solid;
+ background: #f5f0e6;
+ margin: 0px 0px 0px 0px;
+}
+div.entryTitleBox {
+ padding: 4px;
+ font-size: medium;
}
div.entryBoxPinned {
- background: #e5e5e5;
- border: 1px #c0c0c0 solid;
+ background: #f5f0e6;
+ border-bottom: 1px #c8af7b solid;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
color: #ad3537;
Modified: incubator/roller/branches/roller_2.0/web/theme/tan/two-banner.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/two-banner.gif?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-frontpage.jsp Fri Sep 16 13:49:53 2005
@@ -16,12 +16,21 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<tiles:insert attribute="head" />
<style type="text/css">
+#centercontent {
+ margin: 15px 260px 0px 15px;
+}
+#rightcontent {
+ position: absolute;
+ top: 120px;
+ right: 15px;
+ width: 230px;
+}
.menuItemTable {
width: 100%;
height: 2px;
padding: 0px 0px 0px 10px;
}
- <tiles:insert attribute="styles" />
+<tiles:insert attribute="styles" />
</style>
</head>
<body>
Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp Fri Sep 16 13:49:53 2005
@@ -5,13 +5,19 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<tiles:insert attribute="head" />
<style type="text/css">
+<tiles:insert attribute="styles" />
label.formrow {
float: left;
text-align: right;
width: 30%;
padding-right: 1em;
}
-<tiles:insert attribute="styles" />
+#rightcontent {
+ position: absolute;
+ top: 40px;
+ right: 15px;
+ width: 230px;
+}
</style>
</head>
<body>
@@ -19,7 +25,6 @@
<div id="wrapper">
<div id="banner">
- <tiles:insert attribute="banner" />
<tiles:insert attribute="bannerStatus" />
</div>
Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-simplepage.jsp Fri Sep 16 13:49:53 2005
@@ -5,9 +5,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<tiles:insert attribute="head" />
<style type="text/css">
-#banner {
- height: 30px;
-}
<tiles:insert attribute="styles" />
</style>
</head>
Modified: incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp?rev=289650&r1=289649&r2=289650&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/tiles-tabbedpage.jsp Fri Sep 16 13:49:53 2005
@@ -5,9 +5,6 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<tiles:insert attribute="head" />
<style type="text/css">
-#banner {
- height: 30px;
-}
<tiles:insert attribute="styles" />
</style>
</head>