roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r530199 - in /roller/trunk: src/org/apache/roller/ui/core/util/ src/org/apache/roller/ui/core/util/struts2/ web/WEB-INF/jsps/ web/WEB-INF/jsps/core/struts2/ web/WEB-INF/jsps/tiles/struts2/
Date Wed, 18 Apr 2007 23:10:27 GMT
Author: agilliland
Date: Wed Apr 18 16:10:26 2007
New Revision: 530199

URL: http://svn.apache.org/viewvc?view=rev&rev=530199
Log:
fixing up some little things from the struts2 migration.

1. the list of available locales and timeZones is now available in a format that ensures things
are sorted properly for display.

2. added a new method to UIAction to allow access to static & runtime properties via simple
getProp() methods.

3. replaced all scriplet style calls to access config data in jsps with s:property calls using
getProp('key').



Modified:
    roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java
    roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java
    roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp
    roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
    roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
    roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
    roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp

Modified: roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java (original)
+++ roller/trunk/src/org/apache/roller/ui/core/util/UIUtils.java Wed Apr 18 16:10:26 2007
@@ -19,68 +19,44 @@
 package org.apache.roller.ui.core.util;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.TreeMap;
 import org.apache.roller.util.LocaleComparator;
 
-
 /**
  * A utilities class used by the Weblogger UI.
  */
 public class UIUtils {
     
-    public static Map allLocales = null;
-    public static Map allTimeZones = null;
+    private static List locales = null;
+    private static List timeZones = null;
     
     
-    // load up the locales and time zones maps
+    // load up the locales and time zones lists
     static {
-        // build locales Map
-        allLocales = new HashMap(); 
-        Locale[] localeArray = Locale.getAvailableLocales();
-        Arrays.sort(localeArray, new LocaleComparator());
-        for (int i=0; i < localeArray.length; i++) {
-            allLocales.put(localeArray[i].toString(),
-                           localeArray[i].getDisplayName());
-        }
-        
-        // build time zones Map
-        allTimeZones = new TreeMap();
-        String[] zoneArray = TimeZone.getAvailableIDs();
+        // build locales list
+        locales = Arrays.asList(Locale.getAvailableLocales());
+        Collections.sort(locales, new LocaleComparator());
         
-        Date today = new Date();
-        TimeZone zone = null;
-        for (int i=0; i < zoneArray.length; i++) {
-            zone = TimeZone.getTimeZone(zoneArray[i]);
-            
-            // build a display key
-            StringBuffer sb = new StringBuffer();
-            sb.append(zone.getDisplayName(zone.inDaylightTime(today), TimeZone.SHORT));
-            sb.append(" - ");
-            sb.append(zone.getID());
-            
-            allTimeZones.put(zone.getID(), sb.toString());
-        }
+        // build time zones list
+        timeZones = Arrays.asList(TimeZone.getAvailableIDs());
+        Collections.sort(timeZones);
     }
     
     
-    /**
-     * A Map of locales supported by Roller.
-     */
-    public static Map getLocalesMap() {
-        return allLocales;
+    public static List getLocales() {
+        return locales;
     }
     
     
-    /**
-     * A Map of time zones supported by Roller.
-     */
-    public static Map getTimeZonesMap() {
-        return allTimeZones;
+    public static List getTimeZones() {
+        return timeZones;
     }
     
 }

Modified: roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java
URL: http://svn.apache.org/viewvc/roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java (original)
+++ roller/trunk/src/org/apache/roller/ui/core/util/struts2/UIAction.java Wed Apr 18 16:10:26
2007
@@ -21,7 +21,9 @@
 import com.opensymphony.xwork2.ActionSupport;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Map;
+import java.util.List;
+import org.apache.roller.config.RollerConfig;
+import org.apache.roller.config.RollerRuntimeConfig;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WebsiteData;
 import org.apache.roller.ui.core.util.UIUtils;
@@ -70,6 +72,37 @@
     }
     
     
+    public String getProp(String key) {
+        // first try static config
+        String value = RollerConfig.getProperty(key);
+        if(value == null) {
+            value = RollerRuntimeConfig.getProperty(key);
+        }
+        
+        return (value == null) ? key : value;
+    }
+    
+    public boolean getBooleanProp(String key) {
+        // first try static config
+        String value = RollerConfig.getProperty(key);
+        if(value == null) {
+            value = RollerRuntimeConfig.getProperty(key);
+        }
+        
+        return (value == null) ? false : (new Boolean(value)).booleanValue();
+    }
+    
+    public int getIntProp(String key) {
+        // first try static config
+        String value = RollerConfig.getProperty(key);
+        if(value == null) {
+            value = RollerRuntimeConfig.getProperty(key);
+        }
+        
+        return (value == null) ? 0 : (new Integer(value)).intValue();
+    }
+    
+    
     public void addError(String errorKey) {
         addActionError(getText(errorKey));
     }
@@ -149,12 +182,12 @@
         return "MMM dd, yyyy";
     }
     
