Changeset 1834:f4c0c4d04639 for admin

Timestamp:

09/12/13 00:08:55 (12 years ago)

Author:

kevin@…

Branch:

Ticket #1539

Parents:

1833:81903fe2f6eb (diff), 1799:a5868fc53e27 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fusion avec default

Location:

admin

Files:

• js/common.js (modified) (3 diffs)
• js/common.js (modified) (1 diff)
• style/default.css (modified) (1 diff)
• style/default.css (modified) (8 diffs)

admin/js/common.js

@@ -263 +263 @@
      },
 
-     checkboxesHelpers: function(e) {
+     checkboxesHelpers: function(e, target) {
           $(e).append(document.createTextNode(dotclear.msg.to_select));
           $(e).append(document.createTextNode(' '));
 
+          target = target || $(e).parents('form').find('input[type="checkbox"]');
+          
           var a = document.createElement('a');
           a.href='#';
           $(a).append(document.createTextNode(dotclear.msg.select_all));
           a.onclick = function() {
-               $(this).parents('form').find('input[type="checkbox"]').check();
+               target.check();
                return false;
           };
@@ -282 +284 @@
           $(a).append(document.createTextNode(dotclear.msg.no_selection));
           a.onclick = function() {
-               $(this).parents('form').find('input[type="checkbox"]').unCheck();
+               target.unCheck();
                return false;
           };
@@ -293 +295 @@
           $(a).append(document.createTextNode(dotclear.msg.invert_sel));
           a.onclick = function() {
-               $(this).parents('form').find('input[type="checkbox"]').toggleCheck();
+               target.toggleCheck();
                return false;
           };

admin/js/common.js

@@ -348 +348 @@
 $(function() {
      // remove class no-js from html tag; cf style/default.css for examples
-     $('body').removeClass('no-js');
-     $('body').addClass('with-js');
-
+     $('body').removeClass('no-js').addClass('with-js');
+     
      $('#wrapper').contents().each(function() {
           if (this.nodeType==8) {

admin/style/default.css

@@ -2001 +2001 @@
      }
 /* caché pour tout le monde */
-.hide {
+.hide, .button.hide {
      display: none;
      }

admin/style/default.css

@@ -574 +574 @@
      color: #fff;
      background-color:#25A6E1;
-     border-color: #2C8FD1;
+     border: 1px solid #2C8FD1;
      background:-moz-linear-gradient(top,#25A6E1 0%,#188BC0 100%);
      background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#25A6E1),color-stop(100%,#188BC0));
@@ -589 +589 @@
           filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#25A6E1',endColorstr='#25A6E1',GradientType=0);
           }
-/* suppression, reset, "neutres" */
-input[type=reset], input[type=delete], input[type=submit].delete, input[type=submit].reset, input[type=button],
-input.delete, input.reset, input.button,
-a.delete, a.reset, a.button {
+/* suppression, reset, "neutres" fond gris */
+button, input[type=button], input.button,
+input[type=reset], input[type=submit].reset, input.reset, 
+input[type=submit].delete, input.delete,
+a.button.delete, a.button.reset, a.button {
      color: #000;
      background-color: #f5f5f5;
@@ -599 +600 @@
      text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
      }
-     input[type=reset]:hover, input[type=delete]:hover, input[type=button]:hover,
-     input[type=submit].delete:hover,
-     input.delete:hover, input.reset:hover, input.button:hover,
-     a.delete:hover, a.reset:hover, a.button:hover,
-     input[type=reset]:focus, input[type=delete]:focus, input[type=button]:focus,
-     input[type=submit].delete:focus,
-     input.delete:focus, input.reset:focus, input.button:focus,
-     a.delete:focus, a.reset:focus, a.button:focus {
+     button:hover, input[type=button]:hover, input.button:hover,
+     button:focus, input[type=button]:focus, input.button:focus,
+     input[type=reset]:hover, input[type=submit].reset:hover, input.reset:hover, 
+     input[type=reset]:focus, input[type=submit].reset:focus, input.reset:focus, 
+     input[type=submit].delete:hover, input.delete:hover,
+     input[type=submit].delete:focus, input.delete:focus,
+     a.button.delete:hover, a.button.reset:hover, a.button:hover,
+     a.button.delete:focus, a.button.reset:focus, a.button:focus {
           background-color:#e9e9e9;
           background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #e9e9e9), color-stop(1, #f9f9f9) );
@@ -612 +613 @@
           filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#e9e9e9', endColorstr='#f9f9f9');
           }
-     a.delete, input[type=delete], input.delete {
+     /* suppression */
+     input[type=submit].delete, input.delete, a.button.delete {
           border-color: #ccc;
           color: #c00;
           margin-left: 1em;
           }
-     a.delete:first-child, input[type=delete]:first-child, input.delete:first-child {
+     a.delete:first-child, input.delete:first-child {
           margin-left: 0;
           }
-          a.delete:hover, input[type=delete]:hover, input.delete:hover,
-          a.delete:focus, input[type=delete]:focus, input.delete:focus {        
+     input[type=submit].delete:hover, input.delete:hover, a.button.delete:hover,
+     input[type=submit].delete:focus, input.delete:focus, a.button.delete:focus {
                border-color: #c00;
                }
@@ -748 +750 @@
      .dc-update p {
           display: inline-block;
+          vertical-align: middle;
           }
      .dc-update a {
@@ -1079 +1082 @@
                margin: 0.3em 0 1.5em 0;
                }
+/* 1. inside help block */
+#helplink p {
+     padding: 0 0 0 .5em;
+     }
+/* 2. in footer */
+span.helplink {
+     display: block;
+     float: left;
+     padding: 0 1.5em 0 30px;
+     background: transparent url(../images/page_help.png) no-repeat 6px center;
+     }
+span.helplink a {
+     border-bottom: 1px solid #2373A8;
+     }
 /* ------------------------------------------------------------------ FOOTER ELEMENTS */
 #footer p {
@@ -2034 +2051 @@
      display: block;
      }
-
-
-/* 
-                    tests dashboard 
-
-#content {width: auto;float:none !important; margin: 0;}
-#main {width: auto; display:inline-block; vertical-align: top; margin: 0;float: none !important}
-#main-menu {clear:both; width: auto}
-#main-menu {margin-top: 8em}
-#favorites-menu {display:none;}
-#plugins-menu, #blog-menu, #system-menu, #dashboard-items {display: inline-block;vertical-align: top; min-width: 17em; margin: 0; clear: none;}
-
-*/
-
-
 /* ------------------------------------------------------------------------------------
                                                                            UN POIL DE MEDIA QUERIES
@@ -2121 +2123 @@
      #info-box1 p.nomobile, label.nomobile { display: none; }
      }
-}
-