portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r910558 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/webapp/WEB-INF/view/toolbox/toolbox.jsp
Date Tue, 16 Feb 2010 15:19:08 GMT
Author: woonsan
Date: Tue Feb 16 15:19:08 2010
New Revision: 910558

URL: http://svn.apache.org/viewvc?rev=910558&view=rev
Log:
JS2-1057: Fixing the default tab text color.

Modified:
    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/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=910558&r1=910557&r2=910558&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 Feb 16 15:19:08 2010
@@ -44,11 +44,11 @@
 
 <c:set var="portletPageSize" value="${prefs['Rows'][0]}"/>
 
-<ul class="default-tabs">
-  <li><a href="#" id="<portlet:namespace/>portletsTabAction"><fmt:message
key="toolbox.label.portlets"/></a></li>
-  <li><a href="#" id="<portlet:namespace/>layoutTabAction"><fmt:message
key="toolbox.label.layout"/></a></li>
-  <li><a href="#" id="<portlet:namespace/>themeTabAction"><fmt:message
key="toolbox.label.theme"/></a></li>
-  <li><a href="#" id="<portlet:namespace/>widgetsTabAction"><fmt:message
key="toolbox.label.widget"/></a></li>
+<ul id="<portlet:namespace/>tabActions" class="default-tabs">
+  <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">
@@ -58,7 +58,7 @@
     </tr>
     <tr>
         <td width="99%" class="portlet-section-subheader" nowrap="true">
-            <input type='text' name='query' size='25' value='' title='<fmt:message
key="toolbox.message.search"/>' style='WIDTH: 100%' />
+            <input type='text' name='query' class='portlet-form-input-field' size='25'
value='' title='<fmt:message key="toolbox.message.search"/>' style='WIDTH: 100%' />
         </td>
         <td width="1%" class="portlet-section-subheader" nowrap="true">
             <input type='image' src='<c:url value="/images/search.png"/>' width="25"
height="20" 
@@ -68,7 +68,7 @@
     
     <tr>
         <td colspan="2" class="portlet-section-subheader">
-            <select id="<portlet:namespace/>categories" style="WIDTH: 100%">
+            <select id="<portlet:namespace/>categories" class="portlet-form-field"
style="WIDTH: 100%">
                 <option value=""><fmt:message key="toolbox.message.chooseOne"/></option>
                 <c:forEach var="category" items="${categories}">
                     <option value="${category}" keywords="${categoryKeywords[category]}">${category}</option>
@@ -88,7 +88,7 @@
             <div id="<portlet:namespace/>pageNavBar" class="jstbPageNavBar">
 	            <a href="#" class="jstbPageNav" pageIndex="first"><fmt:message key="toolbox.label.moveFirst"/></a>
 	            <a href="#" class="jstbPageNav" pageIndex="prev"><fmt:message key="toolbox.label.movePrev"/></a>
-	            <select id="<portlet:namespace/>pageNavIndex">
+	            <select id="<portlet:namespace/>pageNavIndex" class="portlet-form-field">
 	              <option value=""><fmt:message key="toolbox.label.page"/></option>
 	            </select>
 	            <a href="#" class="jstbPageNav" pageIndex="next"><fmt:message key="toolbox.label.moveNext"/></a>
@@ -103,10 +103,10 @@
 </table>
 </form>
 
-<div id="<portlet:namespace/>portletItemTemplate" style="display: none">
+<div id="<portlet:namespace/>portletItemTemplate" 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>
-	        <td rowspan="2" width="20%" class="portlet-section-body">
+	        <td rowspan="2" width="20%" class="portlet-section-body" style="text-align: center;
vertical-align: middle;">
 	            <img/>
 	        </td>
 	        <td width="80%" class="portlet-section-body">
@@ -122,68 +122,73 @@
     </table>
 </div>
 
