[jboss-svn-commits] JBL Code SVN: r10342 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/web/views and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 19 19:09:41 EDT 2007
Author: szimano
Date: 2007-03-19 19:09:41 -0400 (Mon, 19 Mar 2007)
New Revision: 10342
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.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/FindResultPlugin.java
Log:
wiki theme
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-03-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-03-19 23:09:41 UTC (rev 10342)
@@ -25,6 +25,7 @@
goback=Go back
thisIsVer=This is version
ofPage=of page
+toRollback=For rolling back this page just press EDIT.
changesBetween=Changes between versions
andChng=and
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-19 23:09:41 UTC (rev 10342)
@@ -6,7 +6,7 @@
<ui:composition template="wiki_template.xhtml">
<ui:define name="content">
- <h:outputText value="#{wikiEdit.lockMsg}" styleClass="pageLocked" />
+ <h:outputText value="#{wikiEdit.lockMsg}" styleClass="wikiGreybkgSection" rendered="#{wikiEdit.lockMsg ne ''}" />
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
<h:form>
<h:panelGrid styleClass="editPageArea">
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2007-03-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2007-03-19 23:09:41 UTC (rev 10342)
@@ -2,13 +2,19 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"><ui:composition
- template="wiki_template.xhtml">
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:t="http://myfaces.apache.org/tomahawk">
+
+ <ui:composition template="wiki_template.xhtml">
<ui:define name="content">
-
- <h:dataTable styleClass="basetablestyle" id="history" value="#{wikiView.historyTable}" var="hisElem"
- binding="#{wikiDiff.historyTable}" headerClass="tableheader" rowClasses="#{wikiView.historyClasses}">
+
+ <br />
+ <h:outputText value="#{msg.historytitle}" styleClass="h2" />
+ <br />
+
+ <t:dataTable styleClass="basetablestyle" id="history" value="#{wikiView.historyTable}" var="hisElem"
+ binding="#{wikiDiff.historyTable}" headerClass="historyTableheader" rowClasses="#{wikiView.historyClasses}" >
<h:column>
<f:facet name="header">
<h:outputText value="#{msg.version}" />
@@ -46,7 +52,7 @@
</h:commandLink>
</h:form>
</h:column>
- </h:dataTable>
+ </t:dataTable>
<h:form>
<h:commandLink action="goback">
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-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-19 23:09:41 UTC (rev 10342)
@@ -60,11 +60,12 @@
</h:panelGroup>
</h:panelGrid>
- <h:panelGroup styleClass="otherVersionBox" rendered="#{wikiView.otherVersion}" >
+ <h:panelGroup styleClass="wikiGreybkgSection" rendered="#{wikiView.otherVersion}" >
<h:outputText value="#{msg.thisIsVer} #{wikiCommon.pageVersion} #{msg.ofPage} " />
<h:outputLink value="#{wikiView.wikiFriendlyURL}">
<h:outputText value="#{wikiCommon.pageName}" />
</h:outputLink>
+ <h:outputText value=". #{msg.toRollback}" />
</h:panelGroup>
<ui:insert name="attachment" />
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-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-19 23:09:41 UTC (rev 10342)
@@ -136,10 +136,93 @@
height:20px;
}
+.historyTableheader {
+ background-color: #233345;
+ font-size:10px;
+ font-weight:bold;
+ color:#94aebd;
+ text-align:left;
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+/* -------------------- Info table Style --------------------------------------- */
+
+.basetablestyle {
+ margin:0px;
+}
+.basetablestyle img {
+ border:0px;
+}
+.basetablestyle td {
+ height:3em;
+ padding-left: 6px;
+ padding-right: 30px;
+
+}
+
+.basetablestyle .header {
+ background-color: #233345;
+ font-size:10px;
+ font-weight:bold;
+ color:#94aebd;
+ text-align:left;
+}
+
+.basetablestyle .tableheaderfirst {
+ border-bottom:1px solid #233345;
+ height:2em;
+
+}
+
+.basetablestyle .tableheader {
+ border-left:1px solid #94aebd;
+ border-bottom:1px solid #233345;
+ height:2em;
+}
+
+
+.basetablestyle .rowlinefirst {
+ border-bottom:1px solid #e6e7e8;
+}
+
+.basetablestyle .rowline {
+ border-left:1px solid #e6e7e8;
+ border-bottom:1px solid #e6e7e8;
+}
+
+.basetablestyle .oddRow {
+ background-color: #f4f3f3;
+ padding-left: 6px;
+}
+
+.basetablestyle .evenRow{
+ background-color: #ffffff;
+}
+.basetablestyle .footerrow {
+ background-color:#656565;
+}
+.basetablestyle .bottomline {
+ border-bottom:1px solid #656565;
+}
+
/*
//OLD STYLES
+.otherVersionBox {
+ border: 2px dashed red;
+ text-align: center;
+ border-left: auto;
+ border-right: auto;
+ font-size: 12px;
+ width: 80%;
+ text-align: center;
+ padding:5px;
+ margin: 5px;
+}
+
td.wikiContent {
text-align: left;
width: 100%;
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FindResultPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FindResultPlugin.java 2007-03-19 20:55:56 UTC (rev 10341)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/FindResultPlugin.java 2007-03-19 23:09:41 UTC (rev 10342)
@@ -42,18 +42,28 @@
Map<String, Integer> pages = (Map<String, Integer>) wikiSession
.getAttribute("findResult");
- StringBuilder pageStr = new StringBuilder("!!!__Find results:__\n\\\\\n\\\\\n").append("|__Page__|__Score__\n");
+ StringBuilder pageStr = new StringBuilder(
+ HTMLTranslatorParts.pagePartRegexEnd);
+ pageStr.append("<h2>Find Results</h2>\n");
+ pageStr
+ .append("<table class=\"basetablestyle\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tr class=\"header\" ><th class='tableheaderfirst'>Page</th><th class='tableheader'>Score</th></tr>\n");
+ boolean even = false;
if (pages.size() == 0) {
pageStr.append("''NONE FOUND''");
} else {
for (String p : pages.keySet()) {
- pageStr.append("|[").append(p).append("]|").append(pages.get(p)).append("\n");
+ pageStr.append("<tr class='").append(even ? "evenRow" : "oddRow").append("'><td>").append(HTMLTranslatorParts.pagePartRegexStart).append("[").append(p).append("]").append(HTMLTranslatorParts.pagePartRegexEnd).append("</td><td>")
+ .append(pages.get(p)).append("</td></tr>\n");
+
+ even = !even;
}
}
+ pageStr.append("</table>\n").append(HTMLTranslatorParts.pagePartRegexStart);
+
newPage.setContent(pageStr.toString());
-
+
wikiSession.removeAttribute("findResult");
return newPage;
More information about the jboss-svn-commits
mailing list