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 18:51:35 UTC
svn commit: r289607 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/velocity/ web/WEB-INF/classes/ web/bookmarks/
web/theme/ web/theme/blue/ web/weblog/
Author: snoopdave
Date: Fri Sep 16 09:51:14 2005
New Revision: 289607
URL: http://svn.apache.org/viewcvs?rev=289607&view=rev
Log:
Style/layout tweaks and fixups for blue theme
Removed:
incubator/roller/branches/roller_2.0/web/theme/blue/two-bigbadge-shadow.png
incubator/roller/branches/roller_2.0/web/theme/blue/two-bigbadge.png
incubator/roller/branches/roller_2.0/web/theme/blue/two-sidebarfade.png
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm
incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
incubator/roller/branches/roller_2.0/web/theme/blue/colors.css
incubator/roller/branches/roller_2.0/web/theme/blue/menutab-sel.png
incubator/roller/branches/roller_2.0/web/theme/blue/menutab-unsel.png
incubator/roller/branches/roller_2.0/web/theme/blue/two-banner.png
incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp
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/weblog/CategoriesForm.jsp
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/velocity/ContextLoader.java Fri Sep 16 09:51:14 2005
@@ -442,6 +442,9 @@
if ("Roller-based Site".equals(siteName)) siteName = "Main";
ctx.put("siteName", siteName);
+ String siteShortName = ((RollerPropertyData)props.get("site.shortName")).getValue();
+ ctx.put("siteShortName", siteShortName);
+
// add language of the session (using locale of viewer set by Struts)
ctx.put(
"viewLocale",
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=289607&r1=289606&r2=289607&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 09:51:14 2005
@@ -1418,7 +1418,7 @@
yourWebsites.newEntry=New Entry
yourWebsites.editEntries=Edit Entries
-yourWebsites.manage=Manage
+yourWebsites.manage=Settings
yourWebsites.createWeblog=Create new weblog
yourWebsites.createWeblog.desc=\
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/navbar.vm Fri Sep 16 09:51:14 2005
@@ -56,14 +56,9 @@
#macro( showNavBar2 $vertical $delimiter $useCSS)
#set( $container = "div" )
#if ( $useCSS ) #set( $container = "ul" ) #end
- #set( $rawUrl = "$ctxPath/page/$userName" )
+ #set( $rawUrl = "$ctxPath/page/$website.handle" )
<$container class="rNavigationBar">
- #if ($siteName=="Main")
- #set( $mainUrl = "$ctxPath?rmk=tabbedmenu.main&rmik=tabbedmenu.main" )
- #printNavLink( $mainUrl $text.get("navigationBar.main") $useCSS $vertical "" )
- #else
- #printNavLink( "$ctxPath/" $siteName $useCSS $vertical "" )
- #end
+ #printNavLink( "$ctxPath/" $siteShortName $useCSS $vertical "" )
#if( $website )
#foreach( $iPage in $pages )
#set( $invisible = $iPage.Name.startsWith("_") )
Modified: incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksForm.jsp Fri Sep 16 09:51:14 2005
@@ -89,8 +89,9 @@
<html:options collection="allFolders"
property="id" labelProperty="path"/>
</html:select>
-
<p />
+
+<br />
<table class="rollertable">
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=289607&r1=289606&r2=289607&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 09:51:14 2005
@@ -5,56 +5,62 @@
/* add colors and images to roller.css */
#logobackground {
- background: #00038a !important;
+ background: #573dea !important;
}
.bannerBox {
background: url("two-banner.png") repeat-x top;
}
.sidebarfade {
- background: url("two-sidebarfade.png") repeat-x top;
+ background: #e5e5e5;
+}
+.sidebarfade_hotblogs {
+ background: #e5e5e5;
+}
+.sidebarfade_search {
+ background: #e5e5e5;
}
.bannerStatusBox {
- background: #00038a;
- color: white;
+ background: #e5e5e5;
+ color: #573dea;
}
.bannerStatusBox a {
- color: white;
+ color: #573dea;
}
.bannerStatusBox a:link {
- color: white;
+ color: #573dea;
}
.bannerStatusBox a:visited {
- color: white;
+ color: #573dea;
}
h1 {
- color: #00038a;
+ color: #432eb3;
}
h2 {
- color: #00038a;
+ color: #432eb3;
}
h3 {
- color: #00038a;
+ color: #432eb3;
}
a:link {
- color: #00038a;
+ color: #573dea;
}
a:visited {
- color: #00038a;
+ color: #573dea;
}
table.rollertable th, table.rollertable th {
- background: #00038a;
+ background: #573dea;
}
table.rollertable td, table.rollertable tbody td {
- border: 1px solid #00038a;
+ border: 1px solid #573dea;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
color: black;
}
div.centerTitle {
- background: #9192b0;
+ background: #e5e5e5;
}
div.control {
- background: #9192b0;
+ background: #e5e5e5;
}
div.controlToggle {
background: url("two-togglegrey.png") repeat-x top;
@@ -71,12 +77,12 @@
border: 1px #c0c0c0 solid;
}
a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- color: #00038a;
+ color: #573dea;
font-size: medium;
font-weight: bold;
}
div.yourWeblogBox {
- border-top: 1px #00038a solid;
+ border-top: 1px #573dea solid;
}
/* ------------------------------------------------------------------------ */
@@ -89,7 +95,7 @@
background: url("menutab-unsel.png");
}
.menuItemTable {
- background-color: #00038a;
+ background-color: #573dea;
color: white;
}
td.menuTabSelected a:link, td.menuTabSelected a:visited, td.menuTabSelected a:hover, td.menuTabSelected a:active {
Modified: incubator/roller/branches/roller_2.0/web/theme/blue/menutab-sel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/menutab-sel.png?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/blue/menutab-unsel.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/menutab-unsel.png?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/blue/two-banner.png
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/blue/two-banner.png?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/css-sidebar-low.jsp Fri Sep 16 09:51:14 2005
@@ -4,7 +4,7 @@
}
#rightcontent {
position: absolute;
- top: 140px;
+ top: 135px;
right: 15px;
width: 230px;
}
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=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Fri Sep 16 09:51:14 2005
@@ -24,6 +24,7 @@
td div.menu-tr div.menu-tl a {
display: table-cell;
vertical-align: middle;
+ padding: 0px 5px 0px 5px;
}
/* ----------------------------------------------------------------------
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=289607&r1=289606&r2=289607&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 09:51:14 2005
@@ -493,7 +493,7 @@
text-style: italics;
}
.yourWeblogBox {
- width: 80%;
+ width: 95%;
padding: 4px;
margin: 4px 0px 4px 0px;
}
Modified: incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp?rev=289607&r1=289606&r2=289607&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesForm.jsp Fri Sep 16 09:51:14 2005
@@ -85,6 +85,8 @@
<p />
+<br />
+
<table class="rollertable">
<tr class="rollertable">