-<table id="<portlet:namespace/>layoutTab" style="display: none; 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>
-    <c:forEach var="layout" items="${layouts}"> 
-    <tr>        
-        <c:choose>
-            <c:when test="${editAccess}">
-                <td><a href='<portlet:actionURL><portlet:param name='layout'
value="${layout.layoutPortlet}"/></portlet:actionURL>'><img <c:if test="${!layout.selected}">
style='border-style: none' </c:if> src='<c:url context="${portalContextPath}" value="/layouts/${layout.image}"/>'></a></td>
-            </c:when>
-            <c:otherwise>
-                <td>
-                    <c:choose>
-                        <c:when test="${layout.selected}">
-                            <img style='border-style: solid' src='<c:url context="${portalContextPath}"
value="/layouts/${layout.image}"/>'>
-                        </c:when>
-                        <c:otherwise>
-                            <img src='<c:url context="${portalContextPath}" value="/layouts/${layout.image}"/>'>
-                        </c:otherwise>
-                    </c:choose>
-                </td>
-            </c:otherwise>
-        </c:choose>
-        <td style="vertical-align: middle">${layout.title}</td>
-    </tr>
-    </c:forEach>
-    <tr>
-        <th class="portlet-section-header" colspan="2"></th>
-    </tr>
-</table>
-
+<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>
+	    <c:forEach var="layout" items="${layouts}"> 
+	    <tr>        
+	        <c:choose>
+	            <c:when test="${editAccess}">
+	                <td><a href='<portlet:actionURL><portlet:param name='layout'
value="${layout.layoutPortlet}"/></portlet:actionURL>'><img <c:if test="${!layout.selected}">
style='border-style: none' </c:if> src='<c:url context="${portalContextPath}" value="/layouts/${layout.image}"/>'></a></td>
+	            </c:when>
+	            <c:otherwise>
+	                <td>
+	                    <c:choose>
+	                        <c:when test="${layout.selected}">
+	                            <img style='border-style: solid' src='<c:url context="${portalContextPath}"
value="/layouts/${layout.image}"/>'>
+	                        </c:when>
+	                        <c:otherwise>
+	                            <img src='<c:url context="${portalContextPath}" value="/layouts/${layout.image}"/>'>
+	                        </c:otherwise>
+	                    </c:choose>
+	                </td>
+	            </c:otherwise>
+	        </c:choose>
+	        <td style="vertical-align: middle">${layout.title}</td>
+	    </tr>
+	    </c:forEach>
+	    <tr>
+	        <th class="portlet-section-header" colspan="2"></th>
+	    </tr>
+    </table>
+</div>
 
-<table id="<portlet:namespace/>themeTab" style="display: none; 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>
-    <c:forEach var="theme" items="${themes}">   
-    <tr>        
-        <c:choose>
-            <c:when test="${editAccess}">
-                <td><a href='<portlet:actionURL><portlet:param name='theme'
value="${theme.name}"/></portlet:actionURL>'><img <c:if test="${!theme.selected}">
style='border-style: none' </c:if> src='<c:url context="${portalContextPath}" value="/decorations/layout/${theme.name}/${theme.image}"/>'></a></td>
-            </c:when>
-            <c:otherwise>
-                <td><img <c:if test="${theme.selected}"> style='border-style:
solid' </c:if> src='<c:url context="${portalContextPath}" value="/decorations/layout/${theme.name}/${theme.image}"/>'></td>
-            </c:otherwise>
-        </c:choose>
-        <td style="vertical-align: middle">${theme.title}</td>
-    </tr>
-    </c:forEach>
-    <tr>
-        <th class="portlet-section-header" colspan="2"></th>
-    </tr>
-</table>
+<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>
+	    <c:forEach var="theme" items="${themes}">   
+	    <tr>        
+	        <c:choose>
+	            <c:when test="${editAccess}">
+	                <td><a href='<portlet:actionURL><portlet:param name='theme'
value="${theme.name}"/></portlet:actionURL>'><img <c:if test="${!theme.selected}">
style='border-style: none' </c:if> src='<c:url context="${portalContextPath}" value="/decorations/layout/${theme.name}/${theme.image}"/>'></a></td>
+	            </c:when>
+	            <c:otherwise>
+	                <td><img <c:if test="${theme.selected}"> style='border-style:
solid' </c:if> src='<c:url context="${portalContextPath}" value="/decorations/layout/${theme.name}/${theme.image}"/>'></td>
+	            </c:otherwise>
+	        </c:choose>
+	        <td style="vertical-align: middle">${theme.title}</td>
+	    </tr>
+	    </c:forEach>
+	    <tr>
+	        <th class="portlet-section-header" colspan="2"></th>
+	    </tr>
+	</table>
+</div>
 
