[portal-commits] JBoss Portal SVN: r9139 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-war/WEB-INF/jsp/header and 6 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Tue Nov 27 19:13:09 EST 2007
Author: wesleyhales
Date: 2007-11-27 19:13:09 -0500 (Tue, 27 Nov 2007)
New Revision: 9139
Added:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/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/displayNameObject.xhtml
Removed:
branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBPORTAL-1805 Let a user define multiple display-name for a portal object in the admin portlet
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java 2007-11-28 00:13:09 UTC (rev 9139)
@@ -158,7 +158,12 @@
{
throw new IllegalArgumentException("No null display name accepted");
}
- displayNames = new HashMap();
+
+ if (displayNames == null)
+ {
+ displayNames = new HashMap();
+ }
+
Map map = displayName.getValues();
Iterator it = map.values().iterator();
while (it.hasNext())
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-11-28 00:13:09 UTC (rev 9139)
@@ -22,7 +22,6 @@
}else{
document.write('<a href=\"<%= loginURL %>\">Login</a>');
}
-
</script>
<noscript>
Copied: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css (from rev 9042, branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css 2007-11-28 00:13:09 UTC (rev 9139)
@@ -0,0 +1,507 @@
+/* Redefine spacing for tables. */
+
+a {
+ color: #446688;
+ text-decoration: none;
+}
+
+a:hover {
+ color: #5078aa;
+ text-decoration: underline;
+}
+
+div.admin-ui div.tab-container {
+ border-bottom: 1px solid #B3C0C7;
+ border-right: 1px solid #B3C0C7;
+ border-left: 1px solid #B3C0C7;
+ padding: 15px 0 10px 0;
+}
+
+.admin-ui table {
+ border: 0;
+}
+
+.admin-ui th {
+ text-align: left;
+ border: 0;
+ border-bottom: 1px solid;
+ padding-bottom: 2px;
+ padding-top: 2px;
+ font-size: 11px;
+}
+
+.admin-ui td {
+ padding-bottom: 2px;
+ padding-top: 2px;
+}
+
+/* Pagination. */
+
+.admin-ui ul.pagination {
+ margin: 0;
+ padding: .2em;
+}
+
+.admin-ui ul.pagination li {
+ text-align: center;
+ list-style-type: none;
+ display: inline;
+ margin-right: 2px;
+}
+
+.admin-ui ul.pagination li.selected {
+ font-weight: bold;
+ background-color: #eef;
+ border-bottom: 2px solid #656565;
+}
+
+.pagination a, .pagination a:visited, .pagination a:hover {
+ text-decoration: none;
+}
+
+/* Top nav. */
+
+.admin-ui ul.topnav {
+ padding: 4px 0px 3px;
+ border-bottom: 1px solid #b3c0c7;
+ margin: 0;
+}
+
+.admin-ui ul.topnav li {
+ list-style-type: none;
+ display: inline;
+ margin: 0;
+ padding: 3px 0.5em;
+ margin-left: 5px;
+ border: 1px solid #b3c0c7;
+ border-bottom: none;
+ background-color: #f2f4f5;
+}
+
+.admin-ui ul.topnav li:hover {
+ background-color: #fff;
+}
+
+.admin-ui ul.topnav li#currentTab {
+ background-color: white;
+ border-bottom: 1px solid white;
+}
+
+.admin-ui ul.topnav li#currentTab a:hover {
+}
+
+/* Object path. */
+
+.admin-ui ul.objectpath {
+ list-style-type: none;
+ font-size: 11px;
+ border: solid 1px #bbb;
+ border-left: solid 1px #eee;
+ border-right: solid 1px #eee;
+ background-color: #d5d5d5;
+ background-image: url( ../img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ height: 21px;
+ margin: 0px;
+ padding: 0px;
+ padding-left: 2px;
+}
+
+.admin-ui ul.objectpath li {
+ list-style-type: none;
+ display: block;
+ float: left;
+}
+
+.admin-ui ul li.pathItem {
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+/*
+.admin-ui ul.li.pathSeparator {
+ background-image: url(img/pathSeparator.png);
+ background-position: center center;
+ background-repeat: no-repeat;
+ width: 7px;
+}
+*/
+
+.admin-ui ul.objectpath li.selected {
+ font-weight: bold;
+ padding-top: 4px;
+ padding-left: 3px;
+ padding-right: 2px;
+}
+
+.admin-ui ul.objectpath a {
+ color: #333333;
+ text-decoration: none;
+}
+
+.admin-ui ul.objectpath a:hover {
+ color: #5078aa;
+ text-decoration: none;
+}
+
+/* Resize combo lists */
+.admin-ui select {
+ padding: 2px 4px 2px 1px;
+}
+
+.admin-ui select.contentType {
+ width: 8em;
+}
+
+.admin-ui select.instanceList {
+ width: 11em;
+}
+
+.admin-ui select.windowList {
+ width: 95%;
+ overflow: auto;
+}
+
+/* Style a table for form layout */
+.admin-ui table form {
+ margin: 0;
+}
+
+.admin-ui table form td.label {
+ text-align: right;
+ vertical-align: top;
+ padding-top: 0.4em;
+}
+
+.admin-ui table form td.widget {
+ text-align: left;
+}
+
+/* Area header. */
+
+.admin-ui .portlet-area-header {
+ border: 1px solid #54708c;
+ font-weight: bold;
+ color: #fff;
+ font-size: 11px;
+ background-color: #5986b3;
+ padding: 2px;
+ padding-left: 4px;
+ margin: 0;
+}
+
+.admin-ui .portlet-area-body {
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+ background-color: #fff;
+ padding: 4px;
+ margin: 0;
+}
+
+/* Styles updated and enhanced from the main portal css */
+
+.admin-ui th.portlet-section-title {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border: 1px solid #999;
+ background-color: #ebf2f5;
+ padding-left: 6px;
+}
+
+.admin-ui h3.sectionTitle {
+ font-weight: bold;
+ color: #656565;
+ font-size: 11px;
+ border-top: 1px solid #999;
+ background-color: #ebf2f5;
+ padding: 2px;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header {
+ background-image: url( ../img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-header th {
+ background-image: url( ../img/pathBackground.png );
+ background-position: left;
+ background-repeat: repeat-x;
+ font-weight: bold;
+ color: #656565;
+ font-size: 10px;
+ border-top: 1px solid #ddd;
+ border-bottom: 1px solid #999;
+ padding-left: 4px;
+}
+
+.admin-ui .portlet-section-body {
+ color: #656565;
+ border: 1px solid #d5d5d5;
+ border-top: 0px;
+}
+
+.admin-ui .portlet-section-alternate {
+ background-color: #F2F2F2;
+ border: 1px solid #d5d5d5;
+}
+
+.admin-ui .portlet-section-selected {
+ background-color: #CBD4E6;
+}
+
+.admin-ui .actionDetails {
+ background-image: url( ../img/actionIcon_Details.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionLayout {
+ background-image: url( ../img/actionIcon_Layout.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionSecurity {
+ background-image: url( ../img/actionIcon_Security.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ line-height: 14px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionProperties {
+ background-image: url( ../img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-left: 18px;
+ white-space: nowrap;
+ height: 22px;
+}
+
+.admin-ui .actionTheme {
+ background-image: url( ../img/actionIcon_Theme.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionRename {
+ background-image: url( ../img/actionIcon_Rename.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDelete {
+ background-image: url( ../img/actionIcon_Delete.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionMakeDefault {
+ background-image: url( ../img/actionIcon_MakeDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionDefault {
+ background-image: url( ../img/actionIcon_IsDefault.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionPreferences {
+ background-image: url( ../img/actionIcon_Properties.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .actionCreateInstance {
+ background-image: url( ../img/actionIcon_CreateInstance.gif );
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ line-height: 18px;
+ padding-left: 18px;
+ white-space: nowrap;
+}
+
+.admin-ui .portlet-content-center {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-body {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-content-right {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-footer-left {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui .portlet-table-header {
+ background-color: #eef;
+}
+
+.admin-ui .portlet-section-buttonrow {
+ margin-top: 6px;
+ margin-bottom: 6px;
+ float: right;
+}
+
+/* Change dashed line to solid. */
+
+.admin-ui hr {
+ border-top-style: solid;
+}
+
+div.admin-ui div.wizard-tab-container {
+ border-bottom: 1px solid #B3C0C7;
+ border-right: 1px solid #B3C0C7;
+ border-left: 1px solid #B3C0C7;
+ padding: 0 0 10px 0;
+ margin: 10px 0 0 0;
+}
+
+.admin-ui .wizardStepBox {
+ display: inline;
+ float: left;
+ border: 1px solid #98B7C6;
+ height: 7em;
+ width: 9em;
+ background-color: #DFE8ED;
+ margin: .5em;
+}
+
+.admin-ui .wizardButtonBox {
+ margin: 1em;
+}
+
+.admin-ui .wizardContent {
+ clear: both;
+}
+
+.admin-ui form {
+ padding: 0;
+ margin: 0;
+}
+
+.admin-ui #selected.wizardStepBox {
+ background-color: #C8DCC4;
+ border: 1px solid black;
+ border-bottom: 5px solid black;
+}
+
+.admin-ui .stepNumber {
+ font-size: 2em;
+ text-align: center;
+ margin-top: 5px;
+ margin-bottom: 0;
+}
+
+.admin-ui .stepText {
+ text-align: center;
+}
+
+.admin-ui .layout-button {
+ width: 50px;
+ margin: 2px;
+ padding: 2px;
+}
+
+.admin-ui .createObjectForm {
+ display: block;
+ padding: 1em 0 0 0;
+}
+
+.admin-ui .objectList {
+ width: 100%;
+}
+
+.admin-ui .objectList .objectNameColumn {
+ width: 25%;
+}
+
+.admin-ui .objectList .objectActionColumn {
+ width: 75%;
+}
+
+.admin-ui .portlet-msg {
+ border: 1px solid #bbb;
+ margin: 2em auto;
+ padding: 1em;
+ width: 60%;
+}
+
+.admin-ui .portlet-msg-body {
+ position: relative;
+ top: -3em;
+ left: 3em;
+ width: 95%;
+}
+
+.admin-label {
+ padding: 0 4px 3px 0;
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.admin-ui .objectList img.windowStateIcon {
+ margin: 0 5px 0 0;
+}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/css/style.css
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ LastChangedDate LastChangedBy LastChangedRevision Id
Deleted: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-11-28 00:13:09 UTC (rev 9139)
@@ -1,507 +0,0 @@
-/* Redefine spacing for tables. */
-
-a {
- color: #446688;
- text-decoration: none;
-}
-
-a:hover {
- color: #5078aa;
- text-decoration: underline;
-}
-
-div.admin-ui div.tab-container {
- border-bottom: 1px solid #B3C0C7;
- border-right: 1px solid #B3C0C7;
- border-left: 1px solid #B3C0C7;
- padding: 15px 0 10px 0;
-}
-
-.admin-ui table {
- border: 0;
-}
-
-.admin-ui th {
- text-align: left;
- border: 0;
- border-bottom: 1px solid;
- padding-bottom: 2px;
- padding-top: 2px;
- font-size: 11px;
-}
-
-.admin-ui td {
- padding-bottom: 2px;
- padding-top: 2px;
-}
-
-/* Pagination. */
-
-.admin-ui ul.pagination {
- margin: 0;
- padding: .2em;
-}
-
-.admin-ui ul.pagination li {
- text-align: center;
- list-style-type: none;
- display: inline;
- margin-right: 2px;
-}
-
-.admin-ui ul.pagination li.selected {
- font-weight: bold;
- background-color: #eef;
- border-bottom: 2px solid #656565;
-}
-
-.pagination a, .pagination a:visited, .pagination a:hover {
- text-decoration: none;
-}
-
-/* Top nav. */
-
-.admin-ui ul.topnav {
- padding: 4px 0px 3px;
- border-bottom: 1px solid #b3c0c7;
- margin: 0;
-}
-
-.admin-ui ul.topnav li {
- list-style-type: none;
- display: inline;
- margin: 0;
- padding: 3px 0.5em;
- margin-left: 5px;
- border: 1px solid #b3c0c7;
- border-bottom: none;
- background-color: #f2f4f5;
-}
-
-.admin-ui ul.topnav li:hover {
- background-color: #fff;
-}
-
-.admin-ui ul.topnav li#currentTab {
- background-color: white;
- border-bottom: 1px solid white;
-}
-
-.admin-ui ul.topnav li#currentTab a:hover {
-}
-
-/* Object path. */
-
-.admin-ui ul.objectpath {
- list-style-type: none;
- font-size: 11px;
- border: solid 1px #bbb;
- border-left: solid 1px #eee;
- border-right: solid 1px #eee;
- background-color: #d5d5d5;
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- height: 21px;
- margin: 0px;
- padding: 0px;
- padding-left: 2px;
-}
-
-.admin-ui ul.objectpath li {
- list-style-type: none;
- display: block;
- float: left;
-}
-
-.admin-ui ul li.pathItem {
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-/*
-.admin-ui ul.li.pathSeparator {
- background-image: url(img/pathSeparator.png);
- background-position: center center;
- background-repeat: no-repeat;
- width: 7px;
-}
-*/
-
-.admin-ui ul.objectpath li.selected {
- font-weight: bold;
- padding-top: 4px;
- padding-left: 3px;
- padding-right: 2px;
-}
-
-.admin-ui ul.objectpath a {
- color: #333333;
- text-decoration: none;
-}
-
-.admin-ui ul.objectpath a:hover {
- color: #5078aa;
- text-decoration: none;
-}
-
-/* Resize combo lists */
-.admin-ui select {
- padding: 2px 4px 2px 1px;
-}
-
-.admin-ui select.contentType {
- width: 8em;
-}
-
-.admin-ui select.instanceList {
- width: 11em;
-}
-
-.admin-ui select.windowList {
- width: 95%;
- overflow: auto;
-}
-
-/* Style a table for form layout */
-.admin-ui table form {
- margin: 0;
-}
-
-.admin-ui table form td.label {
- text-align: right;
- vertical-align: top;
- padding-top: 0.4em;
-}
-
-.admin-ui table form td.widget {
- text-align: left;
-}
-
-/* Area header. */
-
-.admin-ui .portlet-area-header {
- border: 1px solid #54708c;
- font-weight: bold;
- color: #fff;
- font-size: 11px;
- background-color: #5986b3;
- padding: 2px;
- padding-left: 4px;
- margin: 0;
-}
-
-.admin-ui .portlet-area-body {
- border: 1px solid #d5d5d5;
- border-top: 0px;
- background-color: #fff;
- padding: 4px;
- margin: 0;
-}
-
-/* Styles updated and enhanced from the main portal css */
-
-.admin-ui th.portlet-section-title {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border: 1px solid #999;
- background-color: #ebf2f5;
- padding-left: 6px;
-}
-
-.admin-ui h3.sectionTitle {
- font-weight: bold;
- color: #656565;
- font-size: 11px;
- border-top: 1px solid #999;
- background-color: #ebf2f5;
- padding: 2px;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-header th {
- background-image: url( img/pathBackground.png );
- background-position: left;
- background-repeat: repeat-x;
- font-weight: bold;
- color: #656565;
- font-size: 10px;
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #999;
- padding-left: 4px;
-}
-
-.admin-ui .portlet-section-body {
- color: #656565;
- border: 1px solid #d5d5d5;
- border-top: 0px;
-}
-
-.admin-ui .portlet-section-alternate {
- background-color: #F2F2F2;
- border: 1px solid #d5d5d5;
-}
-
-.admin-ui .portlet-section-selected {
- background-color: #CBD4E6;
-}
-
-.admin-ui .actionDetails {
- background-image: url( img/actionIcon_Details.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionLayout {
- background-image: url( img/actionIcon_Layout.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionSecurity {
- background-image: url( img/actionIcon_Security.gif );
- background-position: left;
- background-repeat: no-repeat;
- line-height: 14px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionProperties {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- padding-left: 18px;
- white-space: nowrap;
- height: 22px;
-}
-
-.admin-ui .actionTheme {
- background-image: url( img/actionIcon_Theme.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionRename {
- background-image: url( img/actionIcon_Rename.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDelete {
- background-image: url( img/actionIcon_Delete.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionMakeDefault {
- background-image: url( img/actionIcon_MakeDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionDefault {
- background-image: url( img/actionIcon_IsDefault.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionPreferences {
- background-image: url( img/actionIcon_Properties.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .actionCreateInstance {
- background-image: url( img/actionIcon_CreateInstance.gif );
- background-position: left;
- background-repeat: no-repeat;
- padding-top: 2px;
- padding-bottom: 2px;
- line-height: 18px;
- padding-left: 18px;
- white-space: nowrap;
-}
-
-.admin-ui .portlet-content-center {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-body {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-content-right {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-footer-left {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui .portlet-table-header {
- background-color: #eef;
-}
-
-.admin-ui .portlet-section-buttonrow {
- margin-top: 6px;
- margin-bottom: 6px;
- float: right;
-}
-
-/* Change dashed line to solid. */
-
-.admin-ui hr {
- border-top-style: solid;
-}
-
-div.admin-ui div.wizard-tab-container {
- border-bottom: 1px solid #B3C0C7;
- border-right: 1px solid #B3C0C7;
- border-left: 1px solid #B3C0C7;
- padding: 0 0 10px 0;
- margin: 10px 0 0 0;
-}
-
-.admin-ui .wizardStepBox {
- display: inline;
- float: left;
- border: 1px solid #98B7C6;
- height: 7em;
- width: 9em;
- background-color: #DFE8ED;
- margin: .5em;
-}
-
-.admin-ui .wizardButtonBox {
- margin: 1em;
-}
-
-.admin-ui .wizardContent {
- clear: both;
-}
-
-.admin-ui form {
- padding: 0;
- margin: 0;
-}
-
-.admin-ui #selected.wizardStepBox {
- background-color: #C8DCC4;
- border: 1px solid black;
- border-bottom: 5px solid black;
-}
-
-.admin-ui .stepNumber {
- font-size: 2em;
- text-align: center;
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-.admin-ui .stepText {
- text-align: center;
-}
-
-.admin-ui .layout-button {
- width: 50px;
- margin: 2px;
- padding: 2px;
-}
-
-.admin-ui .createObjectForm {
- display: block;
- padding: 1em 0 0 0;
-}
-
-.admin-ui .objectList {
- width: 100%;
-}
-
-.admin-ui .objectList .objectNameColumn {
- width: 25%;
-}
-
-.admin-ui .objectList .objectActionColumn {
- width: 75%;
-}
-
-.admin-ui .portlet-msg {
- border: 1px solid #bbb;
- margin: 2em auto;
- padding: 1em;
- width: 60%;
-}
-
-.admin-ui .portlet-msg-body {
- position: relative;
- top: -3em;
- left: 3em;
- width: 95%;
-}
-
-.admin-label {
- padding: 0 4px 3px 0;
- display: inline-block;
- vertical-align: middle;
-}
-
-.admin-ui .objectList img.windowStateIcon {
- margin: 0 5px 0 0;
-}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PortalObjectDisplayNameAction.java 2007-11-28 00:13:09 UTC (rev 9139)
@@ -22,34 +22,121 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui.actions;
-import java.util.Locale;
-import java.util.Map;
-
+import org.jboss.portal.common.i18n.LocaleFormat;
+import org.jboss.portal.common.i18n.LocaleManager;
import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.common.util.ConversionException;
+import org.jboss.portal.core.admin.ui.PortalObjectManagerBean;
+import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
import org.jboss.portal.core.model.portal.PortalObject;
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import java.util.*;
+
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
+ * @author <a href="mailto:whales at redhat.com">Wesley Hales</a>
* @version $Revision$
*/
-public class PortalObjectDisplayNameAction
-{
+public class PortalObjectDisplayNameAction {
private PortalObject selectedObject;
-
- private Locale newLocale;
-
+
+ public Object bean;
+
+ private String newLocale;
+
private String newText;
-
- public void addDisplayName()
+
+ private SortedMap locales;
+
+ private Map currentLocales;
+
+ private String displayNameByLocale;
+
+
+ public void addDisplayName() throws ConversionException {
+
+ if (newText != null)
+ {
+ if (bean instanceof PortalObjectManagerBean) {
+ selectedObject = ((PortalObjectManagerBean) bean).getSelectedObject();
+ }
+ Locale locale = LocaleFormat.DEFAULT.getLocale(newLocale);
+ Map map = new HashMap();
+ LocalizedString.Value lsv = new LocalizedString.Value(locale, newText);
+ map.put(locale, lsv.getString());
+ LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH);
+ selectedObject.setDisplayName(newLocalizedString);
+ }else{
+ FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "You must enter a name", "You must enter a name");
+ FacesContext.getCurrentInstance().addMessage("status", message);
+ }
+
+ }
+
+ public PortalObject getSelectedObject() {
+ return selectedObject;
+ }
+
+ public void setSelectedObject(PortalObject selectedObject) {
+ this.selectedObject = selectedObject;
+ }
+
+ public String getNewText() {
+ return newText;
+ }
+
+ public void setNewText(String newText) {
+ this.newText = newText;
+ }
+
+ public SortedMap getLocales() {
+ SortedMap set = new TreeMap();
+ Locale[] localList = (Locale[]) LocaleManager.getLocales().toArray(new Locale[0]);
+
+ for (int i = 0; i < localList.length; i++) {
+ Locale thisLocale = localList[i];
+ set.put(thisLocale.getLanguage(), thisLocale.getLanguage());
+ }
+ return set;
+ }
+
+ public void setLocales(SortedMap locales) {
+ this.locales = locales;
+ }
+
+ public String getNewLocale() {
+ return newLocale;
+ }
+
+ public void setNewLocale(String newLocale) {
+ this.newLocale = newLocale;
+ }
+
+ public Map getCurrentLocales()
{
- LocalizedString localizedString = selectedObject.getDisplayName();
- Map map = localizedString.getValues();
- map.put(newLocale, new LocalizedString.Value(newLocale, newText));
- LocalizedString newLocalizedString = new LocalizedString(map, Locale.ENGLISH);
- selectedObject.setDisplayName(newLocalizedString);
+ if (selectedObject != null && selectedObject.getDisplayName() != null) {
+ currentLocales = new HashMap();
+ Map displayNames = selectedObject.getDisplayName().getValues();
+ Iterator it = displayNames.entrySet().iterator();
+ while (it.hasNext()) {
+ Map.Entry pairs = (Map.Entry) it.next();
+ Locale thisLocale = (Locale)pairs.getKey();
+ currentLocales.put(thisLocale.getLanguage(),getDisplayNameByLocale(thisLocale));
+ }
+ return currentLocales;
+ }
+ return null;
}
-
-
+
+ public String getDisplayNameByLocale(Locale locale) {
+ Map displayNames = selectedObject.getDisplayName().getValues();
+ LocalizedString.Value lsv = (LocalizedString.Value)displayNames.get(locale);
+ return lsv.getString();
+ }
+
+
}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -306,6 +306,24 @@
</managed-bean>
<managed-bean>
+ <managed-bean-name>addDisplayNameAction</managed-bean-name>
+ <managed-bean-class>org.jboss.portal.core.admin.ui.actions.PortalObjectDisplayNameAction</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <!--<managed-property>
+ <property-name>pageContainer</property-name>
+ <value>#{portalobjectmgr.selectedObject}</value>
+ </managed-property>-->
+ <managed-property>
+ <property-name>bean</property-name>
+ <value>#{portalobjectmgr}</value>
+ </managed-property>
+ <!--<managed-property>
+ <property-name>domainConfigurator</property-name>
+ <value>#{applicationScope.AuthorizationDomainRegistry.portalobject.configurator}</value>
+ </managed-property>-->
+ </managed-bean>
+
+ <managed-bean>
<managed-bean-name>renameDashboardPageAction</managed-bean-name>
<managed-bean-class>org.jboss.portal.core.admin.ui.actions.RenameAction</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
@@ -411,8 +429,11 @@
<from-outcome>renameObject</from-outcome>
<to-view-id>/WEB-INF/jsf/renameObject.xhtml</to-view-id>
</navigation-case>
-
<navigation-case>
+ <from-outcome>setDisplayName</from-outcome>
+ <to-view-id>/WEB-INF/jsf/displayNameObject.xhtml</to-view-id>
+ </navigation-case>
+ <navigation-case>
<from-outcome>editWindowTheme</from-outcome>
<to-view-id>/WEB-INF/jsf/editWindowTheme.xhtml</to-view-id>
</navigation-case>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -35,7 +35,7 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/>
</header-content>
<portlet-info>
<icon>
@@ -53,7 +53,7 @@
<trans-attribute>Required</trans-attribute>
</transaction>
<header-content>
- <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/>
</header-content>
<portlet-info>
<icon>
Copied: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml (from rev 9138, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -0,0 +1,26 @@
+<div
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+ <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:param name="portalObjectScreen" value="Rename"/>
+ <ui:define name="content">
+ <h3>Add Display Name</h3>
+ <h:form id="displayNameForm">
+ <h:messages/>
+ <c:forEach items="#{addDisplayNameAction.currentLocales}" var="locale">
+ #{locale} - #{locale}<br/>
+ </c:forEach>
+ <p>
+ <h:inputText id="newName" value="#{addDisplayNameAction.newText}"/>
+ <h:selectOneMenu id="locales" value="#{addDisplayNameAction.newLocale}">
+ <f:selectItems value="#{addDisplayNameAction.locales}"/>
+ </h:selectOneMenu>
+ <h:commandButton value="Add Name" action="#{addDisplayNameAction.addDisplayName}" styleClass="portlet-form-button"/>
+ </p>
+ </h:form>
+ </ui:define>
+ </ui:composition>
+</div>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -2,6 +2,7 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
xmlns:h="http://java.sun.com/jsf/html">
<ui:composition template="objectTemplate.xhtml">
@@ -11,6 +12,8 @@
<h3 class="sectionTitle">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
+
+
<h:form>
<h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink
action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout">
@@ -33,6 +36,12 @@
action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
Rename
+ </h:commandLink> | </h:panelGroup>
+ <h:panelGroup
+ rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"><h:commandLink
+ action="setDisplayName" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionDisplayName">
+ <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
+ Display Names
</h:commandLink> | </h:panelGroup><h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/>
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-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -45,7 +45,15 @@
<h:outputText value="Rename"/>
<f:param name="id" value="#{object.id}"/>
</h:commandLink>
- </h:panelGroup> | <h:commandLink action="confirm" styleClass="actionDelete"
+ </h:panelGroup>
+ <h:panelGroup
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (object.name != 'default')}">
+ | <h:commandLink action="setDisplayName" actionListener="#{portalobjectmgr.selectObject}">
+ <h:outputText value="Display Names"/>
+ <f:param name="id" value="#{object.id}"/>
+ </h:commandLink>
+ </h:panelGroup>
+ | <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
Delete
@@ -99,9 +107,13 @@
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
Rename
- </h:commandLink> | <h:commandLink action="confirm" styleClass="actionDelete"
+ </h:commandLink> | <h:commandLink action="setDisplayName" styleClass="actionRename"
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
+ Display Names
+ </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete"
+ actionListener="#{portalobjectmgr.selectObject}">
+ <f:param name="id" value="#{object.id}"/>
Delete
</h:commandLink>
<h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault"
@@ -175,6 +187,10 @@
actionListener="#{portalobjectmgr.selectObject}">
<f:param name="id" value="#{object.id}"/>
Rename
+ </h:commandLink> | <h:commandLink action="setDisplayName" styleClass="actionRename"
+ actionListener="#{portalobjectmgr.selectObject}">
+ <f:param name="id" value="#{object.id}"/>
+ Display Names
</h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionDelete">
<f:param name="id" value="#{object.id}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-27 20:56:08 UTC (rev 9138)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2007-11-28 00:13:09 UTC (rev 9139)
@@ -6,7 +6,7 @@
xmlns:c="http://java.sun.com/jstl/core"
class="admin-ui">
-<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/>
<div class="wizard-tab-container">
<h3 class="sectionTitle">
More information about the portal-commits
mailing list