Changeset 663

Timestamp:

11/05/12 18:26:34 (12 years ago)

Author:

vmipsl

Message:

print ok pour mozilla & chrome

Location:

ether_statistics/web

Files:

• project/statistics-script.jsp (modified) (1 diff)
• project/statistics.jsp (modified) (2 diffs)
• resources/css/printContent.css (modified) (2 diffs)
• resources/js/classesForJQuery/DragSlide.js (modified) (1 diff)
• resources/js/classesForJQuery/PrintContent.js (modified) (8 diffs)
• resources/js/etimbo-jquery-print-preview-plugin (deleted)

ether_statistics/web/project/statistics-script.jsp

@@ -209 +209 @@
     {
         var printContent = new PrintContent();
+        printContent.addContent( $( "#title" ).clone() );
+        printContent.addContent( this.leftTopSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) );
+        printContent.addContent( this.leftMiddleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) );
+        printContent.addContent( this.leftBottomSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) );
+        printContent.addContent( this.middleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=120px"} ) );
         printContent.displayPrintPreview();
-
-//        $( "#containerMiddle" ).printPreview();
-//        $( 'a.print-preview' ).printPreview();
-//        $("#containerMiddle").jqprint();
-
-//        var printContent =$( "#containerMiddle" );
-//        var windowUrl = 'about:blank';
-//        var windowName = 'Print';
-//        var printWindow = window.open( windowUrl, windowName, 'left=50000,top=50000,width=0,height=0' );
-//        printWindow.document.write( "slkdfjlsdkfjsdlf" );
-//        printWindow.document.close();
-//        printWindow.focus();
-//        printWindow.print();
-//        printWindow.close();
-//
-        // TODO export PDF
     },
 

ether_statistics/web/project/statistics.jsp

@@ -14 +14 @@
 
     <ether:htmlCss cssFile="button"/>
-    <%--<ether:htmlCss cssFile="jquery-ui-1.8.16.custom/jquery-ui-1.8.16.custom"/>--%>
     <%-- WIJMO --%>
     <ether:htmlCss cssFile="Wijmo/rocket/jquery-wijmo"/>
@@ -37 +36 @@
 
     <ether:htmlJsp jspFile="statistics-script"/>
-
-    <%--<ether:htmlCss cssFile="etimbo-jquery-print-preview-plugin/960"/>--%>
-    <%--<ether:htmlCss cssFile="etimbo-jquery-print-preview-plugin/screen"/>--%>
-    <%--<ether:htmlCss cssFile="etimbo-jquery-print-preview-plugin/print"/>--%>
-    <%--<ether:htmlCss cssFile="etimbo-jquery-print-preview-plugin/print-preview"/>--%>
-    <%--<script src="http://cdn.jquerytools.org/1.2.5/full/jquery.tools.min.js"></script>--%>
-    <%--<ether:htmlJs jsFile="etimbo-jquery-print-preview-plugin/src/jquery.print-preview"/>--%>
 </HEAD>
 

ether_statistics/web/resources/css/printContent.css

@@ -9 +9 @@
     -moz-box-shadow: 0 0 20px #000;
     -webkit-box-shadow: 0 0 10px #000;
+    min-height: 700px;
 }
 
@@ -59 +60 @@
 #printContent {
     margin-left: 10px;
+    min-height: 500px;
 }

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

@@ -83 +83 @@
     },
 
+    getDivContainer: function()
+    {
+        return this.divContainer;
+    },
+
     isContentVisible: function()
     {

ether_statistics/web/resources/js/classesForJQuery/PrintContent.js

@@ -15 +15 @@
         this.divButtons = $( '<div id="printButtons"></div>' );
         this.divContent = $( '<div id="printContent"></div>' );
-
-//        this.print_frame = $( '<iframe id="print-modal-content" scrolling="no" border="0" frameborder="0" name="print-frame" />' );
-        this.divContent.append( $( "#title" ).clone() );
-        this.divContent.append( $( "#leftTop" ).clone().animate( {'marginLeft' : "+=80px"} ) );
-        this.divContent.append( $( "#leftMiddleSlide" ).clone().animate( {'marginLeft' : "+=80px"} ) );
-        this.divContent.append( $( "#leftBottomSlide" ).clone().animate( {'marginLeft' : "+=80px"} ) );
-        this.divContent.append( $( "#middle" ).clone().animate( {'marginLeft' : "+=120px"} ) );
     },
 
