roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1584485 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/tags/LeftTag.java webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp webapp/WEB-INF/jsps/taglibs-struts2.jsp webapp/WEB-INF/taglib.tld
Date Fri, 04 Apr 2014 00:53:23 GMT
Author: gmazza
Date: Fri Apr  4 00:53:23 2014
New Revision: 1584485

URL: http://svn.apache.org/r1584485
Log:
Removed no longer needed Jakarta taglib LeftTag, replaced with JSTL substring() equivalent.

Removed:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/tags/LeftTag.java
Modified:
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/taglibs-struts2.jsp
    roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld

Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp?rev=1584485&r1=1584484&r2=1584485&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/admin/PlanetSubscriptions.jsp Fri Apr  4
00:53:23 2014
@@ -85,9 +85,8 @@ function confirmSubDelete(subUrl) {
         </td>
         
         <td class="rollertable">
-            <str:left count="100" >
-                <s:property value="#sub.feedURL" />
-            </str:left>
+            <s:set name="feedURL" value="#sub.feedURL" />
+            ${fn:substring(feedURL, 0, 100)}
         </td>
         
         <td class="rollertable">

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=1584485&r1=1584484&r2=1584485&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 Fri Apr  4 00:53:23
2014
@@ -20,5 +20,6 @@
 <%@ 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://tiles.apache.org/tags-tiles" prefix="tiles" %>
+<%@ 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" %>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld?rev=1584485&r1=1584484&r2=1584485&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/taglib.tld Fri Apr  4 00:53:23 2014
@@ -39,21 +39,6 @@
         </attribute>
     </tag>
     <tag>
-        <name>left</name>
-        <tagclass>org.apache.roller.weblogger.ui.tags.LeftTag</tagclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>count</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
         <name>truncateNicely</name>
         <tagclass>org.apache.roller.weblogger.ui.tags.TruncateNicelyTag</tagclass>
         <bodycontent>JSP</bodycontent>



Mime
View raw message