Author: brushed
Date: Mon Feb 2 19:34:23 2009
New Revision: 740086
URL: http://svn.apache.org/viewvc?rev=740086&view=rev
Log:
2.8.2-svn-7:
* JSPWIKI-491 : Icons in list of attachements were only shown when the
attachment type was lower-case
* JSPWIKI-486 : Always show the information table, also in case
there is only one version of the page.
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=740086&r1=740085&r2=740086&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Mon Feb 2 19:34:23
2009
@@ -1,3 +1,14 @@
+2009-02-02 Dirk Frederickx <[email protected]>
+
+ * 2.8.2-svn-7
+
+ * JSPWIKI-491, Icons in list of attachements were only shown when the
+ attachment type was lower-case
+
+ * JSPWIKI-486 Always show the information table, also in case
there is
+ only one version of the page.
+
+
2009-01-23 Harry Metske <[email protected]>
* 2.8.2-svn-6
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=740086&r1=740085&r2=740086&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
Mon Feb 2 19:34:23 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "6";
+ public static final String BUILD = "7";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp?rev=740086&r1=740085&r2=740086&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/AttachmentTab.jsp
Mon Feb 2 19:34:23 2009
@@ -91,7 +91,7 @@
<%
String name = att.getFileName();
int dot = name.lastIndexOf(".");
- String attachtype = ( dot != -1 ) ? name.substring(dot+1) : " ";
+ String attachtype = ( dot != -1 ) ? name.substring(dot+1).toLowerCase()
: " ";
String sname = name;
if( sname.length() > MAXATTACHNAMELENGTH ) sname =
sname.substring(0,MAXATTACHNAMELENGTH) + "...";
Modified:
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp?rev=740086&r1=740085&r2=740086&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/webdocs/templates/default/InfoContent.jsp
Mon Feb 2 19:34:23 2009
@@ -165,9 +165,10 @@
</wiki:CheckRequestContext>
<%-- DIFF section --%>
-
+ <%--
<wiki:CheckVersion mode="first"><fmt:message
key="info.noversions"/></wiki:CheckVersion>
- <wiki:CheckVersion mode="notfirst">
+ --%>
+
<%-- if( itemcount > 1 ) { --%>
<wiki:SetPagination start="<%=startitem%>" total="<%=itemcount%>"
pagesize="<%=pagesize%>" maxlinks="9"
@@ -232,7 +233,6 @@
</div>
${pagination}
<%-- } /* itemcount > 1 */ --%>
- </wiki:CheckVersion>
</wiki:Tab>
</wiki:TabbedSection>