Changeset 6577

Timestamp:

Jun 22, 2010, 9:40:31 PM (14 years ago)

Author:

rvelices

Message:

merge r6575-6576 from branch 2.1
-removed use of fix-khtml.css (I tried Safari and it does not need it)

• better javascript funcs + shorter notation

Location:

trunk/themes/default

Files:

• js/rating.js (modified) (2 diffs)
• js/scripts.js (modified) (7 diffs)
• local_head.tpl (modified) (1 diff)
• theme.css (modified) (8 diffs)

trunk/themes/default/js/rating.js

@@ -36 +36 @@
                         rateButton.parentNode.removeChild(rateButton.previousSibling);
 
-                if(window.addEventListener){ // Mozilla, Netscape, Firefox
-                        rateButton.addEventListener("click", updateRating, false );
-                        rateButton.addEventListener("mouseout", resetRatingStarDisplay, false );
-                        rateButton.addEventListener("mouseover", updateRatingStarDisplayEvt, false );
-                }
-                else if(window.attachEvent) { // IE
-                        rateButton.attachEvent("onclick", updateRating);
-                        rateButton.attachEvent("onmouseout", resetRatingStarDisplay);
-                        rateButton.attachEvent("onmouseover", updateRatingStarDisplayEvt);
-                }
+                pwgAddEventListener(rateButton, "click", updateRating);
+                pwgAddEventListener(rateButton, "mouseout", resetRatingStarDisplay);
+                pwgAddEventListener(rateButton, "mouseover", updateRatingStarDisplayEvt);
         }
         resetRatingStarDisplay();
@@ -89 +82 @@
                                 {
                                         var t = gRatingOptions.ratingSummaryText;
-                                        var args =[result.average, result.count, result.stdev], idx = 0, rexp = new RegExp( /%\.?\d*[sdf]/ );
-                                        _xxx = t.match( rexp );
+                                        var args =[result.average, result.count], idx = 0, rexp = new RegExp( /%\.?\d*[sdf]/ );
+                                        //_xxx = t.match( rexp );
                                         while (idx<args.length) t=t.replace(rexp, args[idx++]);
                                         gRatingOptions.ratingSummaryElement.innerHTML = t;

trunk/themes/default/js/scripts.js

@@ -1 +1 @@
 function SelectAll( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i = 0; i < len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-        if ( formulaire.elements[i].type=='checkbox'
-                && formulaire.elements[i].name != 'copie')
-        {
-                formulaire.elements[i].checked = true;
-        }
+        if (elts[i].type=='checkbox')
+                elts[i].checked = true;
 }
 }
@@ -15 +11 @@
 function DeselectAll( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i = 0; i < len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-        if ( formulaire.elements[i].type=='checkbox'
-                && formulaire.elements[i].name != 'copie')
-        {
-        formulaire.elements[i].checked = false;
-        }
+        if (elts[i].type=='checkbox')
+                elts[i].checked = false;
 }
 }
@@ -29 +21 @@
 function Inverser( formulaire )
 {
-var len = formulaire.elements.length;
-var i=0;
-for( i=0; i<len; i++)
+var elts = formulaire.elements;
+for(var i=0; i <elts.length; i++)
 {
-        if ( formulaire.elements[i].type=='checkbox'
-                && formulaire.elements[i].name != 'copie')
-        {
-        formulaire.elements[i].checked = !formulaire.elements[i].checked;
-        }
+        if (elts[i].type=='checkbox')
+                elts[i].checked = !elts[i].checked;
 }
 }
@@ -47 +35 @@
         if (img.complete)
         {
-                var width=img.width +40;
-                var height=img.height +40;
+                var width=img.width+40, height=img.height+40;
         }
         else
         {
-                var width=640;
-                var height=480;
-                img.onload = resizeWindowToFit;
+                var width=640, height=480;
+                img.onload = function () { newWin.resizeTo( img.width+50, img.height+100); };
         }
         newWin = window.open(theURL,winName,features+',left=2,top=1,width=' + width + ',height=' + height);
-}
-
-function resizeWindowToFit()
-{
-        newWin.resizeTo( img.width+50, img.height+100);
 }
 
@@ -71 +52 @@
 }
 
-
-
 Function.prototype.pwgBind = function() {
-        var __method = this, object = arguments[0], args = new Array();
-        for (var i=1; i<arguments.length; i++)
-                args[i-1] = arguments[i];
-        return function() { return __method.apply(object, args); }
+                var __method = this, object = arguments[0], args = Array.prototype.slice.call(arguments,1);
+                return function() {
+                                return __method.apply(object, args.concat(arguments) );
+                }
 }
-
 function PwgWS(urlRoot)
 {
@@ -145 +123 @@
         onStateChange: function() {
                 var readyState = this.transport.readyState;
-                if (readyState == 4)
-                        this.respondToReadyState(this.transport.readyState);
+                if (readyState==4)
+                        this.respondToReadyState(readyState);
         },
 
@@ -187 +165 @@
         options: {}
 }
+
+function pwgAddEventListener(elem, evt, fn)
+{
+        if (window.attachEvent)
+                elem.attachEvent('on'+evt, fn);
+        else
+                elem.addEventListener(evt, fn, false);
+}

trunk/themes/default/local_head.tpl

@@ -1 @@
-{* the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it *}
-<link rel="stylesheet" type="text/nonsense" href="{$ROOT_URL}themes/default/fix-khtml.css">
 <!--[if lt IE 7]>
         <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css">

trunk/themes/default/theme.css

@@ -26 +26 @@
 #menubar DT {
         font-weight: bold;
-        padding: 5px 5px 5px 5px;
+        padding: 5px;
         font-size: 120%;
         text-align: center;
@@ -220 +220 @@
 .calBackDate {
         padding-left: 4px;
-        padding-top: 0px;
+        padding-top: 0;
         z-index: 2;
         position: absolute;
@@ -253 +253 @@
 .content DIV.thumbnailCategory {
         display:block;
-        padding: 2px 0px 0px 2px;
+        padding: 2px 0 0 2px;
         margin: 5px;
 }
@@ -628 +628 @@
 UL.tagSelection {
         width: 99%;
-        margin: 1em 0 1em 0;
+        margin: 1em 0;
         padding: 0;
 }
@@ -643 +643 @@
         text-align: justify;
         padding: 0;
-        margin: 1em 2em 1em 2em;
+        margin: 1em 2em;
 }
 
@@ -814 +814 @@
 }
 
-/* Informations box in administration */
+/* Informations box */
 .infos {
         color: #002000;
@@ -835 +835 @@
 }
 
-/* Header notes box in public/administration */
+/* Header notes box */
 .header_notes {
-        border: 1px solid #aaaaaa; /* border color and style */
+        border: 1px solid #aaa;
         text-align: center;
         background-image: url(icon/note.png);
@@ -844 +844 @@
         font-weight: bold;
         margin: 14px;
-        padding: 5px 00px 0px 0px;
+        padding: 5px 0 0 0;
 }