-    public Map getLocalesMap() {
-        return UIUtils.getLocalesMap();
+    public List getLocalesList() {
+        return UIUtils.getLocales();
     }
     
-    public Map getTimeZonesMap() {
-        return UIUtils.getTimeZonesMap();
+    public List getTimeZonesList() {
+        return UIUtils.getTimeZones();
     }
     
 }

Modified: roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/CreateWeblogForm.jsp Wed Apr 18 16:10:26 2007
@@ -16,16 +16,17 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
 <script type="text/javascript">
 <!--
 function previewImage(theme) {
     document.preview.src="/themes/" + theme + "/sm-theme-" + theme + ".png";
 }
-function handlePreview() {
-	previewSpan = document.getElementById("handlePreview");
-	var n1 = previewSpan.childNodes[0];
-    var n2 = document.createTextNode(document.createWebsiteForm.handle.value);
-    if (n1 == null) {
+function handlePreview(handle) {
+    previewSpan = document.getElementById("handlePreview");
+    var n1 = previewSpan.childNodes[0];
+    var n2 = document.createTextNode(handle.value);
+    if (handle.value == null) {
 	    previewSpan.appendChild(n2);
     } else {
 	    previewSpan.replaceChild(n2, n1);
@@ -57,7 +58,7 @@
 <tr>
     <td class="label"><label for="handle" /><s:text name="createWebsite.handle"
/></label></td>
     <td class="field">
-        <s:textfield name="bean.handle" size="30" maxlength="30" onkeyup="handlePreview()"
/><br />
+        <s:textfield name="bean.handle" size="30" maxlength="30" onkeyup="handlePreview(this)"
/><br />
         <span style="text-size:70%">
             <s:text name="createWebsite.weblogUrl" />:&nbsp;
             <%-- <c:out value="${model.absoluteURL}" /> --%>/<span id="handlePreview"
style="color:red">handle</span>
@@ -75,7 +76,7 @@
 <tr>
     <td class="label"><label for="locale" /><s:text name="createWebsite.locale"
/></label></td>
     <td class="field">
-       <s:select name="bean.locale" size="1" list="localesMap" />   
+       <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
     </td>
     <td class="description"><s:text name="createWebsite.tip.locale" /></td>
 </tr>
@@ -83,7 +84,7 @@
 <tr>
     <td class="label"><label for="timeZone" /><s:text name="createWebsite.timeZone"
/></label></td>
     <td class="field">
-       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+       <s:select name="bean.timeZone" size="1" list="timeZonesList" />
     </td>
     <td class="description"><s:text name="createWebsite.tip.timezone" /></td>
 </tr>

Modified: roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/ProfileForm.jsp Wed Apr 18 16:10:26 2007
@@ -58,7 +58,7 @@
 <tr>
     <td class="label"><label for="locale" /><s:text name="userSettings.locale"
/></label></td>
     <td class="field">
-       <s:select name="bean.locale" size="1" list="localesMap" />
+       <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
     </td>
     <td class="description"><s:text name="userRegister.tip.locale" /></td>
 </tr>
@@ -66,7 +66,7 @@
 <tr>
     <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone"
/></label></td>
     <td class="field">
-       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+       <s:select name="bean.timeZone" size="1" list="timeZonesList" />
     </td>
     <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
 </tr>

Modified: roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/core/struts2/RegisterForm.jsp Wed Apr 18 16:10:26 2007
@@ -31,10 +31,10 @@
     <td class="description"><s:text name="userRegister.tip.fullName" /></td>
 </tr>
 
-<s:if test="${fromSSO}">
+<s:if test="fromSSO">
 <tr>
     <td class="label"><label for="userName" /><s:text name="userSettings.username"
/></label></td>
-    <td class="field"><strong><c:out value="${bean.userName}" /></strong></td>
+    <td class="field"><strong><s:property value="bean.userName" /></strong></td>
     <td class="description"><s:text name="userRegister.tip.userName" /></td>
 </tr>
 </s:if>
@@ -70,7 +70,7 @@
 <tr>
     <td class="label"><label for="locale" /><s:text name="userSettings.locale"
/></label></td>
     <td class="field">
-       <s:select name="bean.locale" size="1" list="localesMap" />
+       <s:select name="bean.locale" size="1" list="localesList" listValue="displayName"
/>
     </td>
     <td class="description"><s:text name="userRegister.tip.locale" /></td>
 </tr>
@@ -78,7 +78,7 @@
 <tr>
     <td class="label"><label for="timeZone" /><s:text name="userSettings.timeZone"
/></label></td>
     <td class="field">
-       <s:select name="bean.timeZone" size="1" list="timeZonesMap" />
+       <s:select name="bean.timeZone" size="1" list="timeZonesList" />
     </td>
     <td class="description"><s:text name="userRegister.tip.timeZone" /></td>
 </tr>

Modified: roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/taglibs-struts2.jsp Wed Apr 18 16:10:26 2007
@@ -18,21 +18,6 @@
 <% response.setContentType("text/html; charset=UTF-8"); %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" %>
 
-<%@ page import="org.apache.roller.business.Roller" %>
-<%@ page import="org.apache.roller.business.RollerFactory" %>
-
-<%@ page import="org.apache.roller.pojos.UserData" %>
-<%@ page import="org.apache.roller.pojos.WebsiteData" %>
-<%@ page import="org.apache.roller.pojos.RollerConfigData" %>
-
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-<%@ page import="org.apache.roller.config.RollerRuntimeConfig" %>
-<%@ page import="org.apache.roller.config.RollerConfig" %>
-
-<%@ page import="org.apache.roller.ui.core.RequestConstants" %>
-<%@ page import="org.apache.roller.ui.core.BasePageModel" %>
-<%@ page import="org.apache.roller.ui.core.RollerSession" %>
-
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <%@ taglib uri="http://struts.apache.org/tags-tiles2" prefix="tiles" %>

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/bannerStatus.jsp Wed Apr 18 16:10:26 2007
@@ -16,13 +16,7 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-<%
-String absURL = RollerRuntimeConfig.getAbsoluteContextURL();
-boolean allowNewUsers = RollerRuntimeConfig.getBooleanProperty("users.registration.enabled");
-String customRegUrl = RollerRuntimeConfig.getProperty("users.registration.url");
-if(customRegUrl != null && customRegUrl.trim().equals(""))
-    customRegUrl = null;
-%>
+
 <div class="bannerStatusBox">
     
     <table class="bannerStatusBox" cellpadding="0" cellspacing="0">
@@ -47,7 +41,7 @@
             
             <td class="bannerRight">
                 
-                <a href="<s:url value="/"/>"><%= RollerRuntimeConfig.getProperty("site.shortName")
%></a>
+                <a href="<s:url value="/"/>"><s:property value="getProp('site.shortName')"/></a>
                 
                 | <a href="<s:url action="menu"/>"><s:text name="mainPage.mainMenu"
/></a>
                 
@@ -57,11 +51,12 @@
                 <s:else>
                     | <a href="<s:url action="login-redirect"/>"><s:text name="navigationBar.login"/></a>
                     
-                    <% if(allowNewUsers) { %>
-                    | <a href="<s:url action="register"/>"><s:text name="navigationBar.register"/></a>
-                    <% } else if(customRegUrl != null) { %>
-                    | <a href="<%= customRegUrl %>"><s:text name="navigationBar.register"/></a>
-                    <% } %>
+                    <s:if test="getBooleanProp('users.registration.enabled')">
+                        | <a href="<s:url action="register"/>"><s:text name="navigationBar.register"/></a>
+                    </s:if>
+                    <s:elseif test="getProp('users.registration.url') != null">
+                        | <a href="<s:property value="getProp('users.registration.url')"/>"><s:text
name="navigationBar.register"/></a>
+                    </s:elseif>
                 </s:else>
                 
             </td>

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp Wed Apr 18 16:10:26 2007
@@ -17,6 +17,4 @@
 --%>
 #centercontent_wrap {
     width: 100%;
-}
-
-
+}
\ No newline at end of file

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp Wed Apr 18 16:10:26 2007
@@ -20,5 +20,4 @@
 }
 #rightcontent_wrap {
     width: 29%;
-}
-
+}
\ No newline at end of file

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/empty.jsp Wed Apr 18 16:10:26 2007
@@ -14,9 +14,4 @@
   limitations under the License.  For additional information regarding
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
---%>
-
-<%-- empty tile --%>
-
-
-
+--%>
\ No newline at end of file

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/footer.jsp Wed Apr 18 16:10:26 2007
@@ -28,6 +28,3 @@
 
 <a href="http://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists">
     <s:text name="footer.mailingLists" /></a>
