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">&nbsp;<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">&nbsp;<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