[jboss-svn-commits] JBL Code SVN: r10192 - in labs/jbosslabs/trunk/portal-extensions: jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 14 18:11:15 EDT 2007
Author: szimano
Date: 2007-03-14 18:11:15 -0400 (Wed, 14 Mar 2007)
New Revision: 10192
Modified:
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/AdminConsolePlugin.java
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
wiki theme modifications and admin page
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-14 21:59:47 UTC (rev 10191)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/etc/images/wikiStyle.css 2007-03-14 22:11:15 UTC (rev 10192)
@@ -1,3 +1,68 @@
+/* Styles that are unique to the wiki pages */
+
+.wikiContent {
+ margin: 0px;
+ padding: 0px;
+}
+
+.wikiContent p {
+ margin: 1em auto;
+ padding: 0px;
+}
+
+.wikiContent h3 {
+ margin: 1em auto;
+ padding-top: 2px;
+ border-top: 1px solid #e6e7e8;
+}
+
+.wikiYourTrail {
+ margin-top: 10px;
+ background-color: #e6e7e8;
+ line-height:2em;
+ text-indent:1em;
+}
+.wikiYourTrail ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: inline;
+}
+
+.wikiYourTrail li {
+ list-style: none;
+ display: inline;
+ padding-right: 6px;
+}
+
+
+.wikiLastEditedFooter {
+ padding-top: 2px;
+ border-top: 1px solid #e6e7e8;
+}
+
+.wikiNav {
+}
+
+.wikiNav ul {
+ padding-left: 0px;
+ margin-left: 0px;
+ display: inline;
+}
+
+.wikiNav li {
+ list-style: none;
+ display: inline;
+ padding-right: 6px;
+}
+
+.pageLocked {
+ color: red;
+}
+
+/*
+
+//OLD STYLES
+
td.wikiContent {
text-align: left;
width: 100%;
@@ -30,4 +95,4 @@
.lastEdited {
-}
\ No newline at end of file
+}*/
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-03-14 21:59:47 UTC (rev 10191)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/AdminConsolePlugin.java 2007-03-14 22:11:15 UTC (rev 10192)
@@ -126,7 +126,7 @@
adminConsole.append("Go to <a href=\"").append(actionURL).append(
"&type=admin").append("&language=").append(
wikiPage.getLangCode()).append(
- "\">ADMIN GENERAL CONSOLE</a><br />\n");
+ "\">Admin general console</a><br />\n");
if (errorMsg.length() > 0) {
adminConsole.append("<i>" + errorMsg + "</i><br />\n");
}
@@ -141,10 +141,10 @@
for (String att : attSet) {
adminConsole.append("<tr><td>").append(att).append(
- "</td><td><a href=\"").append(actionURL)
+ "</td><td>[<a href=\"").append(actionURL)
.append("&page=").append(wikiPage.getName())
.append("&var1=deleteAtt").append("&var2=")
- .append(att).append("\" >Delete</a></td></tr>");
+ .append(att).append("\" >Delete</a>]</td></tr>");
}
adminConsole.append("</table><br />\n");
@@ -155,15 +155,15 @@
if (!wikiPage.getName().equals(ConfigurationParser.getDefaultLangugeCode())) {
// delete page button
- adminConsole.append("<a href=\"").append(actionURL).append(
+ adminConsole.append("[<a href=\"").append(actionURL).append(
"&page=Main").append("&var1=deletePage").append(
"&var2=").append(wikiPage.getName()).append(
"&var3=false").append(
- "\" >DELETE THIS PAGE</a><br />\n");
+ "\" >Delete this page</a>]<br />\n");
// delete page with subpages button
adminConsole
- .append("<a href=\"")
+ .append("[<a href=\"")
.append(actionURL)
.append("&page=Main")
.append("&var1=deletePage")
@@ -171,38 +171,39 @@
.append(wikiPage.getName())
.append("&var3=true")
.append(
- "\" >DELETE THIS PAGE WITH SUBPAGES</a><br />\n<br />\n");
+ "\" >Delete this page with subpages</a>]<br />\n<br />\n");
}
}
// switch editable button
adminConsole.append("This page ").append(
(editable) ? "is" : "isn't").append(" editable ");
- adminConsole.append("<a href=\"").append(actionURL)
+ adminConsole.append("[<a href=\"").append(actionURL)
.append("&page=").append(wikiPage.getName()).append(
"&var1=chmod").append("&var2=").append(!editable)
- .append("&var3=").append(viewable).append("\" >SWITCH IT ")
- .append((editable) ? "NOT" : "").append(
- " EDITABLE</a><br />\n");
+ .append("&var3=").append(viewable).append("\" >Make ")
+ .append((editable) ? "not" : "").append(
+ " editable</a>]<br />\n");
// switch viewable button
adminConsole.append("This page ").append(
(viewable) ? "is" : "isn't").append(" viewable ");
- adminConsole.append("<a href=\"").append(actionURL)
+ adminConsole.append("[<a href=\"").append(actionURL)
.append("&page=").append(wikiPage.getName()).append(
"&var1=chmod").append("&var2=").append(editable)
.append("&var3=").append(!viewable)
- .append("\" >SWITCH IT ").append((viewable) ? "NOT" : "")
- .append(" VIEWABLE</a><br />\n");
+ .append("\" >Make ").append((viewable) ? "not" : "")
+ .append(" viewable</a>]<br />\n");
adminConsole
- .append("<br />\n<table><tr><th>Role name</th><th colspan=\"2\">View Roles</th><th colspan=\"2\">Edit Roles</th></tr>");
+ .append("<br />\n<table class=\"basetablestyle\" ><tr class=\"header\"><td class=\"tableheaderfirst\">Role name</td><td colspan=\"2\" class=\"tableheader\" >View Roles</td><td colspan=\"2\" class=\"tableheader\" >Edit Roles</td></tr>");
// role set
Set<String> allRoles = credentials.getAllRoles();
+ boolean odd = true;
for (String role : allRoles) {
String roleEd = "<a href=\""
+ actionURL
@@ -223,7 +224,7 @@
+ ((wikiPage.containsViewRole(role)) ? "Remove this role"
: " Add this role") + "</a>";
- adminConsole.append("<tr><td>").append(role)
+ adminConsole.append("<tr class=\"").append(odd ? "oddRow" : "evenRow").append("\" ><td>").append(role)
.append("</td><td>").append(
(wikiPage.containsViewRole(role)) ? "<b>*</b>"
: "").append("</td><td>")
@@ -231,6 +232,8 @@
(wikiPage.containsEditRole(role)) ? "<b>*</b>"
: "").append("</td><td>")
.append(roleEd).append("</td></tr>\n");
+
+ odd = !odd;
}
adminConsole.append("</table>\n");
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-03-14 21:59:47 UTC (rev 10191)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/plugins/OtherLangsPlugin.java 2007-03-14 22:11:15 UTC (rev 10192)
@@ -42,13 +42,13 @@
"\n----\n").append(
HTMLTranslatorParts.pagePartRegexEnd);
- content.append("<h3>Other languages:");
+ content.append("<h3>Other languages:</h3>\n");
if (credentials.isLoggedIn() && wikiPage.isEditable(credentials)) {
- content.append(" <a href=\"").append(
+ content.append(" [<a href=\"").append(
wikiSession.getAttribute(WikiSession.ACTION_URL))
.append("&page=").append(wikiPage.getName()).append(
- "&type=linkPage\">[MAKE LINK]</a></h3>\n");
+ "&type=linkPage\">Make link</a>]<br />\n");
} else {
content
.append("</h3><i>Log in to make links between pages</i><br />\n");
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-03-14 21:59:47 UTC (rev 10191)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2007-03-14 22:11:15 UTC (rev 10192)
@@ -271,51 +271,117 @@
<page>
<page-name>admin</page-name>
<window>
- <window-name>RolePortletWindowDefaultAdmin</window-name>
- <instance-ref>RolePortletInstance</instance-ref>
- <region>center</region>
- <height>2</height>
- <properties>
- <property>
- <name>decorationVisible</name>
- <value>true</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>UserPortletWindowDefaultAdmin</window-name>
- <instance-ref>UserPortletInstance</instance-ref>
- <region>center</region>
- <height>0</height>
- <properties>
- <property>
- <name>decorationVisible</name>
- <value>true</value>
- </property>
- </properties>
- </window>
- <window>
- <window-name>
- ManagementPortletWindowDefaultAdmin
- </window-name>
- <instance-ref>ManagementPortletInstance</instance-ref>
- <region>center</region>
- <height>1</height>
- <properties>
- <property>
- <name>decorationVisible</name>
- <value>true</value>
- </property>
- </properties>
- </window>
+ <window-name>AdminPortletWindow</window-name>
+ <instance-ref>AdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>RolePortletWindow</window-name>
+ <instance-ref>RolePortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
<security-constraint>
- <policy-permission>
- <role-name>Admin</role-name>
- <action-name>view</action-name>
- </policy-permission>
- </security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
</page>
</deployment>
+ <!-- <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>admin</portal-name>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <properties>
+
+ <property>
+ <name>layout.id</name>
+ <value>generic</value>
+ </property>
+
+ <property>
+ <name>theme.id</name>
+ <value>renaissance</value>
+ </property>
+
+ <property>
+ <name>theme.renderSetId</name>
+ <value>divRenderer</value>
+ </property>
+
+ <property>
+ <name>layout.strategyId</name>
+ <value>maximizedRegion</value>
+ </property>
+
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+ </properties>
+ <security-constraint>
+ <policy-permission>
+ <action-name>viewrecursive</action-name>
+ <role-name>Admin</role-name>
+ </policy-permission>
+ </security-constraint>
+ <page>
+ <page-name>default</page-name>
+ <window>
+ <window-name>AdminPortletWindow</window-name>
+ <instance-ref>AdminPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CatalogPortletWindow</window-name>
+ <instance-ref>CatalogPortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>Members</page-name>
+ <window>
+ <window-name>UserPortletWindow</window-name>
+ <instance-ref>UserPortletInstance</instance-ref>
+ <region>center</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>RolePortletWindow</window-name>
+ <instance-ref>RolePortletInstance</instance-ref>
+ <region>left</region>
+ <height>0</height>
+ </window>
+ </page>
+ </portal>
+ </deployment> -->
<deployment>
<if-exists>overwrite</if-exists>
<parent-ref>default</parent-ref>
More information about the jboss-svn-commits
mailing list