-
-
-

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/head.jsp Wed Apr 18 16:10:26 2007
@@ -12,14 +12,12 @@
     href='<c:url value="/roller-ui/styles/menu.css"/>'>
 <link rel="stylesheet" type="text/css" media="all" 
     href='<c:url value="/roller-ui/styles/calendar.css"/>'>
-      
-<% String theme = RollerConfig.getProperty("editor.theme"); %>
 
 <link rel="stylesheet" type="text/css" media="all" 
-    href="<%= request.getContextPath() %>/roller-ui/theme/<%= theme %>/colors.css"
/>  
+    href="<%= request.getContextPath() %>/roller-ui/theme/<s:property value="getProp('editor.theme')"/>/colors.css"
/>
 
 <script type="text/javascript" 
-    src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
  
+    src="<%= request.getContextPath() %>/theme/scripts/roller.js"></script>
 <script type="text/javascript" 
     src='<c:url value="/roller-ui/scripts/calendar.js"/>'></script>
 <script type="text/javascript" 

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-admin.jsp Wed Apr 18 16:10:26 2007
@@ -18,6 +18,3 @@
 <%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
 
 <roller:Menu model="admin-menu.xml" view="templates/menu/menu-tabbed.vm" />
-
-
-

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/menu-editor.jsp Wed Apr 18 16:10:26 2007
@@ -18,5 +18,3 @@
 <%@ taglib uri="http://www.rollerweblogger.org/tags" prefix="roller" %>
 
 <roller:Menu model="editor-menu.xml" view="templates/menu/menu-tabbed.vm" />
