roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r1098879 - in /roller/trunk: weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/ weblogger-web/src/main/resources/ weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/
Date Tue, 03 May 2011 00:59:46 GMT
Author: snoopdave
Date: Tue May  3 00:59:46 2011
New Revision: 1098879

URL: http://svn.apache.org/viewvc?rev=1098879&view=rev
Log:
Adding name of template action to templates display page

Modified:
    roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
    roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
    roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp

Modified: roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java?rev=1098879&r1=1098878&r2=1098879&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
(original)
+++ roller/trunk/weblogger-web/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEditBean.java
Tue May  3 00:59:46 2011
@@ -30,6 +30,7 @@ public class TemplateEditBean {
     
     private String id = null;
     private String name = null;
+    private String action = null;
     private String description = null;
     private String link = null;
     private String contents = null;
@@ -56,6 +57,14 @@ public class TemplateEditBean {
         this.name = name;
     }
     
+	public void setAction(String action) {
+		this.action = action;
+	}
+
+	public String getAction() {
+		return action;
+	}
+    
     public String getDescription() {
         return this.description;
     }
@@ -129,6 +138,7 @@ public class TemplateEditBean {
         // dealing with a CUSTOM weblog template
         if(dataHolder.isCustom()) {
             dataHolder.setName(getName());
+            dataHolder.setAction(getAction());
             dataHolder.setDescription(getDescription());
             dataHolder.setLink(getLink());
             dataHolder.setNavbar(isNavbar());
@@ -142,6 +152,7 @@ public class TemplateEditBean {
         
         this.id = dataHolder.getId();
         this.name = dataHolder.getName();
+        this.action = dataHolder.getAction();
         this.description = dataHolder.getDescription();
         this.link = dataHolder.getLink();
         this.contents = dataHolder.getContents();
@@ -154,5 +165,5 @@ public class TemplateEditBean {
             setAutoContentType(Boolean.FALSE);
         }
     }
-    
+
 }

Modified: roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties?rev=1098879&r1=1098878&r2=1098879&view=diff
==============================================================================
--- roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/weblogger-web/src/main/resources/ApplicationResources.properties Tue May
 3 00:59:46 2011
@@ -1296,6 +1296,7 @@ pagesForm.error.alreadyExists=The templa
 # -------------------------------------------------------------------- Page edit
 
 pageForm.title=Edit Template
+pageForm.action=Edit Template
 pageForm.subtitle=Edit template <span>{0}</span> in weblog <span>{1}</span>
 pageForm.tip=You can edit this template to change what it generates. \
 Refer the the Roller Template Guide for information about the objects \

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp?rev=1098879&r1=1098878&r2=1098879&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/TemplateEdit.jsp Tue
May  3 00:59:46 2011
@@ -52,6 +52,14 @@
             <td class="description"></td>
         </tr>
         
+        <tr>
+            <td class="label"><s:text name="pageForm.action" />&nbsp;</td>
+            <td class="field">
+                 <s:textfield name="bean.action" size="50" readonly="true" cssStyle="background:
#e5e5e5" />
+            </td>
+            <td class="description"></td>
+        </tr>
+        
         <script type="text/javascript">
         <!--
         var weblogURL = '<s:property value="actionWeblog.absoluteURL" />';

Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp?rev=1098879&r1=1098878&r2=1098879&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jsps/editor/Templates.jsp Tue May
 3 00:59:46 2011
@@ -34,6 +34,7 @@
 <table class="rollertable">
     <tr>
         <th width="30%"><s:text name="pagesForm.name" /></th>
+        <th width="10"><s:text name="pagesForm.action" /></th>
         <th width="60%"><s:text name="pagesForm.description" /></th>
         <th width="10"><s:text name="pagesForm.remove" /></th>
     </tr>
@@ -59,6 +60,8 @@
                 <s:a href="%{edit}"><s:property value="#p.name" /></s:a>
             </td>
             
+            <td style="vertical-align:middle"><s:property value="#p.action" /></td>
+
             <td style="vertical-align:middle"><s:property value="#p.description"
/></td>
                         
             <td class="center" style="vertical-align:middle">



Mime
View raw message