JBoss Portal SVN: r9228 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF: classes and 1 other directory.
by portal-commits＠lists.jboss.org
Author: lucboudreau
Date: 2007-11-30 14:11:48 -0500 (Fri, 30 Nov 2007)
New Revision: 9228
Added:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_fr.properties
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
Added french translation and modified the portlet descriptor accordingly.
Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_fr.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_fr.properties 2007-11-30 19:11:48 UTC (rev 9228)
@@ -0,0 +1,41 @@
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+NO_USERS_ONLINE = Pas d'utilisateurs en ligne.
+
+ONE_USER_IS_0 = <b>
+
+ONE_USER_IS_1 = </b>
+
+ONE_USER_ONLINE_0 = Il y a <b>
+
+ONE_USER_ONLINE_1 = </b> utilisateur en ligne:
+
+USERS_ARE_0 = <b>
+
+USERS_ARE_1 = </b>
+
+USERS_ONLINE_0 = Il y a <b>
+
+USERS_ONLINE_1 = </b> utilisateurs en ligne:
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2007-11-30 17:49:53 UTC (rev 9227)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2007-11-30 19:11:48 UTC (rev 9228)
@@ -37,7 +37,8 @@
<portlet-mode>VIEW</portlet-mode>
</supports>
<supported-locale>en</supported-locale>
- <supported-locale>it</supported-locale>
+ <supported-locale>it</supported-locale>
+ <supported-locale>fr</supported-locale>
<resource-bundle>Resource</resource-bundle>
<portlet-info>
<title>Current users</title>
16 years, 7 months
JBoss Portal SVN: r9227 - branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-30 12:49:53 -0500 (Fri, 30 Nov 2007)
New Revision: 9227
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java
Log:
oops
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java 2007-11-30 17:48:16 UTC (rev 9226)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java 2007-11-30 17:49:53 UTC (rev 9227)
@@ -152,7 +152,6 @@
}
catch (SocketTimeoutException e)
{
- e.printStackTrace();
throw new WidgetException("Netvibes directory query failed due to timeout. Try to increase connectionTimeout initial parameter; ", e);
}
catch(JBossXBException e)
16 years, 7 months
JBoss Portal SVN: r9226 - in branches/JBoss_Portal_Branch_2_6/widget/src: resources/portal-widget-war/WEB-INF/jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-30 12:48:16 -0500 (Fri, 30 Nov 2007)
New Revision: 9226
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java
branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
Log:
- added 2 new google categories
- had to generalize the character replacement, because not only the category 'Fun & Games' is affected // now we use the character replacement only when first spot parsing fails
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java 2007-11-30 16:51:47 UTC (rev 9225)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java 2007-11-30 17:48:16 UTC (rev 9226)
@@ -41,12 +41,14 @@
private static final Collection CATEGORIES = Collections.unmodifiableList((List)CollectionBuilder.arrayList()
.add(new GGWidgetCategoryInfo("all", "Popular"))
.add(new GGWidgetCategoryInfo("news", "News"))
+ .add(new GGWidgetCategoryInfo("tools", "Tools"))
.add(new GGWidgetCategoryInfo("communication", "Communication"))
.add(new GGWidgetCategoryInfo("funandgames", "Fun & Games"))
.add(new GGWidgetCategoryInfo("finance", "Finance"))
.add(new GGWidgetCategoryInfo("sports", "Sports"))
.add(new GGWidgetCategoryInfo("lifestyle", "Lifestyle"))
.add(new GGWidgetCategoryInfo("technology", "Technology"))
+ .add(new GGWidgetCategoryInfo("politics", "Politics"))
.add(new GGWidgetCategoryInfo("new", "New stuff"))
.get());
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java 2007-11-30 16:51:47 UTC (rev 9225)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGQueryResultBuilder.java 2007-11-30 17:48:16 UTC (rev 9226)
@@ -94,7 +94,6 @@
}
else
{
-
InputStream in = url.openStream();
try
{
@@ -112,27 +111,34 @@
throw new WidgetException("Cannot retrieve url: " + url + " - you can try to increase the connectionTimeout");
}
- // Remove .replace if google rss feed returns correct xml
- String string = new String(bytes).replace("Fun & Games", "Fun & Games");
-
+ String string = new String(bytes);
List data = null;
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-
// create an instance of ObjectModelFactory
ObjectModelFactory factory = new GGWidgetDirectoryFactory();
- // let the object model factory to create an instance of List and populate it with data from XML
- data = (List) unmarshaller.unmarshal(new ByteArrayInputStream(string.getBytes("UTF-8")), factory, null);
+ // Populate the List with data from XML
+ try
+ {
+ data = (List) unmarshaller.unmarshal(new ByteArrayInputStream(string.getBytes("UTF-8")), factory, null);
+ }
+ catch(JBossXBException e)
+ {
+ /**
+ * Remove this block when google rss feed returns correct xml
+ */
+ // Replace incorrect characters and try the parsing a 2nd time - if it fails again we finally give up
+ String string2 = string.replace("& ", "& ");
+ unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
+ data = (List) unmarshaller.unmarshal(new ByteArrayInputStream(string2.getBytes("UTF-8")), factory, null);
+ }
List entries = new ArrayList();
for (Iterator iterator = data.iterator(); iterator.hasNext();)
{
GGWidgetMetaData md = (GGWidgetMetaData)iterator.next();
-
- log.debug("Adding gadget: " + md);
-
GGQueryResultEntry entry = new GGQueryResultEntry(md);
entries.add(entry);
}
@@ -146,6 +152,7 @@
}
catch (SocketTimeoutException e)
{
+ e.printStackTrace();
throw new WidgetException("Netvibes directory query failed due to timeout. Try to increase connectionTimeout initial parameter; ", e);
}
catch(JBossXBException e)
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2007-11-30 16:51:47 UTC (rev 9225)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2007-11-30 17:48:16 UTC (rev 9226)
@@ -65,7 +65,7 @@
String catTerm = request.getParameter("cat");
if (catTerm == null)
{
- catTerm = "";
+ catTerm = "all";
}
// Compute query
@@ -134,7 +134,6 @@
<form action="<p:renderURL></p:renderURL>" method="post">
<input type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>
<select name="cat" class="portlet-form-field">
- <option value=""> </option>
<%
// Category dropdown
for (Iterator i = provider.getCategories().iterator(); i.hasNext();)
16 years, 7 months
JBoss Portal SVN: r9225 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf: admin/roles and 2 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-30 11:51:47 -0500 (Fri, 30 Nov 2007)
New Revision: 9225
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml
Log:
- fixed the title in noTabContainer
- added some headlines
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/assignRoles.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,6 +23,7 @@
</ui:define>
<ui:define name="content">
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
<h:form>
<h:selectManyCheckbox id="roles" value="#{assignrolemgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/editProfile.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,7 +23,6 @@
</ui:define>
<ui:define name="content">
-
<ui:decorate template="/WEB-INF/jsf/common/profile.xhtml">
<ui:param name="manager" value="#{editprofilemgr}"/>
<ui:param name="adminMode" value="true"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -14,6 +14,7 @@
</ui:define>
<ui:define name="content">
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /></h3>
<h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<h:form>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/createRole.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -19,6 +19,7 @@
</ui:define>
<ui:define name="content">
+<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_ROLE}"/></h3>
<h:form>
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/editRole.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,6 +23,7 @@
</ui:define>
<ui:define name="content">
+<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_EDIT_ROLE}"/></h3>
<h:form>
<h:panelGrid columns="2">
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,7 +23,7 @@
</ui:define>
<ui:define name="content">
-
+<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MEMBERS}"/></h3>
<h:form>
<h:dataTable value="#{rolemanagementbean.roleMembers}" var="uiUser" rows="#{rolemanagementbean.limit}" rendered="#{rolemanagementbean.roleMembers.rowCount > 0}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -14,7 +14,8 @@
</ui:define>
<ui:define name="content">
- <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_MANAGEMENT}" /></h3>
+ <h:messages id="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/changePassword.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,7 +23,7 @@
</li>
</ui:define>
<ui:define name="content">
-<br/>
+ <h3><h:outputText value="#{bundle.IDENTITY_EDIT_CHANGE_PASSWORD}" /></h3>
<h:form>
<h:panelGrid columns="3" cellpadding="3">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -24,7 +24,10 @@
</li>
</ui:define>
<ui:define name="content">
-<br/>
+<h3>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_APPROVE_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'approve'}" />
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_REJECT_ALL}" rendered="#{useradministrationbean.pendingUserAction == 'reject'}" />
+</h3>
<h:form>
<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/createUser.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -19,7 +19,7 @@
</ui:define>
<ui:define name="content">
-
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" /></h3>
<ui:decorate template="/WEB-INF/jsf/common/register.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
</ui:decorate>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -39,7 +39,7 @@
// ]]>
</script>
</f:verbatim>
-<br/>
+<h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS}" /></h3>
<h:form id="pending">
<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerConfirm.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -19,6 +19,7 @@
</li>
</ui:define>
<ui:define name="content">
+ <h3><h:outputText value="#{bundle.IDENTITY_REGISTER_TITLE_CONFIRM}" /></h3>
<ui:decorate template="/WEB-INF/jsf/common/confirm.xhtml">
<ui:param name="manager" value="#{userregistermgr}"/>
<ui:param name="show_roles" value="true"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -24,6 +24,7 @@
<ui:define name="content">
<br/>
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /></h3>
<h:form>
<h:selectManyCheckbox id="roles" value="#{userregistermgr.roles}">
<f:selectItems value="#{identityrolemgr.roleSelectItems}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/resetPassword.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -23,7 +23,7 @@
</ui:define>
<ui:define name="content">
-
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_RESET_PASSWORD}" /></h3>
<div class="portlet-msg">
<div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
<div class="portlet-msg-body">
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -19,6 +19,7 @@
</ui:define>
<ui:define name="content">
+ <h3><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
<h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString" value="#{useradministrationbean.searchString}" />
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -21,7 +21,7 @@
<c:if test="#{show_roles == true}">
<!-- assigned roles -->
<h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ROLE_ASSIGNED}" />
- <h:dataTable id="roleslist" value="#{manager.roles}" var="role" styleClass="datatable">
+ <h:dataTable id="roleslist" value="#{manager.roles}" var="role">
<h:column>
<h:outputText value="#{role}"/>
</h:column>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/noTabContainer.xhtml 2007-11-30 16:51:47 UTC (rev 9225)
@@ -4,6 +4,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<div class="no-tab-container">
+ <ui:insert name="tab-object-path" />
<ui:insert name="tab-container-content"/>
</div>
16 years, 7 months
JBoss Portal SVN: r9224 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-30 11:12:30 -0500 (Fri, 30 Nov 2007)
New Revision: 9224
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
Let rename/delete the correct stuff
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 15:36:56 UTC (rev 9223)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 16:12:30 UTC (rev 9224)
@@ -40,20 +40,22 @@
Theme
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="Rename"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'default')}">
+ </h:panelGroup>
+ <h:panelGroup
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
| <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
Delete
</h:commandLink>
</h:panelGroup>
+ </h:panelGroup>
<h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
16 years, 7 months
JBoss Portal SVN: r9223 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-30 10:36:56 -0500 (Fri, 30 Nov 2007)
New Revision: 9223
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
Log:
oups
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-30 14:59:00 UTC (rev 9222)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-30 15:36:56 UTC (rev 9223)
@@ -35,6 +35,7 @@
import org.jboss.portal.core.portlet.info.CorePortletInfo;
import org.jboss.portal.core.portlet.info.PortletIconInfo;
import org.jboss.portal.core.portlet.info.PortletInfoInfo;
+import org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet;
import org.jboss.portal.faces.el.DelegatingPropertyResolver;
import org.jboss.portal.faces.el.decorator.AbstractBeanDecorator;
import org.jboss.portal.faces.el.decorator.AbstractPropertyDecorator;
@@ -74,8 +75,6 @@
*/
public class AdminPropertyResolver extends DelegatingPropertyResolver
{
- private static final String DEFAULT_PORTLET_ICON = "/portal-admin/img/portletIcon_Default1.gif";
-
public AdminPropertyResolver()
{
init();
@@ -470,7 +469,7 @@
}
}
- return DEFAULT_PORTLET_ICON;
+ return PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
}
}
16 years, 7 months
JBoss Portal SVN: r9222 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-30 09:59:00 -0500 (Fri, 30 Nov 2007)
New Revision: 9222
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
Log:
correct spacing for instances, portlets and dashboard
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-11-30 14:56:51 UTC (rev 9221)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-11-30 14:59:00 UTC (rev 9222)
@@ -9,21 +9,27 @@
<ui:define name="content">
<!-- -->
+ <div class="property-container">
<ui:include src="common/editProperties.xhtml">
<ui:param name="properties" value="#{dashboardmgr.selectedProperties}"/>
</ui:include>
+ </div>
<!-- -->
<br/>
+ <div class="property-container">
<ui:include src="common/editPortalErrorHandling.xhtml">
<ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
</ui:include>
+ </div>
<!-- -->
<br/>
+ <div class="property-container">
<ui:include src="common/editPageErrorHandling.xhtml">
<ui:param name="properties" value="#{dashboardmgr.controlProperties}"/>
</ui:include>
+ </div>
<!-- Separation -->
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-30 14:56:51 UTC (rev 9221)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-30 14:59:00 UTC (rev 9222)
@@ -15,8 +15,8 @@
<table id="instancesTable2" class="portlet-def-table datatable">
<thead class="portlet-section-header">
<tr>
- <th>Id</th>
- <th>Name</th>
+ <th>Instance id</th>
+ <th>Portlet name</th>
<th>Actions</th>
</tr>
</thead>
@@ -114,13 +114,16 @@
</ul>
</h:form>
<br/>
+ <div class="property-container">
<ui:include src="common/editPreferences.xhtml">
<ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/>
</ui:include>
+ <br />
<h:form>
<h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
<h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
</h:form>
+ </div>
</c:if>
<c:if test="#{instancemgr.selectedPlugin == 'security'}">
@@ -137,9 +140,11 @@
</ul>
</h:form>
<br/>
+ <div class="property-container">
<ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{instancemgr.auth}"/>
</ui:decorate>
+ </div>
</c:if>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-30 14:56:51 UTC (rev 9221)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-30 14:59:00 UTC (rev 9222)
@@ -31,7 +31,7 @@
<table class="portlet-def-table datatable">
<thead class="portlet-section-header">
<tr>
- <th>Name</th>
+ <th>Porlet name</th>
<th>Description</th>
<th>Remote</th>
<th>Remotable</th>
@@ -121,9 +121,11 @@
</ul>
</h:form>
<br/>
+ <div class="property-container">
<ui:include src="common/editPreferences.xhtml">
<ui:param name="prefs" value="#{portletmgr.selectedPreferences}"/>
</ui:include>
+ </div>
</c:if>
<c:if test="#{portletmgr.selectedPlugin == 'createInstance'}">
@@ -140,14 +142,17 @@
</ul>
</h:form>
<br/>
+ <div class="property-container">
<h:form id="add_instance_form" styleClass="createObjectForm">
<span class="portlet-font">Create an instance named: </span>
<h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field"
required="true"/>
+ <br />
<h:commandButton action="#{createInstanceAction.execute}" value="Create instance"
styleClass="portlet-form-button"/>
<h:message for="instanceId" errorClass="portlet-msg-error"/>
</h:form>
+ </div>
</c:if>
</ui:define>
16 years, 7 months
JBoss Portal SVN: r9221 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/ui/content/portlet and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-30 09:56:51 -0500 (Fri, 30 Nov 2007)
New Revision: 9221
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Default1.gif
Removed:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Default1.gif
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Add the icons in the portlet instance selection list
Added: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Default1.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/images/portletIcon_Default1.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2007-11-30 14:33:34 UTC (rev 9220)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2007-11-30 14:56:51 UTC (rev 9221)
@@ -55,6 +55,8 @@
public class PortletContentEditorPortlet extends GenericPortlet
{
+ public static final String DEFAULT_PORTLET_ICON = "/portal-core/images/portletIcon_Default1.gif";
+
/** . */
private final PortletMode EDIT_CONTENT = new PortletMode("edit_content");
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-11-30 14:33:34 UTC (rev 9220)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2007-11-30 14:56:51 UTC (rev 9221)
@@ -11,6 +11,11 @@
Collection instances = (Collection)request.getAttribute("INSTANCES");
Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
+<%@page import="org.jboss.portal.portlet.info.PortletInfo"%>
+<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%>
+<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
+<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%>
+<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%>
<portlet:defineObjects/>
<span class="portlet-font">Portlet instance associated to this window:</span>
@@ -27,14 +32,33 @@
{
displayName = instance.getId();
}
+
+ PortletInfo info = instance.getPortlet().getInfo();
+
+ String iconLocation = null;
+ if (info instanceof CorePortletInfo)
+ {
+ CorePortletInfo cInfo = (CorePortletInfo)info;
+ PortletInfoInfo portletInfo = cInfo.getPortletInfo();
+ if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
+ {
+ iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL);
+ }
+ }
+ if (iconLocation == null)
+ {
+ iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
+ }
+
%>
<portlet:actionURL var="url">
<portlet:param name="content.action.select" value="true"/>
<portlet:param name="content.uri" value="<%= instance.getId() %>"/>
</portlet:actionURL>
<tr class="<%= rowClass %>">
- <td><a href="<%= url %>"><%= displayName %>
- </a></td>
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
+ <a href="<%= url %>"><%= displayName %></a></td>
</tr>
<%
}
Deleted: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/portletIcon_Default1.gif
===================================================================
(Binary files differ)
16 years, 7 months
JBoss Portal SVN: r9220 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-30 09:33:34 -0500 (Fri, 30 Nov 2007)
New Revision: 9220
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
Log:
Iadding icons on instances list
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-30 14:33:34 UTC (rev 9220)
@@ -25,6 +25,7 @@
<tr
class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td>
+ <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/>
<h:commandLink action="#{instancemgr.selectInstance}">
<h:outputText value="#{instance.id}"/>
<f:param name="id" value="#{instance.id}"/>
16 years, 7 months
JBoss Portal SVN: r9219 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf: common and 1 other directories.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-11-30 09:31:17 -0500 (Fri, 30 Nov 2007)
New Revision: 9219
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
Log:
- some spacing issues
- adapted styles for wizard
- removed display names for portals
- removed delete button for default portal
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -4,9 +4,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-
-<div class="property-container">
-
<p class="portlet-area-header">Page Error Handling</p>
<div class="portlet-area-body">
@@ -146,6 +143,4 @@
</table>
</div>
-
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -5,8 +5,6 @@
xmlns:c="http://java.sun.com/jstl/core">
-<div class="property-container">
-
<p class="portlet-area-header">Portal Error Handling</p>
<div class="portlet-area-body">
@@ -147,6 +145,4 @@
</table>
</div>
-
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -4,9 +4,6 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
-
-<div class="property-container">
-
<div class="portlet-area-header">Properties</div>
<div class="portlet-area-body">
@@ -150,5 +147,4 @@
</div>
-</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -34,6 +34,7 @@
</c:forEach>
</tbody>
</table>
+ <br />
<div>
<h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/>
<h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -40,6 +40,7 @@
</tr>
</tbody>
</table>
+ <br />
<ui:insert name="form_submit"/>
</h:form>
</div>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -8,7 +8,6 @@
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
- <div class="property-container ">
<h3 class="sectionTitle tenpx-top-bottom">
Manage  
<c:choose>
@@ -46,7 +45,6 @@
<!-- Navigation -->
<ui:include src="objectNavigation.xhtml"/>
- </div>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -8,7 +8,6 @@
<ui:composition template="objectTemplate.xhtml">
<ui:define name="content">
- <div class="property-container">
<h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
@@ -31,22 +30,28 @@
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Theme
- </h:commandLink> | <h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink
+ </h:commandLink><h:panelGroup
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink
action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Rename
- </h:commandLink> | </h:panelGroup>
+ </h:commandLink></h:panelGroup>
<h:panelGroup
- rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink
action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}" />
Display Names
- </h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete"
+ </h:commandLink></h:panelGroup>
+ <h:panelGroup
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}">
+ | <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Delete
</h:commandLink>
+ </h:panelGroup>
</h:form>
<h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
@@ -64,7 +69,6 @@
<!-- Navigation -->
<ui:include src="objectNavigation.xhtml"/>
- </div>
</ui:define>
</ui:composition>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -11,7 +11,7 @@
<ui:define name="content">
<br/>
- <div class="property-container tenpx-top-bottom">
+ <div class="tenpx-top-bottom">
<p class="portlet-area-header">Event Listener Binding</p>
<div class="portlet-area-body tenpx-top-bottom">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -46,20 +46,14 @@
<h:outputText value="Rename"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- </h:panelGroup>
- <h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
- | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}"
- actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
- <h:outputText value="Display Names"/>
- <f:param name="id" value="#{object.id}"/>
- </h:commandLink>
- </h:panelGroup>
+ </h:panelGroup>
+ <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'default')}">
| <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
Delete
- </h:commandLink>
+ </h:commandLink>
+ </h:panelGroup>
<h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
action="#{portalobjectmgr.makeObjectDefault}">
<f:param name="id" value="#{object.id}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -50,7 +50,9 @@
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
<!-- Content -->
- <ui:insert name="content">Content</ui:insert>
+ <div class="property-container">
+ <ui:insert name="content">Content</ui:insert>
+ </div>
</ui:define>
</ui:decorate>
</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-30 13:56:36 UTC (rev 9218)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-30 14:31:17 UTC (rev 9219)
@@ -9,10 +9,11 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="wizard-tab-container">
-<h3 class="sectionTitle">
- Adding a new Portlet
-</h3>
+<ul class="objectpath">
+ <li class="selected">Adding a new Portlet</li>
+</ul>
+<div class="property-container">
<c:choose>
<c:when test="#{newWindowWizard.currentStep == 0}">
<div class="wizardStepBox" id="selected">
@@ -179,7 +180,8 @@
<!-- Content -->
<div class="wizardContent">
- <ui:insert name="content">Content</ui:insert>
+
+ <ui:insert name="content">Content</ui:insert>
</div>
<div class="wizardButtonBox">
@@ -197,3 +199,5 @@
</h:form>
</div>
</div>
+
+</div>
\ No newline at end of file
16 years, 7 months