[jboss-svn-commits] JBL Code SVN: r10333 - in labs/jbosslabs/trunk/portal-extensions/jbosswiki: forge-wiki/src/java/org/jboss/wiki/ui and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 19 12:13:51 EDT 2007
Author: szimano
Date: 2007-03-19 12:13:51 -0400 (Mon, 19 Mar 2007)
New Revision: 10333
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties
labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.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
Log:
theme and edit in wiki
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-03-19 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/portlet/WikiPortletMyFaces.java 2007-03-19 16:13:51 UTC (rev 10333)
@@ -86,8 +86,9 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- log.info(request.getParameter(VIEW_ID));
+ log.info("current" + request.getParameter(VIEW_ID));
+
Map paramMap = request.getParameterMap();
for (String key : (Set<String>) paramMap.keySet()) {
@@ -99,6 +100,14 @@
+ ((String[]) paramMap.get(key))[0]);
}
}
+
+ //if default view - do nonFacesRequest
+ if (request.getParameter(VIEW_ID).equals(getInitParameter(DEFAULT_VIEW))) {
+ log.info("performing nonFacesRender");
+ setPortletRequestFlag(request);
+ nonFacesRequest(request, response, getInitParameter(DEFAULT_VIEW));
+ return;
+ }
super.doView(request, response);
}
@@ -112,8 +121,6 @@
// if (sessionTimedOut(request))
// return;
- log.info("pp action");
-
setPortletRequestFlag(request);
// parse and setup any attachments if they are sent in
@@ -144,9 +151,8 @@
FacesContext facesContext = facesContext(request, response);
try {
- log.info("before exec");
lifecycle.execute(facesContext);
- log.info("after exec");
+
if (!facesContext.getResponseComplete()) {
response.setRenderParameter(VIEW_ID, facesContext.getViewRoot()
.getViewId());
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-19 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/java/org/jboss/wiki/ui/WikiEdit.java 2007-03-19 16:13:51 UTC (rev 10333)
@@ -71,6 +71,8 @@
public WikiEdit() {
attributesExtractor = WikiHelper.getAttributesExtractor(WikiHelper
.getRequest(), WikiHelper.getResponse());
+
+ WikiHelper.getWikiCommonSession().update(attributesExtractor);
editSessionId = WikiHelper.getWikiEngine().getEditSessionId();
@@ -110,7 +112,7 @@
private WikiPage getWikiPage() {
return getWikiPage(false, EDIT_DEFAULT);
}
-
+
private WikiPage getWikiPage(boolean getDirect) {
return getWikiPage(getDirect, EDIT_DEFAULT);
}
@@ -121,9 +123,18 @@
.getCredentials(), wikiEngine.getWikiType(wikiType),
attributesExtractor.getWikiSession());
- return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
- .getPageName(), getDirect ? null : wikiContext, WikiHelper
- .getWikiCommonSession().getLangCode());
+ log.info("Page version: "+WikiHelper.getWikiCommonSession().getPageVersion());
+ if (WikiHelper.getWikiCommonSession().getPageVersion() != null) {
+ log.info("getting page at version: "+WikiHelper.getWikiCommonSession().getPageVersion());
+ return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
+ .getPageName(), getDirect ? null : wikiContext, WikiHelper
+ .getWikiCommonSession().getPageVersion(), WikiHelper
+ .getWikiCommonSession().getLangCode());
+ } else {
+ return wikiEngine.getByName(WikiHelper.getWikiCommonSession()
+ .getPageName(), getDirect ? null : wikiContext, WikiHelper
+ .getWikiCommonSession().getLangCode());
+ }
}
public String save() {
@@ -241,7 +252,7 @@
public String getLockMsg() {
return lockMsg;
}
-
+
public String getShowEditHTML() {
return getWikiPage(false, "editShowHTML").getContent();
}
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 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/Messages.properties 2007-03-19 16:13:51 UTC (rev 10333)
@@ -33,6 +33,10 @@
search=Search
new_att=/Add new attachment/
+selectAtt=Select attachment
+selectFile=Select a file to attach:
+attachFile=Attach a file
+close=Close
print=Print
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-03-19 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_attach.xhtml 2007-03-19 16:13:51 UTC (rev 10333)
@@ -4,29 +4,36 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:t="http://myfaces.apache.org/tomahawk">
-<ui:composition template="wiki_template.xhtml">
+<ui:composition template="wiki_view.xhtml">
- <ui:define name="content">
- <h:panelGroup styleClass="wikiDiff">
- <h:outputText value="#{wikiDiff.diff}" escape="false"/>
- </h:panelGroup>
-
- <h:form id="uploadForm" enctype="multipart/form-data">
- <h:selectOneMenu value="#{wikiEdit.attName}" >
- <f:selectItems value="#{wikiEdit.fileNames}" />
- </h:selectOneMenu>
+ <ui:define name="attachment">
+
+ <h:panelGrid styleClass="wikiGreybkgSection">
+ <h:outputText styleClass="h2" value="#{msg.attachFile}" />
+ <h:form id="uploadForm" enctype="multipart/form-data">
+ <h:panelGrid>
+ <h:outputText value="#{msg.selectAtt}"/>
+ <h:selectOneMenu value="#{wikiEdit.attName}" >
+ <f:selectItems value="#{wikiEdit.fileNames}" />
+ </h:selectOneMenu>
+
+ <h:outputText value="#{msg.selectFile}"/>
+ <h:panelGrid columns="2">
+ <t:inputFileUpload id="file"
+ value="#{wikiEdit.newFile}"
+ required="true"/>
+ <t:commandButton value="#{msg.addFile}" action="#{wikiEdit.addFile}" />
+ </h:panelGrid>
+ </h:panelGrid>
+ </h:form>
- <t:inputFileUpload id="file"
- value="#{wikiEdit.newFile}"
- required="true"/>
- <t:commandButton value="#{msg.addFile}" action="#{wikiEdit.addFile}" />
- </h:form>
+ <h:form>
+ <h:commandLink action="goback">
+ <h:outputText value="#{msg.close}" />
+ </h:commandLink>
+ </h:form>
+ </h:panelGrid>
- <h:form>
- <h:commandLink action="goback">
- <h:outputText value="#{msg.goback}" />
- </h:commandLink>
- </h:form>
</ui:define>
</ui:composition>
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 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/forge-wiki/src/web/views/wiki_view.xhtml 2007-03-19 16:13:51 UTC (rev 10333)
@@ -23,6 +23,9 @@
<h:form rendered="#{wikiCommon.userLoggedIn}">
<h:outputText value="["/><h:commandLink action="edit">
+ <c:if test="#{wikiCommon.pageVersion ne null}">
+ <f:param name="version" value="#{wikiCommon.pageVersion}" />
+ </c:if>
<h:outputText value="#{msg.edit}" />
</h:commandLink>
<h:outputText value="] [" />
@@ -64,6 +67,8 @@
</h:outputLink>
</h:panelGroup>
+ <ui:insert name="attachment" />
+
<hr />
<h:panelGroup styleClass="wikiContent">
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 15:26:25 UTC (rev 10332)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-19 16:13:51 UTC (rev 10333)
@@ -1,4 +1,4 @@
-fa/* Styles that are unique to the wiki pages */
+/* Styles that are unique to the wiki pages */
.wikiContent {
margin: 0px;
@@ -16,9 +16,25 @@
border-top: 1px solid #e6e7e8;
}
+.wikiGreybkgSection {
+ background-color: #faf8ed;
+ border: 1px solid #e3a835;
+ padding: 10px 20px;
+ margin-top: 10px;
+}
+
+.wikiGreybkgSection h3 {
+ font-size:12px;
+ font-weight:bold;
+ padding: 0px;
+ margin: 0px auto 3px auto;
+}
+
.wikiYourTrail {
margin-top: 10px;
- background-color: #e6e7e8;
+ background-color:#f4f3f3;
+ border-top:1px solid #e6e7e8;
+ border-bottom:1px solid #e6e7e8;
line-height:2em;
text-indent:1em;
}
@@ -34,7 +50,6 @@
padding-right: 6px;
}
-
.wikiLastEditedFooter {
padding-top: 2px;
border-top: 1px solid #e6e7e8;
@@ -64,6 +79,11 @@
font-weight: bold;
}
+.h2 {
+ font-size: 10pt;
+ font-weight: bold;
+}
+
.clear { clear:both;}
.floatright {
More information about the jboss-svn-commits
mailing list