[portal-commits] JBoss Portal SVN: r8462 - tags/JBoss_Portal_2_6_2/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.

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"/>