Changeset 761 for ether_statistics/web

Timestamp:

02/21/13 12:34:04 (11 years ago)

Author:

vmipsl

Message:

shortcut icon
dragslide

Location:

ether_statistics/web

Files:

• project/statistics-script.jsp (modified) (2 diffs)
• project/statistics.jsp (modified) (1 diff)
• resources/cloud.png (added)
• resources/css/statistics.css (modified) (2 diffs)
• resources/js/classesForJQuery/DragSlide.js (modified) (3 diffs)

ether_statistics/web/project/statistics-script.jsp

@@ -92 +92 @@
     createAllSlides: function()
     {
-        this.middleSlide = new DragSlide( {id:"middle", parent:this.parent, minWidth:"700", minHeight:"550", top:"150px", left:"38px",
-            specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent"} );
+        this.middleSlide = new DragSlide( {id:"middle", parent:this.parent, minWidth:"700", minHeight:"550", top:"150px", right:"232px",
+            specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent", activeDbClick:"None"} );
 
         this.rightSlide = new DragSlide( {id:"right", parent:this.parent, width:"180", height:"325", top:"212px", left:"750px",
@@ -390 +390 @@
         var printContent = new PrintContent();
         printContent.addContent( $( "#title" ).clone() );
-        printContent.addContent( this.middleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=93px", 'width' : "667px"} ) );
+        printContent.addContent( this.middleSlide.getDivContainer().clone().animate( {'right' : "100px", 'width' : "667px"} ) );
         printContent.displayPrintPreview();
     },

ether_statistics/web/project/statistics.jsp

@@ -11 +11 @@
 
     <title><spring:message code="title"/></title>
-    <link rel="shortcut icon" href="<html:rewrite page='/resources/images/megapoli/favicon.ico'/>">
+
+    <link href="resources/cloud.png" rel="icon">
 
     <ether:htmlCss cssFile="button"/>

ether_statistics/web/resources/css/statistics.css

@@ -39 +39 @@
     background: -ms-linear-gradient(#65981E, #E6EFC2) repeat scroll 0 0 transparent; /*For IE10*/
     background: -webkit-linear-gradient(#65981E, #E6EFC2) repeat scroll 0 0 transparent; /*For IE10*/
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#65981E', endColorstr = 'E6EFC2'); /*For IE7-8-9*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#65981E', endColorstr = '#E6EFC2'); /*For IE7-8-9*/
     background-color: #65981E;
     -moz-border-radius: 4px 4px 4px 4px;
@@ -272 +272 @@
     background: -ms-linear-gradient(#F5F5F5, #DFF4FF) repeat scroll 0 0 transparent; /*For IE10*/
     background: -webkit-linear-gradient(#F5F5F5, #DFF4FF) repeat scroll 0 0 transparent; /*For IE10*/
-    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#F5F5F5', endColorstr = 'DFF4FF'); /*For IE7-8-9*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#F5F5F5', endColorstr = '#DFF4FF'); /*For IE7-8-9*/
     -moz-box-shadow: none;
     -webkit-box-shadow: none;

ether_statistics/web/resources/js/classesForJQuery/DragSlide.js

@@ -23 +23 @@
         this.top = objectParameter.top;
         this.left = objectParameter.left;
+        this.right = objectParameter.right;
         this.specificClass = objectParameter.specificClass;
         this.specificTitleClass = objectParameter.specificTitleClass ? objectParameter.specificTitleClass : false;
@@ -54 +55 @@
         // Height and width or min-height and min-width
         if( this.height && this.width )
-            this.divContainer.attr( {id:this.id, style:"width:" + this.width + "px; height:" + this.height + "px; top:" + this.top + "; left:" + this.left} );
+            this.divContainer.attr( {id:this.id, style:"width:" + this.width + "px; height:" + this.height + "px; top:" + this.top} );
         else
-            this.divContainer.attr( {id:this.id, style:"min-width:" + this.minWidth + "px; min-height:" + this.minHeight + "px; height:" + this.divTitle.height() + "px; top:" + this.top + "; left:" + this.left} );
+            this.divContainer.attr( {id:this.id, style:"min-width:" + this.minWidth + "px; min-height:" + this.minHeight + "px; top:" + this.top} );
+        if( this.left )
+            this.divContainer.css( "left", this.left );
+        if( this.right )
+            this.divContainer.css( "right", this.right );
 
 
@@ -146 +151 @@
             {
                 this.divContainer.css( 'min-height', this.minHeight + 'px' );
-                this.divContainer.css( 'height', this.divTitle.height() + 'px' );
+                this.divContainer.removeAttr( "top" );
                 this.divContent.show();
-            }, this ) );
+            }, this ) ).removeAttr( "top" );
         }
         else