svn commit: r289675 - in /incubator/roller/branches/roller_2.0/web: WEB-INF/classes/ApplicationResources.properties theme/head.jsp theme/tiles-mainmenupage.jsp website/YourWebsites.jsp

[sn...@apache.org]

Author: snoopdave
Date: Fri Sep 16 16:50:56 2005
New Revision: 289675

URL: http://svn.apache.org/viewcvs?rev=289675&view=rev
Log:
Even more minor layout tweaks

Modified:
    incubator/roller/branches/roller_2.0/web/WEB-INF/classes/ApplicationResources.properties
    incubator/roller/branches/roller_2.0/web/theme/head.jsp
    incubator/roller/branches/roller_2.0/web/theme/tiles-mainmenupage.jsp
    incubator/roller/branches/roller_2.0/web/website/YourWebsites.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=289675&r1=289674&r2=289675&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 16:50:56 2005
@@ -1387,8 +1387,8 @@
 
 yourWebsites.title=Main Menu
 yourWebsites.subtitle=Welcome to Roller. Use this main menu page to \
-manage your weblogs, your user profile and (if you have admin permissions) \
-administer the blog server.
+edit and manage your weblogs, your user profile and (if you have global admin \
+permissions) administer the blog server.
 
 yourWebsites.actions=Actions
 
@@ -1397,9 +1397,7 @@
 yourWebsites.prompt.welcomeNoBlog=Would you like to
 yourWebsites.createOne=create a weblog
 
-yourWebsites.weblogs.title=Manage Weblogs
-yourWebsites.weblogs.prompt=Your existing weblogs. You may \
-add entries, manage templates, set configurations, etc.
+yourWebsites.weblogs.title=Your Weblogs
 
 yourWebsites.existingWebsites=Your Existing Weblogs
 

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=289675&r1=289674&r2=289675&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/theme/head.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/theme/head.jsp Fri Sep 16 16:50:56 2005
@@ -14,9 +14,18 @@
     href="<%= request.getContextPath() %>/theme/calendar.css" />
       
 <%
+//String theme = theme = RollerConfig.getProperty("editor.theme");
+
 String theme = request.getParameter("look");
-if (theme == null) theme = RollerConfig.getProperty("editor.theme");
+if (theme == null && session != null) {
+    theme = (String)session.getAttribute("look");
+}
+if (theme == null) {
+    theme = RollerConfig.getProperty("editor.theme");
+}
+if (session !=null) session.setAttribute("look", theme);
 %>
+
 <link rel="stylesheet" type="text/css" media="all" 
     href="<%= request.getContextPath() %>/theme/<%= theme %>/colors.css" />  
 

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=289675&r1=289674&r2=289675&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 16:50:56 2005
@@ -12,6 +12,9 @@
    width: 30%;
    padding-right: 1em;
 }
+#centercontent {
+    margin: 15px 260px 0px 15px;
+}
 #rightcontent {
     position: absolute;
     top:    40px;

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=289675&r1=289674&r2=289675&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp (original)
+++ incubator/roller/branches/roller_2.0/web/website/YourWebsites.jsp Fri Sep 16 16:50:56 2005
@@ -34,11 +34,13 @@
     <input type="hidden" name="websiteId" value="" />
     <input type="hidden" name="method" value="select" />		  
 
+<%-- TITLE: Main Menu --%>
 <p class="subtitle"><fmt:message key="yourWebsites.subtitle" /></p>
 
 <%-- Choose appropriate prompt at start of page --%>
 <c:choose>
 
+    <%-- PROMPT: Welcome... you have no blog --%>
     <c:when test="${empty model.permissions && empty model.pendings}"> 
         <p><fmt:message key="yourWebsites.subtitle.welcomeNoBlog" /></p>        
         <p>
@@ -49,6 +51,7 @@
         </p>
     </c:when>
     
+    <%-- PROMPT: You have invitation(s) --%>
     <c:when test="${!empty model.pendings}">      
         <p><fmt:message key="yourWebsites.invitationsPrompt" /></p>
         
@@ -70,8 +73,9 @@
 </c:choose>
             
 <c:if test="${!empty model.permissions}">
-    <h2><fmt:message key="yourWebsites.weblogs.title" /></h2>
-    <p class="subtitle"><fmt:message key="yourWebsites.weblogs.prompt" /></p>
+
+    <%-- SUBTITLE: Your weblogs --%>    
+    <h3><fmt:message key="yourWebsites.weblogs.title" /></h3>
 
         <c:forEach var="perms" items="${model.permissions}">