-<table id="<portlet:namespace/>widgetsTab" style="display: none; 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 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>
 
 <div id="<portlet:namespace/>previewOverlay" style="BACKGROUND-COLOR: #eee; BORDER-LEFT:
#fff solid 2px; BORDER-TOP: #fff solid 2px; BORDER-RIGHT: #aaa solid 2px; BORDER-BOTTOM: #aaa
solid 2px; DISPLAY: none; PADDING: 5px">
     <div class="yui-widget-hd"><h2><fmt:message key="toolbox.label.preview"/></h2></div>
@@ -333,7 +338,7 @@
                 }
             }
     };
-    
+
     function switchTab(e) {
         var tabId = null;
         if ('string' == typeof(e)) {
@@ -341,34 +346,22 @@
         } else {
             tabId = e.target.get("id").replace(/TabAction$/, "").substring("<portlet:namespace/>".length);
         }
-        if (tabId == "portlets") {
-            Y.Node.one("#<portlet:namespace/>portletsTab").setStyle("display", "");
-            Y.Node.one("#<portlet:namespace/>portletsTabAction").get("parentNode").addClass("selected");
-        } else {
-            Y.Node.one("#<portlet:namespace/>portletsTab").setStyle("display", "none");
-            Y.Node.one("#<portlet:namespace/>portletsTabAction").get("parentNode").removeClass("selected");
-        }
-        if (tabId == "layout") {
-            Y.Node.one("#<portlet:namespace/>layoutTab").setStyle("display", "");
-            Y.Node.one("#<portlet:namespace/>layoutTabAction").get("parentNode").addClass("selected");
-        } else {
-            Y.Node.one("#<portlet:namespace/>layoutTab").setStyle("display", "none");
-            Y.Node.one("#<portlet:namespace/>layoutTabAction").get("parentNode").removeClass("selected");
-        }
-        if (tabId == "theme") {
-            Y.Node.one("#<portlet:namespace/>themeTab").setStyle("display", "");
-            Y.Node.one("#<portlet:namespace/>themeTabAction").get("parentNode").addClass("selected");
-        } else {
-            Y.Node.one("#<portlet:namespace/>themeTab").setStyle("display", "none");
-            Y.Node.one("#<portlet:namespace/>themeTabAction").get("parentNode").removeClass("selected");
-        }
-        if (tabId == "widgets") {
-            Y.Node.one("#<portlet:namespace/>widgetsTab").setStyle("display", "");
-            Y.Node.one("#<portlet:namespace/>widgetsTabAction").get("parentNode").addClass("selected");
-        } else {
-            Y.Node.one("#<portlet:namespace/>widgetsTab").setStyle("display", "none");
-            Y.Node.one("#<portlet:namespace/>widgetsTabAction").get("parentNode").removeClass("selected");
-        }
+        
+        Y.Node.one("#<portlet:namespace/>tabActions").all("A").each(function(v, k)
{
+            if (v.get("id") == "<portlet:namespace/>" + tabId + "TabAction") {
+                v.get("parentNode").removeClass("not-selected");
+                v.get("parentNode").addClass("selected");
+            } else {
+                v.get("parentNode").removeClass("selected");
+                v.get("parentNode").addClass("not-selected");
+            }
+        });
+        
+        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);
 



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