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 05:09:23 UTC
svn commit: r291065 - in /incubator/roller/branches/roller_2.0/web: ./
WEB-INF/ WEB-INF/classes/ bookmarks/ planet/ theme/ theme/blue/ theme/sun/
theme/tan/ weblog/ website/
Author: snoopdave
Date: Thu Sep 22 20:08:58 2005
New Revision: 291065
URL: http://svn.apache.org/viewcvs?rev=291065&view=rev
Log:
UI style/layout tweaks
Added:
incubator/roller/branches/roller_2.0/web/theme/footerMain.jsp
incubator/roller/branches/roller_2.0/web/theme/title.jsp
Modified:
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/log4j.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/tiles-defs.xml
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp
incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
incubator/roller/branches/roller_2.0/web/main.jsp
incubator/roller/branches/roller_2.0/web/planet/planet-sidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/footer.jsp
incubator/roller/branches/roller_2.0/web/theme/layout.css
incubator/roller/branches/roller_2.0/web/theme/menu.css
incubator/roller/branches/roller_2.0/web/theme/roller.css
incubator/roller/branches/roller_2.0/web/theme/search.jsp
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/theme/tiles-frontpage.jsp
incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
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/WeblogQuery.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/YourProfile.jsp
incubator/roller/branches/roller_2.0/web/website/YourWebsites.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/WEB-INF/classes/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties?rev=291065&r1=291064&r2=291065&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 Thu Sep 22 20:08:58 2005
@@ -557,8 +557,8 @@
mainPage.pinnedEntries=Featured Weblog Entries
mainPage.category=Category
mainPage.read=Read
-mainPage.hotWeblogs=Hot Weblogs
-mainPage.searchWeblogs=Search Weblogs
+mainPage.hotWeblogs=Hot Blogs : Daily Hits
+mainPage.searchWeblogs=Search for blogs
mainPage.searchButton=Search
mainPage.hits=hits
mainPage.link=Link
@@ -983,7 +983,7 @@
tabbedmenu.admin.planetGroups=Custom Groups
-tabbedmenu.planet.localEntries=Recent Entries
+tabbedmenu.planet.localEntries=Recent Posts
tabbedmenu.planet.planetEntries=Planet
# ------------------------------------------------------------------------ Theme
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/log4j.properties?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/log4j.properties (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/log4j.properties Thu Sep 22 20:08:58 2005
@@ -9,6 +9,7 @@
# Options are: DEBUG, INFO, WARN, ERROR, FATAL
log4j.category.org.roller=INFO
+log4j.category.org.roller.presentation.atomapi04=DEBUG
log4j.category.com.ecyrd.jspwiki=ERROR
log4j.category.com.opensymphony.oscache=ERROR
log4j.category.org.hibernate=ERROR
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=291065&r1=291064&r2=291065&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 Thu Sep 22 20:08:58 2005
@@ -6,13 +6,14 @@
<definition name=".tiles-frontpage" path="/theme/tiles-frontpage.jsp">
<put name="banner" value="/theme/banner.jsp" />
+ <put name="title" value="/theme/title.jsp" />
<put name="bannerStatus" value="/theme/bannerStatus.jsp" />
<put name="head" value="/theme/head.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" />
- <put name="footer" value="/theme/footer.jsp" />
+ <put name="footer" value="/theme/footerMain.jsp" />
</definition>
<definition name=".tiles-mainmenupage" path="/theme/tiles-mainmenupage.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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,9 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
@@ -32,7 +31,6 @@
<br />
<br />
- </div>
</div>
</div>
</div>
Modified: incubator/roller/branches/roller_2.0/web/main-sidebar.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/main-sidebar.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Thu Sep 22 20:08:58 2005
@@ -1,34 +1,31 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade_hotblogs">
+<div class="sidebarBodyHead">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
-
- <h3><fmt:message key="mainPage.hotWeblogs" /></h3>
- <hr size="1" noshade="noshade" />
-
- <c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
- <ul style="list-style-type:none; padding-left:2px; margin: 0px">
- <c:forEach var="site" items="${popularWebsites}">
- <li style="list-style-type:none; padding-left:2px; margin: 0px">
- <a href='<c:out value="${baseURL}" />/page/<c:out value="${site.userName}" />'
- title='<c:out value="${site.userName}" />' >
- <str:truncateNicely lower="45"
- upper="45" ><c:out
- value="${site.websiteName}" /></str:truncateNicely></a>:
- <c:out value="${site.hits}" /> <fmt:message key="mainPage.hits" />
- </li>
- </c:forEach>
- </ul>
- </c:if>
-
- <br />
-
- </div>
+ <h3><fmt:message key="mainPage.hotWeblogs" /></h3>
</div>
</div>
</div>
+
+<div class="sidebarBody">
+ <c:if test="${not empty popularWebsites}"> <%-- to prevent invalid XHTML --%>
+ <ul>
+ <c:forEach var="site" items="${popularWebsites}">
+ <li>
+ <a href='<c:out value="${baseURL}" />/page/<c:out value="${site.userName}" />'
+ title='<c:out value="${site.userName}" />' >
+ <str:truncateNicely lower="45"
+ upper="45" ><c:out
+ value="${site.websiteName}" /></str:truncateNicely></a>:
+ <c:out value="${site.hits}" /> <fmt:message key="mainPage.hits" />
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+ <br />
+</div>
+
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=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main.jsp Thu Sep 22 20:08:58 2005
@@ -20,6 +20,9 @@
</div>
</c:if>
+<div class="entriesBox">
+<div class="entriesBoxInner">
+
<c:if test="${!empty pinnedPosts}">
<c:forEach var="post" items="${pinnedPosts}">
@@ -29,15 +32,17 @@
<str:truncateNicely upper="90" >
<c:out value="${post.displayTitle}" />
</str:truncateNicely></a>
- </a><br />
+ </a>
+ <br />
<span class="entryDetails">
<a href='<c:out value="${baseURL}" />/page/<c:out value="${post.website.handle}" />' class="entryDetails">
+
<str:truncateNicely upper="50" >
<c:out value="${post.website.name}" />
</str:truncateNicely></a> |
- <c:out value="${post.category.path}" /> |
+ <c:out value="${post.category.name}" /> |
<fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" /> |
<fmt:message key="mainPage.postedBy" />
<c:out value="${post.creator.userName}" />
@@ -47,8 +52,7 @@
<br />
</span>
-
- <roller:ApplyPlugins name="post" scope="page" maxLength="250" skipFlag="true" />
+ <roller:ApplyPlugins name="post" scope="page" skipFlag="false" />
</div>
</c:forEach>
@@ -65,12 +69,11 @@
</a><br />
<span class="entryDetails">
-
- <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.website.handle}" />' class="entryDetails">
+ <a href='<c:out value="${baseURL}" />/page/<c:out value="${post.website.handle}" />'>
<str:truncateNicely upper="50" >
<c:out value="${post.website.name}" />
</str:truncateNicely></a> |
- <c:out value="${post.category.path}" /> |
+ <c:out value="${post.category.name}" /> |
<fmt:formatDate value="${post.pubTime}" type="both" dateStyle="medium" timeStyle="medium" /> |
<fmt:message key="mainPage.postedBy" />
<c:out value="${post.creator.userName}" />
@@ -78,14 +81,18 @@
| <a href='<c:out value="${post.link}" />' class="entryDetails"><fmt:message key="mainPage.link" /></a>
</c:if>
<br />
-
</span>
-
- <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="200" skipFlag="true" />
-
+
+ <span class="entryDescription">
+ <roller:ApplyPlugins name="post" scope="page" stripHtml="true" maxLength="120" skipFlag="true" />
+ </span>
+
</div>
</c:if>
</c:forEach>
+
+</div> <!-- entriesBoxInner -->
+</div> <!-- entriesBox -->
<br />
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,38 +1,38 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarBodyHead">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
-
- <h3><fmt:message key="planet.rankings" /></h3>
- <hr size="1" noshade="noshade" />
-
- <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}">
- <li style="list-style-type:none; padding-left:2px; margin: 0px">
- <a href='<c:out value="${blog.siteUrl}" />'
- title='<c:out value="${blog.title}" />' >
- <str:left count="120" >
- <str:removeXml>
- <c:out value="${blog.title}" />
- </str:removeXml>
- </str:left>...
- </a>:
- <c:out value="${blog.inboundlinks}" />
- <fmt:message key="planet.links" />
- </li>
- </c:forEach>
- </ul>
- </c:if>
-
- <br />
-
- </div>
+ <h3><fmt:message key="planet.rankings" /></h3>
</div>
</div>
</div>
+
+<div class="sidebarBody">
+
+ <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}">
+ <li style="list-style-type:none; padding-left:2px; margin: 0px">
+ <a href='<c:out value="${blog.siteUrl}" />'
+ title='<c:out value="${blog.title}" />' >
+ <str:left count="120" >
+ <str:removeXml>
+ <c:out value="${blog.title}" />
+ </str:removeXml>
+ </str:left>...
+ </a>:
+ <c:out value="${blog.inboundlinks}" />
+ <fmt:message key="planet.links" />
+ </li>
+ </c:forEach>
+ </ul>
+ </c:if>
+
+ <br />
+
+</div>
+
<br />
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=291065&r1=291064&r2=291065&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 Thu Sep 22 20:08:58 2005
@@ -10,17 +10,17 @@
.bannerBox {
background: url("two-banner.png") repeat-x top;
}
-.sidebarfade {
- background: #e5e5e5;
+.sidebarFade {
+ background: #e3e3e3;
}
-.sidebarfade_hotblogs {
- background: #e5e5e5;
+.sidebarFade_hotblogs {
+ background: #e3e3e3;
}
-.sidebarfade_search {
- background: #e5e5e5;
+.sidebarFade_search {
+ background: #e3e3e3;
}
.bannerStatusBox {
- background: #e5e5e5;
+ background: #e3e3e3;
color: #573dea;
}
.bannerStatusBox a {
@@ -57,17 +57,17 @@
color: black;
}
div.centerTitle {
- background: #e5e5e5;
+ background: #e3e3e3;
}
div.control {
- background: #e5e5e5;
+ background: #e3e3e3;
}
div.controlToggle {
background: url("two-togglegrey.png") repeat-x top;
}
div.entryBox {
border-bottom: 1px #573dea solid;
- background: #e5e5e5;
+ background: #e3e3e3;
margin: 0px 0px 0px 0px;
}
div.entryTitleBox {
@@ -75,7 +75,7 @@
font-size: medium;
}
div.entryBoxPinned {
- background: #e5e5e5;
+ background: #e3e3e3;
border-bottom: 1px #573dea solid;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
Modified: 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=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/css-sidebar.jsp Thu Sep 22 20:08:58 2005
@@ -1,10 +1,10 @@
#centercontent {
- margin: 15px 260px 0px 15px;
+ margin: 15px 260px 0px 10px;
}
#rightcontent {
position: absolute;
top: 130px;
- right: 15px;
+ right: 10px;
width: 230px;
}
Modified: incubator/roller/branches/roller_2.0/web/theme/footer.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footer.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footer.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/footer.jsp Thu Sep 22 20:08:58 2005
@@ -1,12 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<%--
-Default footer for all pages.
-You can override it with your own file via WEB-INF/tiles-def.xml
---%>
-
<a href="http://www.rollerweblogger.org">
- Powered by Roller Weblogger</a> |
+ Powered by Roller Weblogger</a>
+ <%= RollerContext.getRollerContext(request).getRollerVersion() %> |
<a href="http://opensource.atlassian.com/projects/roller/Dashboard.jspa">
<fmt:message key="footer.reportIssue" /></a> |
@@ -19,7 +15,6 @@
<a href="http://sourceforge.net/mail/?group_id=47722">
<fmt:message key="footer.mailingLists" /></a>
-
Added: incubator/roller/branches/roller_2.0/web/theme/footerMain.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/footerMain.jsp?rev=291065&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/footerMain.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/footerMain.jsp Thu Sep 22 20:08:58 2005
@@ -0,0 +1,9 @@
+<%@ include file="/taglibs.jsp" %>
+
+<div style="border-top: 1px solid grey">
+ Powered by <a href="http://www.rollerweblogger.org/">Roller Weblogger</a>
+ Version: <%= RollerContext.getRollerContext(request).getRollerVersion() %>
+</div>
+
+
+
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=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/layout.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/layout.css Thu Sep 22 20:08:58 2005
@@ -10,11 +10,31 @@
margin: 0px;
padding: 0px 0px 0px 0px;
}
+.bannerBox {
+ height: 78px;
+ width: 100%;
+}
+.bannerStatusBox {
+ height: 21px;
+ width: 100%;
+}
+.sidebarBodyHead {
+ height: 25px;
+}
+.searchSidebarHead {
+ height: 5px;
+}
+.searchSidebarBody {
+ margin: 0px 0px 0px 0px;
+}
+.searchSidebarBody input {
+ margin: 5px;
+}
#menu {
- padding: 0px 15px 0px 15px;
+ padding: 0px 10px 0px 10px;
}
#centercontent {
- margin: 15px 15px 0px 15px;
+ margin: 10px 10px 0px 10px;
}
#rightcontent {
position: absolute;
Modified: incubator/roller/branches/roller_2.0/web/theme/menu.css
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/menu.css?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Thu Sep 22 20:08:58 2005
@@ -8,6 +8,7 @@
margin: 0px;
padding: 0px;
height: 100%;
+ width: 100%;
background: url("images/menutab-tl.gif") no-repeat top left;
background-repeat: no-repeat;
vertical-align: middle;
@@ -17,6 +18,7 @@
margin: 0px;
padding: 0px;
height: 100%;
+ width: 100%;
background: url("images/menutab-tr.gif") no-repeat top right;
background-repeat: no-repeat;
}
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -12,12 +12,7 @@
padding: 0px;
font: small Verdana,Arial,Sans-serif;
font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
-}
-p {
- margin: 0px 0px 5px 0px;
- font-size: 1em;
- background: transparent;
- color: #000000;
+ line-height: 1.2em;
}
p.subtitle {
margin: 5px 0px 15px;
@@ -31,20 +26,20 @@
background: transparent;
font-size: 19px;
font-weight: bold;
- margin: 10px 0px;
+ letter-spacing: 0.2em;
}
h2 {
background: transparent;
font-size: large;
font-weight: bold;
+ letter-spacing: 0.2em;
}
h3 {
- font-size: .9em;
- background: transparent;
- font-weight: bold;
- background: url(none);
- padding: 5px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
+ letter-spacing: normal;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ text-decoration: none;
+ margin: 0px;
}
img {
border: 0px;
@@ -76,13 +71,8 @@
Page element styles: boxes and borders, etc.
---------------------------------------------------------------------- */
-.bannerBox {
- height: 78px;
- width: 100%;
-}
-.bannerStatusBox {
- height: 25px;
- width: 100%;
+.bannerStatusBox a, .bannerStatusBox a {
+ font-weight: bold;
}
.bannerLeft {
float: left;
@@ -96,41 +86,72 @@
margin: 10px 0px 0px 0px;
border-top: 1px grey solid;
}
-.sidebarfade, .sidebarfade_hotblogs, .sidebarfade_search, {
+.sidebarFade, .sidebarFade_hotblogs, .sidebarFade_search, {
padding: 0px;
width: 100%;
}
-.sidebarBody {
- margin: 10px;
+.sidebarBodyHead h3, .sidebarBodyHead p, .sidebarFade h3, .sidebarFade p {
+ padding: 0px 4px 0px 4px;
+}
+.sidebarBody ul {
+ margin: 0px;
+ padding-left: 0.5em;
+}
+.sidebarBody li {
+ list-style-position: inside;
+ list-style-image: url(images/dash.gif);
+ margin-left: 0em;
+ padding-left: 0.5em;
+}
+div.entriesBoxInner {
+ padding: 5px;
}
div.entryTitleBox {
padding: 4px;
margin: 4px 0px 4px 0px;
font-size: medium;
}
-div.entryBox {
- padding: 4px;
- margin: 4px 0px 4px 0px;
- /* line-height: 1.2em; */
+div.entryBox, div.entryBoxPinned {
+ font-family: Arial, Helvetica, sans-serif;
+ border-bottom-width: thin;
+ border-bottom-style: solid;
+ padding: 3px 0px 3px 0px;
}
div.entryBoxPinned {
- padding: 4px;
- margin: 0px 0px 0px 0px;
}
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- font-size: small;
- font-weight: bold;
+.entryTitle {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ text-decoration: none;
+}
+.entryDetails {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ text-decoration: none;
+}
+.entryDescription {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ text-decoration: none;
}
span.hotBlogs, a.hotBlogs, a:active.hotBlogs, a:visited.hotBlogs, ul.hotBlogs {
font-size: small;
padding-left: 0px;
list-style-type: none
}
-span.entryDetails, a.entryDetails, a:active.entryDetails, a:visited.entryDetails {
- font-size: small;
- color: grey;
+input.searchButton {
+ cursor: hand;
+ font-family: lucida,arial,sans-serif;
+ height: 1.4em;
+ font-weight: bold;
+ font-size: 11px;
+ padding: 0px 0px 2px 0px;
+ margin: 5px;
+ border: 0px none #000;
}
+
/* ----------------------------------------------------------------------
form layout styles
---------------------------------------------------------------------- */
@@ -170,7 +191,7 @@
vertical-align: top;
border-style: solid;
border-width: 0px 0px 1px 0px;
- border-color: #e5e5e5;
+ border-color: #e3e3e3;
padding: 4px 10px 4px 10px;
}
.formtable td.label {
@@ -505,6 +526,7 @@
p.websiteDescription {
text-style: italics;
+ font-size: 11px;
}
.version {
font-size: small;
Modified: incubator/roller/branches/roller_2.0/web/theme/search.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/search.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/search.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/search.jsp Thu Sep 22 20:08:58 2005
@@ -1,38 +1,36 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade_search">
+<div class="searchSidebarHead">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
-
- <h3><fmt:message key="mainPage.searchWeblogs" /></h3>
- <hr size="1" noshade="noshade" />
-
- <form id="searchForm" method="get"
- action="<c:out value="${baseURL}" />/search"
- style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
- <input type="text" id="q" name="q" size="20"
- maxlength="255" value="<c:out value="${param.q}" />" />
- <input type="submit" value="<fmt:message key="mainPage.searchButton" />" />
- </form>
- <script type="text/javascript">
- // <!--
- function validateSearch(form) {
- if (form.q.value == "") {
- alert("Please enter a search term to continue.");
- form.q.focus();
- return false;
- }
- return true;
- }
- // -->
- </script>
-
- <br />
-
- </div>
+ <h3> </h3>
</div>
</div>
</div>
-<br />
+<div class="searchSidebarBody">
+
+ <h3><fmt:message key="mainPage.searchWeblogs" /></h3>
+
+ <form id="searchForm" method="get"
+ action="<c:out value="${baseURL}" />/search"
+ style="margin: 0; padding: 0" onsubmit="return validateSearch(this)">
+ <input type="text" id="q" name="q" size="20"
+ maxlength="255" value="<c:out value="${param.q}" />" />
+ <input value=" ยป " class="searchButton" type="submit">
+ </form>
+ <script type="text/javascript">
+ // <!--
+ function validateSearch(form) {
+ if (form.q.value == "") {
+ alert("Please enter a search term to continue.");
+ form.q.focus();
+ return false;
+ }
+ return true;
+ }
+ // -->
+ </script>
+
+</div>
+
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -10,19 +10,16 @@
.bannerBox {
background: url("two-banner.gif") repeat-x top;
border-bottom: 2px black solid;
-}
-.sidebarfade {
- background: url("two-sidebarfade.gif") repeat-x bottom;
-}
-.sidebarfade_hotblogs {
- background: #dee7ef;
-}
-.sidebarfade_search {
- background: url("two-sidebarfade-search.gif") repeat-x bottom;
+ color: #666666;
}
.bannerStatusBox {
- color: #31556b;
- background: #dee7ef;
+ background: #ccdae3;
+ border-top: 2px black solid;
+ color: #666666;
+}
+#footer {
+ border: none;
+ color: #5d7992;
}
h1 {
color: #e77100;
@@ -37,11 +34,20 @@
color: #505050;
font-size: 120%;
}
+a {
+ color: #35556B;
+}
a:link {
- color: #31556b;
+ color: #35556B;
}
a:visited {
- color: #31556b;
+ color: #35556B;
+}
+a:hover {
+ color: #35556B;
+}
+a:active {
+ color: #35556B;
}
table.rollertable th, table.rollertable th {
background: #52829c;
@@ -49,9 +55,6 @@
table.rollertable td, table.rollertable tbody td {
border: 1px solid #52829c;
}
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- color: black;
-}
div.centerTitle {
background: #dee7ef;
}
@@ -61,30 +64,54 @@
div.controlToggle {
background: url("two-togglegrey.gif") repeat-x top;
}
+div.entriesBox {
+ background: #e3e3e3;
+}
div.entryTitleBox {
- color: white;
+ color: #35556B;
+ background: #dee7ef;
}
div.entryBox {
- border-bottom: 1px grey solid;
- background: #e7e3e7;
- margin: 0px 0px 0px 0px;
-}
-div.entryTitleBox {
- padding: 4px;
- font-size: medium;
+ border-bottom: 1px #999999 solid;
}
div.entryBoxPinned {
- background: #e5e5e5;
- border: 1px #c0c0c0 solid;
+ border-bottom: 1px grey solid;
+}
+.entryDetails {
+ color: #666666;
}
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- color: #52829c;
+.entryDescription {
+ color: black;
}
div.yourWeblogBox {
border-top: 1px grey solid;
}
td.actions {
background: #e9e9e9;
+}
+.sidebarBodyHead {
+ background: #3d5c71;
+ color: white;
+}
+.searchSidebarBodyHead h3 {
+ color: black;
+}
+.sidebarBodyHead h3 {
+ color: white;
+}
+.sidebarFade, div.sidebarBody {
+ background: #ccdae3;
+ color: #666666;
+}
+.searchSidebarHead {
+ background: #d1d766;
+}
+.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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -10,13 +10,13 @@
.bannerBox {
background: url("two-banner.gif") repeat-x top;
}
-.sidebarfade {
+.sidebarFade {
background: #f5f0e6;
}
-.sidebarfade_hotblogs {
+.sidebarFade_hotblogs {
background: #f5f0e6;
}
-.sidebarfade_search {
+.sidebarFade_search {
background: #f5f0e6;
}
.bannerStatusBox {
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=291065&r1=291064&r2=291065&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 Thu Sep 22 20:08:58 2005
@@ -17,12 +17,12 @@
<tiles:insert attribute="head" />
<style type="text/css">
#centercontent {
- margin: 15px 260px 0px 15px;
+ margin: 15px 260px 0px 10px;
}
#rightcontent {
position: absolute;
- top: 120px;
- right: 15px;
+ top: 150px;
+ right: 10px;
width: 230px;
}
.menuItemTable {
@@ -46,8 +46,7 @@
</div>
<div id="centercontent">
- <h1><c:out value="${siteTitle}" /></h1>
- <p class="subtitle"><c:out value="${siteDescription}" /></p>
+ <tiles:insert attribute="title" />
<c:choose>
<c:when test="${planetEnabled}">
<roller:Menu model="planet-menu.xml" view="/menu-tabbed.vm" />
@@ -63,6 +62,7 @@
<div id="rightcontent">
<tiles:insert attribute="search" />
+ <br />
<tiles:insert attribute="sidebar" />
</div>
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=291065&r1=291064&r2=291065&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 Thu Sep 22 20:08:58 2005
@@ -13,12 +13,12 @@
padding-right: 1em;
}
#centercontent {
- margin: 15px 260px 0px 15px;
+ margin: 15px 260px 0px 10px;
}
#rightcontent {
position: absolute;
top: 40px;
- right: 15px;
+ right: 10px;
width: 230px;
}
</style>
Added: incubator/roller/branches/roller_2.0/web/theme/title.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/title.jsp?rev=291065&view=auto
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/title.jsp (added)
+++ incubator/roller/branches/roller_2.0/web/theme/title.jsp Thu Sep 22 20:08:58 2005
@@ -0,0 +1,3 @@
+<%@ include file="/taglibs.jsp" %>
+<h1><c:out value="${siteTitle}" /></h1>
+<p class="subtitle"><c:out value="${siteDescription}" /></p>
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,9 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
@@ -20,7 +19,6 @@
<br />
- </div>
</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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -5,18 +5,17 @@
WeblogEntryPageModel model = (WeblogEntryPageModel)request.getAttribute("model");
%>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="weblogEdit.pendingEntries" /></h3>
<c:if test="${empty model.recentPendingEntries}">
- <fmt:message key="application.none" />
+ <span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPendingEntries}">
- <roller:link page="/editor/weblog.do">
+ <span><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -26,7 +25,7 @@
<str:truncateNicely lower="50">
<c:out value="${post.title}" />
</str:truncateNicely>
- </roller:link>
+ </roller:link></span>
<br />
</c:forEach>
@@ -35,10 +34,10 @@
<h3><fmt:message key="weblogEdit.draftEntries" /></h3>
<c:if test="${empty model.recentDraftEntries}">
- <fmt:message key="application.none" />
+ <span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentDraftEntries}">
- <roller:link page="/editor/weblog.do">
+ <span><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -48,7 +47,7 @@
<str:truncateNicely lower="50">
<c:out value="${post.title}" />
</str:truncateNicely>
- </roller:link>
+ </roller:link></span>
<br />
</c:forEach>
@@ -59,10 +58,10 @@
<h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
<c:if test="${empty model.recentPublishedEntries}">
- <fmt:message key="application.none" />
+ <span><fmt:message key="application.none" /></span>
</c:if>
<c:forEach var="post" items="${model.recentPublishedEntries}">
- <roller:link page="/editor/weblog.do">
+ <span><roller:link page="/editor/weblog.do">
<roller:linkparam
id="<%= RollerRequest.WEBLOGENTRYID_KEY %>"
name="post" property="id" />
@@ -72,14 +71,13 @@
<str:truncateNicely lower="50">
<c:out value="${post.title}" />
</str:truncateNicely>
- </roller:link>
+ </roller:link></span>
<br />
</c:forEach>
<br />
<br />
- </div>
</div>
</div>
</div>
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuery.jsp Thu Sep 22 20:08:58 2005
@@ -17,6 +17,9 @@
<fmt:message key="weblogEntryQuery.queryResults" />
</div>
+<div class="entriesBox">
+<div class="entriesBoxInner">
+
<c:forEach var="post" items="${model.recentWeblogEntries}">
<div class="entryBox">
@@ -52,6 +55,8 @@
</div>
</c:forEach>
+</div> <!-- entriesBoxInner -->
+</div> <!-- entriesBox -->
<c:if test="${empty model.recentWeblogEntries}" >
<fmt:message key="weblogEntryQuery.noneFound" />
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -5,10 +5,9 @@
WeblogQueryPageModel model = (WeblogQueryPageModel)request.getAttribute("model");
%>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="weblogEntryQuery.sidebarTitle" /></h3>
<hr size="1" noshade="noshade" />
@@ -106,7 +105,6 @@
<br />
<br />
- </div>
</div>
</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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,9 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
<hr size="1" noshade="noshade" />
@@ -19,7 +18,6 @@
<br />
<br />
- </div>
</div>
</div>
</div>
@@ -27,7 +25,7 @@
<br />
<br />
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
<div class="sidebarBody">
Modified: incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourProfile.jsp Thu Sep 22 20:08:58 2005
@@ -1,12 +1,4 @@
<%@ include file="/taglibs.jsp" %>
-<script type="text/javascript">
-<!--
-function cancel() {
- document.userFormEx.method.value="cancel";
- document.userFormEx.submit();
-}
--->
-</script>
<p class="subtitle"><fmt:message key="yourProfile.description" /></p>
@@ -76,8 +68,7 @@
<br />
-<input type="submit" value='<fmt:message key="userSettings.button.save" />'></input>
-<input type="button" value='<fmt:message key="userSettings.button.cancel" />' onclick="cancel()"></input>
+<input type="submit" value='<fmt:message key="userSettings.button.save" />' ></input>
</html:form>
Modified: incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp?rev=291065&r1=291064&r2=291065&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Thu Sep 22 20:08:58 2005
@@ -114,7 +114,7 @@
</td>
- <td class="actions" width="25%" align="left">
+ <td class="actions" width="25%" align="left" style="padding: 4px">
<fmt:message key='yourWebsites.actions' />
<br />
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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,9 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="yourWebsites.actions" /></h3>
<hr size="1" noshade="noshade" />
@@ -44,7 +43,6 @@
<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=291065&r1=291064&r2=291065&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 20:08:58 2005
@@ -1,9 +1,8 @@
<%@ include file="/taglibs.jsp" %>
-<div class="sidebarfade">
+<div class="sidebarFade">
<div class="menu-tr">
<div class="menu-tl">
- <div class="sidebarBody">
<h3><fmt:message key="pagesForm.addNewPage" /></h3>
<hr size="1" noshade="noshade" />
@@ -19,7 +18,6 @@
</html:form>
<br />
- </div>
</div>
</div>
</div>