[jboss-svn-commits] JBL Code SVN: r10802 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Apr 6 10:48:55 EDT 2007
Author: szimano
Date: 2007-04-06 10:48:55 -0400 (Fri, 06 Apr 2007)
New Revision: 10802
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
Log:
wiki att bug downloads case bug and downloads max/normal state bug
Modified: labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java 2007-04-06 14:07:39 UTC (rev 10801)
+++ labs/jbosslabs/trunk/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/url/DownloadUrlFactory.java 2007-04-06 14:48:55 UTC (rev 10802)
@@ -9,7 +9,7 @@
public class DownloadUrlFactory extends AbstractLabsProjectPortletUrlFactory {
public void buildPathFromPortletParameters(StringBuffer sb, PortletParametersStateString ppss) {
if (ppss.getValue("category") != null) {
- addTokenToPath(sb, ppss.getValue("category").toLowerCase());
+ addTokenToPath(sb, ppss.getValue("category"));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-04-06 14:07:39 UTC (rev 10801)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiCommonSession.java 2007-04-06 14:48:55 UTC (rev 10802)
@@ -58,7 +58,7 @@
}
public void update(AttributesExtractor attrExtractor) {
- if (attrExtractor.getRequestedPageName() != null) {
+ if (attrExtractor.getRequestedPageName() != null && attrExtractor.getRequestedPageName().length() > 0) {
pageName = attrExtractor.getRequestedPageName();
log.info("Page name: " + pageName);
} else {
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-04-06 14:07:39 UTC (rev 10801)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-04-06 14:48:55 UTC (rev 10802)
@@ -131,6 +131,11 @@
type = attrExtractor.getType();
}
+ log.info("Loading page: "
+ + WikiHelper.getWikiCommonSession().getPageName() + " ["
+ + WikiHelper.getWikiCommonSession().getLangCode() + "] type: "
+ + type);
+
if (currentPage == null) {
WikiType wikiType = WikiHelper.getWikiEngine().getWikiType(type);
WikiContext wikiContext = new WikiContext(attrExtractor
@@ -252,7 +257,7 @@
public String getDate() {
return getCurrentPage().getEditDate().toString();
}
-
+
public Integer getPageVersion() {
return attrExtractor.getPageVersion();
}
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-04-06 14:07:39 UTC (rev 10801)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-04-06 14:48:55 UTC (rev 10802)
@@ -6,22 +6,26 @@
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
-
+
+ <link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RSS Feed" href="#{wikiView.rssURL}" />
+ <link rel="alternate" type="application/atom+xml" title="JBoss Wiki: #{wikiView.pageName} ATOM Feed" href="#{wikiView.atomURL}" />
+ <link rel="alternate" type="application/rss+xml" title="JBoss Wiki: #{wikiView.pageName} RDF Feed" href="#{wikiView.rdfURL}" />
+
<h:panelGrid columns="8">
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.wikiFriendlyURL}"><h:outputText value="#{msg.permalink}" /></h:outputLink><h:outputText value="]"/>
</h:panelGroup>
- <h:form>
+ <h:panelGroup><h:form>
<h:outputText value="["/>
<h:commandLink action="recentChanges">
<f:param name="type" value="recentChanges" />
<h:outputText value="#{msg.recentChanges}"/>
</h:commandLink>
<h:outputText value="]"/>
- </h:form>
+ </h:form></h:panelGroup>
- <h:form rendered="#{wikiCommon.userLoggedIn}">
+ <h:panelGroup><h:form rendered="#{wikiCommon.userLoggedIn}">
<h:outputText value="["/><h:commandLink action="edit">
<c:if test="#{wikiView.pageVersion ne null}">
<f:param name="version" value="#{wikiView.pageVersion}" />
@@ -34,15 +38,15 @@
<h:outputText value="#{msg.attach}" />
</h:commandLink>
<h:outputText value="] " />
- </h:form>
+ </h:form></h:panelGroup>
- <h:form>
+ <h:panelGroup><h:form>
<h:outputText value="[" />
<h:commandLink action="history">
<h:outputText value="#{msg.history}" />
</h:commandLink>
<h:outputText value="]"/>
- </h:form>
+ </h:form></h:panelGroup>
<h:panelGroup>
<h:outputText value="["/><h:outputLink value="#{wikiView.rssURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rss}" /></h:outputLink><h:outputText value="]"/>
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-04-06 14:07:39 UTC (rev 10801)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachementInfoPlugin.java 2007-04-06 14:48:55 UTC (rev 10802)
@@ -58,16 +58,18 @@
history.append("<h3>History of file: ").append(attachementName).append(
" page: ").append(wikiPage.getName()).append("</h3>\n");
- history.append("<hr>\n").append("<table border=\"1\">\n");
+ history.append("<hr>\n").append("<table class='basetablestyle'>\n");
history
- .append("<tr><td><b>Version</b></td><td><b>Date</b></td><td><b>Author</b></td><td><b>Size</b></td><td><b>Rollback</b></td></tr>\n");
+ .append("<tr><th class='historyTableheader'>Version</th><th class='historyTableheader'>Date</th><th class='historyTableheader'>Author</th><th class='historyTableheader'>Size</th><th class='historyTableheader'>Rollback</th></tr>\n");
+ boolean odd = true;
+
int lastVer = wikiEngine.getLastAttachmentVersion(wikiPage.getName(),
attachementName, wikiPage.getLangCode());
for (int i = lastVer; i > 0; i--) {
WikiAttachment wikiAttachment = wikiEngine.getAttachment(wikiPage
.getName(), attachementName, i, wikiPage.getLangCode());
- history.append("<tr><td>").append("<a href=\"").append(attURL)
+ history.append("<tr class='").append(odd ? "oddRow" : "evenRow").append("'><td><a href=\"").append(attURL)
.append(attachementName).append(
(i != lastVer) ? ":" + i : "").append("\" >")
.append(i).append("</a></td>").append("<td>").append(
@@ -110,6 +112,8 @@
}
history.append("</tr>\n");
+
+ odd = !odd;
}
history.append("</table>\n");
wikiPage.setContent(history.toString());
More information about the jboss-svn-commits
mailing list