Author: bpapez Date: Fri Jun 15 16:09:04 2007 New Revision: 714 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D714&repname= =3Dcorporate_portal_templates_v2 Log: OPEN - issue JAHIA-2044: Sp2 Blog trackback: regroup comments and trackabck= s =
http://www.jahia.net/jira/browse/JAHIA-2044 changed order and added an extra button to add ping urls Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2.properties branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_de.properties branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_en.properties branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_pingurl.inc branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_trackbacks.inc Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po= rtal_templates_v2.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2.properties&re= v=3D714&repname=3Dcorporate_portal_templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2.properties Fri Jun 15 16:09:04 2007 @@ -305,7 +305,7 @@ blog.thisWeek =3D This week blog.trackbacks =3D trackbacks blog.trackback =3D trackback -blog.sentPingUrl =3D Sent ping urls +blog.sentPingUrl =3D Send a ping url blog.pingURL =3D URL to send the ping to blog.trackBackTitle =3D Title of the blog entry for this trackback blog.trackBackExcerpt =3D Excerpt of the blog entry for this trackback Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po= rtal_templates_v2_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_de.properties= &rev=3D714&repname=3Dcorporate_portal_templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_de.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_de.properties Fri Jun 15 16:09:04 2007 @@ -293,7 +293,7 @@ blog.thisWeek =3D Diese Woche blog.trackbacks =3D Trackbacks blog.trackback =3D Trackback -blog.sentPingUrl =3D URLs der gesendeten Pings +blog.sentPingUrl =3D Ping an URL senden blog.pingURL =3D URL des zu sendenden Pings blog.trackBackTitle =3D Titel des Blogeintrags von diesem Trackback blog.trackBackExcerpt =3D Zusammenfassung des Blogeintrags von diesem Tra= ckback Modified: branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_po= rtal_templates_v2_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/java/jahiatemplates/Corporate_portal_templates_v2_en.properties= &rev=3D714&repname=3Dcorporate_portal_templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_en.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/java/jahiatemplates/Corporate_portal_t= emplates_v2_en.properties Fri Jun 15 16:09:04 2007 @@ -299,7 +299,7 @@ blog.thisWeek =3D This week blog.trackbacks =3D trackbacks blog.trackback =3D trackback -blog.sentPingUrl =3D Sent ping urls +blog.sentPingUrl =3D Send a ping url blog.pingURL =3D URL to send the ping to blog.trackBackTitle =3D Title of the blog entry for this trackback blog.trackBackExcerpt =3D Excerpt of the blog entry for this trackback Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/jsp/blogs/entries.inc&rev=3D714&repname=3Dcorporate_portal_temp= lates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc Fri Jun 15 16:09= :04 2007 @@ -153,9 +153,9 @@ title=3D"<content:resourceBundle resourceBundle=3D"jahiate= mplates.Corporate_portal_templates_v2" resourceName=3D"blog.permanentLink"/>" rel=3D"bookmark= " class=3D"permalink">link</a> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" - resourceName=3D"blog.postedBy"/> <%=3Dauthor%> + resourceName=3D"blog.postedBy"/> <%=3Dauthor%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" - resourceName=3D"blog.at"/> <%=3Dkkmm%> + resourceName=3D"blog.at"/> <%=3Dkkmm%> <% int categCount =3D 0; Set selectedCategories =3D Category.getObjectCategories(Conten= tContainer.getContainer(entry.getID()).getObjectKey()); @@ -190,11 +190,11 @@ } %> <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>#com= ments" - class=3D"commentlink"><%=3DcommentsCount%> + class=3D"commentlink"><%=3DcommentsCount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.comments"/></a> <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>#tra= ckbacks" - class=3D"commentlink"><%=3DtrackbaksCount%> + class=3D"commentlink"><%=3DtrackbaksCount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.trackbacks"/></a> </dd> @@ -259,7 +259,7 @@ if ("day".equals(range)){ %> <content:resourceBundle resourceBundle=3D"jahiatemplat= es.Corporate_portal_templates_v2" - resourceName=3D"blog.the"/> <%=3Dsdf.format( (new = Date(lowerVal.getTime())) )%> + resourceName=3D"blog.the"/> <%=3Dsdf.format( = (new Date(lowerVal.getTime())) )%> <% } else { String doc=3DjData.page().getDoc(); @@ -268,10 +268,10 @@ %> = <content:resourceBundle resourceBundle=3D"jahiatemplat= es.Corporate_portal_templates_v2" - resourceName=3D"blog.to"/> <%=3Dsdf.format( (new D= ate(tdoc)) )%><!--<%=3Dsdf.format( (new Date(lowerVal.getTime())) )%> + resourceName=3D"blog.to"/> <%=3Dsdf.format( (= new Date(tdoc)) )%><%--<%=3Dsdf.format( (new Date(lowerVal.getTime())) )%> <content:resourceBundle resourceBundle=3D"jahiatemplat= es.Corporate_portal_templates_v2" resourceName=3D"blog.to"/> - <%=3Dsdf.format( (new Date(upperVal.getTime())) ) %>--> + <%=3Dsdf.format( (new Date(upperVal.getTime())) ) %>--= %> <% } } @@ -279,7 +279,7 @@ %> <br/> <br/>[<a href=3D"<%=3DbypassUrl%>"><content:resourceBundle resourc= eBundle=3D"jahiatemplates.Corporate_portal_templates_v2" - resourceName=3D"blog.backTo"/> <%=3DjData.page().getTitle()%><= /a>] + resourceName=3D"blog.backTo"/> <%=3DjData.page().getTitle= ()%></a>] = <% } Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/jsp/blogs/entry.inc&rev=3D714&repname=3Dcorporate_portal_templa= tes_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entry.inc Fri Jun 15 16:09:0= 4 2007 @@ -76,7 +76,7 @@ } = %> - <a href=3D"#comments" class=3D"commentlink"><%=3DcommentsCount= %> + <a href=3D"#comments" class=3D"commentlink"><%=3DcommentsCount= %> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" resourceName=3D"blog.comments"/></a> <% @@ -86,7 +86,7 @@ trackbacksCount =3D trackbacks.getFullSize(); } %> - <a href=3D"#trackbacks" class=3D"commentlink"><%=3DtrackbacksC= ount%> + <a href=3D"#trackbacks" class=3D"commentlink"><%=3DtrackbacksC= ount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" resourceName=3D"blog.trackbacks"/></a> </p> @@ -138,9 +138,9 @@ title=3D"<content:resourceBundle resourceBundle=3D"jahiate= mplates.Corporate_portal_templates_v2" resourceName=3D"blog.permanentLink"/>" rel=3D"bookmark= " class=3D"permalink">link</a> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" - resourceName=3D"blog.postedBy"/> <%=3Dauthor%> + resourceName=3D"blog.postedBy"/> <%=3Dauthor%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" - resourceName=3D"blog.at"/> <%=3Dkkmm%> + resourceName=3D"blog.at"/> <%=3Dkkmm%> <% int categCount =3D 0; Set selectedCategories =3D Category.getObjectCategories(Conten= tContainer.getContainer(entry.getID()).getObjectKey()); @@ -165,12 +165,12 @@ %> = <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>#com= ments" - class=3D"commentlink"><%=3DcommentsCount%> + class=3D"commentlink"><%=3DcommentsCount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.comments"/></a> = <a href=3D"<%=3DbypassUrl%>?entryId=3D<%=3Dentry.getID()%>#tra= ckbacks" - class=3D"commentlink"><%=3DtrackbacksCount%> + class=3D"commentlink"><%=3DtrackbacksCount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.trackbacks"/></a> = @@ -179,10 +179,10 @@ </dd> = <div id=3D"comments"> - <%@ include file=3D"view_comments.inc"%> + <%@ include file=3D"view_pingurl.inc"%> = <%@ include file=3D"view_trackbacks.inc"%> + <%@ include file=3D"view_comments.inc"%> <%@ include file=3D"addcomment_form.inc"%> - <%@ include file=3D"view_pingurl.inc"%> </div> = <% Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/jsp/blogs/view_comments.inc&rev=3D714&repname=3Dcorporate_porta= l_templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_comments.inc Fri Jun 15= 16:09:04 2007 @@ -21,9 +21,9 @@ if (commentsCount>0 || jData.gui().isEditMode()) { %> <h4> - <%=3DcommentsCount%> + <%=3DcommentsCount%> <content:resourceBundle resourceBundle=3D"jahiatemplates.Corpo= rate_portal_templates_v2" - resourceName=3D"blog.comments"/> <content:resourceBundle r= esourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" + resourceName=3D"blog.comments"/> <content:resourceBun= dle resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"blog.forFar"/> <span> (<a href=3D"#postcomment"><content:resourceBundle resourceBund= le=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"blog.postYourOwn"/></a>)</span> @@ -49,10 +49,10 @@ %> <dt id=3D"comment<%=3Dcounter%>" class=3D"<%=3Dalt%>"> <a href=3D"#comment<%=3Dcounter%>" class=3D"postno" title= =3D"Link to comment <%=3Dcounter%>"><%=3Dcounter%>.</a> - <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.at"/> + <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.at"/> <% sdf.applyPattern("kk:mm z"); %><%=3Dsdf.format( new Dat= e(commentDateLong) )%> - <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.on"/> - <%sdf.applyPattern("d MMM yyyy");%><%=3Dsdf.format( new Da= te(commentDateLong) )%>, <%=3DcommentAuthor%> + <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.on"/> + <%sdf.applyPattern("d MMM yyyy");%><%=3Dsdf.format( new Da= te(commentDateLong) )%>, <%=3DcommentAuthor%> <content:resourceBundle resourceBundle=3D"jahiatemplates.C= orporate_portal_templates_v2" resourceName=3D"blog.wrote"/>: </dt> <dd class=3D"<%=3Dalt%>"> Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_pingurl.inc URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/jsp/blogs/view_pingurl.inc&rev=3D714&repname=3Dcorporate_portal= _templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_pingurl.inc (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_pingurl.inc Fri Jun 15 = 16:09:04 2007 @@ -16,14 +16,24 @@ limitations under the License. --%><% if (jData.gui().isEditMode()) { - %><h4><content:resourceBundle resourceBundle=3D"jahiatemplates.Corpora= te_portal_templates_v2" - resourceName=3D"blog.sentPingUrl"/></h4><% JahiaContainerList pingURLs =3D entry.getContainerList( "trackBackPing= URLs" ); ContainerListBean pingURLsBean =3D new ContainerListBean(pingURLs,jPar= ams); - + pageContext.setAttribute("pingURLsList", pingURLsBean); + = jData.gui().html().drawBeginActionMenu(pingURLsBean , null, null, true, "", "jahiatemplates.Corporate_portal_templates_v= 2", null, out); - +%> + <content:addContainerURL name=3D"pingURLsList" id=3D"addPingUrlContain= erURL" display=3D"false"/> = + = + <h4><content:resourceBundle resourceBundle=3D"jahiatemplates.Corporate= _portal_templates_v2" + resourceName=3D"blog.sentPingUrl"/> + <logic:present name=3D"addPingUrlContainerURL"> + <a href=3D"<bean:write name=3D'addPingUrlContainerURL'/>"><img + src=3D"<content:contextURL/>/img/actions/add.gif" width=3D"1= 1" height=3D"11" + alt=3D"+" border=3D"0"/></a> + </logic:present> = + </h4> = +<% if (pingURLs !=3D null) { Enumeration pingURLEnum =3D pingURLs.getContainers(); while (pingURLEnum.hasMoreElements()) { Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_trackbacks.inc URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/jsp/blogs/view_trackbacks.inc&rev=3D714&repname=3Dcorporate_por= tal_templates_v2 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_trackbacks.inc (origina= l) +++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/view_trackbacks.inc Fri Jun = 15 16:09:04 2007 @@ -22,7 +22,7 @@ if (trackbacksCount>0 || jData.gui().isEditMode()) { %> <h4 id=3D"trackbacks"> - <%=3DtrackbacksCount%> <content:resourceBundle resourceBundle= =3D"jahiatemplates.Corporate_portal_templates_v2" + <%=3DtrackbacksCount%> <content:resourceBundle resourceBu= ndle=3D"jahiatemplates.Corporate_portal_templates_v2" resourceName=3D"blog.trackbacks"/> </h4> <dl> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
