JBoss Portal SVN: r9208 - in branches/JBoss_Portal_Branch_2_6/core: src/resources/portal-core-sar/META-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 17:35:21 -0500 (Thu, 29 Nov 2007)
New Revision: 9208
Modified:
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
Apply optimizations
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-11-29 22:34:45 UTC (rev 9207)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-11-29 22:35:21 UTC (rev 9208)
@@ -337,7 +337,6 @@
<fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/>
<fileset dir="${ehcache.ehcache.lib}" includes="ehcache.jar"/>
<fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
- <fileset dir="${javassist.javassist.lib}" includes="javassist.jar"/>
<fileset dir="${apache.fileupload.lib}" includes="commons-fileupload.jar"/>
<fileset dir="${jakarta.io.lib}" includes="commons-io.jar"/>
<fileset dir="${freemarker.freemarker.lib}" includes="freemarker.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-29 22:34:45 UTC (rev 9207)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-29 22:35:21 UTC (rev 9208)
@@ -458,6 +458,63 @@
<attribute name="IsolationLevel">REPEATABLE_READ</attribute>
<attribute name="CacheMode">REPL_SYNC</attribute>
<attribute name="ClusterName">portal.hibernate</attribute>
+ <attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
+ <attribute name="ClusterConfig">
+ <config>
+ <UDP mcast_addr="${jboss.partition.udpGroup:230.1.2.3}"
+ mcast_port="${jboss.ejb3entitypartition.mcast_port:43333}"
+ tos="8"
+ ucast_recv_buf_size="20000000"
+ ucast_send_buf_size="640000"
+ mcast_recv_buf_size="25000000"
+ mcast_send_buf_size="640000"
+ loopback="false"
+ discard_incompatible_packets="true"
+ enable_bundling="false"
+ max_bundle_size="64000"
+ max_bundle_timeout="30"
+ use_incoming_packet_handler="true"
+ use_outgoing_packet_handler="false"
+ ip_ttl="${jgroups.udp.ip_ttl:2}"
+ down_thread="false" up_thread="false"/>
+ <PING timeout="2000"
+ down_thread="false" up_thread="false" num_initial_members="3"/>
+ <MERGE2 max_interval="100000"
+ down_thread="false" up_thread="false" min_interval="20000"/>
+ <FD_SOCK down_thread="false" up_thread="false"/>
+ <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
+ <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
+ <pbcast.NAKACK max_xmit_size="60000"
+ use_mcast_xmit="false" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800"
+ down_thread="false" up_thread="false"
+ discard_delivered_msgs="true"/>
+ <UNICAST timeout="300,600,1200,2400,3600"
+ down_thread="false" up_thread="false"/>
+ <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
+ down_thread="false" up_thread="false"
+ max_bytes="400000"/>
+ <pbcast.GMS print_local_addr="true" join_timeout="3000"
+ down_thread="false" up_thread="false"
+ join_retry_timeout="2000" shun="true"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
+ <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
+ </config>
+ </attribute>
+
+ <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
+
+ <attribute name="EvictionPolicyConfig">
+ <config>
+ <attribute name="wakeUpIntervalSeconds">5</attribute>
+ <region name="/_default_">
+ <attribute name="maxNodes">5000</attribute>
+ <attribute name="timeToLiveSeconds">1000</attribute>
+ </region>
+ </config>
+ </attribute>
+
</mbean>
<mbean
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9207 - in branches/JBoss_Portal_Branch_2_6/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-29 17:34:45 -0500 (Thu, 29 Nov 2007)
New Revision: 9207
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-11-29 22:34:45 UTC (rev 9207)
@@ -6,9 +6,7 @@
}
div.admin-ui div.cms-tab-container {
- border-bottom:1px solid #B3C0C7;
- border-right:1px solid #B3C0C7;
- border-left:1px solid #B3C0C7;
+ border:1px solid #B3C0C7;
padding: 0 0 10px 0;
margin: 10px 0 0 0;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -12,9 +12,10 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
- <div class=" cms-tab-container">
+ <br/>
+<h3 class="sectionTitle-blue">${n:i18n("TITLE_COPYCONFIRM")}</h3>
+ <div class="cms-tab-container">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_COPYCONFIRM")}</h3></th>
<tr>
<td class="portlet-section-body" align="left">
<form name="pickform" action="<portlet:actionURL>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -10,9 +10,10 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3>
<div class=" cms-tab-container">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -8,6 +8,8 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_DELETECONFIRM")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -19,7 +21,7 @@
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
- <th><h3 class="sectionTitle-blue">${n:i18n("TITLE_DELETECONFIRM")}</h3></th>
+
<tr>
<td align="center">
<font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -12,9 +12,11 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_MOVECONFIRM")}</h3>
<div class=" cms-tab-container">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_MOVECONFIRM")}</h3></th>
+
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -91,6 +91,8 @@
}
</script>
<div class="admin-ui">
+<br/>
+<h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATE")}</h3>
<div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
@@ -99,7 +101,6 @@
<input type="hidden" name="savetopath" value="<%= sCurrPath %>">
<table width="100%">
-<th><h3 class="sectionTitle-blue">${n:i18n("TITLE_CREATE")}</h3></th>
<tr>
<td height="10"></td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -8,6 +8,8 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+<br/>
+<h3 class="sectionTitle-blue">${n:i18n("TITLE_EDIT")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -66,7 +68,7 @@
</portlet:actionURL>">
<table width="100%">
-<th><h3 class="sectionTitle-blue">${n:i18n("TITLE_EDIT")}</h3></th>
+
<tr>
<td height="10"></td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -7,6 +7,8 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -19,7 +21,7 @@
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<input type="hidden" name="language" value="<%= sLanguage %>">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3></th>
+
<tr>
<td align="left">
<table>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -12,13 +12,15 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3>
<div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
+
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -7,13 +7,14 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
<table width="100%">
- <th><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -7,13 +7,14 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
<table width="100%">
- <th><h3 class="sectionTitle-blue">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -23,11 +23,13 @@
%>
<div class="admin-ui">
-<div class=" cms-tab-container">
+<br/>
<h3 class="sectionTitle-blue">
${n:i18n("CMS_MANAGE")}
</h3>
+<div class="cms-tab-container">
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -11,6 +11,10 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+<br/>
+<h3 class="sectionTitle-blue">
+ ${n:i18n("CMS_MAIN_USE")}
+</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -21,11 +25,9 @@
%>
-<h3 class="sectionTitle-blue">
- ${n:i18n("CMS_MAIN_USE")}
-</h3>
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -13,10 +13,12 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
-<div class=" cms-tab-container">
+<br/>
<h3 class="sectionTitle-blue">
${n:i18n("CMS_MANAGE")}
</h3>
+<div class=" cms-tab-container">
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -26,6 +26,8 @@
Set manageUserSet = (Set)request.getAttribute("manageUserSet");
%>
<div class="admin-ui">
+<br/>
+<h3 class="sectionTitle-blue">${n:i18n("TITLE_SECURECONFIRM")}</h3>
<div class=" cms-tab-container">
<form action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SECURE %>"/>
@@ -33,7 +35,6 @@
<portlet:param name="returnOp" value="<%= returnOp %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
-<th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_SECURECONFIRM")}</h3></th>
<%
if (sConfirm != null && !"".equals(sConfirm))
{
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -12,13 +12,14 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3>
<div class=" cms-tab-container">
<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONTENT %>"/>
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("TITLE_UPLOAD")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -7,6 +7,8 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+ <br/>
+ <h3 class="sectionTitle-blue">${n:i18n("CMS_UPLOADARCHIVE")}</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -19,7 +21,6 @@
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-29 22:01:52 UTC (rev 9206)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-11-29 22:34:45 UTC (rev 9207)
@@ -18,6 +18,10 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="admin-ui">
+<br/>
+<h3 class="sectionTitle-blue">
+ ${n:i18n("CMS_MANAGE")}
+</h3>
<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
@@ -45,11 +49,9 @@
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
%>
-<h3 class="sectionTitle-blue">
- ${n:i18n("CMS_MANAGE")}
-</h3>
+
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9206 - in docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en: src and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 17:01:52 -0500 (Thu, 29 Nov 2007)
New Revision: 9206
Added:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/src/
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/src/schemas.ppt
Log:
Adding schemas
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/src/schemas.ppt
===================================================================
(Binary files differ)
Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/src/schemas.ppt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9205 - in docs/branches/JBoss_Portal_Branch_2_6/userGuide/en: images/management and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-29 17:01:05 -0500 (Thu, 29 Nov 2007)
New Revision: 9205
Added:
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/default_portal.svg
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/portals.svg
Modified:
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/images/management/default_portal.png
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/dynamicity.xml
Log:
iAdding section about display-names
Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/images/management/default_portal.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/dynamicity.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/dynamicity.xml 2007-11-29 18:46:29 UTC (rev 9204)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/modules/dynamicity.xml 2007-11-29 22:01:05 UTC (rev 9205)
@@ -219,6 +219,19 @@
</para>
<para>
+ The <literal>Display Name</literal> action link displays a screen where the administrator can configure
+ different names for different languages:
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/management/display_names.png" format="png" align="center"
+ valign="middle"/>
+ </imageobject>
+ </mediaobject>
+ The different names will be used as page display names for the preferred locale of the logged-in user.
+ This is used by the default tab navigation of the default layouts.
+ </para>
+
+ <para>
Now that we have looked at portal level information, let's drill down the hierachy again and look at
a page, more precisely the <literal>default</literal> page, by clicking its name in the pages list.
</para>
Added: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/default_portal.svg
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/default_portal.svg (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/default_portal.svg 2007-11-29 22:01:05 UTC (rev 9205)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1052.3622"
+ height="744.09448"
+ id="svg2283"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home/theute/Portal/workspace_2.6/docs_trunk/userGuide/en/src"
+ sodipodi:docname="default_portal.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/theute/test.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path14987"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.4) translate(10,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6237">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6239" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6241" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient6243"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9156"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9160"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="translate(-3.6825839e-6,3.9228687e-8)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15182"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15188"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15194"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="scale(1.0716936,0.9331025)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient18369"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,4.6375475e-6,8.0716472e-7)"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:document-units="mm"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.9936143"
+ inkscape:cx="533.82596"
+ inkscape:cy="334.53066"
+ inkscape:current-layer="layer1"
+ width="1052.3622px"
+ height="744.09448px"
+ inkscape:window-width="1024"
+ inkscape:window-height="705"
+ inkscape:window-x="0"
+ inkscape:window-y="24" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <image
+ y="207.24872"
+ x="126.09255"
+ id="image2424"
+ height="339"
+ width="873"
+ sodipodi:absref="/home/theute/test.png"
+ xlink:href="/home/theute/test.png" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.5433073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect2355"
+ width="146.93829"
+ height="20.128536"
+ x="132.84833"
+ y="248.93254"
+ ry="6.5417743"
+ rx="6.5417747" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient9160);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="414.64783"
+ y="264.02893"
+ id="text5264"><tspan
+ sodipodi:role="line"
+ id="tspan5266"
+ x="414.64783"
+ y="264.02893"
+ style="fill:none;fill-opacity:0.51807233;stroke:#ff0000;stroke-opacity:1">Breadcrumbs</tspan></text>
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline"
+ d="M 280.38734,260.87787 L 407.23455,260.05597"
+ id="path12069"
+ inkscape:connector-type="polyline" />
+ <rect
+ rx="6.5417747"
+ ry="6.5417743"
+ y="307.30527"
+ x="132.84833"
+ height="25.160671"
+ width="269.72235"
+ id="rect15176"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.5433073;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816" />
+ <text
+ id="text15190"
+ y="301.77292"
+ x="504.77109"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient15194);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"
+ transform="scale(0.9331025,1.0716936)"><tspan
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1"
+ y="301.77292"
+ x="504.77109"
+ id="tspan15192"
+ sodipodi:role="line">Operations on this portal instance</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path16423"
+ d="M 403.61322,320.25704 L 467.62016,319.43514"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031521;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330683;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect18363"
+ width="364.32648"
+ height="28.179951"
+ x="132.84833"
+ y="362.65872"
+ ry="6.5417747"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient18369);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="653.6153"
+ y="353.42337"
+ id="text18365"><tspan
+ sodipodi:role="line"
+ id="tspan18367"
+ x="653.6153"
+ y="353.42337"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Page creation form</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path19340"
+ d="M 498.78514,375.8319 L 602.59752,375.01"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect19342"
+ width="858.48193"
+ height="112.7198"
+ x="130.83548"
+ y="412.43832"
+ ry="6.5417752"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="834.15491"
+ y="345.38943"
+ id="text19344"><tspan
+ sodipodi:role="line"
+ id="tspan19346"
+ x="834.15491"
+ y="345.38943"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Pages list</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path21288"
+ d="M 796.32431,411.3508 L 809.66914,373.52098"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031473;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ </g>
+</svg>
Added: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/portals.svg
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/portals.svg (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/src/portals.svg 2007-11-29 22:01:05 UTC (rev 9205)
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1052.3622"
+ height="744.09448"
+ id="svg2283"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home/theute"
+ sodipodi:docname="test.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <marker
+ inkscape:stockid="Arrow1Mstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mstart"
+ style="overflow:visible">
+ <path
+ id="path14987"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+ transform="scale(0.4) translate(10,0)" />
+ </marker>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6237">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop6239" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop6241" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient6243"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9156"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient9160"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15182"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15188"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient15194"
+ gradientUnits="userSpaceOnUse"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,5.8642201e-6,1.2089557e-7)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6237"
+ id="linearGradient18369"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0716936,0,0,0.9331025,4.6200444e-6,8.2304494e-7)"
+ x1="258.82297"
+ y1="249.49103"
+ x2="337.04562"
+ y2="249.49103" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:document-units="mm"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.9936143"
+ inkscape:cx="522.85715"
+ inkscape:cy="380.30376"
+ inkscape:current-layer="layer1"
+ width="1052.3622px"
+ height="744.09448px"
+ inkscape:window-width="1280"
+ inkscape:window-height="953"
+ inkscape:window-x="0"
+ inkscape:window-y="24" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <image
+ y="209.79073"
+ x="131.35715"
+ id="image2352"
+ height="308"
+ width="783"
+ sodipodi:absref="/home/theute/test.png"
+ xlink:href="test.png" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect2355"
+ width="56.359894"
+ height="16.102829"
+ x="137.88046"
+ y="252.95824"
+ ry="6.5417743"
+ rx="6.5417743" />
+ <text
+ xml:space="preserve"
+ style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient9160);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="280.79306"
+ y="263.02249"
+ id="text5264"><tspan
+ sodipodi:role="line"
+ id="tspan5266"
+ x="280.79306"
+ y="263.02249"
+ style="fill:none;fill-opacity:0.51807233;stroke:#ff0000;stroke-opacity:1">Breadcrumbs</tspan></text>
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline"
+ d="M 194.84105,260.87787 L 271.36692,260.05597"
+ id="path12069"
+ inkscape:connector-type="polyline" />
+ <rect
+ rx="6.5417743"
+ ry="6.5417743"
+ y="307.30527"
+ x="131.8419"
+ height="21.134964"
+ width="82.526985"
+ id="rect15176"
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816" />
+ <text
+ id="text15190"
+ y="299.89471"
+ x="393.67725"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient15194);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ xml:space="preserve"
+ transform="scale(0.9331025,1.0716936)"><tspan
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1"
+ y="299.89471"
+ x="393.67725"
+ id="tspan15192"
+ sodipodi:role="line">To the properties page</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path16423"
+ d="M 215.41143,318.24419 L 353.89395,317.42229"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031521;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect18363"
+ width="364.32648"
+ height="29.186378"
+ x="130.83548"
+ y="369.70374"
+ ry="6.5417747"
+ rx="6.5417743" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:url(#linearGradient18369);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="655.77246"
+ y="361.87527"
+ id="text18365"><tspan
+ sodipodi:role="line"
+ id="tspan18367"
+ x="655.77246"
+ y="361.87527"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Portal creation form</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path19340"
+ d="M 495.76586,384.88974 L 599.57824,384.06784"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ <rect
+ style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:3.54330707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:18.89999962;stroke-dasharray:none;stroke-opacity:0.51204816"
+ id="rect19342"
+ width="786.01923"
+ height="104.66838"
+ x="130.83548"
+ y="406.43829"
+ ry="6.5417747"
+ rx="6.5417738" />
+ <text
+ transform="scale(0.9331025,1.0716936)"
+ xml:space="preserve"
+ style="font-size:11.19723034px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
+ x="834.15491"
+ y="345.38943"
+ id="text19344"><tspan
+ sodipodi:role="line"
+ id="tspan19346"
+ x="834.15491"
+ y="345.38943"
+ style="fill:none;fill-opacity:1;stroke:#ff0000;stroke-width:1;stroke-opacity:1">Available portals list</tspan></text>
+ <path
+ inkscape:connector-type="polyline"
+ id="path21288"
+ d="M 800.35005,405.31224 L 818.72701,378.55312"
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.48031497;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.51807233;display:inline" />
+ </g>
+</svg>
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9204 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf and 11 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-29 13:46:29 -0500 (Thu, 29 Nov 2007)
New Revision: 9204
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-blue.gif
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-vert.gif
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
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
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
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/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.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/pendingUsers.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/admin/user/userTemplate.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/tabContainer.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
Log:
JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 18:46:29 UTC (rev 9204)
@@ -62,7 +62,8 @@
/* Pagination. */
.admin-ui ul.pagination {
- margin: 0;
+ margin: 0 auto 0 auto;
+ width:98%;
padding: .2em;
}
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -55,7 +55,7 @@
</c:forEach>
</tbody>
</table>
- <ul class="pagination">
+ <ul class="pagination property-container">
<c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
<c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
var="index">
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -72,7 +72,7 @@
</c:forEach>
</tbody>
</table>
- <ul class="pagination">
+ <ul class="pagination property-container">
<c:if test="#{portletmgr.portletCount > portletmgr.paginationSize}">
<c:forEach begin="0" end="#{(portletmgr.portletCount - 1) / portletmgr.paginationSize}" step="1"
var="index">
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -37,7 +37,7 @@
</c:forEach>
</tbody>
</table>
- <ul class="pagination">
+ <ul class="pagination property-container">
<c:forEach begin="0" end="#{(portletmgr.portletCount - 1)/portletmgr.paginationSize}" step="1"
var="index">
<li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}">
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-blue.gif (from rev 9201, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif)
===================================================================
(Binary files differ)
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/img/border-dotted-vert.gif (from rev 9203, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif)
===================================================================
(Binary files differ)
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/bin/portal-identity-war/style.css 2007-11-29 18:46:29 UTC (rev 9204)
@@ -17,8 +17,20 @@
.identity-ui table {
border: 0;
+ border-collapse:collapse;
}
+hr {
+ display:none;
+ visibility:hidden;
+}
+
+table.datatable{
+ border-right: 1px solid #B3C0C7;
+ border-left: 1px solid #B3C0C7;
+ border-bottom: 1px solid #B3C0C7;
+}
+
div.identity-ui div.tab-container{
border-bottom:1px solid #B3C0C7;
border-right:1px solid #B3C0C7;
@@ -29,7 +41,6 @@
.identity-ui th {
text-align: left;
border: 0;
- border-bottom: 1px solid;
padding-bottom: 2px;
padding-top: 2px;
font-size: 11px;
@@ -210,21 +221,31 @@
.identity-ui th.portlet-section-title {
font-weight: bold;
- color: #656565;
+ color: #31587f;
font-size: 11px;
- border: 1px solid #999;
- background-color: #ebf2f5;
- padding-left: 6px;
+ padding-bottom: 5px;
}
-.identity-ui h3.sectionTitle {
+.identity-ui h3.sectionTitle,
+table th.sectionTitle {
font-weight: bold;
- color: #656565;
+ color: #31587f;
font-size: 11px;
- border-top: 1px solid #999;
+ padding-bottom: 5px;
+ background-image:url(img/border-dotted-blue.gif);
+ background-position:left bottom;
+ background-repeat:repeat-x;
+ background-color:#fafafa;
+}
+
+.sectionTitle-blue {
+ font-weight: bold;
+ color: #5986b3;
+ font-size: 13px;
background-color: #ebf2f5;
- padding: 2px;
- padding-left: 4px;
+ padding: 2px 2px 2px 4px;
+ margin: 0;
+ border:1px solid #B3C0C7;
}
.identity-ui .portlet-section-header {
@@ -257,6 +278,11 @@
border-top: 0px;
}
+.identity-ui .line-item {
+ color: #656565;
+ border-bottom: 1px solid #d5d5d5;
+}
+
.identity-ui .portlet-section-alternate {
background-color: #F2F2F2;
border: 1px solid #d5d5d5;
@@ -499,3 +525,8 @@
display: inline-block;
vertical-align: middle;
}
+
+.content-container {
+ width: 98%;
+ margin: 0 auto 0 auto;
+}
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/index.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -8,86 +8,89 @@
<ui:composition template="/WEB-INF/jsf/admin/user/userTemplate.xhtml">
<ui:define name="title">
- <li class="selected">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
- </li>
+ <li class="selected">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" />
+ </li>
</ui:define>
<ui:define name="content">
- <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
+ <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error"
fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>
- <h:form>
- <h:panelGrid>
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
- styleClass="actionDetails"/>
-
- <c:if test="#{useradministrationbean.pendingCount > 0}">
- <h:commandLink value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
- </c:if>
-
- <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
- </h:panelGrid>
- </h:form>
- <br/>
- <table style="width: 100%;">
- <tr>
- <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th>
- </tr>
- <tr class="portlet-section-body">
- <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td>
- <td>
- <h:outputText value="#{useradministrationbean.userCount}" />
- </td>
- </tr>
- <c:if test="#{useradministrationbean.pendingCount > 0}">
- <tr class="portlet-section-body">
- <td> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
- <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td>
- </tr>
- </c:if>
- <tr>
- <th colspan="2" class="portlet-section-header"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th>
- </tr>
- <tr class="portlet-section-body">
- <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td>
- <td>
- <c:choose>
- <c:when test="#{useradministrationbean.subscriptionMode == 'automatic'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
- </c:when>
- <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_approval_workflow'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" />
- </c:when>
- <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_workflow'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
- </c:when>
- <c:otherwise>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr class="portlet-section-body">
- <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td>
- <td>
- <c:choose>
- <c:when test="#{useradministrationbean.adminSubscriptionMode == 'automatic'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
- </c:when>
- <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_approval_workflow'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" />
- </c:when>
- <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_workflow'}">
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
- </c:when>
- <c:otherwise>
- <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
+ <h:form>
+ <h:panelGrid>
+ <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}" action="searchUsers"
+ styleClass="actionDetails"/>
+ <c:if test="#{useradministrationbean.pendingCount > 0}">
+ <h:commandLink value="Show pending registrations" action="showPendingUsers" styleClass="actionPreferences"/>
+ </c:if>
+
+ <h:commandLink value="#{bundle.IDENTITY_MANAGEMENT_CREATE_USER}" action="createUser" styleClass="actionCreateInstance"/>
+ </h:panelGrid>
+ </h:form>
+ <br/>
+ <table style="width: 100%;">
+ <tr>
+ <th colspan="2" class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_MATRIX}" /></th>
+ </tr>
+ <tr class="line-item">
+ <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS}"/></td>
+ <td>
+ <h:outputText value="#{useradministrationbean.userCount}" />
+ </td>
+ </tr>
+ <c:if test="#{useradministrationbean.pendingCount > 0}">
+ <tr class="portlet-section-body">
+ <td> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_COUNT_PENDING_USERS}" /></td>
+ <td><h:outputText value="#{useradministrationbean.pendingCount}" /></td>
+ </tr>
+ </c:if>
+ </table>
+ <br/>
+ <table style="width: 100%;">
+ <tr>
+ <th colspan="2" class="sectionTitle"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES}" /></th>
+ </tr>
+ <tr class="line-item">
+ <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE}" /></td>
+ <td>
+ <c:choose>
+ <c:when test="#{useradministrationbean.subscriptionMode == 'automatic'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
+ </c:when>
+ <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_approval_workflow'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" />
+ </c:when>
+ <c:when test="#{useradministrationbean.subscriptionMode == 'jbp_identity_validation_workflow'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
+ </c:when>
+ <c:otherwise>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ <tr class="line-item">
+ <td><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE}" /></td>
+ <td>
+ <c:choose>
+ <c:when test="#{useradministrationbean.adminSubscriptionMode == 'automatic'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC}" />
+ </c:when>
+ <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_approval_workflow'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN}" />
+ </c:when>
+ <c:when test="#{useradministrationbean.adminSubscriptionMode == 'jbp_identity_validation_workflow'}">
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL}" />
+ </c:when>
+ <c:otherwise>
+ <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM}" />
+ </c:otherwise>
+ </c:choose>
+ </td>
+ </tr>
+ </table>
+
</ui:define>
</ui:composition>
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -25,7 +25,7 @@
<ui:define name="content">
<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" width="100%">
+ <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>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -19,14 +19,15 @@
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
- <ui:define name="tab-container-content">
- <!-- Title -->
+
+ <ui:define name="tab-object-path"><!-- Title -->
<h:form>
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
</h:form>
-
+ </ui:define>
+ <ui:define name="tab-container-content">
<br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -19,7 +19,7 @@
<br/>
<h:form>
- <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+ <h:dataTable id="userlist" value="#{rolemanagementbean.roleList}" var="role" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
<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/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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/confirmPendingAction.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -26,7 +26,7 @@
<ui:define name="content">
<br/>
<h:form>
-<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+<h:dataTable value="#{useradministrationbean.pendingActionList}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox value="#{user.selected}" disabled="true" />
</h:column>
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/pendingUsers.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -41,7 +41,7 @@
</f:verbatim>
<br/>
<h:form id="pending">
-<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+<h:dataTable value="#{useradministrationbean.pendingUsers}" var="user" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<h:selectBooleanCheckbox id="selected" value="#{user.selected}" />
</h:column>
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/searchUsers.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -35,7 +35,7 @@
</h:form>
<br/>
<h:form>
- <h:dataTable id="userlist" value="#{useradministrationbean.userList}" var="uiUser" rendered="#{useradministrationbean.userList.rowCount > 0}" rows="#{useradministrationbean.limit}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" width="100%">
+ <h:dataTable id="userlist" value="#{useradministrationbean.userList}" var="uiUser" rendered="#{useradministrationbean.userList.rowCount > 0}" rows="#{useradministrationbean.limit}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable" width="100%">
<h:column>
<f:facet name="header">
<h:outputText value="#{bundle.IDENTITY_USERNAME}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/userTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -6,10 +6,10 @@
xmlns:c="http://java.sun.com/jstl/core"
class="identity-ui">
- <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
+ <f:loadBundle var="bundle" basename="conf.bundles.Identity" />
<c:choose>
- <c:when test="#{configurationbean.validConfiguration}">
- <h:form>
+ <c:when test="#{configurationbean.validConfiguration}">
+ <h:form>
<ul class="topnav">
<li id="currentTab"><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}"/></li>
<li>
@@ -17,24 +17,28 @@
</li>
</ul>
</h:form>
-
+
+
<ui:decorate template="/WEB-INF/jsf/common/tabContainer.xhtml">
- <ui:define name="tab-container-content">
- <!-- Title -->
- <h:form>
- <ul class="objectpath">
- <ui:insert name="title"><li>Title</li></ui:insert>
- </ul>
- </h:form>
- <br/>
+
+ <ui:define name="tab-object-path">
+ <!-- Title -->
+ <h:form>
+ <ul class="objectpath">
+ <ui:insert name="title"><li>Title</li></ui:insert>
+ </ul>
+ </h:form>
+ </ui:define>
+ <ui:define name="tab-container-content">
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
-
+
</ui:define>
</ui:decorate>
- </c:when>
- <c:otherwise>
- <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
- </c:otherwise>
+ </c:when>
+ <c:otherwise>
+ <span class="portlet-msg-error"><h:outputText value="#{bundle.IDENTITY_APPLICATION_NOT_AVAILABLE}" /></span>
+ </c:otherwise>
</c:choose>
</div>
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-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/confirm.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -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">
+ <h:dataTable id="roleslist" value="#{manager.roles}" var="role" styleClass="datatable">
<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/tabContainer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/common/tabContainer.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -4,7 +4,10 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<div class="tab-container">
+ <ui:insert name="tab-object-path"/>
+ <div class="content-container">
<ui:insert name="tab-container-content"/>
+ </div>
</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/lostPassword/lostTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -23,14 +23,16 @@
</ul>
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
- <ui:define name="tab-container-content">
- <!-- Title -->
+
+ <ui:define name="tab-object-path"><!-- Title -->
<ul class="objectpath">
<li class="selected">
<ui:insert name="title">Title</ui:insert>
</li>
</ul>
- <br/>
+ </ui:define>
+ <ui:define name="tab-container-content">
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/editProfileTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -19,14 +19,16 @@
</ul>
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
- <ui:define name="tab-container-content">
+ <ui:define name="tab-object-path">
<!-- Title -->
<h:form>
<ul class="objectpath">
<ui:insert name="title">Title</ui:insert>
</ul>
</h:form>
- <br/>
+ </ui:define>
+ <ui:define name="tab-container-content">
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/profile/viewProfileTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -18,14 +18,16 @@
</ul>
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
- <ui:define name="tab-container-content">
+ <ui:define name="tab-object-path">
<!-- Title -->
<ul class="objectpath">
<li class="selected">
<ui:insert name="title">Title</ui:insert>
</li>
</ul>
- <br/>
+ </ui:define>
+ <ui:define name="tab-container-content">
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/register/registerTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -27,14 +27,16 @@
</ul>
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
- <ui:define name="tab-container-content">
+ <ui:define name="tab-object-path">
<!-- Title -->
<ul class="objectpath">
<li class="selected">
<ui:insert name="title">Title</ui:insert>
</li>
</ul>
- <br/>
+ </ui:define>
+ <ui:define name="tab-container-content">
+ <br/>
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
</ui:define>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/startTemplate.xhtml 2007-11-29 18:46:29 UTC (rev 9204)
@@ -27,15 +27,18 @@
</ul>
</h:form>
<ui:decorate template="/WEB-INF/jsf/common/noTabContainer.xhtml">
- <ui:define name="tab-container-content">
- <!-- Title -->
+
+ <ui:define name="tab-object-path">
+ <!-- Title -->
<ul class="objectpath">
<li class="selected">
<ui:insert name="title">Title</ui:insert>
</li>
</ul>
- <br/>
- <!-- Content -->
+
+ </ui:define>
+ <ui:define name="tab-container-content"><br/>
+ <!-- Content -->
<ui:insert name="content">Content</ui:insert>
</ui:define>
</ui:decorate>
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9203 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/bin/portal-admin-war/img and 8 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-29 12:49:34 -0500 (Thu, 29 Nov 2007)
New Revision: 9203
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-blue.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
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/editPreferences.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/common/editWindowTheme.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.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/objectNavigation.xhtml
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/wizard/selectPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css 2007-11-29 17:49:34 UTC (rev 9203)
@@ -91,3 +91,9 @@
background-repeat:repeat-x;
}
+.dotted-blue-vert-rt {
+ background-image:url(../img/border-dotted-vert.gif);
+ background-position:right top;
+ background-repeat:repeat-y;
+}
+
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-29 17:49:34 UTC (rev 9203)
@@ -24,6 +24,12 @@
border-collapse:collapse;
}
+.admin-ui table.datatable{
+ border-right: 1px solid #B3C0C7;
+ border-left: 1px solid #B3C0C7;
+ border-bottom: 1px solid #B3C0C7;
+}
+
.admin-ui table tbody{
}
@@ -217,6 +223,10 @@
margin: 0;
}
+.admin-ui .property-body {
+ border-right: 1px solid #B3C0C7;
+}
+
/* Styles updated and enhanced from the main portal css */
.admin-ui th.portlet-section-title {
@@ -537,3 +547,7 @@
width:98%;
margin: 0 auto 0 auto;
}
+
+.cms-tab-container th{
+ background:none;
+}
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-vert.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -20,7 +20,7 @@
<h:form>
-<table width="100%">
+<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
<th>Case</th>
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -20,7 +20,7 @@
<td valign="top" class="portlet-section-body">
<h:form>
-<table width="100%">
+<table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
<th>Case</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -8,7 +8,7 @@
<c:choose>
<c:when test="#{not empty prefs.entries}">
<h:form>
- <table width="100%">
+ <table class="full-width datatable">
<thead class="portlet-section-header" style="text-align:left;">
<tr>
<th>Key</th>
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -16,12 +16,12 @@
<td class="align-top">
<!-- defines property creation section -->
- <table class="grey-border full-width">
+ <table class="full-width">
<tr>
<th class="portlet-section-title">Add a property.</th>
</tr>
<tr>
- <td class="portlet-section-body grey-border">
+ <td class="dotted-blue-vert-rt">
<h:form>
<!-- defines layout of property form -->
@@ -83,7 +83,7 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header"
+ <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width"
rowClasses="portlet-section-body, portlet-section-alternate" var="prop">
<h:column>
<f:facet name="header">Name</f:facet>
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core">
<h:form>
- <table>
+ <table class="datatable full-width">
<thead class="portlet-section-header">
<tr>
<th>Roles</th>
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -2,7 +2,7 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
<h:form>
- <table width="100%">
+ <table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
<th>Name</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<h:form>
- <table width="100%">
+ <table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
<th>Name</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -10,7 +10,7 @@
<h:message id="error" for="error" errorClass="portlet-msg-error"/>
</div>
-<table width="100%">
+<table class="full-width datatable">
<tr>
<th class="portlet-section-header" align="center">Personal Dashboard Editor</th>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -30,7 +30,7 @@
<div class="portlet-area-body">
- <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList"
+ <h:dataTable var="value" value="#{addDisplayNameAction.currentLocales}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -12,7 +12,7 @@
<c:if test="#{empty instancemgr.selectedPlugin}">
<h:form>
- <table id="instancesTable2" width="100%" class="portlet-def-table">
+ <table id="instancesTable2" class="portlet-def-table datatable">
<thead class="portlet-section-header">
<tr>
<th>Id</th>
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -10,7 +10,7 @@
<h:form>
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList"
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
@@ -73,7 +73,7 @@
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.pages}">
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList"
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList datatable"
columnClasses="objectNameColumn, objectActionColumn"
rowClasses="portlet-section-body,portlet-section-alternate"
headerClass="portlet-section-header">
@@ -136,7 +136,7 @@
<ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
- <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList"
+ <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList datatable"
rowClasses="portlet-section-body,portlet-section-alternate"
columnClasses="objectNameColumn, objectActionColumn"
headerClass="portlet-section-header">
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-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -28,7 +28,7 @@
</div>
<h:form>
- <table class="portlet-def-table">
+ <table class="portlet-def-table datatable">
<thead class="portlet-section-header">
<tr>
<th>Name</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -8,7 +8,7 @@
<ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <table width="100%">
+ <table class="datatable full-width">
<tbody class="portlet-section-header">
<tr>
<th>Page</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -7,7 +7,7 @@
<ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <table width="100%">
+ <table class="full-width datatable">
<tbody class="portlet-section-header">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -17,7 +17,7 @@
</h:form>
<h:form>
- <table width="100%">
+ <table class="full-width datatable">
<thead class="portlet-section-header">
<tr>
<th>Name</th>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -8,7 +8,7 @@
<ui:composition template="newWindowTpl.xhtml">
<ui:define name="content">
- <table width="100%">
+ <table class="full-width datatable">
<tbody class="portlet-section-header">
<tr>
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-blue.gif (from rev 9200, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif)
===================================================================
(Binary files differ)
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/border-dotted-vert.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -4,8 +4,11 @@
<ui:insert name="topnav">Top navigation</ui:insert>
<div class="tab-container">
+
+
<ui:insert name="objectpath">Object path if needed</ui:insert>
+ <div class="wsrp-content-container">
<c:if test="#{!empty title}">
<h3 class="sectionTitle">${title}</h3>
</c:if>
@@ -16,6 +19,8 @@
<!-- Content -->
<ui:insert name="content">Content</ui:insert>
+ </div>
+
</div>
</div>
</ui:composition>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2007-11-29 17:49:34 UTC (rev 9203)
@@ -58,7 +58,7 @@
</h:commandLink>
<c:if
test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}">
+ | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
<f:param name="id" value="#{consumer.producerId}"/>
<f:param name="register" value="#{!consumer.producerInfo.registered}"/>
<h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/>
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css (from rev 9200, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/basestyles.css)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/basestyles.css 2007-11-29 17:49:34 UTC (rev 9203)
@@ -0,0 +1,99 @@
+.zero {
+ margin:0;
+ padding:0;
+}
+
+.align-center {
+ text-align: center;
+}
+
+.align-center-margin {
+ margin: 0 auto 0 auto;
+}
+
+.float-left {
+ float: left;
+}
+
+.float-right {
+ float: right;
+}
+
+.align-left {
+ text-align: left;
+}
+
+.align-right {
+ text-align: right;
+}
+
+.align-top {
+ vertical-align:top;
+}
+
+.half-width {
+ width: 49%;
+}
+
+.quarter-width {
+ width: 24.9%;
+}
+
+.three-quarter-width {
+ width: 74.9%;
+}
+
+.full-width {
+ width: 100%;
+}
+
+.third-width {
+ width: 32.9%;
+}
+
+.two-third-width {
+ width: 65.9%;
+}
+
+.third-width-pad5 {
+ width: 32.5%;
+ padding: 5px;
+}
+
+.two-third-width-pad5 {
+ width: 65.5%;
+ padding: 5px;
+}
+
+.tenpx-top-bottom {
+ margin: 10px 0 10px 0;
+}
+
+.clear {
+ clear: both;
+}
+
+.pad5 {
+ padding: 5px;
+}
+
+.pad10 {
+ padding: 10px
+}
+
+.grey-border {
+ border: 1px solid #B3C0C7;
+}
+
+.dotted-blue-border {
+ background-image:url(../img/border-dotted-blue.gif);
+ background-position:left bottom;
+ background-repeat:repeat-x;
+}
+
+.dotted-blue-vert-rt {
+ background-image:url(../img/border-dotted-vert.gif);
+ background-position:right top;
+ background-repeat:repeat-y;
+}
+
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-11-29 16:35:29 UTC (rev 9202)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-11-29 17:49:34 UTC (rev 9203)
@@ -1,3 +1,5 @@
+@import url(basestyles.css);
+
.wsrp-consumers-ui table {
border: 0;
border-collapse: separate;
@@ -100,12 +102,13 @@
/* Override theme styles */
.wsrp-consumers-ui h3.sectionTitle {
font-weight: bold;
- color: #656565;
+ color: #31587f;
font-size: 11px;
- border-top: 1px solid #999;
- background-color: #ebf2f5;
- padding: 2px;
- padding-left: 4px;
+ padding-bottom: 5px;
+ background-image:url( img/border-dotted-blue.gif);
+ background-position:left bottom;
+ background-repeat:repeat-x;
+ background-color:#fafafa;
}
.wsrp-consumers-ui .portlet-section-header {
@@ -141,6 +144,33 @@
white-space: nowrap;
}
+.wsrp-consumers-ui .actionRefresh {
+ background-image: url( img/actionIcon_Refresh.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionRegister {
+ background-image: url( img/actionIcon_Register.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.wsrp-consumers-ui .actionDeregister {
+ background-image: url( img/actionIcon_Deregister.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
.wsrp-consumers-ui .actionDelete {
background-image: url( img/actionIcon_Delete.gif );
background-position: left;
@@ -336,3 +366,8 @@
left: 3em;
width: 95%;
}
+
+.wsrp-consumers-ui .wsrp-content-container {
+ margin: 0 auto 0 auto;
+ width: 98%;
+}
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9202 - in branches/presentation: core-presentation/src/main/org/jboss/portal/core/presentation/server/content and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-29 11:35:29 -0500 (Thu, 29 Nov 2007)
New Revision: 9202
Modified:
branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIWindowImpl.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIWindow.java
Log:
- remove generic get/set content state on the UIWindow as the client does not need to be aware of the kind of state and the server can manage it using a detyped access
Modified: branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
===================================================================
--- branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-29 15:15:31 UTC (rev 9201)
+++ branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-29 16:35:29 UTC (rev 9202)
@@ -45,6 +45,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.RenderResponse;
import org.jboss.portal.presentation.client.PresentationContext;
+import org.jboss.portal.presentation.model.StateScopeType;
import org.jboss.portal.presentation.model.UIWindow;
import org.jboss.portal.presentation.protocol.ErrorResponse;
import org.jboss.portal.presentation.protocol.LinkActivation;
@@ -253,7 +254,7 @@
{
uiWindow.setMode(mode);
}
- uiWindow.setContentState(contentState);
+ uiWindow.setProperty(StateScopeType.NAVIGATIONAL, "content", contentState);
response = new ShowUIObjectResponse(window.getPage().getId().toString(PortalObjectPath.CANONICAL_FORMAT));
}
}
Modified: branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java
===================================================================
--- branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java 2007-11-29 15:15:31 UTC (rev 9201)
+++ branches/presentation/core-presentation/src/main/org/jboss/portal/core/presentation/server/content/PresentationContentRendererContext.java 2007-11-29 16:35:29 UTC (rev 9202)
@@ -37,6 +37,7 @@
import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.presentation.client.PresentationContext;
+import org.jboss.portal.presentation.model.StateScopeType;
import org.jboss.portal.presentation.model.UIWindow;
/**
@@ -82,7 +83,7 @@
windowState = WindowState.NORMAL;
}
- StateString contentState = (StateString)uiwindow.getContentState();
+ StateString contentState = (StateString)uiwindow.getProperty(StateScopeType.NAVIGATIONAL, "content");
//
return new WindowNavigationalState(windowState, mode, contentState);
@@ -92,7 +93,7 @@
{
uiwindow.setWindowState(navigationalState.getWindowState());
uiwindow.setMode(navigationalState.getMode());
- uiwindow.setContentState(navigationalState.getContentState());
+ uiwindow.setProperty(StateScopeType.NAVIGATIONAL, "content", navigationalState.getContentState());
}
public User getUser()
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIWindowImpl.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIWindowImpl.java 2007-11-29 15:15:31 UTC (rev 9201)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIWindowImpl.java 2007-11-29 16:35:29 UTC (rev 9202)
@@ -73,16 +73,6 @@
setProperty(StateScopeType.NAVIGATIONAL, "windowstate", windowState);
}
- public Object getContentState()
- {
- return getProperty(StateScopeType.NAVIGATIONAL, "content", Object.class);
- }
-
- public void setContentState(Object contentState)
- {
- setProperty(StateScopeType.NAVIGATIONAL, "content", contentState);
- }
-
/**
*
* @param <T>
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIWindow.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIWindow.java 2007-11-29 15:15:31 UTC (rev 9201)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/UIWindow.java 2007-11-29 16:35:29 UTC (rev 9202)
@@ -32,30 +32,30 @@
public interface UIWindow extends UIObject
{
/**
- *
- * @return
+ * Returns the window state of the window or null if it does not exist.
+ *
+ * @return the window state
*/
WindowState getWindowState();
/**
- *
- * @param windowState
+ * Update the window state of the window.
+ *
+ * @param windowState the new window state
*/
void setWindowState(WindowState windowState);
/**
- *
- * @return
+ * Returns the mode of the window or null if it does not exist.
+ *
+ * @return the mode
*/
Mode getMode();
/**
- *
- * @param mode
+ * Update the mode of the window.
+ *
+ * @param mode the new mode
*/
void setMode(Mode mode);
-
- Object getContentState();
-
- void setContentState(Object contentState);
}
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9201 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-11-29 10:15:31 -0500 (Thu, 29 Nov 2007)
New Revision: 9201
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
Log:
UserInterceptor exception handling during shutdown
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-11-29 14:19:53 UTC (rev 9200)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 2007-11-29 15:15:31 UTC (rev 9201)
@@ -374,7 +374,7 @@
catch(Exception e)
{
try{tx.rollback();}catch(Exception rbe){}
- throw new RuntimeException(e);
+ log.debug(this, e);
}
}
}
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9200 - in branches/presentation/presentation/src/main/org/jboss/portal/presentation: model/state/structural and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-29 09:19:53 -0500 (Thu, 29 Nov 2007)
New Revision: 9200
Added:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/AbstractStructuralStateContext.java
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/StructuralStateModification.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/EventAssert.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
Log:
- added other modification for structural state (although not implemented)
- added AbstractStructualStateContext for abstracting stuff that does not depend on the nature of the implementation
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-29 14:15:23 UTC (rev 9199)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model/UIObjectImpl.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -178,7 +178,7 @@
changes.put(propertyName, (String)propertyValue);
// Create change
- StructuralStateModification mod = new StructuralStateModification.SetProperties(changes);
+ StructuralStateModification mod = new StructuralStateModification.Update(changes);
StateChange<StructuralStateModification> change = new StateChange<StructuralStateModification>(id, mod);
// Have context process change
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/AbstractStructuralStateContext.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/AbstractStructuralStateContext.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/AbstractStructuralStateContext.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -0,0 +1,69 @@
+/******************************************************************************
+ * 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. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.state.structural;
+
+import org.jboss.portal.presentation.model.state.StateChange;
+import org.jboss.portal.presentation.model.state.StateChangeVetoException;
+import org.jboss.portal.presentation.model.UIObject;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public abstract class AbstractStructuralStateContext implements StructuralStateContext
+{
+
+ public void update(List<StateChange<StructuralStateModification>> changes)
+ {
+ for (StateChange<StructuralStateModification> change : changes)
+ {
+ update(change);
+ }
+ }
+
+ public StructuralState create(String parentId, Class<? extends UIObject> type, String name, Map<String, String> properties) throws StateChangeVetoException
+ {
+ update(new StateChange<StructuralStateModification>(parentId, new StructuralStateModification.Create(type, name, properties)));
+
+ //
+ return load(parentId);
+ }
+
+ public void destroy(String objectId) throws StateChangeVetoException
+ {
+ update(new StateChange<StructuralStateModification>(objectId, new StructuralStateModification.Destroy()));
+ }
+
+ public void move(String objectId, String parentId) throws StateChangeVetoException
+ {
+ update(new StateChange<StructuralStateModification>(objectId, new StructuralStateModification.Move(parentId)));
+ }
+
+ public void update(String objectId, Map<String, String> changes) throws StateChangeVetoException
+ {
+ update(new StateChange<StructuralStateModification>(objectId, new StructuralStateModification.Update(changes)));
+ }
+}
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/StructuralStateModification.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/StructuralStateModification.java 2007-11-29 14:15:23 UTC (rev 9199)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model/state/structural/StructuralStateModification.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -23,6 +23,7 @@
package org.jboss.portal.presentation.model.state.structural;
import org.jboss.portal.presentation.model.state.StateModification;
+import org.jboss.portal.presentation.model.UIObject;
import java.util.Map;
@@ -40,19 +41,79 @@
}
/**
+ * Destruction of an object.
+ */
+ public final static class Destroy extends StructuralStateModification
+ {
+ }
+
+ public final static class Create extends StructuralStateModification
+ {
+
+ /** . */
+ private final Class<? extends UIObject> type;
+
+ /** . */
+ private final String name;
+
+ /** . */
+ private final Map<String, String> properties;
+
+ public Create(Class<? extends UIObject> type, String name, Map<String, String> properties)
+ {
+ this.type = type;
+ this.name = name;
+ this.properties = properties;
+ }
+
+ public Class<? extends UIObject> getType()
+ {
+ return type;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public Map<String, String> getProperties()
+ {
+ return properties;
+ }
+ }
+
+ public final static class Move extends StructuralStateModification
+ {
+
+ /** . */
+ private final String parentId;
+
+ public Move(String parentId)
+ {
+ this.parentId = parentId;
+ }
+
+ public String getParentId()
+ {
+ return parentId;
+ }
+ }
+
+
+ /**
* Update the properties portion of the state. The <code>Map</code> values are interpreted as follow:
* <ul>
* <li>Each non null value will replace an existing value of create a new one</li>
* <li>Each null value will destroy an existing value</li>
* </ul>
*/
- public final static class SetProperties extends StructuralStateModification
+ public final static class Update extends StructuralStateModification
{
/** . */
private final Map<String, String> changes;
- public SetProperties(Map<String, String> changes)
+ public Update(Map<String, String> changes)
{
if (changes == null)
{
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/EventAssert.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/EventAssert.java 2007-11-29 14:15:23 UTC (rev 9199)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/EventAssert.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -60,12 +60,12 @@
return clazz.cast(event);
}
- public void next(String targetId, StructuralStateModification.SetProperties sp)
+ public void next(String targetId, StructuralStateModification.Update sp)
{
StateChangeEvent ste = next(StateChangeEvent.class);
StateChange change = ste.getChange();
Assert.assertEquals(targetId, change.getTargetId());
- StructuralStateModification.SetProperties mod = (StructuralStateModification.SetProperties)change.getModification();
+ StructuralStateModification.Update mod = (StructuralStateModification.Update)change.getModification();
Assert.assertEquals(sp.getChanges(), mod.getChanges());
}
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java 2007-11-29 14:15:23 UTC (rev 9199)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/MockModel.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -22,11 +22,11 @@
******************************************************************************/
package org.jboss.portal.presentation.test.model;
-import org.jboss.portal.presentation.model.UIObject;
import org.jboss.portal.presentation.model.state.NoSuchStateException;
+import org.jboss.portal.presentation.model.state.StateChange;
import org.jboss.portal.presentation.model.state.StateChangeVetoException;
import org.jboss.portal.presentation.model.state.StateException;
-import org.jboss.portal.presentation.model.state.StateChange;
+import org.jboss.portal.presentation.model.state.structural.AbstractStructuralStateContext;
import org.jboss.portal.presentation.model.state.structural.StructuralState;
import org.jboss.portal.presentation.model.state.structural.StructuralStateContext;
import org.jboss.portal.presentation.model.state.structural.StructuralStateModification;
@@ -36,7 +36,6 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
-import java.util.List;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -54,7 +53,7 @@
/** . */
private final MockObjectImpl root = new MockObjectImpl();
- private final StructuralStateContext structuralStateContext = new StructuralStateContext()
+ private final StructuralStateContext structuralStateContext = new AbstractStructuralStateContext()
{
public StructuralState load(String objectId) throws IllegalArgumentException
{
@@ -66,80 +65,59 @@
return object != null ? object.takeSnapshot() : null;
}
- public void update(List<StateChange<StructuralStateModification>> changes)
- {
- for (StateChange<StructuralStateModification> change : changes)
- {
- update(change);
- }
- }
-
public void update(StateChange<StructuralStateModification> change)
{
- StructuralStateModification.SetProperties sp = (StructuralStateModification.SetProperties)change.getModification();
-
- //
- MockObjectImpl object = universe.get(change.getTargetId());
- if (object == null)
+ if (change.getModification() instanceof StructuralStateModification.Update)
{
- throw new NoSuchStateException();
- }
+ StructuralStateModification.Update sp = (StructuralStateModification.Update)change.getModification();
- //
- for (Map.Entry<String, String> entry : sp.getChanges().entrySet())
- {
- String propertyName = entry.getKey();
- MockObject.UpdateBehavior behavior = object.propertyBehaviors.get(propertyName);
- if (behavior instanceof MockObject.Veto)
+ //
+ MockObjectImpl object = universe.get(change.getTargetId());
+ if (object == null)
{
- throw new StateChangeVetoException("Cannot modify non behavior property");
+ throw new NoSuchStateException();
}
- else if (behavior instanceof MockObject.Failure)
+
+ //
+ for (Map.Entry<String, String> entry : sp.getChanges().entrySet())
{
- MockObject.Failure failure = (MockObject.Failure)behavior;
- failure.throwAs(IllegalArgumentException.class).
- throwAs(StateChangeVetoException.class).
- throwAs(StateException.class);
- }
- else
- {
- String propertyValue = entry.getValue();
- if (propertyValue != null)
+ String propertyName = entry.getKey();
+ MockObject.UpdateBehavior behavior = object.propertyBehaviors.get(propertyName);
+ if (behavior instanceof MockObject.Veto)
{
- object.propertyValues.put(propertyName, propertyValue);
+ throw new StateChangeVetoException("Cannot modify non behavior property");
}
+ else if (behavior instanceof MockObject.Failure)
+ {
+ MockObject.Failure failure = (MockObject.Failure)behavior;
+ failure.throwAs(IllegalArgumentException.class).
+ throwAs(StateChangeVetoException.class).
+ throwAs(StateException.class);
+ }
else
{
- object.propertyValues.remove(propertyName);
+ String propertyValue = entry.getValue();
+ if (propertyValue != null)
+ {
+ object.propertyValues.put(propertyName, propertyValue);
+ }
+ else
+ {
+ object.propertyValues.remove(propertyName);
+ }
}
}
}
+ else
+ {
+ throw new StateChangeVetoException();
+ }
}
public String getRootId()
{
return root.id;
}
-
- public StructuralState create(String parentId, Class<? extends UIObject> type, String name, Map<String, String> properties) throws StateChangeVetoException
- {
- throw new StateChangeVetoException();
- }
-
- public void destroy(String objectId) throws StateChangeVetoException
- {
- throw new StateChangeVetoException();
- }
-
- public void move(String objectId, String parentId) throws StateChangeVetoException
- {
- throw new StateChangeVetoException();
- }
-
- public void update(String objectId, Map<String, String> changes) throws StateChangeVetoException
- {
- update(new StateChange<StructuralStateModification>(objectId, new StructuralStateModification.SetProperties(changes)));
- }
};
public StructuralStateContext getStructuralStateContext()
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-29 14:15:23 UTC (rev 9199)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model/ModelTestCase.java 2007-11-29 14:19:53 UTC (rev 9200)
@@ -313,7 +313,7 @@
// Update structural property
foo.setProperty(StateScopeType.STRUCTURAL, "foo", "foo_new_value");
fooAssert.assertStructuralEquals("foo", "foo_new_value");
- eventAssert.next(fooId, new StructuralStateModification.SetProperties(Collections.singletonMap("foo", "foo_new_value")));
+ eventAssert.next(fooId, new StructuralStateModification.Update(Collections.singletonMap("foo", "foo_new_value")));
// Try a non string type
try
@@ -383,7 +383,7 @@
// Update structural property
foo.setProperty(StateScopeType.STRUCTURAL, "foo", "foo_new_value");
fooAssert.assertStructuralEquals("foo", "foo_new_value");
- eventAssert.next(fooId, new StructuralStateModification.SetProperties(Collections.singletonMap("foo", "foo_new_value")));
+ eventAssert.next(fooId, new StructuralStateModification.Update(Collections.singletonMap("foo", "foo_new_value")));
// Try a non string type
try
16 years, 6 months
- 1
- 0
JBoss Portal SVN: r9199 - branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-11-29 09:15:23 -0500 (Thu, 29 Nov 2007)
New Revision: 9199
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif
Log:
JBPORTAL-1798 Cleanup nested tables and other UI elements in core adminlocation
Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/img/border-dotted-blue.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 6 months
- 1
- 0