[jboss-svn-commits] JBL Code SVN: r10301 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: wiki-common/src/etc/images and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 17 09:45:31 EDT 2007
Author: szimano
Date: 2007-03-17 09:45:31 -0400 (Sat, 17 Mar 2007)
New Revision: 10301
Added:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/ico_12x_feed.gif
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
Log:
view new theme
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-17 13:25:17 UTC (rev 10300)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_template.xhtml 2007-03-17 13:45:31 UTC (rev 10301)
@@ -23,7 +23,14 @@
<f:loadBundle basename="Messages" var="msg"/>
<h:panelGroup rendered="#{wikiCommon.userLoggedIn}" id="tagMeWiki" />
-
+
+ <h:panelGroup styleClass="floatright">
+ <h:form>
+ <h:inputText value="#{wikiView.searchQuery}" required="true" />
+ <h:commandButton value="#{msg.search}" action="#{wikiView.search}" />
+ </h:form>
+ </h:panelGroup>
+
<h:panelGrid>
<h:panelGroup styleClass="wikiNavHeader" >
<h:outputLink value="#{wikiView.wikiMainPageURL}">
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-03-17 13:25:17 UTC (rev 10300)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-17 13:45:31 UTC (rev 10301)
@@ -8,52 +8,51 @@
<ui:define name="content">
<h:panelGrid columns="8">
- <h:outputLink value="#{wikiView.wikiFriendlyURL}">
- <h:outputText value="#{msg.permalink}" />
- </h:outputLink>
+ <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:commandLink action="recentChanges">
- <f:param name="type" value="recentChanges" />
- <h:outputText value="#{msg.recentChanges}"/>
- </h:commandLink>
+ <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 rendered="#{wikiCommon.userLoggedIn}">
- <h:commandLink action="edit">
- <h:outputText value="#{msg.edit}" />
- </h:commandLink>
- <h:outputText value=" " />
- <h:commandLink action="attach">
- <h:outputText value="#{msg.attach}" />
- </h:commandLink>
- <h:outputText value=" " />
- <h:commandLink action="history">
- <h:outputText value="#{msg.history}" />
- </h:commandLink>
+ <h:outputText value="["/><h:commandLink action="edit">
+ <h:outputText value="#{msg.edit}" />
+ </h:commandLink>
+ <h:outputText value="] [" />
+ <h:commandLink action="attach">
+ <h:outputText value="#{msg.attach}" />
+ </h:commandLink>
+ <h:outputText value="] [" />
+ <h:commandLink action="history">
+ <h:outputText value="#{msg.history}" />
+ </h:commandLink>
+ <h:outputText value="]"/>
</h:form>
- <h:outputLink value="#{wikiView.rssURL}">
- <h:outputText value="#{msg.rss}" />
- </h:outputLink>
- <h:outputLink value="#{wikiView.rdfURL}">
- <h:outputText value="#{msg.rdf}" />
- </h:outputLink>
- <h:outputLink value="#{wikiView.atomURL}">
- <h:outputText value="#{msg.atom}" />
- </h:outputLink>
+ <h:panelGroup>
+ <h:outputText value="["/><h:outputLink value="#{wikiView.rssURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rss}" /></h:outputLink><h:outputText value="]"/>
+ </h:panelGroup>
- <h:outputLink value="http://false.link.print.to" onclick="#{wikiView.printURL}">
- <h:outputText value="#{msg.print}"/>
- </h:outputLink>
+ <h:panelGroup>
+ <h:outputText value="["/><h:outputLink value="#{wikiView.rdfURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.rdf}" /></h:outputLink><h:outputText value="]"/>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText value="["/><h:outputLink value="#{wikiView.atomURL}" styleClass="standardFeedLink" ><h:outputText value="#{msg.atom}" /></h:outputLink><h:outputText value="]"/>
+ </h:panelGroup>
+
+ <h:panelGroup>
+ <h:outputText value="["/><h:outputLink value="http://false.link.print.to" onclick="#{wikiView.printURL}"><h:outputText value="#{msg.print}"/></h:outputLink><h:outputText value="]"/>
+ </h:panelGroup>
</h:panelGrid>
- <h:panelGroup>
- <h:form>
- <h:inputText value="#{wikiView.searchQuery}" required="true" />
- <h:commandButton value="#{msg.search}" action="#{wikiView.search}" />
- </h:form>
- </h:panelGroup>
-
<h:panelGroup styleClass="otherVersionBox" rendered="#{wikiView.otherVersion}" >
<h:outputText value="#{msg.thisIsVer} #{wikiCommon.pageVersion} #{msg.ofPage} " />
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
Added: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/ico_12x_feed.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/ico_12x_feed.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-17 13:25:17 UTC (rev 10300)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-17 13:45:31 UTC (rev 10301)
@@ -1,4 +1,4 @@
-/* Styles that are unique to the wiki pages */
+fa/* Styles that are unique to the wiki pages */
.wikiContent {
margin: 0px;
@@ -64,6 +64,23 @@
font-weight: bold;
}
+.clear { clear:both;}
+
+.floatright {
+ float:right;
+}
+.floatleft {
+ float:left;
+}
+
+.standardFeedLink {
+ background-image:url(ico_12x_feed.gif);
+ background-repeat: no-repeat;
+ background-position: 0px 3px;
+ padding: 2px 0px 2px 15px;
+ white-space:nowrap;
+}
+
/*
//OLD STYLES
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2007-03-17 13:25:17 UTC (rev 10300)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AttachmentListPlugin.java 2007-03-17 13:45:31 UTC (rev 10301)
@@ -64,10 +64,8 @@
String href = host + newPage.getName() + "/file:" + file;
newContent += "<tr><td><a href=\"" + href + "\">" + href
+ "</a></td>";
- newContent += "<td><a href=\"" + fileEditURL + "&var1=" + file
- + "\" ><img border=\"0\" src=\"" + host
- + WikiCommon.WIKI_BUTTONS
- + "/historyButton.png\" /></a></td></tr>\n";
+ newContent += "<td>[<a href=\"" + fileEditURL + "&var1=" + file
+ + "\" >History</a>]</td></tr>\n";
}
newContent += "</table>\n";
More information about the jboss-svn-commits
mailing list