You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/06/21 03:53:33 UTC

svn commit: r1352391 - in /rave/trunk/rave-portal-resources/src/main/webapp/static: css/rave-css.less script/rave.js

Author: carlucci
Date: Thu Jun 21 01:53:33 2012
New Revision: 1352391

URL: http://svn.apache.org/viewvc?rev=1352391&view=rev
Log:
RAVE-577: Reformat canvas view.  Patch supplied by Kristen Legacy

Modified:
    rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
    rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js

Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less?rev=1352391&r1=1352390&r2=1352391&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/css/rave-css.less Thu Jun 21 01:53:33 2012
@@ -77,15 +77,31 @@
     top: 51px;
 }
 
+.canvas-overlay{
+	position: absolute;
+	left:0;
+	margin-top: -20px;
+	width: 100%;
+	z-index:10;
+    opacity:0.8;
+    background: #fff;
+}
 .widget-wrapper-canvas {
     position: absolute;
-    z-index: 1000;
-    left: 0.25%;
-    top: 72px;
-    width: 99.5%;
-    height: 100%;
+    z-index: 999;
+    left: 1.25%;
+    top: 50px;
+    width: 97.5%;
+    /*height: 100%;*/
+    margin-bottom: 20px;
     opacity: 1;
     vertical-align: top;
+    border: 1px solid #cfcfcf;
+    .border-radius(5px);
+    /*using prefixes for browser specific styles*/
+    box-shadow: 1px 1px 3px rgba(0,0,0,.25);
+    -webkit-box-shadow: 1px 1px 5px rgba(0,0,0,.25);
+    -moz-box-shadow: 2px 2px 2px rgba(0,0,0,.25);
 }
 
 .widget-wrapper {

Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1352391&r1=1352390&r2=1352391&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Thu Jun 21 01:53:33 2012
@@ -399,7 +399,7 @@ var rave = rave || (function () {
 
         function minimizeAction(args, view_params) {
             var regionWidgetId = args.data.id;
-            $(".dnd-overlay").remove();
+            $(".dnd-overlay, .canvas-overlay").remove();
             getNonLockedRegions().sortable("option", "disabled", false);
             // display the widget in normal view
             $("#widget-" + regionWidgetId + "-wrapper").removeClass("widget-wrapper-canvas").addClass("widget-wrapper");
@@ -733,8 +733,21 @@ var rave = rave || (function () {
             jqElm.prepend(overlay[0]);
         }
 
+        function addCanvasOverlay(jqElm){
+            var overlay = $('<div></div>');
+            var styleMap = {
+                height:$('body').height()-40
+             };
+
+            // style it and give it the marker class
+            $(overlay).css(styleMap);
+            $(overlay).addClass("canvas-overlay");
+            // add it to the dom before the iframe so it covers it
+            jqElm.prepend(overlay[0]);
+        }
+
         function openFullScreenOverlay(regionWidgetId) {
-            addOverlay($("#pageContent"));
+            addCanvasOverlay($("#pageContent"));
             getNonLockedRegions().sortable("option", "disabled", true);
             $("#widget-" + regionWidgetId + "-wrapper").removeClass("widget-wrapper").addClass("widget-wrapper-canvas");
             // hide the widget menu