portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r832842 - in /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp: WEB-INF/jetui/yui/jetui-portlet.jsp WEB-INF/jetui/yui/jetui.jsp jetui/css/portal.css jetui/engine/portal.js
Date Wed, 04 Nov 2009 18:52:03 GMT
Author: taylor
Date: Wed Nov  4 18:52:03 2009
New Revision: 832842

URL: http://svn.apache.org/viewvc?rev=832842&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
- drags are no longer opaque 
- fixed bug in dragging toolbars losing style
- contribution from Arje Cahn, remove slider buttons, replaced with skinny handles
- contribution form Arje Cahn, CSS cleanup

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp?rev=832842&r1=832841&r2=832842&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
Wed Nov  4 18:52:03 2009
@@ -59,7 +59,7 @@
 			    </div>
 		      </div>
 		       <div class="PContentBorder">
-		         <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span><%=content%></div>
+		         <div class="PContent"><%=content%></div>
 		       </div>
 		    </div>
           </div>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp?rev=832842&r1=832841&r2=832842&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui.jsp
Wed Nov  4 18:52:03 2009
@@ -74,7 +74,7 @@
 <h1 class="logo">Jetspeed 2</h1>
 <span id="environments-menu" class="layout-horizontal-menu yui-menu yui-menu-horizontal
yui-menubuttonnav"><%=spacesNavContent%></span>
 <div class="menu">
-&nbsp;<span style='position: absolute; left: 0px' id='jstbLeftToggle' class='jstbToggle1'></span><span
id='jstbRightToggle' class='jstbToggle2' style='position: absolute; right: 0px'></span>
+&nbsp;<span style='position: absolute; left: 0px; top: 50px;' id='jstbLeftToggle'
class='jstbToggle1'></span><span id='jstbRightToggle' class='jstbToggle2' style='position:
absolute; right: 0px; top: 50px;'></span>
 </div>
 <%if (request.getUserPrincipal() != null) {%>
 <span class="layout-statusarea"><b>David Sean Taylor</b> | Profile | Tasks
(5) | Notifications (2) | <a href="<%=request.getContextPath()%>/login/logout">Log
out</a></span>
@@ -86,8 +86,9 @@
 <table cellpadding="0" cellspacing="0" border="0" width="100%" id="main">
 <tr>         
 <td>
-<div id='jstbLeft' class='jsLeftToolbar'> 
-<div id="jsNavigator" class="portlet <%=pageDec%>">
+<div id='jstbLeft' class='jsLeftToolbar'>
+<div id='jsNavigator' class='xportal-layout-cell'>
+<div id="jsNavigator2" class="portlet <%=pageDec%>">
     <div class="PTitle" >
       <div class="PTitleContent">Navigator</div>
     </div>
@@ -96,6 +97,7 @@
     </div>
 </div>
 </div>
+</div>
 </td>
 <td id='jsMainarea' class='jsMainarea'>
 <div id="jsFragments" class="portal-nested-layout portal-nested-layout-TwoColumns">
@@ -127,7 +129,7 @@
 %>
 <div id="column_id_<%=index%>" 
      class="portal-layout-column" column='<%=index%>'
-     style="float:<%=columnFloat%>; min-height: 100px; width:<%=columnWidth%>;
background-color: #ffffff;">
+     style="float:<%=columnFloat%>; min-height: 100px; width:<%=columnWidth%>;">
 
 <%      
             int subindex = 0;
@@ -158,15 +160,17 @@
 </td>
 <td>
 <div id='jstbRight' class='jsRightToolbar'>
-<div id="jsToolbox" class="portlet <%=pageDec%>">
+<div id='jsToolbox' class='xportal-layout-cell'>
+<div id="jsToolbox2" class="portlet <%=pageDec%>">
     <div class="PTitle" >
       <div class="PTitleContent">Toolbox</div>
     </div>
     <div class="PContentBorder">
-      <div class="PContent"><span style="line-height:0.005px;">&nbsp;</span><%=tbContent
%></div>
+      <div class="PContent"><%=tbContent %></div>
     </div>
 </div>
 </div> 
+</div>
 </td>
 </tr>
 </table>
@@ -181,4 +185,4 @@
 </script>
 <script src="<%=request.getContextPath()%>/jetui/engine/portal.js"></script>
  
-</html>
\ No newline at end of file
+</html>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css?rev=832842&r1=832841&r2=832842&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/css/portal.css
Wed Nov  4 18:52:03 2009
@@ -3,7 +3,6 @@
 	height: 600px;
 }
 .jsMainarea {
-	background:#ffffff;
 	width: 100%;
 }
 .jsRightToolbar {
@@ -17,14 +16,14 @@
 }
 
 .jstbToggle1 {
-    background:transparent url("layout_sprite.png") no-repeat -20px -120px;
-	height: 14px;
-    width: 18px;
+    background:transparent url("layout_sprite.png") no-repeat -0px -4px;
+    height: 17px;
+    width: 5px;
 }
 .jstbToggle2 {
-    background:transparent url("layout_sprite.png") no-repeat -20px -140px;
-	height: 14px;
-    width: 18px;    
+    background:transparent url("layout_sprite.png") no-repeat -0px -4px;
+    height: 17px;
+    width: 5px;    
 }
 #jsNavigator 	{
 	z-index: 100;

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js?rev=832842&r1=832841&r2=832842&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/jetui/engine/portal.js
Wed Nov  4 18:52:03 2009
@@ -478,8 +478,11 @@
 //        }
         var dragNode = drag.get('dragNode');
         dragNode.set('innerHTML', drag.get('node').get('innerHTML'));
-        dragNode.setStyle('opacity','.5');
-        dragNode.setAttribute('class', 'portlet purpleplanet');
+        Y.log("class is " + drag.get('node').getAttribute('class'));
+        Y.log("node is " + drag.get('node').getAttribute('id'));
+
+        //        dragNode.setStyle('opacity','.5');
+//        dragNode.setAttribute('class', 'portlet purpleplanet');
 
         if (drag.get('node').data.get("toolbar"))
         {



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