Author: gmazza
Date: Sun Aug 10 21:11:13 2014
New Revision: 1617161
URL: http://svn.apache.org/r1617161
Log:
Created tags:help JSP tag to output question mark and tooltip definitions for
hard-to-understand fields.
Added:
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
- copied, changed from r1617083,
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
roller/trunk/app/src/main/webapp/WEB-INF/tags/
roller/trunk/app/src/main/webapp/WEB-INF/tags/help.tag
Removed:
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
roller/trunk/app/src/main/webapp/WEB-INF/web.xml
roller/trunk/docs/roller-user-guide.odt
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/TextEditor.java
Sun Aug 10 21:11:13 2014
@@ -36,7 +36,7 @@ public class TextEditor implements Weblo
}
public String getJspPage() {
- return "/roller-ui/authoring/editors/editor-text.jsp";
+ return "/WEB-INF/jsps/editor/EntryEditor.jsp";
}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/plugins/XinhaEditor.java
Sun Aug 10 21:11:13 2014
@@ -37,8 +37,7 @@ public class XinhaEditor implements Webl
}
public String getJspPage() {
- // now handled within editor-text.jsp
- return "/roller-ui/authoring/editors/editor-text.jsp";
+ return "/WEB-INF/jsps/editor/EntryEditor.jsp";
}
}
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sun Aug
10 21:11:13 2014
@@ -161,6 +161,7 @@ categoriesForm.addCategory=Add Category
categoriesForm.move=Move
categoriesForm.move.confirm=Move selected categories?
categoriesForm.remove=Remove
+categoriesForm.imageUrl=Image URL
# ---------------------------------------------------------
CategoryDeleteOK.jsp
@@ -1470,8 +1471,9 @@ Link to edit the pending post:\
weblogEntry.notFound=Cannot find requested weblog entry
weblogEdit.summary=Summary (optional)
+weblogEdit.summary.tooltip=If provided, replaces above content on weblog home
page \
+with this summary and a link to the full blog entry.
weblogEdit.content=Content
-
weblogEdit.category=Category
weblogEdit.comments=Comments
weblogEdit.entryRemoved=Entry "{0}" deleted
@@ -1516,8 +1518,11 @@ weblogEdit.miscSettings=Advanced Setting
weblogEdit.rightToLeft=Text reads right-to-left
weblogEdit.pinnedToMain=Pinned to main
+weblogEdit.pinnedToMain.tooltip=Pin blog entry to top of front page weblog \
+(if theme supports it). Option provided only for global admins.
weblogEdit.searchDescription=Search Description
-
+weblogEdit.searchDescription.tooltip=Short description of blog entry that gets
\
+placed in HTML header (if coded by your blog template) for SEO.
weblogEdit.trackback=Trackback
weblogEdit.sendTrackback=Send Trackback
weblogEdit.trackbackUrl=Trackback URL
@@ -1532,6 +1537,7 @@ weblogEdit.trackbackError404=Trackback f
weblogEdit.hasComments=<a href="{0}">Comments [{1}]</a>
weblogEdit.enclosureURL=Enclosure URL
+weblogEdit.enclosureURL.tooltip=Podcast or other multimedia URL to embed
within the RSS & Atom feeds for this blog entry.
weblogEdit.enclosureType=Type
weblogEdit.enclosureLength=Length
weblogEdit.mediaCastFailedFetchingInfo=Unable to reach the enclosure. Check
the hostname in the URL.
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Categories.jsp Sun Aug
10 21:11:13 2014
@@ -50,10 +50,11 @@ function onMove()
<table class="rollertable">
<tr class="rollertable">
- <th class="rollertable" width="35%"><s:text name="generic.name"
/></th>
- <th class="rollertable" width="45%"><s:text
name="generic.description" /></th>
- <th class="rollertable" width="10%"><s:text name="generic.edit"
/></th>
- <th class="rollertable" width="10%"><s:text
name="categoriesForm.remove" /></th>
+ <th class="rollertable" width="15%"><s:text name="generic.name"
/></th>
+ <th class="rollertable" width="40%"><s:text
name="generic.description" /></th>
+ <th class="rollertable" width="31%"><s:text
name="categoriesForm.imageUrl" /></th>
+ <th class="rollertable" width="7%"><s:text name="generic.edit"
/></th>
+ <th class="rollertable" width="7%"><s:text
name="categoriesForm.remove" /></th>
</tr>
<s:if test="AllCategories != null && !AllCategories.isEmpty">
@@ -67,14 +68,12 @@ function onMove()
<tr class="rollertable_even">
</s:else>
- <td class="rollertable">
- <str:truncateNicely lower="15" upper="20" ><s:property
value="#category.name" /></str:truncateNicely>
- </td>
+ <td class="rollertable"><s:property value="#category.name"
/></td>
- <td class="rollertable">
- <str:truncateNicely lower="30" upper="35" ><s:property
value="#category.description" /></str:truncateNicely>
- </td>
+ <td class="rollertable"><s:property
value="#category.description" /></td>
+ <td class="rollertable"><s:property value="#category.image"
/></td>
+
<td class="rollertable" align="center">
<s:url var="editUrl" action="categoryEdit">
<s:param name="weblog" value="%{actionWeblog.handle}"
/>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/CategoryEdit.jsp Sun
Aug 10 21:11:13 2014
@@ -53,13 +53,13 @@
</tr>
<tr>
- <td><s:text name="categoryForm.image" /></td>
- <td><s:textfield name="bean.image" size="120"
style="width:50%"/></td>
+ <td><s:text name="generic.description" /></td>
+ <td><s:textfield name="bean.description" size="120"
style="width:50%"/></td>
</tr>
<tr>
- <td><s:text name="generic.description" /></td>
- <td><s:textfield name="bean.description" size="120"
style="width:50%"/></td>
+ <td><s:text name="categoryForm.image" /></td>
+ <td><s:textfield name="bean.image" size="120"
style="width:50%"/></td>
</tr>
</table>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEdit.jsp Sun Aug
10 21:11:13 2014
@@ -227,19 +227,19 @@
<s:if test="authenticatedUser.hasGlobalPermission('admin')">
<s:checkbox name="bean.pinnedToMain" />
- <s:text name="weblogEdit.pinnedToMain" />
+ <s:text name="weblogEdit.pinnedToMain" /><tags:help
key="weblogEdit.pinnedToMain.tooltip"/>
<br />
</s:if>
<br />
<table>
<tr>
- <td><s:text name="weblogEdit.searchDescription"
/>: </td>
+ <td><s:text name="weblogEdit.searchDescription"
/>:<tags:help key="weblogEdit.searchDescription.tooltip"/></td>
<td><s:textfield name="bean.searchDescription"
size="60" maxlength="255" style="width:100%"/> </td>
</tr>
<tr>
- <td><s:text name="weblogEdit.enclosureURL" />:
</td>
- <td><s:textfield name="bean.enclosureURL"
size="40" maxlength="255" style="width:80%"/></td>
+ <td><s:text name="weblogEdit.enclosureURL"
/>:<tags:help key="weblogEdit.enclosureURL.tooltip"/></td>
+ <td><s:textfield name="bean.enclosureURL"
size="40" maxlength="255" style="width:100%"/></td>
</tr>
<s:if test="actionName == 'entryEdit'">
<tr>
Copied: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
(from r1617083,
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp)
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp?p2=roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp&p1=roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp&r1=1617083&r2=1617161&rev=1617161&view=diff
==============================================================================
---
roller/trunk/app/src/main/webapp/roller-ui/authoring/editors/editor-text.jsp
(original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp Sun
Aug 10 21:11:13 2014
@@ -35,7 +35,7 @@
<div>
<s:textarea id="edit_content" name="bean.text" cols="75" rows="25"
cssStyle="width: 100%" tabindex="5"/>
</div>
- <h3><s:text name="weblogEdit.summary" /></h3>
+ <h3><s:text name="weblogEdit.summary"/><tags:help
key="weblogEdit.summary.tooltip"/></h3>
<div>
<s:textarea id="edit_summary" name="bean.summary" cols="75" rows="10"
cssStyle="width: 100%" tabindex="6"/>
</div>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp Sun Aug
10 21:11:13 2014
@@ -23,3 +23,4 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
<%@ taglib uri="/struts-tags" prefix="s" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1"; prefix="str" %>
+<%@ taglib tagdir="/WEB-INF/tags" prefix="tags"%>
Added: roller/trunk/app/src/main/webapp/WEB-INF/tags/help.tag
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tags/help.tag?rev=1617161&view=auto
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tags/help.tag (added)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tags/help.tag Sun Aug 10 21:11:13
2014
@@ -0,0 +1,6 @@
+<%@tag%>
+<%@ attribute name="key" required="true" rtexprvalue="true" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt"%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+
+<img src="<s:url value='/images/help.png'/>" border="0" alt="icon"
title="<fmt:message key='${key}'/>" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/web.xml?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/web.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/web.xml Sun Aug 10 21:11:13 2014
@@ -11,6 +11,11 @@
<param-value>/WEB-INF/security.xml</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+ <param-value>ApplicationResources</param-value>
+ </context-param>
+
<filter>
<filter-name>struts2</filter-name>
<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
Modified: roller/trunk/docs/roller-user-guide.odt
URL:
http://svn.apache.org/viewvc/roller/trunk/docs/roller-user-guide.odt?rev=1617161&r1=1617160&r2=1617161&view=diff
==============================================================================
Binary files - no diff available.
