[jboss-svn-commits] JBL Code SVN: r10302 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/web/views and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 17 12:01:01 EDT 2007
Author: szimano
Date: 2007-03-17 12:01:01 -0400 (Sat, 17 Mar 2007)
New Revision: 10302
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/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/wiki-common/src/etc/images/wikiStyle.css
Log:
wiki edit&history theme
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-03-17 13:45:31 UTC (rev 10301)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiView.java 2007-03-17 16:01:01 UTC (rev 10302)
@@ -58,6 +58,8 @@
private String searchQuery;
+ private List<HistoryElement> hisList;
+
public WikiView() {
attrExtractor = WikiHelper.getAttributesExtractor(WikiHelper
.getRequest(), WikiHelper.getResponse());
@@ -173,21 +175,34 @@
}
public List<HistoryElement> getHistoryTable() {
- List<HistoryElement> hisList = new Vector<HistoryElement>();
+ if (hisList == null) {
+ hisList = new Vector<HistoryElement>();
- WikiEngine engine = WikiHelper.getWikiEngine();
- WikiPage currentPage = getCurrentPage();
+ WikiEngine engine = WikiHelper.getWikiEngine();
+ WikiPage currentPage = getCurrentPage();
- for (int i = currentPage.getLastVersion(); i > 0; i--) {
- WikiPage histPage = engine.getPageAtVersion(currentPage, true, i,
- currentPage.getLangCode());
+ for (int i = currentPage.getLastVersion(); i > 0; i--) {
+ WikiPage histPage = engine.getPageAtVersion(currentPage, true,
+ i, currentPage.getLangCode());
- hisList.add(new HistoryElement(i, histPage.getEditDate(), histPage
- .getLastAuthor().getName(), histPage.getLength()));
+ hisList.add(new HistoryElement(i, histPage.getEditDate(),
+ histPage.getLastAuthor().getName(), histPage
+ .getLength()));
+ }
+
}
return hisList;
}
+
+ public String getHistoryClasses() {
+ String classes = "oddRow";
+ for (int i = 1; i < getHistoryTable().size(); i++) {
+ classes += (i % 2 == 0) ? ",oddRow" : ",evenRow";
+ }
+
+ return classes;
+ }
public boolean isOtherVersion() {
if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
@@ -230,11 +245,11 @@
return print;
}
-
+
public String getLastAuthor() {
return getCurrentPage().getLastAuthor().getName();
}
-
+
public String getDate() {
return getCurrentPage().getEditDate().toString();
}
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-17 13:45:31 UTC (rev 10301)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_edit.xhtml 2007-03-17 16:01:01 UTC (rev 10302)
@@ -9,12 +9,12 @@
<h:outputText value="#{wikiEdit.lockMsg}" styleClass="pageLocked" />
<h:outputText value="#{wikiEdit.showEditHTML}" escape="false" />
<h:form>
- <h:panelGrid>
+ <h:panelGrid styleClass="editPageArea">
<h:inputTextarea rows="40" cols="80" value="#{wikiEdit.pageContent}" styleClass="editPageArea" acceptcharset="UTF-8" />
- <h:panelGroup>
- <h:commandButton value="#{msg.edit_save}" action="#{wikiEdit.save}" />
- <h:commandButton value="#{msg.edit_cancel}" action="#{wikiEdit.cancel}" />
- <h:commandButton value="#{msg.edit_spellcheck}" onclick="openSpellChecker(); return false;" />
+ <h:panelGroup styleClass="formbuttons">
+ <h:commandButton styleClass="submit" value="#{msg.edit_save}" action="#{wikiEdit.save}" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_cancel}" action="#{wikiEdit.cancel}" />
+ <h:commandButton styleClass="submit" value="#{msg.edit_spellcheck}" onclick="openSpellChecker(); return false;" />
</h:panelGroup>
</h:panelGrid>
<h:inputHidden value="#{wikiEdit.editSessionId}" />
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-17 13:45:31 UTC (rev 10301)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_history.xhtml 2007-03-17 16:01:01 UTC (rev 10302)
@@ -7,7 +7,8 @@
<ui:define name="content">
- <h:dataTable id="history" value="#{wikiView.historyTable}" var="hisElem" binding="#{wikiDiff.historyTable}" >
+ <h:dataTable styleClass="basetablestyle" id="history" value="#{wikiView.historyTable}" var="hisElem"
+ binding="#{wikiDiff.historyTable}" headerClass="tableheader" rowClasses="#{wikiView.historyClasses}">
<h:column>
<f:facet name="header">
<h:outputText value="#{msg.version}" />
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:45:31 UTC (rev 10301)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-17 16:01:01 UTC (rev 10302)
@@ -81,6 +81,41 @@
white-space:nowrap;
}
+.editPageArea {
+ width: 100%;
+}
+
+.formbuttons {
+ margin: 10px auto 15px auto;
+ padding-top: 5px;
+ border-top: 1px solid #4a5d75;
+ width: 100%;
+}
+
+.formbuttons ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: inline;
+}
+
+.formbuttons ul li {
+ list-style: none;
+ display: inline;
+ padding-right: 4px;
+}
+
+.formbuttons .submit {
+ font-size: 10px;
+ font-weight: bold;
+ color: #FFFFFF;
+ background-color: #4a5d75;
+ border-top: 1px solid #94aebd;
+ border-left: 1px solid #94aebd;
+ border-right: 1px solid #233345;
+ border-bottom: 1px solid #233345;
+ height:20px;
+}
+
/*
//OLD STYLES
@@ -100,10 +135,6 @@
border: 0px;
}
-.editPageArea {
- width: 100%;
-}
-
.otherVersionBox {
border: 2px dashed red;
text-align: center;
More information about the jboss-svn-commits
mailing list