Author: wesleyhales Date: 2007-09-21 21:17:46 -0400 (Fri, 21 Sep 2007) New Revision: 8424 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/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 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 branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java Log: JBPORTAL-1709 - CMS Admin, unify the UI with the other admin portlets and fixed NPE on CMS search 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-war/images/cms/admin/style.css 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_pt_BR.properties 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcopy.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmdelete.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmmove.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -7,7 +7,7 @@ <%@ 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(); @@ -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> @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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"); @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/editbinary.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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,113 @@ if (parser.hasMoreTokens()) { %> ->&nbsp;<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 { %> ->&nbsp;<%= sPathChunk %> +<li class="pathSeperator"><img src="/portal-admin/img/pathSeparator.png" alt=">"></li> + <li class="selected"><%= sPathChunk %></li> <% } } %> +</ul> +<br/> -<br/><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> + <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> -<!-- 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 +285,15 @@ </tr> <% } + }else{%> + + <tr> + <td> + <p>This folder is empty.</p> + </td> + </tr> + +<% } %> </table> @@ -286,3 +302,5 @@ } %> +</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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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()) { %> ->&nbsp;<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 { %> ->&nbsp;<%= 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 --> @@ -139,4 +146,5 @@ </td> </tr> <%}%> -</table> \ No newline at end of file +</table> +</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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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 = ""; @@ -104,3 +118,4 @@ <% } %> +<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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -10,7 +10,7 @@ <%@ 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"); @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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: 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-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2007-09-22 01:17:46 UTC (rev 8424) @@ -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"); @@ -41,17 +44,19 @@ 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,26 +67,30 @@ if (parser.hasMoreTokens()) { %> ->&nbsp;<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 { %> ->&nbsp;<%= 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 @@ -140,9 +149,9 @@ </li> </ul> </div> +</div> +<br style="clear:both"/> -<br/><br/> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> <% if (vContents.size() > 0) @@ -321,7 +330,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 +340,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 +407,4 @@ <%}%> </table> <%}%> +</div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2007-09-21 20:20:32 UTC (rev 8423) +++ branches/JBoss_Portal_Branch_2_6/search/src/main/org/jboss/portal/search/impl/jcr/JCRQueryConverter.java 2007-09-22 01:17:46 UTC (rev 8424) @@ -48,7 +48,11 @@ result.append("//*["); try { - result.append(((JCRQuery)super.convert(query)).getJcrQuery()); + if (super.convert(query) != null) + { + result.append(((JCRQuery)super.convert(query)).getJcrQuery()); + } + } catch (QueryConversionException e) {