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/06 15:11:54 UTC
svn commit: r278996 - in /incubator/roller/branches/roller_2.0:
sandbox/standalone/ web/ web/WEB-INF/classes/ web/bookmarks/ web/planet/
web/theme/ web/theme/sun/ web/theme/tan/ web/weblog/ web/website/
Author: snoopdave
Date: Tue Sep 6 06:11:25 2005
New Revision: 278996
URL: http://svn.apache.org/viewcvs?rev=278996&view=rev
Log:
UI styles and layout changes
Modified:
incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
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/planet/planet-sidebar.jsp
incubator/roller/branches/roller_2.0/web/theme/banner.jsp
incubator/roller/branches/roller_2.0/web/theme/head.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/theme/search.jsp
incubator/roller/branches/roller_2.0/web/theme/sun/colors.css
incubator/roller/branches/roller_2.0/web/theme/sun/logo.gif
incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.gif
incubator/roller/branches/roller_2.0/web/theme/tan/colors.css
incubator/roller/branches/roller_2.0/web/theme/tan/logo.gif
incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp
incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.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/sandbox/standalone/build.xml
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml (original)
+++ incubator/roller/branches/roller_2.0/sandbox/standalone/build.xml Tue Sep 6 06:11:25 2005
@@ -57,7 +57,7 @@
<delete dir="./build/roller-demo/webapps/webdav" />
<!-- unzip JSPWiki, unjar its WAR into ./build/roller-demo/webapps -->
- <mkdir dir="./build/roller-demo/webapps/wiki" />
+ <!-- <mkdir dir="./build/roller-demo/webapps/wiki" />
<unzip src="./jspwiki/${jspwiki.filename}" dest="./build" />
<unjar src="./build/JSPWiki/JSPWiki.war"
dest="./build/roller-demo/webapps/wiki" />
@@ -66,11 +66,11 @@
<fileset dir="./jspwiki/default" includes="**/**" />
</copy>
<copy file="./jspwiki/jspwiki.properties" overwrite="true"
- todir="./build/roller-demo/webapps/wiki/WEB-INF" />
+ todir="./build/roller-demo/webapps/wiki/WEB-INF" /> -->
<!-- Roller wiki plugin goes in JSPWiki webapp -->
- <copy file="./build/roller-jspwiki.jar"
- todir="./build/roller-demo/webapps/wiki/WEB-INF/lib" />
+ <!-- <copy file="./build/roller-jspwiki.jar"
+ todir="./build/roller-demo/webapps/wiki/WEB-INF/lib" /> -->
<!-- Copy Roller from its build directory -->
<mkdir dir="./build/roller-demo/webapps/roller" />
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/blacklist.txt Tue Sep 6 06:11:25 2005
@@ -1,8 +1,8 @@
#
# MT-Blacklist Master Copy
#
-# Last update: 2005/08/02 09:08:55
-# Number of entries: 3101
+# Last update: 2005/08/26 10:18:13
+# Number of entries: 3117
#
# This is the master copy of the MT-Blacklist plugin
# spammer blacklist. You can import this file through
@@ -34,6 +34,7 @@
-site.info
.gb.com
.lycos.de
+.static.net
01-beltonen.com
01-klingeltoene.at
01-klingeltoene.de
@@ -565,6 +566,7 @@
calendari-donne.net
calendaridonne.com
calendaridonne.net
+california-real-estate-sale.com
callingcardchoice.com
cambridgetherapynotebook.co.uk
camemberts.org
@@ -767,6 +769,7 @@
creditsharpie.com
crepesuzette.com
crescentarian.net
+crpublish.com
cum-facials.us
cumfiesta-4u.com
cumfietavideos.com
@@ -2054,6 +2057,7 @@
pai-gow-keno.com
painkillersonline.biz
paisleydevelopmentassociation.org
+pamperedchef-online.com
paololinks.porkyhost.com
paperscn.com
paramountseedfarms.net
@@ -2092,6 +2096,8 @@
paysites.info
pc-choices.com
pcdweb.com
+pedronetwork.com
+pedronetwork.com
peepissing.com
penelopeschenk.com
penilestretch.com
@@ -2107,6 +2113,7 @@
personalads.us.com
personales.com
personals-online-personals.com
+personalserotic.com
petlesbians.com
petroglyphx.com
phantadu.de
@@ -2441,10 +2448,14 @@
selectedsex.com
selena-u.ru
selten-angeklickt.de
+semax14.info
+semax15.info
+semax16.info
sempo-tahoe.com
senior.mine.nu
seoy.com
servepics.com
+servicesdating.net
sesso-gratis.cc
sesso-online.net
sessoanalex.com
@@ -2464,6 +2475,7 @@
sex-pussy.us
sex-toys-next-day.com
sex4dollar.com
+sexadultdating.com
sexbrides.com
sexchat.ccx
sexcia.com
@@ -2682,9 +2694,11 @@
swedenet.com
swedenetwork.com
sweet-horny.com
+sweetbuyz.com
sweethotgirls.com
sweetteenbodies.com
swinger-story.blogspot.com
+swingersadult.net
swingersunidos.com
sydney-harbour.info
sylphiel.org
@@ -2852,6 +2866,7 @@
tt7.org
tubegator.com
tuff-enuff.fnpsites.com
+turist.com.pl
tvforum.org
twinky.org
tygef.org
@@ -3030,6 +3045,7 @@
x-video-poker.com
x-video-poker.us
xadulthosting.com
+xadultpersonals.com
xaper.com
xdolar.com
xfreehosting.com
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/menu-tabbed.vm Tue Sep 6 06:11:25 2005
@@ -23,7 +23,7 @@
<table class="menuItemTable" cellspacing="0">
<tr>
- <td>
+ <td class="padleft">
#set( $count = 0 )
#set( $currentMenu = $menuModel.getSelectedMenu( $req ) )
#if( $currentMenu.isPermitted( $req ) )
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/bookmarks/BookmarksSidebar.jsp Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<p>
<%-- Add Bookmark link --%>
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/main-sidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/main-sidebar.jsp Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="mainPage.hotWeblogs" /></h3>
- <hr />
+ <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">
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=278996&r1=278995&r2=278996&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 Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="planet.rankings" /></h3>
- <hr />
+ <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">
Modified: incubator/roller/branches/roller_2.0/web/theme/banner.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/banner.jsp?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/banner.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/banner.jsp Tue Sep 6 06:11:25 2005
@@ -1,7 +1,9 @@
<%@ include file="/taglibs.jsp" %>
+
<%
-String themename = RollerConfig.getProperty("editor.theme");
-String logourl = "/theme/" + themename + "/logo.gif";
+String theme = request.getParameter("theme");
+if (theme == null) theme = RollerConfig.getProperty("editor.theme");
+String logourl = "/theme/" + theme + "/logo.gif";
request.setAttribute("logourl", logourl);
%>
<div class="bannerBox">
Modified: incubator/roller/branches/roller_2.0/web/theme/head.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/head.jsp?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/head.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/head.jsp Tue Sep 6 06:11:25 2005
@@ -3,14 +3,31 @@
You can override it with your own file via WEB-INF/tiles-def.xml
--%>
<%@ include file="/taglibs.jsp" %>
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/theme/layout.css" />
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/theme/roller.css" />
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/theme/menu.css" />
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/theme/calendar.css" />
-<link rel="stylesheet" type="text/css" media="all" href="<%= request.getContextPath() %>/theme/<%= RollerConfig.getProperty("editor.theme") %>/colors.css" />
-<script type="text/javascript" src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/tags/calendar.js"></script>
-<script type="text/javascript" src="<%= request.getContextPath() %>/theme/scripts/overlib.js"><!-- overLIB (c) Erik Bosrup --></script>
+
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/layout.css" />
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/roller.css" />
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/menu.css" />
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/calendar.css" />
+
+<%
+String theme = request.getParameter("theme");
+if (theme == null) theme = RollerConfig.getProperty("editor.theme");
+%>
+<link rel="stylesheet" type="text/css" media="all"
+ href="<%= request.getContextPath() %>/theme/<%= theme %>/colors.css" />
+
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/tags/calendar.js"></script>
+<script type="text/javascript"
+ src="<%= request.getContextPath() %>/theme/scripts/overlib.js">
+ <!-- overLIB (c) Erik Bosrup -->
+</script>
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/menu.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/menu.css Tue Sep 6 06:11:25 2005
@@ -17,20 +17,28 @@
background-repeat: no-repeat;
}
+td.menuTabSelected a, td.menuTabUnselected a {
+ vertical-align: middle;
+ text-align: middle;
+}
+
/* ----------------------------------------------------------------------
Menu tab table (the tabs)
---------------------------------------------------------------------- */
.menuTabTable {
- height: 22px;
+ height: 21px;
}
td.menuTabSeparator {
width: 4px;
}
td.menuTabSelected {
- font-weight: bold;
- padding: 0px;
+ padding-right: 0px;
+ padding-left: 0px;
+ padding-bottom: 0px;
margin: 0px;
+ padding-TOP: 0px;
+ font-weight: bold;
}
td.menuTabUnselected {
padding: 0px 0px 0px 0px;
@@ -42,17 +50,24 @@
---------------------------------------------------------------------- */
.menuItemTable {
+ padding-right: 0px;
+ padding-bottom: 0px;
width: 100%;
+ padding-top: 0px;
height: 25px;
- padding: 0px 0px 0px 10px;
}
.menuItemSelected {
+ padding-right: 1px;
+ padding-left: 1px;
+ padding-bottom: 0px;
+ padding-top: 0px;
font-weight: bold;
- padding: 0px 1px 0px 1px; /* TRBL */
}
.menuItemUnselected {
padding: 0px 1px 0px 1px; /* TRBL */
}
+
+
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/roller.css (original)
+++ incubator/roller/branches/roller_2.0/web/theme/roller.css Tue Sep 6 06:11:25 2005
@@ -5,36 +5,6 @@
and placed in separate colors.css files for different color schemes.
====================================================================== */
-.bannerBox {
- height: 78px;
- width: 100%;
-}
-.bannerStatusBox {
- height: 25px;
- width: 100%;
-}
-.bannerLeft {
- float: left;
- padding: 4px 15px 4px 15px;
-}
-.bannerRight {
- float: right;
- padding: 4px 15px 4px 15px;
-}
-.sidebarfade, .sidebarfade_hotblogs, .sidebarfade_search, {
- padding: 0px;
- width: 100%;
-}
-.sidebarfadeBody {
- padding: 0px 5px 0px 5px;
-}
-#footer {
- border-top: 1px grey solid;
-}
-
-/* ----------------------------------------------------------------------
-General styles
----------------------------------------------------------------------- */
body {
background: white;
@@ -44,22 +14,24 @@
font: small/1.5em Verdana, Arial, Helvetica, sans-serif;
}
p {
+ margin: 0px 0px 0px 0px;
+ font-size: 1em;
background: transparent;
color: #000000;
}
p.subtitle {
- margin: 5px 0px 15px 0px;
- font-size: 120%;
+ margin: 5px 0px 15px;
+ font-size: 1em;
+ font-weight: bold;
}
p.pagetip {
margin: 0px 0px 15px 0px;
}
h1 {
background: transparent;
- /* CUSTOMIZABLE color: #ad3537; */
- font-size: x-large;
+ font-size: 19px;
font-weight: bold;
- margin: 10px 0px 10px 0px;
+ margin: 10px 0px;
}
h2 {
background: transparent;
@@ -67,11 +39,12 @@
font-weight: bold;
}
h3 {
+ font-size: .9em;
background: transparent;
font-weight: bold;
-}
-div.sidebarfade h3, .sidebarfade_hotblogs h3, .sidebarfade_search h3 {
- margin: 0px; padding: 0px;
+ background: url(none);
+ padding: 5px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
}
img {
border: 0px;
@@ -100,6 +73,65 @@
}
/* ----------------------------------------------------------------------
+Page element styles: boxes and borders, etc.
+---------------------------------------------------------------------- */
+
+.bannerBox {
+ height: 78px;
+ width: 100%;
+}
+.bannerStatusBox {
+ height: 25px;
+ width: 100%;
+}
+.bannerLeft {
+ float: left;
+ padding: 4px 15px 4px 15px;
+}
+.bannerRight {
+ float: right;
+ padding: 4px 15px 4px 15px;
+}
+#footer {
+ padding: 10px 0px 0px 0px;
+ border-top: 1px grey solid;
+}
+.sidebarfade, .sidebarfade_hotblogs, .sidebarfade_search, {
+ padding: 0px;
+ width: 100%;
+}
+.sidebarBody {
+ margin: 10px;
+}
+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.entryBoxPinned {
+ padding: 4px;
+ margin: 4px 0px 4px 0px;
+}
+a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
+ font-size: small;
+ font-weight: bold;
+}
+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;
+}
+
+/* ----------------------------------------------------------------------
form layout styles
---------------------------------------------------------------------- */
@@ -181,11 +213,12 @@
}
label.sideformrow {
float: left;
- text-align: right;
+ text-align: left;
width: 30%;
padding-right: 1em;
}
+
/* ----------------------------------------------------------------------
Table styles
---------------------------------------------------------------------- */
@@ -348,6 +381,65 @@
}
/* ----------------------------------------------------------------------
+weblog editor styles
+---------------------------------------------------------------------- */
+
+div.previewEntry {
+ border: 1px solid gray;
+ clear: both;
+ height: 22em;
+ width: 98%;
+ padding: 10px;
+ overflow: auto;
+}
+div.centerTitle {
+ border: 1px solid #ccc;
+ color: black;
+ font-weight: bolder;
+ font-size: large;
+ text-align: center;
+}
+div.control {
+ width: 100%;
+}
+div.controlToggle {
+ width: 100%;
+ height: 20px;
+}
+.control input {
+ margin: 5px;
+}
+a.controlToggle {
+ margin: 5px;
+ padding: 5px;
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+a.controlToggle:link {
+ margin: 5px;
+ padding: 5px;
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+a.controlToggle:visited {
+ margin: 5px;
+ padding: 5px;
+ color: black;
+ background: transparent;
+ text-decoration: none;
+}
+a.controlToggle:hover {
+ margin: 5px;
+ padding: 5px;
+ color: black;
+ background: transparent;
+ text-decoration: underline;
+ font-weight: bold;
+}
+
+/* ----------------------------------------------------------------------
Misc styles
---------------------------------------------------------------------- */
@@ -397,37 +489,6 @@
margin: 2px;
}
-/* ----------------------------------------------------------------------
-Main page styles
----------------------------------------------------------------------- */
-
-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.entryBoxPinned {
- padding: 4px;
- margin: 4px 0px 4px 0px;
-}
-a.entryTitle, a:active.entryTitle, a:visited.entryTitle {
- font-size: small;
- font-weight: bold;
-}
-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;
-}
p.websiteDescription {
text-style: italics;
}
@@ -452,65 +513,10 @@
margin: 30px 10px 10px 0px;
width: 75%;
}
-
-/* ----------------------------------------------------------------------
-weblog editor styles
----------------------------------------------------------------------- */
-
-div.previewEntry {
- border: 1px solid gray;
- clear: both;
- height: 22em;
- width: 98%;
- padding: 10px;
- overflow: auto;
-}
-div.centerTitle {
- border: 1px solid #ccc;
- color: black;
- font-weight: bolder;
- font-size: large;
- text-align: center;
-}
-div.control {
- width: 100%;
-}
-div.controlToggle {
- width: 100%;
- height: 20px;
-}
-.control input {
- margin: 5px;
-}
-a.controlToggle {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:link {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:visited {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: none;
-}
-a.controlToggle:hover {
- margin: 5px;
- padding: 5px;
- color: black;
- background: transparent;
- text-decoration: underline;
- font-weight: bold;
+.padleft {
+ padding-left: 8px;
}
+
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/search.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/search.jsp Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="mainPage.searchWeblogs" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<form id="searchForm" method="get"
action="<c:out value="${baseURL}" />/search"
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=278996&r1=278995&r2=278996&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 Tue Sep 6 06:11:25 2005
@@ -5,7 +5,7 @@
/* add colors and images to roller.css */
.bannerlogo {
- margin: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 5px;
}
.bannerBox {
background: url("two-banner.gif") repeat-x top;
@@ -112,5 +112,12 @@
a.menuItemUnselected:link, a.menuItemUnselected:visited, a.menuItemUnselected:hover, a.menuItemUnselected:active {
color: white;
}
-
+a.menuItemSelected:hover {
+ color: white;
+ text-decoration: none;
+}
+td.menuTabSelected a:hover {
+ color: white;
+ text-decoration: none;
+}
Modified: incubator/roller/branches/roller_2.0/web/theme/sun/logo.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/logo.gif?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/sun/two-banner.gif?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
Binary files - no diff available.
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=278996&r1=278995&r2=278996&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 Tue Sep 6 06:11:25 2005
@@ -5,7 +5,8 @@
/* add colors and images to roller.css */
.bannerlogo {
- margin: 15px 0px 0px 15px;
+ /* margin: 15px 0px 0px 15px; */
+ margin: 0px;
}
.bannerBox {
Modified: incubator/roller/branches/roller_2.0/web/theme/tan/logo.gif
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/theme/tan/logo.gif?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
Binary files - no diff available.
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/CategoriesSidebar.jsp Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<%-- Add Category link --%>
<p>
Modified: incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp?rev=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEdit.jsp Tue Sep 6 06:11:25 2005
@@ -106,8 +106,6 @@
<html:optionsCollection name="model" property="categories" value="id" label="path" />
</html:select>
</div>
-
- <br />
<div class="row">
<label style="width:10%; float:left;" for="link"><fmt:message key="weblogEdit.pubTime" /></label>
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogEditSidebar.jsp Tue Sep 6 06:11:25 2005
@@ -31,7 +31,7 @@
</c:forEach>
-<hr />
+<hr size="1" noshade="noshade" />
<h3><fmt:message key="weblogEdit.draftEntries" /></h3>
<c:if test="${empty model.recentDraftEntries}">
@@ -55,7 +55,7 @@
<c:if test="${model.userAuthorizedToAuthor}">
-<hr />
+<hr size="1" noshade="noshade" />
<h3><fmt:message key="weblogEdit.publishedEntries" /></h3>
<c:if test="${empty model.recentPublishedEntries}">
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/weblog/WeblogQuerySidebar.jsp Tue Sep 6 06:11:25 2005
@@ -11,7 +11,7 @@
<div class="sidebarBody">
<h3><fmt:message key="weblogEntryQuery.sidebarTitle" /></h3>
-<hr />
+<hr size="1" noshade="noshade" />
<p><fmt:message key="weblogEntryQuery.sidebarDescription" /></p>
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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/MemberPermissionsSidebar.jsp Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="mainPage.actions" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<img src='<c:url value="/images/ComposeMail16.gif"/>' alt="mail-icon" align="bottom" />
<c:url value="/editor/inviteMember.do" var="inviteUrl">
<c:param name="weblog" value="${model.website.handle}" />
@@ -35,7 +35,7 @@
<h3>
<fmt:message key="memberPermissions.permissionsHelpTitle" />
</h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<fmt:message key="memberPermissions.permissionHelp" />
<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=278996&r1=278995&r2=278996&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsitesSidebar.jsp Tue Sep 6 06:11:25 2005
@@ -6,47 +6,39 @@
<div class="sidebarBody">
<h3><fmt:message key="yourWebsites.actions" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<c:if test="${!empty model.permissions && model.groupBloggingEnabled}">
- <p>
- <h3>
- <roller:link forward="createWebsite">
- <fmt:message key="yourWebsites.createWeblog" />
- </roller:link>
- </h3>
- <fmt:message key="yourWebsites.createWeblog.desc" />
- </p>
- </c:if>
-
- <p>
<h3>
- <roller:link forward="yourProfile">
- <fmt:message key="yourWebsites.editProfile" />
+ <roller:link forward="createWebsite">
+ <fmt:message key="yourWebsites.createWeblog" />
</roller:link>
</h3>
- <fmt:message key="yourWebsites.editProfile.desc" />
- </p>
+ <p><fmt:message key="yourWebsites.createWeblog.desc" /></p>
+ </c:if>
+
+ <h3>
+ <roller:link forward="yourProfile">
+ <fmt:message key="yourWebsites.editProfile" />
+ </roller:link>
+ </h3>
+ <p><fmt:message key="yourWebsites.editProfile.desc" /></p>
<c:if test="${model.rollerSession.globalAdminUser}">
- <p>
- <h3>
- <roller:link forward="rollerConfig">
- <fmt:message key="yourWebsites.globalAdmin" />
- </roller:link>
- </h3>
- <fmt:message key="yourWebsites.globalAdmin.desc" />
- </p>
+ <h3>
+ <roller:link forward="rollerConfig">
+ <fmt:message key="yourWebsites.globalAdmin" />
+ </roller:link>
+ </h3>
+ <p><fmt:message key="yourWebsites.globalAdmin.desc" /></p>
<c:if test="${model.planetAggregatorEnabled}">
- <p>
- <h3>
- <roller:link forward="planetConfig">
- <fmt:message key="yourWebsites.planetAdmin" />
- </roller:link>
- </h3>
- <fmt:message key="yourWebsites.planetAdmin.desc" />
- </p>
+ <h3>
+ <roller:link forward="planetConfig">
+ <fmt:message key="yourWebsites.planetAdmin" />
+ </roller:link>
+ </h3>
+ <p><fmt:message key="yourWebsites.planetAdmin.desc" /></p>
</c:if>
</c:if>
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=278996&r1=278995&r2=278996&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 Tue Sep 6 06:11:25 2005
@@ -6,7 +6,7 @@
<div class="sidebarBody">
<h3><fmt:message key="pagesForm.addNewPage" /></h3>
- <hr />
+ <hr size="1" noshade="noshade" />
<html:form action="/editor/page" method="post" focus="name">