@@ -29 +22 @@
         this.divWrapper.append( this.divButtons );
         this.divWrapper.append( this.divContent );
-//        this.divWrapper.append( this.print_frame );
         $( 'body' ).append( this.divWrapper );
 
-        // The frame lives
-//        for( var i = 0; i < window.frames.length; i++ )
-//        {
-//            if( window.frames[i].name == "print-frame" )
-//            {
-//                this.print_frame_ref = window.frames[i].document;
-//                break;
-//            }
-//        }
-
-//        this.print_frame_ref.open();
-//        this.print_frame_ref.write( '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' +
-//                '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">' +
-//                '<head><title>zzzzzzzzzzz</title></head>' +
-//                '<body></body>' +
-//                '</html>' );
-//        this.print_frame_ref.close();
-
-//        if( !$.browser.msie && !($.browser.version < 7) )
-//        {
-//            $( 'head', this.print_frame_ref ).append( "headhhhhh" );
-//            $( 'body', this.print_frame_ref ).append( this.content );
-//        }
-//        else
-//        {
-//            $( 'body > *:not(#printWrapper):not(script)' ).clone().each( function()
-//            {
-//                $( 'body', this.print_frame_ref ).append( this.outerHTML );
-//            } );
-//            $( 'head link[media*=print], head link[media=all]' ).each( function()
-//            {
-//                $( 'head', this.print_frame_ref ).append( $( this ).clone().attr( 'media', 'all' )[0].outerHTML );
-//            } );
-//        }
-
+        // Display mask
         this.loadMask();
-
-        // Disable scrolling
-//        $( 'body' ).css( {overflowY: 'hidden', height: '100%'} );
-//        $( 'img', this.print_frame_ref ).load( function()
-//        {
-//            this.print_frame.height( $( 'body', this.print_frame.contents() )[0].scrollHeight );
-//        } );
 
         // Position modal
@@ -91 +42 @@
         }, this ) );
 
-//        this.print_frame.height( $( 'body', this.print_frame.contents() )[0].scrollHeight );
-//        this.print_frame.height( $( 'body', this.print_frame.contents() )[0].scrollHeight );
         this.createButtons();
     },
@@ -103 +52 @@
         this.printButton.bind( "click", jQuery.proxy( function()
         {
-//            this.mask.animate( { opacity: 1}, 400, jQuery.proxy( function()
-//            {
-            window.print();
-//            }, this ) );
-
-//            var thePopup = window.open( '', "Customer Listing", "menubar=0,location=0,height=700,width=700" );
-//            thePopup.document.body.innerHTML = this.content;
-//            this.divWrapper.clone().appendTo( thePopup.document.body );
-//            thePopup.print();
-//            window.open()
-//            window.document.body.innerHTML = "paf";
-//            document.location.href = "";
+            this.mask.animate( { opacity: 1}, 400, jQuery.proxy( function()
+            {
+                window.print();
+            }, this ) );
+//            window.print();
         }, this ) );
         this.divButtons.append( this.printButton );
@@ -126 +68 @@
         this.divButtons.append( this.closeButton );
     },
-
-//    printdiv: function( printpage )
-//    {
-//        var headstr = "<html><head><title></title></head><body>";
-//        var footstr = "</body>";
-//        var newstr = document.all.item( printpage ).innerHTML;
-//        var newstr = "<div>qsdqmsdkqsmdkqsd</div>";
-//        var oldstr = document.body.innerHTML;
-//        document.body.innerHTML = headstr + newstr + footstr;
-//        window.print();
-//        document.body.innerHTML = oldstr;
-//        return false;
-//    },
 
     distroyPrintPreview: function()
@@ -189 +118 @@
         {
             if( e.keyCode == 27 )
-            {
                 this.distroyPrintPreview();
-            }
         }, this ) );
     },
@@ -204 +131 @@
                 window.innerWidth || // ie7+
                         document.documentElement.clientWidth || // ie6
-                        document.body.clientWidth,                     // ie6 quirks mode
+                        document.body.clientWidth, // ie6 quirks mode
                 d - w < 20 ? w : d
             ];
@@ -216 +143 @@
         this.size = this.getMaskSize();
         this.mask.css( {width: this.size[0], height: this.size[1]} );
+    },
+
+    setContent: function( content )
+    {
+        this.divContent.append( content );
+    },
+
+    addContent: function( content )
+    {
+        this.divContent.append( content );
     }
+
 } );