Author: snoopdave
Date: Tue May 15 18:30:26 2007
New Revision: 538396
URL: http://svn.apache.org/viewvc?view=rev&rev=538396
Log:
Merging latest from trunk
Added:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Comments.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/Comments.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/CommentsBean.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/CommentsBean.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/Entries.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/Entries.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntriesBean.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntriesBean.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd-validation.xml
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryAdd.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryAdd.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryBase.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryBase.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryBean.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryBean.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryEdit.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryEdit.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/EntryRemove.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/ui/authoring/struts2/EntryRemove.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MediacastException.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/util/MediacastException.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MediacastResource.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/util/MediacastResource.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/util/MediacastUtil.java
- copied unchanged from r538395,
roller/trunk/src/org/apache/roller/util/MediacastUtil.java
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Comments.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Comments.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/Entries.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/Entries.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp
- copied unchanged from r538395,
roller/trunk/web/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp
Removed:
roller/branches/roller_4.0_newbackend/metadata/xdoclet/filter-mappings.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/filters.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlet-mappings.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/servlets.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/web-resource-env-refs.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/web-security.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/web-settings.xml
roller/branches/roller_4.0_newbackend/metadata/xdoclet/welcomefiles.xml
Modified:
roller/branches/roller_4.0_newbackend/build.xml
roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml
roller/branches/roller_4.0_newbackend/merges.txt
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp
roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
Modified: roller/branches/roller_4.0_newbackend/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/build.xml?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
--- roller/branches/roller_4.0_newbackend/build.xml (original)
+++ roller/branches/roller_4.0_newbackend/build.xml Tue May 15 18:30:26 2007
@@ -318,12 +318,12 @@
</copy>
<mkdir dir="${build.compile.business}/META-INF" />
- <copy todir="${build.compile.business}/META-INF"
file="web/WEB-INF/classes/META-INF/persistence.xml" />
+ <copy todir="${build.compile.business}/META-INF"
file="${ro.src}/META-INF/persistence.xml" />
<!-- OpenJPA bytecode enhancement -->
<taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
classpathref="business.path" />
<openjpac>
- <config propertiesFile="web/WEB-INF/classes/META-INF/persistence.xml"
/>
+ <config propertiesFile="${ro.src}/META-INF/persistence.xml" />
<classpath>
<path refid="business.path"/>
<pathelement location="${build.compile.business}" />
Modified:
roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml
(original)
+++
roller/branches/roller_4.0_newbackend/docs/examples/plugins/pluginmodel/build.xml
Tue May 15 18:30:26 2007
@@ -16,5 +16,10 @@
</javac>
<jar basedir="build" destfile="dist/authusermodel.jar" />
</target>
+
+ <target name="clean" >
+ <delete dir="build" />
+ <delete dir="clean" />
+ </target>
-</project>
\ No newline at end of file
+</project>
Modified: roller/branches/roller_4.0_newbackend/merges.txt
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/merges.txt?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
--- roller/branches/roller_4.0_newbackend/merges.txt (original)
+++ roller/branches/roller_4.0_newbackend/merges.txt Tue May 15 18:30:26 2007
@@ -3,6 +3,9 @@
Temporary file to track merges from trunk into the roller_4.0_newbackend
branch.
+May 15, 2007: merging latest from trunk
+svn merge -r 537690:538395 https://svn.apache.org/repos/asf/roller/trunk
+
May 14, 2007: merging latest from trunk
svn merge -r 531174:537690 https://svn.apache.org/repos/asf/roller/trunk
Modified:
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
(original)
+++
roller/branches/roller_4.0_newbackend/sandbox/scripting/groovy/examples/rollerapi/createuser.gy
Tue May 15 18:30:26 2007
@@ -31,6 +31,7 @@
user = new org.apache.roller.pojos.UserData();
user.setUserName(username);
+user.setScreenName(username);
user.setPassword(password);
user.setFullName(fullName);
user.setEmailAddress(email);
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/admin/struts2/GlobalCommentManagement.java
Tue May 15 18:30:26 2007
@@ -102,7 +102,7 @@
getBean().getOffset(),
getBean().getCount() + 1);
- if(comments != null) {
+ if(comments != null && comments.size() > 0) {
if(comments.size() > getBean().getCount()) {
comments.remove(comments.size()-1);
setMoreResults(true);
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/authoring/struts2/editor-menu.xml
Tue May 15 18:30:26 2007
@@ -24,10 +24,11 @@
<menu name="tabbedmenu.weblog" perms="limited" roles="editor">
- <menu-item action="postEntry"
+ <menu-item action="entryAdd"
name="tabbedmenu.weblog.newEntry"
roles="editor"
- perms="limited" />
+ perms="limited"
+ subactions="entryEdit,entryRemove" />
<menu-item action="entries"
name="tabbedmenu.weblog.archives"
@@ -37,8 +38,7 @@
<menu-item action="comments"
name="tabbedmenu.admin.commentManagement"
roles="editor"
- perms="admin"
- subactions="commentQuery" />
+ perms="admin" />
<menu-item action="categories"
name="tabbedmenu.weblog.categories"
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/KeyValueObject.java
Tue May 15 18:30:26 2007
@@ -24,30 +24,30 @@
*/
public class KeyValueObject {
- private String key = null;
- private String value = null;
+ private Object key = null;
+ private Object value = null;
public KeyValueObject() {}
- public KeyValueObject(String key, String value) {
+ public KeyValueObject(Object key, Object value) {
this.setKey(key);
this.setValue(value);
}
- public String getKey() {
+ public Object getKey() {
return key;
}
- public void setKey(String key) {
+ public void setKey(Object key) {
this.key = key;
}
- public String getValue() {
+ public Object getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
this.value = value;
}
Modified:
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
(original)
+++
roller/branches/roller_4.0_newbackend/src/org/apache/roller/ui/core/util/struts2/UIAction.java
Tue May 15 18:30:26 2007
@@ -21,10 +21,10 @@
import com.opensymphony.xwork2.ActionSupport;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.List;
import org.apache.roller.config.RollerConfig;
import org.apache.roller.config.RollerRuntimeConfig;
-import org.apache.roller.pojos.PermissionsData;
import org.apache.roller.pojos.UserData;
import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.core.util.UIUtils;
@@ -44,6 +44,9 @@
public abstract class UIAction extends ActionSupport
implements UIActionPreparable, UISecurityEnforced {
+ // a result that sends the user to an access denied warning
+ public static final String DENIED = "access-denied";
+
// a common result name used to indicate the result should list some data
public static final String LIST = "list";
@@ -253,6 +256,46 @@
public List getTimeZonesList() {
return UIUtils.getTimeZones();
+ }
+
+ public List getHoursList() {
+ List ret = new ArrayList();
+ for (int i=0; i<24; i++) {
+ ret.add(i);
+ }
+ return ret;
+ }
+
+ public List getMinutesList() {
+ List ret = new ArrayList();
+ for (int i=0; i<60; i++) {
+ ret.add(i);
+ }
+ return ret;
+ }
+
+ public List getSecondsList() {
+ return getMinutesList();
+ }
+
+ public List getCommentDaysList() {
+
+ List opts = new ArrayList();
+
+ opts.add(new KeyValueObject(new Integer(0),
getText("weblogEdit.unlimitedCommentDays")));
+ opts.add(new KeyValueObject(new Integer(1),
getText("weblogEdit.days1")));
+ opts.add(new KeyValueObject(new Integer(2),
getText("weblogEdit.days2")));
+ opts.add(new KeyValueObject(new Integer(3),
getText("weblogEdit.days3")));
+ opts.add(new KeyValueObject(new Integer(4),
getText("weblogEdit.days4")));
+ opts.add(new KeyValueObject(new Integer(5),
getText("weblogEdit.days5")));
+ opts.add(new KeyValueObject(new Integer(7),
getText("weblogEdit.days7")));
+ opts.add(new KeyValueObject(new Integer(10),
getText("weblogEdit.days10")));
+ opts.add(new KeyValueObject(new Integer(20),
getText("weblogEdit.days20")));
+ opts.add(new KeyValueObject(new Integer(30),
getText("weblogEdit.days30")));
+ opts.add(new KeyValueObject(new Integer(60),
getText("weblogEdit.days60")));
+ opts.add(new KeyValueObject(new Integer(90),
getText("weblogEdit.days90")));
+
+ return opts;
}
}
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml
(original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/classes/struts.xml Tue
May 15 18:30:26 2007
@@ -20,11 +20,43 @@
<interceptor name="UIActionPrepareInterceptor"
class="org.apache.roller.ui.core.util.struts2.UIActionPrepareInterceptor" />
+ <!-- Define a custom interceptor stack for Roller so that we can
+ add in our own custom interceptors. We basically copy the
+ default stack from struts2 rather than extend it because we
+ need to have our custom interceptors go in the middle of the
+ default stack -->
<interceptor-stack name="rollerStack">
- <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="exception"/>
+ <interceptor-ref name="alias"/>
+ <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="i18n"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="debugging"/>
+ <interceptor-ref name="profiling"/>
+ <interceptor-ref name="scoped-model-driven"/>
+ <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="checkbox"/>
+ <interceptor-ref name="static-params"/>
+ <interceptor-ref name="params">
+ <param name="excludeParams">dojo\..*</param>
+ </interceptor-ref>
+ <interceptor-ref name="conversionError"/>
+
+ <!-- custom Roller interceptors -->
<interceptor-ref name="UIActionInterceptor"/>
<interceptor-ref name="UISecurityInterceptor"/>
<interceptor-ref name="UIActionPrepareInterceptor"/>
+
+ <!-- validation interceptors, MUST come after our custom
interceptors -->
+ <interceptor-ref name="validation">
+ <param
name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param
name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+
</interceptor-stack>
</interceptors>
@@ -162,16 +194,33 @@
<!-- Weblogger Authoring UI -->
<package name="weblogger-authoring" namespace="/roller-ui/authoring"
extends="weblogger">
- <action name="postEntry">
- <result>/roller-ui/authoring/weblog.do?method=create</result>
+ <action name="entryAdd!*" method="{1}"
+ class="org.apache.roller.ui.authoring.struts2.EntryAdd">
+ <result name="input" type="tiles">.EntryAdd</result>
+ <result name="success" type="chain">entryEdit</result>
</action>
- <action name="entries">
-
<result>/roller-ui/authoring/weblogEntryManagement.do?method=query</result>
+ <action name="entryEdit!*" method="{1}"
+ class="org.apache.roller.ui.authoring.struts2.EntryEdit">
+ <result name="input" type="tiles">.EntryEdit</result>
+ <result name="error" type="chain">menu</result>
</action>
- <action name="comments">
-
<result>/roller-ui/authoring/commentManagement.do?method=query</result>
+ <action name="entryRemove!*" method="{1}"
+ class="org.apache.roller.ui.authoring.struts2.EntryRemove">
+ <result name="input" type="tiles">.EntryRemove</result>
+ <result name="error" type="chain">menu</result>
+ <result name="success" type="chain">entryAdd</result>
+ </action>
+
+ <action name="entries"
+ class="org.apache.roller.ui.authoring.struts2.Entries">
+ <result name="list" type="tiles">.Entries</result>
+ </action>
+
+ <action name="comments!*" method="{1}"
+ class="org.apache.roller.ui.authoring.struts2.Comments">
+ <result name="list" type="tiles">.Comments</result>
</action>
<action name="categories!*" method="{1}"
@@ -326,26 +375,6 @@
<result name="importEntries.page">.import-entries</result>
</action>
- <action name="categoryDelete!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.CategoryDeleteAction">
- <result name="CategoryDeleteOK">.CategoryDeleteOK</result>
- </action>
-
- <action name="categoryEdit!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.CategoryEditAction">
- <result name="CategoryForm">.CategoryForm</result>
- </action>
-
- <action name="categorySave!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.CategorySaveAction">
- </action>
-
- <action name="weblog!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.WeblogEntryFormAction">
- <result name="weblogEdit.page">.WeblogEdit</result>
- <result name="weblogEntryRemove.page">.WeblogEntryRemove</result>
- </action>
-
<action name="weblogEntryManagement!*" method="{1}"
class="org.apache.roller.ui.authoring.struts2.WeblogEntryManagementAction">
<result
name="weblogEntryManagement.page">.WeblogEntryManagement</result>
@@ -358,17 +387,6 @@
<action name="toggleLinkback!*" method="{1}"
class="org.apache.roller.ui.authoring.struts2.ToggleLinkbackDisplayAction">
- </action>
-
- <action name="commentManagement!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.CommentManagementAction">
- <result name="commentManagement.page">.CommentManagement</result>
- <result
name="commentManagementGlobal.page">.CommentManagementGlobal</result>
- </action>
- <action name="commentQuery!*" method="{1}"
-
class="org.apache.roller.ui.authoring.struts2.CommentManagementAction">
- <result name="commentManagement.page">.CommentManagement</result>
- <result
name="commentManagementGlobal.page">.CommentManagementGlobal</result>
</action>
-->
</package>
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/head-ajax.jsp
Tue May 15 18:30:26 2007
@@ -17,7 +17,7 @@
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="<s:url value="/theme/scripts/roller.js"/>"></script>
<script type="text/javascript"
src='<s:url value="/roller-ui/scripts/calendar.js"/>'></script>
<script type="text/javascript"
@@ -25,4 +25,7 @@
<!-- overLIB (c) Erik Bosrup -->
</script>
-<s:head theme="ajax"/>
\ No newline at end of file
+<s:head theme="ajax"/>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/prototype.js"/>" ></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/scriptaculous/scriptaculous.js"/>" ></script>
+<script type="text/javascript" src="<s:url
value="/roller-ui/scripts/roller-autocomplete.js"/>" ></script>
\ No newline at end of file
Modified:
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
---
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp
(original)
+++
roller/branches/roller_4.0_newbackend/web/WEB-INF/jsps/tiles/struts2/messages.jsp
Tue May 15 18:30:26 2007
@@ -32,15 +32,18 @@
</script>
<%-- Success Messages --%>
-<s:if test="! actionMessages.isEmpty">
+<s:if test="!actionMessages.isEmpty">
<div id="messages" class="messages">
<s:actionmessage />
</div>
</s:if>
<%-- Error Messages --%>
-<s:if test="! actionErrors.isEmpty">
+<s:if test="!actionErrors.isEmpty || !fieldErrors.isEmpty">
<div id="errors" class="errors">
<s:actionerror />
+ <s:iterator id="key" value="fieldErrors">
+ <s:property value="#key.value" />
+ </s:iterator>
</div>
</s:if>
Modified: roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml?view=diff&rev=538396&r1=538395&r2=538396
==============================================================================
--- roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml (original)
+++ roller/branches/roller_4.0_newbackend/web/WEB-INF/tiles.xml Tue May 15
18:30:26 2007
@@ -139,32 +139,36 @@
<!-- weblog editor pages (and associates) -->
- <definition name=".WeblogEdit" extends=".tiles-tabbedpage" >
- <put name="content" value="/WEB-INF/jsps/authoring/WeblogEdit.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/WeblogEditSidebar.jsp" />
+ <definition name=".EntryAdd" extends=".tiles-tabbedpage" >
+ <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryAdd.jsp" />
+ <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
<put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
</definition>
- <definition name=".WeblogEntryRemove" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/WeblogEntryRemove.jsp" />
- <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
+ <definition name=".EntryEdit" extends=".tiles-tabbedpage" >
+ <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryEdit.jsp" />
+ <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntrySidebar.jsp" />
+ <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
</definition>
- <definition name=".WeblogEntryManagement" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/WeblogEntryManagement.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/WeblogEntryManagementSidebar.jsp" />
- <put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
+ <definition name=".EntryRemove" extends=".tiles-tabbedpage" >
+ <put name="content"
value="/WEB-INF/jsps/authoring/struts2/EntryRemove.jsp" />
+ <put name="styles"
value="/WEB-INF/jsps/tiles/struts2/css-nosidebar.jsp" />
</definition>
- <definition name=".CommentManagement" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
+ <definition name=".Entries" extends=".tiles-tabbedpage" >
+ <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Entries.jsp" />
+ <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/EntriesSidebar.jsp" />
<put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
</definition>
- <definition name=".CommentManagementGlobal" extends=".tiles-tabbedpage" >
- <put name="content"
value="/WEB-INF/jsps/authoring/CommentManagement.jsp" />
- <put name="sidebar"
value="/WEB-INF/jsps/authoring/CommentManagementSidebar.jsp" />
+ <definition name=".Comments" extends=".tiles-tabbedpage" >
+ <put name="head" value="/WEB-INF/jsps/tiles/struts2/head-ajax.jsp" />
+ <put name="content"
value="/WEB-INF/jsps/authoring/struts2/Comments.jsp" />
+ <put name="sidebar"
value="/WEB-INF/jsps/authoring/struts2/CommentsSidebar.jsp" />
<put name="styles" value="/WEB-INF/jsps/tiles/struts2/css-sidebar.jsp"
/>
</definition>