-
-

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/messages.jsp Wed Apr 18 16:10:26 2007
@@ -16,6 +16,7 @@
   directory of this distribution.
 --%>
 <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+
 <script type="text/javascript">
 <!--
 function dirty() {

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-mainmenupage.jsp Wed Apr 18 16:10:26
2007
@@ -19,7 +19,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property
value="pageTitle" /></title>
+<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"
/></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <tiles:insertAttribute name="head" />     
 <style type="text/css">

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-simplepage.jsp Wed Apr 18 16:10:26 2007
@@ -19,7 +19,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property
value="pageTitle" /></title>
+<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"
/></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <tiles:insertAttribute name="head" />
 <style type="text/css">

Modified: roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp?view=diff&rev=530199&r1=530198&r2=530199
==============================================================================
--- roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp (original)
+++ roller/trunk/web/WEB-INF/jsps/tiles/struts2/tiles-tabbedpage.jsp Wed Apr 18 16:10:26 2007
@@ -19,7 +19,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title><%= RollerRuntimeConfig.getProperty("site.shortName") %>: <s:property
value="pageTitle" /></title>
+<title><s:property value="getProp('site.shortName')"/>: <s:property value="pageTitle"
/></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <tiles:insertAttribute name="head" />     
 <style type="text/css">



Mime
View raw message