portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r921053 - in /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF: portlet.xml view/toolbox/toolbox.jsp
Date Tue, 09 Mar 2010 18:52:28 GMT
Author: taylor
Date: Tue Mar  9 18:52:27 2010
New Revision: 921053

URL: http://svn.apache.org/viewvc?rev=921053&view=rev
Log:
 JS2-1121 - toolbox menus cleanup

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml?rev=921053&r1=921052&r2=921053&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/portlet.xml Tue
Mar  9 18:52:27 2010
@@ -2335,7 +2335,7 @@
       </preference>
       <preference>
         <name>Rows</name>                    
-        <value>5</value>
+        <value>7</value>
       </preference>
     </portlet-preferences>                
   </portlet>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp?rev=921053&r1=921052&r2=921053&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Tue Mar  9 18:52:27 2010
@@ -48,14 +48,13 @@ limitations under the License.
   <li class="not-selected"><a href="#" id="<portlet:namespace/>portletsTabAction"
title="<fmt:message key='toolbox.label.portlets'/>"><fmt:message key="toolbox.label.portlets"/></a></li>
   <li class="not-selected"><a href="#" id="<portlet:namespace/>layoutTabAction"
title="<fmt:message key='toolbox.label.layout'/>"><fmt:message key="toolbox.label.layout"/></a></li>
   <li class="not-selected"><a href="#" id="<portlet:namespace/>themeTabAction"
title="<fmt:message key='toolbox.label.theme'/>"><fmt:message key="toolbox.label.theme"/></a></li>
-  <li class="not-selected"><a href="#" id="<portlet:namespace/>widgetsTabAction"
title="<fmt:message key='toolbox.label.widget'/>"><fmt:message key="toolbox.label.widget"/></a></li>
 </ul>
 
 <form id="<portlet:namespace/>form">
 <table id="<portlet:namespace/>portletsTab" style="display: none; border-collapse:
collapse;  width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
-    <tr>
-        <th colspan="2" class="portlet-section-header"><fmt:message key="toolbox.label.portlets"/></th>
-    </tr>
+	    <tr>
+	        <th class="portlet-section-header" colspan="2"></th>
+	    </tr>        
     <tr>
         <td width="99%" class="portlet-section-subheader" nowrap="true">
             <input type='text' name='query' class='portlet-form-input-field' size='25'
value='' title='<fmt:message key="toolbox.message.search"/>' style='WIDTH: 100%' />
@@ -97,9 +96,6 @@ limitations under the License.
         </td>
     </tr>
 
-    <tr>
-        <th colspan="2" class="portlet-section-header"></th>
-    </tr>
 </table>
 </form>
 
@@ -125,8 +121,8 @@ limitations under the License.
 <div id="<portlet:namespace/>layoutTab" style="display: none; border-collapse: collapse;
width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
     <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom:
0px; float: left;">
 	    <tr>
-	        <th class="portlet-section-header" colspan="2"><fmt:message key="toolbox.label.layout"/></th>
-	    </tr>
+	        <th class="portlet-section-header" colspan="2"></th>
+	    </tr>    
 	    <c:forEach var="layout" items="${layouts}"> 
 	    <tr>        
 	        <c:choose>
@@ -149,17 +145,14 @@ limitations under the License.
 	        <td style="vertical-align: middle">${layout.title}</td>
 	    </tr>
 	    </c:forEach>
-	    <tr>
-	        <th class="portlet-section-header" colspan="2"></th>
-	    </tr>
     </table>
 </div>
 
 <div id="<portlet:namespace/>themeTab" style="display: none; border-collapse: collapse;
width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
     <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom:
0px; float: left;">
 	    <tr>
-	        <th class="portlet-section-header" colspan="2"><fmt:message key="toolbox.label.theme"/></th>
-	    </tr>
+	        <th class="portlet-section-header" colspan="2"></th>
+	    </tr>    
 	    <c:forEach var="theme" items="${themes}">   
 	    <tr>        
 	        <c:choose>
@@ -173,20 +166,6 @@ limitations under the License.
 	        <td style="vertical-align: middle">${theme.title}</td>
 	    </tr>
 	    </c:forEach>
-	    <tr>
-	        <th class="portlet-section-header" colspan="2"></th>
-	    </tr>
-	</table>
-</div>
-
-<div id="<portlet:namespace/>widgetsTab" style="display: none; border-collapse:
collapse; width: 100%; margin-top: 0px; margin-bottom: 0px; float: left;">
-    <table style="border-collapse: collapse; width: 100%; margin-top: 0px; margin-bottom:
0px; float: left;">
-	    <tr>
-	        <th class="portlet-section-header" colspan="1"><fmt:message key="toolbox.label.widget"/></th>
-	    </tr>
-	    <tr>
-	        <th class="portlet-section-header" colspan="1"></th>
-	    </tr>
 	</table>
 </div>
 
@@ -360,7 +339,6 @@ YUI().use('jetui-portal', 'io', 'json', 
         Y.Node.one("#<portlet:namespace/>portletsTab").setStyle("display", "none");
         Y.Node.one("#<portlet:namespace/>layoutTab").setStyle("display", "none");
         Y.Node.one("#<portlet:namespace/>themeTab").setStyle("display", "none");
-        Y.Node.one("#<portlet:namespace/>widgetsTab").setStyle("display", "none");
         Y.Node.one("#<portlet:namespace/>" + tabId + "Tab").setStyle("display", "");
         
         Y.Cookie.set("toolboxtab", tabId);
@@ -643,7 +621,6 @@ YUI().use('jetui-portal', 'io', 'json', 
     Y.on("click", switchTab, "#<portlet:namespace/>portletsTabAction");
     Y.on("click", switchTab, "#<portlet:namespace/>layoutTabAction");
     Y.on("click", switchTab, "#<portlet:namespace/>themeTabAction");
-    Y.on("click", switchTab, "#<portlet:namespace/>widgetsTabAction");
     Y.on("change", loadPortletsInCategory, "#<portlet:namespace/>categories");
     Y.on("submit", loadPortletsByQuery, "#<portlet:namespace/>form");
     



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message