JBoss Portal SVN: r8469 - in docs: branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-24 17:22:58 -0400 (Mon, 24 Sep 2007)
New Revision: 8469
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_create.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_created.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_end.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_init.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_refresh.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_usewsdl.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
docs/trunk/referenceGuide/en/images/wsrp/config_create.png
docs/trunk/referenceGuide/en/images/wsrp/config_created.png
docs/trunk/referenceGuide/en/images/wsrp/config_end.png
docs/trunk/referenceGuide/en/images/wsrp/config_init.png
docs/trunk/referenceGuide/en/images/wsrp/config_refresh.png
docs/trunk/referenceGuide/en/images/wsrp/config_usewsdl.png
docs/trunk/referenceGuide/en/modules/wsrp.xml
Log:
- Updated documentation after WSRP admin GUI update.
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_create.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_created.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_end.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_init.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_refresh.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/wsrp/config_usewsdl.png
===================================================================
(Binary files differ)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2007-09-24 20:33:56 UTC (rev 8468)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/wsrp.xml 2007-09-24 21:22:58 UTC (rev 8469)
@@ -307,7 +307,7 @@
<imagedata fileref="images/wsrp/config_usewsdl.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- Enter the WSDL URL for the producer in the text field and press the "Refresh" button. This will retrieve
+ Enter the WSDL URL for the producer in the text field and press the "Save & Refresh" button. This will retrieve
the service description associated with the Producer which WSRP is described by the WSDL file found at
the URL you just entered. In our case, querying the service description will allow us to learn that the
Producer requires registration and that it expects a value for the registration property named
@@ -319,7 +319,7 @@
</mediaobject>
<note>At this point, there is no automated way to learn about which possible values (if any) are
expected by the remote Producer. Please refer to the specific Producer's documentation.</note>
- Enter "public" as the value for the registration property and press "Refresh" once more. You should now
+ Enter "public" as the value for the registration property and press "Save & Refresh" once more. You should now
see something similar to:
<mediaobject>
<imageobject>
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_create.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_created.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_end.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_init.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_refresh.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/images/wsrp/config_usewsdl.png
===================================================================
(Binary files differ)
Modified: docs/trunk/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/wsrp.xml 2007-09-24 20:33:56 UTC (rev 8468)
+++ docs/trunk/referenceGuide/en/modules/wsrp.xml 2007-09-24 21:22:58 UTC (rev 8469)
@@ -307,7 +307,7 @@
<imagedata fileref="images/wsrp/config_usewsdl.png" format="png" align="center" valign="middle"/>
</imageobject>
</mediaobject>
- Enter the WSDL URL for the producer in the text field and press the "Refresh" button. This will retrieve
+ Enter the WSDL URL for the producer in the text field and press the "Save & Refresh" button. This will retrieve
the service description associated with the Producer which WSRP is described by the WSDL file found at
the URL you just entered. In our case, querying the service description will allow us to learn that the
Producer requires registration and that it expects a value for the registration property named
@@ -319,7 +319,7 @@
</mediaobject>
<note>At this point, there is no automated way to learn about which possible values (if any) are
expected by the remote Producer. Please refer to the specific Producer's documentation.</note>
- Enter "public" as the value for the registration property and press "Refresh" once more. You should now
+ Enter "public" as the value for the registration property and press "Save & Refresh" once more. You should now
see something similar to:
<mediaobject>
<imageobject>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8468 - in tags/JBoss_Portal_2_6_2/core-cms/src: resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 16:33:56 -0400 (Mon, 24 Sep 2007)
New Revision: 8468
Modified:
tags/JBoss_Portal_2_6_2/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
Add Admin CMS border
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-24 20:33:56 UTC (rev 8468)
@@ -2,9 +2,17 @@
div.menu-container {
float:left;
width: 300px;
- padding: 5px 0 10px 0;
+ padding: 5px 0 10px 10px;
}
+div.admin-ui div.cms-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;
+}
+
.menu {
width: 150px;
font-size: 0.85em;
@@ -126,4 +134,18 @@
div.file-table-container{
width: 100%;
-}
\ No newline at end of file
+}
+
+h3.sectionTitle {
+ margin:0;
+}
+
+div.admin-ui table{
+ margin:0;
+ border-collapse:collapse;
+}
+
+div.admin-ui th{
+ padding:0;
+}
+
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -12,6 +12,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th>
<tr>
@@ -46,4 +47,4 @@
</tr>
</table>
</div>
-
+</div>
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -10,6 +10,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th>
<tr>
@@ -58,8 +59,8 @@
</table>
<br/><br/>
</div>
+</div>
-
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -8,6 +8,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sBackPath = NodeUtil.getParentPath(sCurrPath);
@@ -37,4 +38,5 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
+ </div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -12,6 +12,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th>
<tr>
@@ -55,4 +56,5 @@
<br/><br/>
-</div>
\ No newline at end of file
+</div>
+ </div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -90,6 +90,7 @@
}
</script>
<div class="admin-ui">
+<div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
<portlet:param name="path" value=""/>
@@ -201,4 +202,5 @@
</tr>
</table>
</form>
+</div>
</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -8,6 +8,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sContent = (String)request.getAttribute("content");
@@ -169,3 +170,5 @@
</table>
</form>
+</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sLanguage = (String)request.getAttribute("language");
@@ -63,3 +64,4 @@
</form>
</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -12,6 +12,7 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
</portlet:actionURL>">
@@ -66,3 +67,4 @@
</table>
</form>
</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String) request.getAttribute("currpath");
%>
@@ -37,4 +38,4 @@
</tr>
</table>
</div>
-
+</div>
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
@@ -27,3 +28,4 @@
</tr>
</table>
</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -23,9 +23,11 @@
%>
<div class="admin-ui">
+<div class=" cms-tab-container">
<h3 class="sectionTitle">
${n:i18n("CMS_MANAGE")}
</h3>
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
@@ -295,4 +297,5 @@
%>
</div>
+</div>
</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -11,6 +11,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
@@ -147,4 +148,5 @@
</tr>
<%}%>
</table>
+</div>
</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<h3 class="sectionTitle">
${n:i18n("CMS_MANAGE")}
</h3>
@@ -118,4 +119,7 @@
<%
}
%>
-<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
\ No newline at end of file
+<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
+
+</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -26,6 +26,7 @@
Set manageUserSet = (Set)request.getAttribute("manageUserSet");
%>
<div class="admin-ui">
+<div class=" cms-tab-container">
<form action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
@@ -244,4 +245,4 @@
</table>
</form>
</div>
-
+</div>
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -12,6 +12,7 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <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>">
@@ -80,3 +81,4 @@
</table>
</form>
</div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -7,63 +7,67 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
-<%
- String sCurrPath = (String)request.getAttribute("currpath");
- String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
- String[] langs = Locale.getISOLanguages();
-%>
+ <div class=" cms-tab-container">
+ <%
+ String sCurrPath = (String) request.getAttribute("currpath");
+ String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
+ String[] langs = Locale.getISOLanguages();
+ %>
-<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
+ <form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVE %>"/>
</portlet:actionURL>">
- <input type="hidden" name="destination" value="<%= sCurrPath %>">
- <table width="100%">
- <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
- <tr>
- <td valign="top" width="250" class="portlet-section-alternate">
- <%@ include file="folderlist.jsp" %>
- </td>
- <td align="left">
- <table>
- <tr>
- <td valign="bottom">
- ${n:i18n("CMS_DESTINATION")}:
- </td>
- <td>
- <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
- class="portlet-form-input-field"/></td>
- </tr>
- <tr>
- <td valign="bottom">
- ${n:i18n("CMS_LANGUAGE")}:
- </td>
- <td><select name="language" class="portlet-form-input-field">
- <option selected
- value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
- </option>
- <%
- for (int i = 0; i < langs.length; i++)
- {
- %>
- <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
- </option>
- <%
- }
- %>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
- <br><br>
- <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
- <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</form>
-</div>
+ <input type="hidden" name="destination" value="<%= sCurrPath %>">
+ <table width="100%">
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
+ <tr>
+ <td valign="top" width="250" class="portlet-section-alternate">
+ <%@ include file="folderlist.jsp" %>
+ </td>
+ <td align="left">
+ <table>
+ <tr>
+ <td valign="bottom">
+ ${n:i18n("CMS_DESTINATION")}:
+ </td>
+ <td>
+ <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
+ class="portlet-form-input-field"/></td>
+ </tr>
+ <tr>
+ <td valign="bottom">
+ ${n:i18n("CMS_LANGUAGE")}:
+ </td>
+ <td><select name="language" class="portlet-form-input-field">
+ <option selected
+ value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
+ </option>
+ <%
+ for (int i = 0; i < langs.length; i++) {
+ %>
+ <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
+ </option>
+ <%
+ }
+ %>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
+ <br><br>
+ <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}"
+ class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
+ name="cancel"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
\ No newline at end of file
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 20:30:38 UTC (rev 8467)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 20:33:56 UTC (rev 8468)
@@ -18,35 +18,33 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
-
+<div class=" cms-tab-container">
<%
- String sCurrPath = (String)request.getAttribute("currpath");
- Vector vContents = (Vector)request.getAttribute("contents");
- Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
+ String sCurrPath = (String) request.getAttribute("currpath");
+ Vector vContents = (Vector) request.getAttribute("contents");
+ Collection pendingQueue = (Collection) request.getAttribute("pendingQueue");
String sType = "";
- if (vContents.size() > 0)
- {
- List contentList = (List)vContents.elementAt(0);
- if (contentList.size() > 0)
- {
- Content content = (Content)contentList.get(0);
+ if (vContents.size() > 0) {
+ List contentList = (List) vContents.elementAt(0);
+ if (contentList.size() > 0) {
+ Content content = (Content) contentList.get(0);
sType = content.getMimeType();
}
}
- String sPreviewPath = (String)request.getAttribute("previewpath");
+ String sPreviewPath = (String) request.getAttribute("previewpath");
String createDate = "";
String modifiedDate = "";
String rowClass = "portlet-section-body";
-
+
String exception = request.getParameter("exception");
- Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
+ Boolean manageWorkflowAccessible = (Boolean) request.getAttribute("manageWorkflowAccessible");
%>
<h3 class="sectionTitle">
-${n:i18n("CMS_MANAGE")}
+ ${n:i18n("CMS_MANAGE")}
</h3>
@@ -57,105 +55,97 @@
</portlet:renderURL>">Home</a></li>
-<%
- StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
- String sPathBuilder = "";
- while (parser.hasMoreTokens())
- {
- String sPathChunk = parser.nextToken();
- sPathBuilder += "/" + sPathChunk;
- if (parser.hasMoreTokens())
- {
-%>
+ <%
+ StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
+ String sPathBuilder = "";
+ while (parser.hasMoreTokens()) {
+ String sPathChunk = parser.nextToken();
+ sPathBuilder += "/" + sPathChunk;
+ if (parser.hasMoreTokens()) {
+ %>
<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
- <li class="pathItem"><a href="
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
-</a>
- </li>
-<%
-}
-else
-{
-%>
-<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
- <li class="selected"><%= sPathChunk %></li>
-<%
+ </a>
+ </li>
+ <%
+ } else {
+ %>
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %>
+ </li>
+ <%
+ }
}
- }
-%>
+ %>
</ul>
<br/>
<!-- file-level action dropdown -->
<div class="menu-container" style="width:100%">
-<div class="menu">
+ <div class="menu">
- <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
- <%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
- %>
- <option value="<portlet:renderURL>
+ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
+ <%
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
</portlet:renderURL>">${n:i18n("CMS_CREATE")}</option>
- <%
- }
- else
- {
- %>
- <option value="<portlet:renderURL>
+ <%
+ } else {
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
</portlet:renderURL>">${n:i18n("CMS_EDIT")}</option>
- <%
- }
- %>
- <option value="<portlet:renderURL>
+ <%
+ }
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
</portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
</portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
</portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <option value="<portlet:renderURL>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
- <%}%>
- </select>
+ <%}%>
+ </select>
+ </div>
</div>
-</div>
<br style="clear:both"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<%
- if (vContents.size() > 0)
- {
+ if (vContents.size() > 0) {
for (int j = 0; j < vContents.size(); j++) // cycle thru list of content nodes
{
- List contentList = (List)vContents.elementAt(j);
- if (contentList.size() > 0)
- {
- Content content = (Content)contentList.get(0);
+ List contentList = (List) vContents.elementAt(j);
+ if (contentList.size() > 0) {
+ Content content = (Content) contentList.get(0);
%>
<tr>
<td height="15"></td>
@@ -163,8 +153,7 @@
<tr>
<td colspan="6">
<%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
alt="${n:i18n("CMS_EDIT")}" border="0"> <a href="<portlet:renderURL>
@@ -174,9 +163,7 @@
</portlet:renderURL>"><%= content.getLocale().getDisplayLanguage() %>
</a>
<%
- }
- else
- {
+ } else {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
alt="${n:i18n("CMS_EDIT")}" border="0"> <a href="<portlet:renderURL>
@@ -201,27 +188,22 @@
<%
for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
{
- Content version = (Content)contentList.get(i);
+ Content version = (Content) contentList.get(i);
- if (version.isWaitingForPublishApproval())
- {
+ if (version.isWaitingForPublishApproval()) {
continue;
}
- if (i % 2 == 0)
- {
+ if (i % 2 == 0) {
rowClass = "portlet-section-body";
- }
- else
- {
+ } else {
rowClass = "portlet-section-alternate";
}
%>
<tr onmouseover="this.className='portlet-section-selected';" onmouseout="this.className='<%= rowClass %>';"
class="<%= rowClass %>">
<td><%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
@@ -233,9 +215,7 @@
</portlet:renderURL>"><%= version.getMimeType() %>
</a>
<%
- }
- else
- {
+ } else {
%>
<%= version.getMimeType() %>
<%
@@ -245,16 +225,13 @@
<td><%= version.getSize() / 1024 %>kb</td>
<td>
<%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<%= version.getVersionNumber() %>
- <% }
- else
- {
- //save the principal for the preview servlet
- String remoteUser = request.getRemoteUser();
- request.getSession().setAttribute("remoteUser",remoteUser);
+ <% } else {
+ //save the principal for the preview servlet
+ String remoteUser = request.getRemoteUser();
+ request.getSession().setAttribute("remoteUser", remoteUser);
%>
<a target="_blank"
href="<%= request.getContextPath() %>/cmspreview?v=<%= version.getVersionNumber() %>&l=<%= content.getLocale().getLanguage() %>&p=<%= sCurrPath %>"><%=
@@ -262,29 +239,28 @@
</a>
<%
}
- if (version.isLive())
- {
+ if (version.isLive()) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_IsDefault.gif"
alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
<%
- }else{
+ } else {
%>
- <a href="<portlet:actionURL>
+ <a href="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAKELIVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="language" value="<%= content.getLocale().getLanguage() %>"/>
<portlet:param name="version" value="<%= version.getVersionNumber() %>"/>
</portlet:actionURL>"
- >
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif" alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
- </a>
+ >
+ <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif"
+ alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
+ </a>
<%}%>
</td>
<td>
<%
- if (version.getCreationDate() != null)
- {
+ if (version.getCreationDate() != null) {
Format formatter;
formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
createDate = formatter.format(version.getCreationDate());
@@ -294,8 +270,7 @@
</td>
<td>
<%
- if (version.getLastModified() != null)
- {
+ if (version.getLastModified() != null) {
Format formatter;
formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
modifiedDate = formatter.format(version.getLastModified());
@@ -316,25 +291,25 @@
<!-- the approval queue, content waiting for managers to signoff on -->
<%
- if (pendingQueue != null && !pendingQueue.isEmpty())
- {
+ if (pendingQueue != null && !pendingQueue.isEmpty()) {
%>
<br/><br/>
<!-- show any errors here -->
-<%if(exception!=null && exception.trim().length()>0){%>
+<%if (exception != null && exception.trim().length() > 0) {%>
<table width="100%">
-<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
-<tr colspan="2" align="center">
- <td colspan="2">
- <font color="red">
- <%=exception%>
- </font>
- </td>
-</tr>
+ <th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
+ <tr colspan="2" align="center">
+ <td colspan="2">
+ <font color="red">
+ <%=exception%>
+ </font>
+ </td>
+ </tr>
</table>
<br/><br/>
-<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
@@ -345,23 +320,19 @@
<td class="portlet-table-text"><b>${n:i18n("CMS_SIZE")}</b></td>
<td class="portlet-table-text"><b>${n:i18n("CMS_CREATED")}</b></td>
<td class="portlet-table-text"><b>${n:i18n("CMS_CREATED_BY")}</b></td>
- <%if(manageWorkflowAccessible.booleanValue()){%>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
<td class="portlet-table-text"><b>${n:i18n("CMS_ACTION")}</b></td>
<%}%>
</tr>
<%int i = 0;%>
<%
- for (Iterator itr = pendingQueue.iterator(); itr.hasNext();)
- {
+ for (Iterator itr = pendingQueue.iterator(); itr.hasNext();) {
%>
<%
- org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content)itr.next();
- if (i % 2 == 0)
- {
+ org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content) itr.next();
+ if (i % 2 == 0) {
rowClass = "portlet-section-body";
- }
- else
- {
+ } else {
rowClass = "portlet-section-alternate";
}
i++;
@@ -380,7 +351,7 @@
<!-- User who requested approval -->
<td><%= cour.getUserName() %>
</td>
- <%if(manageWorkflowAccessible.booleanValue()){%>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
<td>
<a href="<portlet:actionURL>
<portlet:param name="op" value="<%=CMSAdminConstants.OP_APPROVE%>"/>
@@ -401,4 +372,5 @@
<%}%>
</table>
<%}%>
+</div>
</div>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8467 - 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-09-24 16:30:38 -0400 (Mon, 24 Sep 2007)
New Revision: 8467
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:
Add border to cms content
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-24 20:30:38 UTC (rev 8467)
@@ -2,9 +2,17 @@
div.menu-container {
float:left;
width: 300px;
- padding: 5px 0 10px 0;
+ padding: 5px 0 10px 10px;
}
+div.admin-ui div.cms-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;
+}
+
.menu {
width: 150px;
font-size: 0.85em;
@@ -126,4 +134,18 @@
div.file-table-container{
width: 100%;
-}
\ No newline at end of file
+}
+
+h3.sectionTitle {
+ margin:0;
+}
+
+div.admin-ui table{
+ margin:0;
+ border-collapse:collapse;
+}
+
+div.admin-ui th{
+ padding: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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -12,6 +12,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th>
<tr>
@@ -46,4 +47,4 @@
</tr>
</table>
</div>
-
+</div>
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -10,6 +10,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th>
<tr>
@@ -58,8 +59,8 @@
</table>
<br/><br/>
</div>
+</div>
-
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -8,6 +8,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sBackPath = NodeUtil.getParentPath(sCurrPath);
@@ -37,4 +38,5 @@
</tr>
</table>
</form>
-</div>
\ No newline at end of file
+</div>
+ </div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -12,6 +12,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<table width="100%">
<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th>
<tr>
@@ -55,4 +56,5 @@
<br/><br/>
-</div>
\ No newline at end of file
+</div>
+ </div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -90,6 +90,7 @@
}
</script>
<div class="admin-ui">
+<div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
<portlet:param name="path" value=""/>
@@ -201,4 +202,5 @@
</tr>
</table>
</form>
+</div>
</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -8,6 +8,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sContent = (String)request.getAttribute("content");
@@ -169,3 +170,5 @@
</table>
</form>
+</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sLanguage = (String)request.getAttribute("language");
@@ -63,3 +64,4 @@
</form>
</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -12,6 +12,7 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
</portlet:actionURL>">
@@ -66,3 +67,4 @@
</table>
</form>
</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String) request.getAttribute("currpath");
%>
@@ -37,4 +38,4 @@
</tr>
</table>
</div>
-
+</div>
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -7,6 +7,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+ <div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
@@ -27,3 +28,4 @@
</tr>
</table>
</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -23,9 +23,11 @@
%>
<div class="admin-ui">
+<div class=" cms-tab-container">
<h3 class="sectionTitle">
${n:i18n("CMS_MANAGE")}
</h3>
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
@@ -295,4 +297,5 @@
%>
</div>
+</div>
</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -11,6 +11,7 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<%
String sCurrPath = (String)request.getAttribute("currpath");
Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
@@ -147,4 +148,5 @@
</tr>
<%}%>
</table>
+</div>
</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -13,6 +13,7 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
+<div class=" cms-tab-container">
<h3 class="sectionTitle">
${n:i18n("CMS_MANAGE")}
</h3>
@@ -118,4 +119,7 @@
<%
}
%>
-<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
\ No newline at end of file
+<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
+
+</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -26,6 +26,7 @@
Set manageUserSet = (Set)request.getAttribute("manageUserSet");
%>
<div class="admin-ui">
+<div class=" cms-tab-container">
<form action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
@@ -244,4 +245,4 @@
</table>
</form>
</div>
-
+</div>
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -12,6 +12,7 @@
String[] langs = Locale.getISOLanguages();
%>
<div class="admin-ui">
+ <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>">
@@ -80,3 +81,4 @@
</table>
</form>
</div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -7,63 +7,67 @@
<portlet:defineObjects/>
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
-<%
- String sCurrPath = (String)request.getAttribute("currpath");
- String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
- String[] langs = Locale.getISOLanguages();
-%>
+ <div class=" cms-tab-container">
+ <%
+ String sCurrPath = (String) request.getAttribute("currpath");
+ String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
+ String[] langs = Locale.getISOLanguages();
+ %>
-<form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
+ <form name="pickform" method="post" enctype="multipart/form-data" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVE %>"/>
</portlet:actionURL>">
- <input type="hidden" name="destination" value="<%= sCurrPath %>">
- <table width="100%">
- <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
- <tr>
- <td valign="top" width="250" class="portlet-section-alternate">
- <%@ include file="folderlist.jsp" %>
- </td>
- <td align="left">
- <table>
- <tr>
- <td valign="bottom">
- ${n:i18n("CMS_DESTINATION")}:
- </td>
- <td>
- <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
- class="portlet-form-input-field"/></td>
- </tr>
- <tr>
- <td valign="bottom">
- ${n:i18n("CMS_LANGUAGE")}:
- </td>
- <td><select name="language" class="portlet-form-input-field">
- <option selected
- value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
- </option>
- <%
- for (int i = 0; i < langs.length; i++)
- {
- %>
- <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
- </option>
- <%
- }
- %>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
- <br><br>
- <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
- <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</form>
-</div>
+ <input type="hidden" name="destination" value="<%= sCurrPath %>">
+ <table width="100%">
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
+ <tr>
+ <td valign="top" width="250" class="portlet-section-alternate">
+ <%@ include file="folderlist.jsp" %>
+ </td>
+ <td align="left">
+ <table>
+ <tr>
+ <td valign="bottom">
+ ${n:i18n("CMS_DESTINATION")}:
+ </td>
+ <td>
+ <input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
+ class="portlet-form-input-field"/></td>
+ </tr>
+ <tr>
+ <td valign="bottom">
+ ${n:i18n("CMS_LANGUAGE")}:
+ </td>
+ <td><select name="language" class="portlet-form-input-field">
+ <option selected
+ value="<%= Locale.getDefault().getLanguage() %>"><%= Locale.getDefault().getDisplayLanguage() %>
+ </option>
+ <%
+ for (int i = 0; i < langs.length; i++) {
+ %>
+ <option value="<%= langs[i] %>"><%= new Locale(langs[i]).getDisplayLanguage() %>
+ </option>
+ <%
+ }
+ %>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
+ <br><br>
+ <input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}"
+ class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}"
+ name="cancel"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </div>
+</div>
\ No newline at end of file
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-09-24 20:29:34 UTC (rev 8466)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 20:30:38 UTC (rev 8467)
@@ -18,35 +18,33 @@
<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<div class="admin-ui">
-
+<div class=" cms-tab-container">
<%
- String sCurrPath = (String)request.getAttribute("currpath");
- Vector vContents = (Vector)request.getAttribute("contents");
- Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
+ String sCurrPath = (String) request.getAttribute("currpath");
+ Vector vContents = (Vector) request.getAttribute("contents");
+ Collection pendingQueue = (Collection) request.getAttribute("pendingQueue");
String sType = "";
- if (vContents.size() > 0)
- {
- List contentList = (List)vContents.elementAt(0);
- if (contentList.size() > 0)
- {
- Content content = (Content)contentList.get(0);
+ if (vContents.size() > 0) {
+ List contentList = (List) vContents.elementAt(0);
+ if (contentList.size() > 0) {
+ Content content = (Content) contentList.get(0);
sType = content.getMimeType();
}
}
- String sPreviewPath = (String)request.getAttribute("previewpath");
+ String sPreviewPath = (String) request.getAttribute("previewpath");
String createDate = "";
String modifiedDate = "";
String rowClass = "portlet-section-body";
-
+
String exception = request.getParameter("exception");
- Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
+ Boolean manageWorkflowAccessible = (Boolean) request.getAttribute("manageWorkflowAccessible");
%>
<h3 class="sectionTitle">
-${n:i18n("CMS_MANAGE")}
+ ${n:i18n("CMS_MANAGE")}
</h3>
@@ -57,105 +55,97 @@
</portlet:renderURL>">Home</a></li>
-<%
- StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
- String sPathBuilder = "";
- while (parser.hasMoreTokens())
- {
- String sPathChunk = parser.nextToken();
- sPathBuilder += "/" + sPathChunk;
- if (parser.hasMoreTokens())
- {
-%>
+ <%
+ StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
+ String sPathBuilder = "";
+ while (parser.hasMoreTokens()) {
+ String sPathChunk = parser.nextToken();
+ sPathBuilder += "/" + sPathChunk;
+ if (parser.hasMoreTokens()) {
+ %>
<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
- <li class="pathItem"><a href="
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
-</a>
- </li>
-<%
-}
-else
-{
-%>
-<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
- <li class="selected"><%= sPathChunk %></li>
-<%
+ </a>
+ </li>
+ <%
+ } else {
+ %>
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %>
+ </li>
+ <%
+ }
}
- }
-%>
+ %>
</ul>
<br/>
<!-- file-level action dropdown -->
<div class="menu-container" style="width:100%">
-<div class="menu">
+ <div class="menu">
- <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
- <%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
- %>
- <option value="<portlet:renderURL>
+ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
+ <%
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
</portlet:renderURL>">${n:i18n("CMS_CREATE")}</option>
- <%
- }
- else
- {
- %>
- <option value="<portlet:renderURL>
+ <%
+ } else {
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
</portlet:renderURL>">${n:i18n("CMS_EDIT")}</option>
- <%
- }
- %>
- <option value="<portlet:renderURL>
+ <%
+ }
+ %>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
</portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
</portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
- <option value="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
</portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <option value="<portlet:renderURL>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
- <%}%>
- </select>
+ <%}%>
+ </select>
+ </div>
</div>
-</div>
<br style="clear:both"/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<%
- if (vContents.size() > 0)
- {
+ if (vContents.size() > 0) {
for (int j = 0; j < vContents.size(); j++) // cycle thru list of content nodes
{
- List contentList = (List)vContents.elementAt(j);
- if (contentList.size() > 0)
- {
- Content content = (Content)contentList.get(0);
+ List contentList = (List) vContents.elementAt(j);
+ if (contentList.size() > 0) {
+ Content content = (Content) contentList.get(0);
%>
<tr>
<td height="15"></td>
@@ -163,8 +153,7 @@
<tr>
<td colspan="6">
<%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
alt="${n:i18n("CMS_EDIT")}" border="0"> <a href="<portlet:renderURL>
@@ -174,9 +163,7 @@
</portlet:renderURL>"><%= content.getLocale().getDisplayLanguage() %>
</a>
<%
- }
- else
- {
+ } else {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
alt="${n:i18n("CMS_EDIT")}" border="0"> <a href="<portlet:renderURL>
@@ -201,27 +188,22 @@
<%
for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
{
- Content version = (Content)contentList.get(i);
+ Content version = (Content) contentList.get(i);
- if (version.isWaitingForPublishApproval())
- {
+ if (version.isWaitingForPublishApproval()) {
continue;
}
- if (i % 2 == 0)
- {
+ if (i % 2 == 0) {
rowClass = "portlet-section-body";
- }
- else
- {
+ } else {
rowClass = "portlet-section-alternate";
}
%>
<tr onmouseover="this.className='portlet-section-selected';" onmouseout="this.className='<%= rowClass %>';"
class="<%= rowClass %>">
<td><%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/edit.gif"
@@ -233,9 +215,7 @@
</portlet:renderURL>"><%= version.getMimeType() %>
</a>
<%
- }
- else
- {
+ } else {
%>
<%= version.getMimeType() %>
<%
@@ -245,16 +225,13 @@
<td><%= version.getSize() / 1024 %>kb</td>
<td>
<%
- if (sType.equals("text/html") || sType.equals("text/plain"))
- {
+ if (sType.equals("text/html") || sType.equals("text/plain")) {
%>
<%= version.getVersionNumber() %>
- <% }
- else
- {
- //save the principal for the preview servlet
- String remoteUser = request.getRemoteUser();
- request.getSession().setAttribute("remoteUser",remoteUser);
+ <% } else {
+ //save the principal for the preview servlet
+ String remoteUser = request.getRemoteUser();
+ request.getSession().setAttribute("remoteUser", remoteUser);
%>
<a target="_blank"
href="<%= request.getContextPath() %>/cmspreview?v=<%= version.getVersionNumber() %>&l=<%= content.getLocale().getLanguage() %>&p=<%= sCurrPath %>"><%=
@@ -262,29 +239,28 @@
</a>
<%
}
- if (version.isLive())
- {
+ if (version.isLive()) {
%>
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_IsDefault.gif"
alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
<%
- }else{
+ } else {
%>
- <a href="<portlet:actionURL>
+ <a href="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAKELIVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="language" value="<%= content.getLocale().getLanguage() %>"/>
<portlet:param name="version" value="<%= version.getVersionNumber() %>"/>
</portlet:actionURL>"
- >
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif" alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
- </a>
+ >
+ <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/actionIcon_MakeDefault.gif"
+ alt="${n:i18n("CMS_LIVEVERSION")}" border="0"/>
+ </a>
<%}%>
</td>
<td>
<%
- if (version.getCreationDate() != null)
- {
+ if (version.getCreationDate() != null) {
Format formatter;
formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
createDate = formatter.format(version.getCreationDate());
@@ -294,8 +270,7 @@
</td>
<td>
<%
- if (version.getLastModified() != null)
- {
+ if (version.getLastModified() != null) {
Format formatter;
formatter = new SimpleDateFormat("MM/dd/yy HH:mm");
modifiedDate = formatter.format(version.getLastModified());
@@ -316,25 +291,25 @@
<!-- the approval queue, content waiting for managers to signoff on -->
<%
- if (pendingQueue != null && !pendingQueue.isEmpty())
- {
+ if (pendingQueue != null && !pendingQueue.isEmpty()) {
%>
<br/><br/>
<!-- show any errors here -->
-<%if(exception!=null && exception.trim().length()>0){%>
+<%if (exception != null && exception.trim().length() > 0) {%>
<table width="100%">
-<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
-<tr colspan="2" align="center">
- <td colspan="2">
- <font color="red">
- <%=exception%>
- </font>
- </td>
-</tr>
+ <th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
+ <tr colspan="2" align="center">
+ <td colspan="2">
+ <font color="red">
+ <%=exception%>
+ </font>
+ </td>
+ </tr>
</table>
<br/><br/>
-<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel"
+ onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
@@ -345,23 +320,19 @@
<td class="portlet-table-text"><b>${n:i18n("CMS_SIZE")}</b></td>
<td class="portlet-table-text"><b>${n:i18n("CMS_CREATED")}</b></td>
<td class="portlet-table-text"><b>${n:i18n("CMS_CREATED_BY")}</b></td>
- <%if(manageWorkflowAccessible.booleanValue()){%>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
<td class="portlet-table-text"><b>${n:i18n("CMS_ACTION")}</b></td>
<%}%>
</tr>
<%int i = 0;%>
<%
- for (Iterator itr = pendingQueue.iterator(); itr.hasNext();)
- {
+ for (Iterator itr = pendingQueue.iterator(); itr.hasNext();) {
%>
<%
- org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content)itr.next();
- if (i % 2 == 0)
- {
+ org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content) itr.next();
+ if (i % 2 == 0) {
rowClass = "portlet-section-body";
- }
- else
- {
+ } else {
rowClass = "portlet-section-alternate";
}
i++;
@@ -380,7 +351,7 @@
<!-- User who requested approval -->
<td><%= cour.getUserName() %>
</td>
- <%if(manageWorkflowAccessible.booleanValue()){%>
+ <%if (manageWorkflowAccessible.booleanValue()) {%>
<td>
<a href="<portlet:actionURL>
<portlet:param name="op" value="<%=CMSAdminConstants.OP_APPROVE%>"/>
@@ -401,4 +372,5 @@
<%}%>
</table>
<%}%>
+</div>
</div>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8465 - tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 16:22:17 -0400 (Mon, 24 Sep 2007)
New Revision: 8465
Modified:
tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
- JBPORTAL-1684: forgot to make hr solid.
Modified: tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
===================================================================
--- tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-09-24 20:01:29 UTC (rev 8464)
+++ tags/JBoss_Portal_2_6_2/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-09-24 20:22:17 UTC (rev 8465)
@@ -8,6 +8,10 @@
border: 0;
}
+.wsrp-consumers-ui hr {
+ border-top-style: solid;
+}
+
/* Top nav. */
.wsrp-consumers-ui ul.topnav {
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8464 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-09-24 16:01:29 -0400 (Mon, 24 Sep 2007)
New Revision: 8464
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css
Log:
- JBPORTAL-1684: forgot to make hr solid.
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-09-24 18:42:16 UTC (rev 8463)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/style.css 2007-09-24 20:01:29 UTC (rev 8464)
@@ -8,6 +8,10 @@
border: 0;
}
+.wsrp-consumers-ui hr {
+ border-top-style: solid;
+}
+
/* Top nav. */
.wsrp-consumers-ui ul.topnav {
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8463 - in trunk/core-cms/src: resources/portal-cms-war/WEB-INF/classes and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-24 14:42:16 -0400 (Mon, 24 Sep 2007)
New Revision: 8463
Modified:
trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-1709 - CMS Admin, unify the UI with the other admin portlets
Modified: trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css
===================================================================
--- trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-24 18:42:16 UTC (rev 8463)
@@ -1,3 +1,10 @@
+
+div.menu-container {
+ float:left;
+ width: 300px;
+ padding: 5px 0 10px 0;
+}
+
.menu {
width: 150px;
font-size: 0.85em;
@@ -22,7 +29,7 @@
float: left;
width: 150px;
position: relative;
- list-style: none;
+ list-style: none;
}
/* style the links for the top level */
@@ -101,4 +108,22 @@
.menu ul a:hover ul {
visibility: visible;
background: #C0D3DC;
+}
+
+div.search-container {
+ float:right;
+ padding: 5px 15px 10px 0;
+}
+
+div.search-container form{
+ margin:0;
+ padding:0;
+}
+
+h3.sectionTitle{
+
+}
+
+div.file-table-container{
+ width: 100%;
}
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-24 18:42:16 UTC (rev 8463)
@@ -51,6 +51,7 @@
CMS_FOLDER=Folder
CMS_FILE=File
CMS_CREATE=Create
+CMS_CANCEL=Cancel
CMS_EDIT=Edit
CMS_UPLOAD=Upload
CMS_MODIFY=Modify
@@ -85,6 +86,7 @@
CMS_CONTENT_DIR=Content Directory
CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
+CMS_MANAGE=Manage Content
CMS_CREATED_BY=Created By
CMS_APPROVE=Approve
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-24 18:42:16 UTC (rev 8463)
@@ -51,6 +51,7 @@
CMS_FOLDER=Cartella
CMS_FILE=File
CMS_CREATE=Crea
+CMS_CANCEL=annullamento
CMS_EDIT=Edita
CMS_UPLOAD=Caricamento
CMS_MODIFY=Modifica
@@ -85,6 +86,7 @@
CMS_CONTENT_DIR=Contenuto della Directory
CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a cartelle del portale.
CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo portale.
+CMS_MANAGE=Controllare il soddisfare
CMS_CREATED_BY=Creato da
CMS_APPROVE=Approva
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-24 18:42:16 UTC (rev 8463)
@@ -49,6 +49,7 @@
CMS_FOLDER=Pasta
CMS_FILE=Arquivo
CMS_CREATE=Criar
+CMS_CANCEL=Cancel
CMS_RESET=Resetar
CMS_EDIT=Editar
CMS_UPLOAD=Enviar
@@ -80,6 +81,7 @@
CMS_CONTENT_DIR=Content Directory
CMS_CONTENT_DIR_USE=Use the directory tree to navigate the portal folder structure.
CMS_MAIN_USE=Use the CMS Administration portlet to manage the content of your portal.
+CMS_MANAGE=Manage Content
CMS_CREATED_BY=Created By
CMS_APPROVE=Approve
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -7,11 +7,13 @@
String sCurrPath = (String) request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_CONFIRMCOPY;
String sType = (String) request.getAttribute("type");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_COPYCONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_COPYCONFIRM")}</h3></th>
<tr>
<td class="portlet-section-body" align="left">
<form name="pickform" action="<portlet:actionURL>
@@ -32,6 +34,7 @@
</tr>
<tr><td></td><td valign="top"><input class="portlet-form-input-field" type="submit" value="${n:i18n("CMS_COPY")}"
name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -42,15 +45,5 @@
</td>
</tr>
</table>
-<br/><br/>
+</div>
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -8,9 +8,10 @@
String OP = CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION;
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_CREATECOLLCONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_CREATECOLLCONFIRM")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -47,6 +48,7 @@
<td></td>
<td>
<input class="portlet-form-button" type="submit" value="${n:i18n("CMS_CREATE")}" name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -55,16 +57,9 @@
</tr>
</table>
<br/><br/>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
-
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -6,9 +6,11 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<form action="<portlet:actionURL>
@@ -16,7 +18,7 @@
<portlet:param name="path" value="<%= sCurrPath %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
- <th align="center" class="portlet-section-header">${n:i18n("TITLE_DELETECONFIRM")}</th>
+ <th><h3 class="sectionTitle">${n:i18n("TITLE_DELETECONFIRM")}</h3></th>
<tr>
<td align="center">
<font class="portlet-font">${n:i18n("CMS_DELETEPATH")} <%= sCurrPath %>
@@ -29,18 +31,10 @@
</tr>
<tr>
<td align="center"><input type="submit" value="${n:i18n("CMS_DELETE")}" name="submit"
- class="portlet-form-button"></td>
+ class="portlet-form-button">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
+ </td>
</tr>
</table>
</form>
-
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
\ No newline at end of file
+</div>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -7,11 +7,13 @@
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_CONFIRMMOVE;
String sType = (String)request.getAttribute("type");
+ String sBackPath = NodeUtil.getParentPath(sCurrPath);
%>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("TITLE_MOVECONFIRM")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_MOVECONFIRM")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -42,6 +44,7 @@
<td></td>
<td>
<input class="portlet-form-button" type="submit" value="${n:i18n("CMS_MOVE")}" name="submit">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sBackPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -51,13 +54,5 @@
</table>
<br/><br/>
-<%
- String sBackPath = NodeUtil.getParentPath(sCurrPath);
-%>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sBackPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+
+</div>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -7,13 +7,13 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String[] langs = Locale.getISOLanguages();
String sDocBase = (String)request.getAttribute("document_base_url");
String sCSSURL = (String)request.getAttribute("css_url");
-
+
//validation handling related data
String sContent = (String)request.getAttribute("error:content");
String description = (String)request.getAttribute("error:description");
@@ -57,7 +57,7 @@
document_base_url : "<%= sDocBase %>",
extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
-
+
var status = true;
function toggleEditor()
{
@@ -89,7 +89,7 @@
}
}
</script>
-
+<div class="admin-ui">
<form name="pickform" method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SAVENEWTEXT %>"/>
<portlet:param name="path" value=""/>
@@ -97,7 +97,7 @@
<input type="hidden" name="savetopath" value="<%= sCurrPath %>">
<table width="100%">
- <th align="center"><b>${n:i18n("TITLE_CREATE")}</b></th>
+ <th ><h3 class="sectionTitle">${n:i18n("TITLE_CREATE")}</h3></th>
<tr>
<td height="10"></td>
</tr>
@@ -140,8 +140,8 @@
</td>
<td><select name="language"
class="portlet-form-input-field">
-
- <%if(language.equals("")){%>
+
+ <%if(language.equals("")){%>
<%
for (int i = 0; i < langs.length; i++)
{
@@ -196,15 +196,9 @@
<br>
<input type="button" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button" onclick="javascript:validateAndSubmit();"/>
<input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -6,7 +6,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sContent = (String)request.getAttribute("content");
@@ -21,7 +22,7 @@
<!-- tinyMCE -->
<script language="javascript" type="text/javascript"
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
+<script language="javascript" type="text/javascript">
tinyMCE.init({
mode : "textareas",
theme : "advanced",
@@ -38,7 +39,7 @@
document_base_url : "<%= sDocBase %>",
extended_valid_elements : "style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
-
+
var status = true;
function toggleEditor()
{
@@ -63,7 +64,7 @@
</portlet:actionURL>">
<table width="100%">
- <th align="center"><b>${n:i18n("TITLE_EDIT")}</b></th>
+ <th><h3 class="sectionTitle">${n:i18n("TITLE_EDIT")}</h3></th>
<tr>
<td height="10"></td>
</tr>
@@ -162,16 +163,9 @@
<br>
<input type="submit" name="save" value="${n:i18n("CMS_CREATE")}" class="portlet-form-button"/>
<input type="reset" name="reset" value="Reset" class="portlet-form-button"/>
-
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</form>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,7 +5,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String sLanguage = (String)request.getAttribute("language");
@@ -17,7 +18,7 @@
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<input type="hidden" name="language" value="<%= sLanguage %>">
<table width="100%">
- <th colspan="2" align="center"><b>${n:i18n("TITLE_UPLOAD")}</b></th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th>
<tr>
<td align="left">
<table>
@@ -52,6 +53,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -60,10 +62,4 @@
</table>
</form>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,19 +5,19 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_EXPORTARCHIVE;
String[] langs = Locale.getISOLanguages();
%>
-
+<div class="admin-ui">
<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" class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -57,6 +57,7 @@
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_EXPORTARCHIVE")}"
class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -64,11 +65,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,13 +5,14 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String) request.getAttribute("currpath");
%>
<table width="100%">
- <th class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
@@ -27,17 +28,13 @@
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
<a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+ <br/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
</td>
</tr>
</table>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,28 +5,25 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
%>
<table width="100%">
- <th class="portlet-section-header" align="center">${n:i18n("CMS_EXPORTARCHIVE")}</th>
+ <th ><h3 class="sectionTitle">${n:i18n("CMS_EXPORTARCHIVE")}</h3></th>
<tr>
<td align="left">
<table width="100%">
<tr>
<td align="center"><font color="red">ERROR processing export request!</font></td>
</tr>
+ <tr>
+ <td align="center"><input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'"></td>
+ </tr>
</table>
</td>
</tr>
</table>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -12,7 +12,7 @@
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
List folders = (List)request.getAttribute("folders");
@@ -22,31 +22,18 @@
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
%>
-<br>
+<div class="admin-ui">
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
+<!-- Currently browsing -->
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
-${n:i18n("CMS_MAIN_USE")}
-<hr/>
-
-<div align="right">
-
-<form method="post" action="<portlet:actionURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
- </portlet:actionURL>">
- <input type="text"
- size="15"
- maxlength="80"
- name="search"
- class="portlet-form-input-field"/>
- <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
-</form>
-</div>
-
-<!-- Currently browsing -->
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -57,93 +44,105 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
+</ul>
+<br/>
+<!-- folder-level action dropdown -->
+<div class="menu-container">
+ <div class="menu">
+<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
+ <%
+ if (!"/".equals(sCurrPath))
+ {
+ %>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="type" value="fo"/>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ <portlet:param name="type" value="fo"/>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <% } %>
+</select>
-<br/><br/>
+ </div>
-<!-- folder-level action dropdown -->
-<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
- <%
- if (!"/".equals(sCurrPath))
- {
- %>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- <portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <% } %>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
</div>
-<br/><br/>
+<div class="search-container">
+ <form method="post" action="<portlet:actionURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
+ </portlet:actionURL>">
+ <input type="text"
+ size="15"
+ maxlength="80"
+ name="search"
+ class="portlet-form-input-field"/>
+ <input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
+
+ </form>
+</div>
+<br style="clear:both"/>
+<div class="file-table-container">
<%
if (folders.size() > 0 || files.size() > 0)
@@ -278,6 +277,15 @@
</tr>
<%
}
+ }else{%>
+
+ <tr>
+ <td>
+ <p>This folder is empty.</p>
+ </td>
+ </tr>
+
+<%
}
%>
</table>
@@ -286,3 +294,5 @@
}
%>
+</div>
+</div>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -9,7 +9,8 @@
<%@ page import="java.util.StringTokenizer" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
Collection pendingQueue = (Collection)request.getAttribute("pendingQueue");
@@ -18,17 +19,20 @@
String rowClass = "portlet-section-body";
%>
-<br>
+<h3 class="sectionTitle">
${n:i18n("CMS_MAIN_USE")}
+</h3>
-<hr/>
<!-- Currently browsing -->
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+
+
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -39,30 +43,32 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
"><%= sPathChunk %>
</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
-
-<br/><br/>
-
+</ul>
+<br/>
<!-- show any errors here -->
<%if(exception!=null && exception.trim().length()>0){%>
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">Error:</th>
+<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -72,6 +78,7 @@
</tr>
</table>
<br/><br/>
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<!-- the table listing the pending queue items -->
@@ -90,7 +97,7 @@
for (Iterator itr = pendingQueue.iterator(); itr.hasNext();)
{
%>
- <%
+ <%
org.jboss.portal.cms.workflow.Content cour = (org.jboss.portal.cms.workflow.Content)itr.next();
String linkPath = cour.getPath().substring(0, cour.getPath().lastIndexOf("/"));
@@ -139,4 +146,5 @@
</td>
</tr>
<%}%>
-</table>
\ No newline at end of file
+</table>
+</div>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -1,9 +1,8 @@
+<%@ page import="org.jboss.portal.cms.model.File" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
-<%@ page import="java.util.Locale" %>
-<%@ page import="java.util.List" %>
<%@ page import="java.text.Format" %>
<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="org.jboss.portal.cms.model.File" %>
+<%@ page import="java.util.List" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
@@ -11,8 +10,22 @@
<portlet:defineObjects/>
-<div align="right">
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
+<!-- Currently browsing -->
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+</ul>
+<br/>
+
+<div class="search-container">
<form method="post" action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_DOSEARCH %>"/>
</portlet:actionURL>">
@@ -24,10 +37,11 @@
value="<%= request.getAttribute("textQuery") %>"
/>
<input type="submit" name="search" value="${n:i18n("CMS_SEARCH")}" class="portlet-form-button"/>
-</form>
+</form>
</div>
+
<%
List files = (List)request.getAttribute("files");
String createDate = "";
@@ -99,8 +113,9 @@
}
else
{
-%>
+%>
<h2>${n:i18n("CMS_SEARCHNORESULT")}</h2>
-<%
+<%
}
%>
+<input class="portlet-form-button" type="button" value="Cancel" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -10,14 +10,14 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+ <link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
Set roleSet = (Set)request.getAttribute("roles");
Set userSet = (Set)request.getAttribute("users");
String sConfirm = (String)request.getAttribute("confirm");
String returnOp = (String)request.getAttribute("returnOp");
-
+
Set readRoleSet = (Set)request.getAttribute("readRoleSet");
Set readUserSet = (Set)request.getAttribute("readUserSet");
Set writeRoleSet = (Set)request.getAttribute("writeRoleSet");
@@ -25,14 +25,14 @@
Set manageRoleSet = (Set)request.getAttribute("manageRoleSet");
Set manageUserSet = (Set)request.getAttribute("manageUserSet");
%>
-
+<div class="admin-ui">
<form action="<portlet:actionURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_SECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= returnOp %>"/>
</portlet:actionURL>" method="post">
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">${n:i18n("TITLE_SECURECONFIRM")}</th>
+<th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_SECURECONFIRM")}</h3></th>
<%
if (sConfirm != null && !"".equals(sConfirm))
{
@@ -237,15 +237,11 @@
</tr>
<tr>
<td align="center" colspan="2"><input type="submit" value="${n:i18n("CMS_SECURE")}" name="submit"
- class="portlet-form-button"></td>
+ class="portlet-form-button">
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= returnOp %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
+ </td>
</tr>
</table>
</form>
+</div>
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= returnOp %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
\ No newline at end of file
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,19 +5,19 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_UPLOADCONFIRM;
String[] langs = Locale.getISOLanguages();
%>
-
+<div class="admin-ui">
<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" class="portlet-section-header" align="center">${n:i18n("TITLE_UPLOAD")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("TITLE_UPLOAD")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -71,6 +71,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -78,11 +79,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -5,7 +5,8 @@
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
-
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
<%
String sCurrPath = (String)request.getAttribute("currpath");
String OP = CMSAdminConstants.OP_UPLOADARCHIVECONFIRM;
@@ -17,7 +18,7 @@
</portlet:actionURL>">
<input type="hidden" name="destination" value="<%= sCurrPath %>">
<table width="100%">
- <th colspan="2" class="portlet-section-header" align="center">${n:i18n("CMS_UPLOADARCHIVE")}</th>
+ <th colspan="2"><h3 class="sectionTitle">${n:i18n("CMS_UPLOADARCHIVE")}</h3></th>
<tr>
<td valign="top" width="250" class="portlet-section-alternate">
<%@ include file="folderlist.jsp" %>
@@ -57,6 +58,7 @@
<input type="file" size="32" name="response" value="" class="portlet-form-input-field"/>
<br><br>
<input type="submit" name="submit" value="${n:i18n("CMS_UPLOAD")}" class="portlet-form-button"/>
+ <input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="<%= sCurrPath %>"/></portlet:renderURL>'">
</td>
</tr>
</table>
@@ -64,11 +66,4 @@
</tr>
</table>
</form>
-
-<a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- <portlet:param name="path"
- value="<%= sCurrPath %>"/>
- </portlet:renderURL>">
- <img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/browse.gif" border="0"
- alt="${n:i18n("CMS_BACKTOBROWSER")}"></a>
+</div>
Modified: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 16:45:01 UTC (rev 8462)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 18:42:16 UTC (rev 8463)
@@ -15,7 +15,10 @@
<%@ page import="java.util.Vector" %>
<portlet:defineObjects/>
+<link rel="stylesheet" type="text/css" href="/portal-admin/style.css" media="screen"/>
+<div class="admin-ui">
+
<%
String sCurrPath = (String)request.getAttribute("currpath");
Vector vContents = (Vector)request.getAttribute("contents");
@@ -37,21 +40,23 @@
String modifiedDate = "";
String rowClass = "portlet-section-body";
-
+
String exception = request.getParameter("exception");
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
%>
-<br>
-${n:i18n("CMS_MAIN_USE")}
+<h3 class="sectionTitle">
+${n:i18n("CMS_MANAGE")}
+</h3>
-<hr/>
-Browsing: <a href="<portlet:renderURL>
-<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
-<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a>
+<ul class="objectpath">
+ <li class="pathItem"><a href="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
+ <portlet:param name="path" value="/"/>
+ </portlet:renderURL>">Home</a></li>
+
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -62,87 +67,85 @@
if (parser.hasMoreTokens())
{
%>
-> <a href="
+ <li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="pathItem"><a href="
<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="<%= sPathBuilder %>"/>
</portlet:renderURL>
-"><%= sPathChunk %></a>
+"><%= sPathChunk %>
+</a>
+ </li>
<%
}
else
{
%>
-> <%= sPathChunk %>
+<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li>
+ <li class="selected"><%= sPathChunk %></li>
<%
}
}
%>
-
-<br/><br/>
-
+</ul>
+<br/>
<!-- file-level action dropdown -->
+<div class="menu-container" style="width:100%">
<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
+
+ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATE")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_CREATE")}</option>
<%
}
else
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EDIT")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_EDIT")}</option>
<%
}
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
+ </select>
+
</div>
+</div>
+<br style="clear:both"/>
-<br/><br/>
-
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<%
if (vContents.size() > 0)
@@ -250,7 +253,7 @@
else
{
//save the principal for the preview servlet
- String remoteUser = request.getRemoteUser();
+ String remoteUser = request.getRemoteUser();
request.getSession().setAttribute("remoteUser",remoteUser);
%>
<a target="_blank"
@@ -321,7 +324,7 @@
<!-- show any errors here -->
<%if(exception!=null && exception.trim().length()>0){%>
<table width="100%">
-<th colspan="2" align="center" class="portlet-section-header">Error:</th>
+<th colspan="2"><h3 class="sectionTitle">Error:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -331,6 +334,7 @@
</tr>
</table>
<br/><br/>
+<input class="portlet-form-button" type="button" value="${n:i18n("CMS_CANCEL")}" name="cancel" onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
@@ -397,3 +401,4 @@
<%}%>
</table>
<%}%>
+</div>
\ No newline at end of file
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8462 - tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 12:45:01 -0400 (Mon, 24 Sep 2007)
New Revision: 8462
Modified:
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
CMS admin IE6 fix
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 16:35:21 UTC (rev 8461)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 16:45:01 UTC (rev 8462)
@@ -66,71 +66,63 @@
%>
</ul>
<br/>
-
<!-- folder-level action dropdown -->
<div class="menu-container">
<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</a></li>
- <li><a href="<portlet:renderURL>
+<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
<%
if (!"/".equals(sCurrPath))
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <% } %>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <% } %>
+</select>
+
</div>
</div>
Modified: tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 16:35:21 UTC (rev 8461)
+++ tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 16:45:01 UTC (rev 8462)
@@ -92,62 +92,56 @@
<!-- file-level action dropdown -->
<div class="menu-container" style="width:100%">
<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
+
+ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATE")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_CREATE")}</option>
<%
}
else
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EDIT")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_EDIT")}</option>
<%
}
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
+ </select>
+
</div>
</div>
<br style="clear:both"/>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8461 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2007-09-24 12:35:21 -0400 (Mon, 24 Sep 2007)
New Revision: 8461
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/viewfile.jsp
Log:
Replaced cms select action menu with drop down menu
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-09-24 12:08:13 UTC (rev 8460)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-24 16:35:21 UTC (rev 8461)
@@ -66,71 +66,63 @@
%>
</ul>
<br/>
-
<!-- folder-level action dropdown -->
<div class="menu-container">
<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
- <li><a href="<portlet:renderURL>
- <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
- <portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</a></li>
- <li><a href="<portlet:renderURL>
+<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
+ <option value="<portlet:renderURL>
+ <portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
+ <portlet:param name="path" value="<%= sCurrPath %>"/>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFOLDER")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_CREATEFILE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("TITLE_UPLOAD")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADARCHIVECONFIRM %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_UPLOADARCHIVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_EXPORTARCHIVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_EXPORTARCHIVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_MAIN %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
<%
if (!"/".equals(sCurrPath))
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fo"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <% } %>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <% } %>
+</select>
+
</div>
</div>
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-09-24 12:08:13 UTC (rev 8460)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-24 16:35:21 UTC (rev 8461)
@@ -92,62 +92,56 @@
<!-- file-level action dropdown -->
<div class="menu-container" style="width:100%">
<div class="menu">
- <ul>
- <li><a href="#">Select Action <img
- src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/downarrow.gif"
- border="0">
- <!--[if IE 7]><!--></a><!--<![endif]-->
- <!--[if lte IE 6]><table><tr><td><![endif]-->
- <ul>
+
+ <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
+ <option value="">Select Action...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CREATENEWTEXT %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_CREATE")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_CREATE")}</option>
<%
}
else
{
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_UPLOADCONFIRM %>"/>
<portlet:param name="path" value="<%= NodeUtil.getParentPath(sCurrPath) %>"/>
- </portlet:renderURL>">${n:i18n("CMS_EDIT")}</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_EDIT")}</option>
<%
}
%>
- <li><a href="<portlet:renderURL>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMCOPY %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_COPY")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_COPY")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMMOVE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="type" value="fi"/>
- </portlet:renderURL>">${n:i18n("CMS_MOVE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_MOVE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMDELETE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_DELETE")}</a></li>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_DELETE")}</option>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRMSECURE %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
<portlet:param name="returnOp" value="<%= CMSAdminConstants.OP_VIEWFILE %>"/>
- </portlet:renderURL>">${n:i18n("CMS_SECURE")}</a></li>
- <%if(manageWorkflowAccessible.booleanValue()){%>
- <li><a href="<portlet:renderURL>
+ </portlet:renderURL>">${n:i18n("CMS_SECURE")}</option>
+ <%if(manageWorkflowAccessible.booleanValue()){%>
+ <option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_VIEWPENDING %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
- </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</a></li>
- <%}%>
- </ul>
- <!--[if lte IE 6]></td></tr></table></a><![endif]-->
- </li>
- </ul>
+ </portlet:renderURL>">${n:i18n("CMS_APPROVAL")}</option>
+ <%}%>
+ </select>
+
</div>
</div>
<br style="clear:both"/>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8460 - modules/common/tags/1_0_0/testsuite.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-09-24 08:08:13 -0400 (Mon, 24 Sep 2007)
New Revision: 8460
Modified:
modules/common/tags/1_0_0/testsuite/build.xml
Log:
- blank line
Modified: modules/common/tags/1_0_0/testsuite/build.xml
===================================================================
--- modules/common/tags/1_0_0/testsuite/build.xml 2007-09-24 12:06:05 UTC (rev 8459)
+++ modules/common/tags/1_0_0/testsuite/build.xml 2007-09-24 12:08:13 UTC (rev 8460)
@@ -67,6 +67,7 @@
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
</target>
+
<!-- copy all logs to testsuite/output/logs -->
<target name="copy-logs">
<copy todir="${log.dir}">
@@ -145,4 +146,4 @@
e.g. ant -Dmodule=portlet test-module"/>
</target>
-</project>
\ No newline at end of file
+</project>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8458 - branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-09-24 07:17:17 -0400 (Mon, 24 Sep 2007)
New Revision: 8458
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README
docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml
Log:
2.6.3.SNAPSHOT version
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -33,7 +33,7 @@
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
- implversion="jboss-portal-2.6.1.CR1"
+ implversion=""
implvendor="JBoss, a division of Red Hat Inc."
implurl="http://www.jboss.org"
description="JBoss Portal"
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -61,8 +61,8 @@
<property name="version.major" value="2"/>
<property name="version.minor" value="6"/>
- <property name="version.revision" value="0"/>
- <property name="version.tag" value="A"/>
+ <property name="version.revision" value="3"/>
+ <property name="version.tag" value="SNAPSHOT"/>
<property name="version.name" value="Ninja"/>
<!-- This must be set to the CVS tag for any release -->
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -2,7 +2,7 @@
<property name="source.dir" value="../../jboss-portal-2.6"/>
<property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.2.GA"/>
+ <property name="release.version" value="2.6.3.SNAPSHOT"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-09-24 09:28:21 UTC (rev 8457)
+++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2007-09-24 11:17:17 UTC (rev 8458)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 6, 2, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Ninja");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 6, 3, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Ninja");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
Modified: docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/quickstartuser/en/master.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -11,9 +11,9 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.2-GA</title>
+ <title>JBoss Portal 2.6.3-SNAPSHOT</title>
<subtitle>Quickstart User Guide</subtitle>
- <releaseinfo>Release 2.6.2-GA</releaseinfo>
+ <releaseinfo>Release 2.6.3-SNAPSHOT</releaseinfo>
<author>
<firstname>Kevin</firstname>
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-bin.README 2007-09-24 11:17:17 UTC (rev 8458)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.2
+ JBoss Portal 2.6.3-SNAPSHOT
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-ha-bin.README 2007-09-24 11:17:17 UTC (rev 8458)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.2
+ JBoss Portal 2.6.3-SNAPSHOT
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/readmeFiles/jboss-portal-src.README 2007-09-24 11:17:17 UTC (rev 8458)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.2
+ JBoss Portal 2.6.3-SNAPSHOT
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/master.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -33,9 +33,9 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.2</title>
+ <title>JBoss Portal 2.6.3-SNAPSHOT</title>
<subtitle>Reference Guide</subtitle>
- <releaseinfo>Release 2.6.2</releaseinfo>
+ <releaseinfo>Release 2.6.3-SNAPSHOT</releaseinfo>
<releaseinfo>October 2007</releaseinfo>
<author>
<firstname>Thomas</firstname>
Modified: docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml 2007-09-24 09:28:21 UTC (rev 8457)
+++ docs/branches/JBoss_Portal_Branch_2_6/userGuide/en/master.xml 2007-09-24 11:17:17 UTC (rev 8458)
@@ -13,15 +13,10 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.2-GA</title>
+ <title>JBoss Portal 2.6.3-SNAPSHOT</title>
<subtitle>User Guide</subtitle>
- <releaseinfo>Release 2.6.2-GA "Ninja"</releaseinfo>
+ <releaseinfo>Release 2.6.3-SNAPSHOT "Ninja"</releaseinfo>
<releaseinfo>October 2007</releaseinfo>
- <author>
- <firstname>Roy</firstname>
- <surname>Russo</surname>
- <email>roy(a)jboss.org</email>
- </author>
</bookinfo>
<toc/>
<!-- portal overview - marketing stuff --> &overview;
16 years, 7 months
- 1
- 0