Changeset 2131:a1a18627d23d

Timestamp:

09/22/13 18:39:29 (11 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Message:

Ticket #1707 : Merge pécédent mal fait.

Files:

• admin/style/default.css (modified) (23 diffs)
• inc/admin/lib.pager.php (modified) (10 diffs)

admin/style/default.css

@@ -20 +20 @@
 #header {
      background: #676e78;
-     position: relative;
+     color: #FFF;
      border-bottom: 4px solid #A2CBE9;
      width: 100%;
-     }
-#wrapper {
+     display: table;
+     }
+#wrapper, #wrapper.with-prelude {
      position: relative;
-     padding-top: 1em;
-     overflow: hidden;
+     padding-top: 1.5em;
      float: left;
      width: 100%;
      z-index: 10;
-     /*background: #f7f7f7 url(bg_wrapper.png) repeat-y 15.5em;*/
+     background: #F7F7F7 url(bg_wrapper.png) repeat-y 15em;
      }
 .with-js #wrapper {
@@ -39 +39 @@
      width: 100%;
      float: right;
-     margin-left: -15.5em;
+     margin-left: -14em;
      margin-top: 0;
      }
 #content {
-     margin: 0 0 0 15.5em;
-     padding: .75em 1em;
+     margin: 0 0 0 14em;
+     padding: .75em 1.5em .75em 2.5em;
      background: #fff;
      }
@@ -64 +64 @@
      border-top: 1px solid #ccc;
      background-color: #fff;
-     }
-#content, #main-menu { /* hauteurs égales */
-     padding-bottom: 200em;
-     margin-bottom: -200em;
      }
 /* to hide main-menu */
@@ -137 +133 @@
           margin-right: 0;
           }
+     .two-cols table {
+          width: 90%;
+          }
 /* -------------------------------------------------------------- layout: three-cols */
 .three-cols {
@@ -201 +200 @@
      }
 /* ---------------------------------------------------------------- layout: popups */
-.popup #wrapper, .popup #top {
+.popup h1 {
+     display: block;
      width: 100%;
-     padding: 0;
-     }
-.popup h1, .popup #top {
      margin: 0;
-     border-bottom: 1px solid;
+     background: #676e78;
+     font-size: 1.5em;
+     text-indent: 1em;
+     line-height: 1.5em;
      font-weight: normal;
      color: #fff;
-     background: #676e78;
-     font-size: 1.5em;
-     text-indent: .5em;
-     line-height: 1.3em;
      }
 .popup #wrapper {
+     display: block;
      float: none;
-     margin:0;
-     display: block;
-     }
-     .popup #main {
-          margin-bottom: 1em 0;
-          }
-     .popup #content {
-          margin: 0;
-          padding: .5em 0;
-          }
-          .popup #content h2 {
-               margin: 0 0 1em;
-               }
-     .popup #footer p {
-          border: none;
-          }
+     width: 100%;
+     margin: 0;
+     padding: 0;
+     background-position: 0 0;
+     }
+.popup #main {
+     margin: 0;
+     padding: 0;
+     }
+.popup #content {
+     margin: 0;
+     padding: 1em;
+     }
+.popup #content h2 {
+     margin: 0 0 1em 0;
+     padding: 0;
+     }
+.popup #footer p {
+     border: none;
+     }
 /* -------------------------------------------------------- layout: classes de complément */
 .constrained {
@@ -301 +302 @@
      /* titre de page */
      #content > h2 {
-          padding: 0 18px 6px; /* ie < 9 sucks */
-          padding: 0 1.8rem .6rem;
-          margin: 0 -18px .5em; /* ie < 9 sucks */
-          margin: 0 -1.8rem 1rem;
+          padding: 0 1em .5em 1em;
+          margin: 0 -1em .5em -1em;
           background: #fff url(bg_h2.png) repeat-x center bottom;
           }
@@ -366 +365 @@
      }
 /* ---------------------------------------------------------------- tableaux */
+.table-outer {
+     width: 100%;
+     overflow: auto;
+     }
 table {
      font-size: 12px; /* ie < 9 sucks */
@@ -371 +374 @@
      border-collapse: collapse;
      margin: 0 0 1em 0;
+     width: 100%;
      }
 caption {
@@ -438 +442 @@
      }
 a:hover, a:active, a:focus {
-     text-decoration: underline;
+     border-bottom-style: solid;
      }
 a img, a:link img, a:visited img {
@@ -572 +576 @@
           display: inline-block;
           }
-a.form-control {
-     display: none;
-     background: url(../images/expand.png) no-repeat 4px center;
-     padding-left: 20px;
-     color: #000;
-     }
-a.form-control.open {
-     background: url(../images/hide.png) no-repeat 4px center;
-     }
 .form-note {
      font-style: italic;
@@ -746 +741 @@
      display: block;
      padding: 1em 1em .33em 1em;
+     margin-bottom: 1em;
      }
      .warn, .warning {
@@ -794 +790 @@
                border: 1px solid #F7E07E;
                }
-          .success a, .warning-msg a {
+          .success a, .warning-msg a, .info a {
                color: #333;
                }
@@ -856 +852 @@
           border-bottom-color: #A2CBE9;
           }
-/* top (h1) */
-#top {
+/* header global h1, form#top-info-blog, ul#top-info-user */
+#header a {
+     color: #FFF;
+     }
+#header img {
+     vertical-align: middle;
+     padding-left: .5em;
+     }
+h1, #top-info-blog, #top-info-user {
+     display: table-cell;
+     padding: 8px 0;
      margin: 0;
-     padding: 0;
-     width: 14.5em;
-     float: left;
-     }
-     h1 {
-          padding: 0;
-          margin: 0;
-          height: 36px;
-          text-indent: -1000px;
-          }
-          h1 a {
-               position: absolute;
-               top: 0;
-               left: 0;
-               width: 174px; /* ie < 9 sucks */
-               width: 17.4rem;
-               height: 36px; /* ie < 9 sucks */
-               height: 3.6rem;
-               color: #fff;
-               background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 6px;
-               }
-          h1 a:hover, h1 a:focus {
-               background-position: 0 -94px;
-               }
-/* info-boxes */
-#info-boxes {
-     font-size: 12px; /* ie < 9 sucks */
-     font-size: 1.2rem;
-     line-height: 3em;
-     }
-     #info-boxes a {
-          font-weight: bold;
+     font-size: 1em;
+     vertical-align: top;
+     }
+/* h1 */
+h1 {
+     text-indent: -1000px;
+     width: 16.5em;
+     }
+     h1 a {
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 174px; /* ie < 9 sucks */
+          width: 17.4rem;
+          height: 36px; /* ie < 9 sucks */
+          height: 3.6rem;
           color: #fff;
-          border-bottom-color: #ccc;
-          margin-left: .3em;
-          margin-right: .3em;
-          white-space: nowrap;
-          font-weight: normal;
-          }
-     #info-boxes a img {
-          vertical-align: middle;
-          padding-left: .3em;
-          }
-     #info-box1 {
-          margin: 0;
-          padding: 0 3px 0 18px;
-          color: #fff;
-          display: inline-block;
-          }
-          #info-box1 p {
-               margin: 0;
-               display: inline;
-               }
-          .with-js #info-box1 .hidden-if-js {
-               display: none;
-               }
-          #info-box1 select {
-               width: 145px; /* ie < 9 sucks */
-               width: 14.5em;
-               }
-          #info-box1 a {
-               margin-left: 1.33em;
-               }
-          #info-box1 input[type=submit] {
-               background: #000;
-               border-color: #999;
-               margin-left: .33em; 
-               }
-          #info-box1 input[type=submit]:hover {
-               background: #999;
-               }
-     #info-box2 {
-          margin: 0;
-          padding: 0 18px 0 0;
-          color: #fff;
-          float: right;
-          text-align: right;
-          }
-          #info-box2 span {
-               color: #999;
-               }
-          #info-box2 .logout {
-               margin-right: 0;
-               }
-          #info-box2 a.active {
-               border-bottom-color: #fff;
-               margin: 0;
-               padding: 1.2em .5em;
-               background-color: #fff;
-               color: #333;
-               font-weight: bold;
-               }
+          background: transparent url(dc_logos/b-dotclear120.png) no-repeat 0 6px;
+          }
+     h1 a:hover, h1 a:focus {
+          background-position: 0 -94px;
+          }
+/* top-info-blog */
+#top-info-blog select {
+     max-width: 20em;
+     }
+.with-js #top-info-blog select, .no-js #top-info-blog input[type=submit] {
+     margin-right: 1.33em;
+     }
+#top-info-blog input[type=submit] {
+     background: #000;
+     border-color: #999;
+     margin-left: .33em; 
+     }
+#top-info-blog input[type=submit]:hover {
+     background: #999;
+     }
+#top-info-blog p {
+     display: inline-block;
+     margin: 0;
+     }
+/* top-info-user */
+#top-info-user {
+     padding-right: 18px;
+     list-style-type: none;
+     text-align: right;
+     }
+#top-info-user li {
+     display: inline-block;
+     margin-left: .5em;
+     padding-left: .5em;
+     border-left: 1px solid #999;
+     }
+#top-info-user li:first-child {
+     border-left: none;
+     }
+#top-info-user a.active {
+     border-bottom-color: #fff;
+     margin: 0;
+     padding: 16px .5em;
+     background-color: #fff;
+     color: #333;
+     font-weight: bold;
+     }
 /* ---------------------------------------------------------- MAIN-MENU ELEMENTS */
 #favorites-menu, #blog-menu, #system-menu, #plugins-menu {
@@ -1030 +1007 @@
           }
           #qx:focus {
-               border-color: #bee74b;
+               border: 1px solid #bee74b;
                }
      #search-menu input[type="submit"] {
@@ -1120 +1097 @@
      line-height: 3.6rem;
      }
+     #help-button.floatable {
+          border-top: 2px solid #ccc;
+          border-left: 2px solid #ccc;
+          border-bottom: 2px solid #ccc;
+          border-bottom-left-radius: 1em;
+          border-top-left-radius: 1em;
+        background-color: #f5f5f5;
+        position: fixed;
+        top: 10px;
+        }
      .no-js #help-button {
           top: 1em;
@@ -1128 +1115 @@
           }
      #content.with-help #help-button {
-          right: 282px; /* ie < 9 sucks */
+          right: 280px; /* ie < 9 sucks */
           right: 28rem;
           background-color: #f5f5f5;
           position: fixed;
-          top: 54px;
+          top: 50px;
           z-index: 100;
           border-top: 2px solid #FFD478;
@@ -1148 +1135 @@
           }
      #content.with-help .help-content {
-          padding: 0 .5em 1em;
+          padding: 0 1em 1em;
           }
           .help-content dt {
@@ -1266 +1253 @@
      }
 /* ----------------------------------------------------------- BOITES À FILTRES */
+a.form-control {
+     display: none;
+     background: url(../images/expand.png) no-repeat 4px center;
+     padding-left: 20px;
+     color: #000;
+     }
+a.form-control.open {
+     background: url(../images/hide.png) no-repeat 4px center;
+     }
 #filters-form {
      border: 1px dashed #999;
@@ -1369 +1365 @@
      #icons a:hover,
      #icons a:focus {
-          border-bottom-width: 0px;
+          border-bottom-width: 0;
           text-decoration: none;
           }
@@ -1389 +1385 @@
                     }
                #icons a:focus span, #icons a:hover span {
-                    text-decoration: underline;
+                    border-bottom-style: solid;
                     }
 /* billet rapide */
@@ -2091 +2087 @@
      }
 /* password indicator */
+.install .pw-table, .install .pw-cell, .install .pwindicator {
+     display: block;
+     }
 .pw-table {
      display: table;
@@ -2334 +2333 @@
 /* ------------------------------------------------------------------------------------
                                                                            UN POIL DE MEDIA QUERIES
------------------------------------------------------------------------------------- */
+------------------------------------------------------------------------------------
 @media screen and (max-width: 920px) {
      #top, #top h1 a {
@@ -2404 +2403 @@
      #info-box1 p.nomobile, label.nomobile { display: none; }
      }
+*/

inc/admin/lib.pager.php

@@ -50 +50 @@
           $this->form_hidden = '';
           foreach ($args as $k=>$v) {
-               $this->form_hidden .= form::hidden(array($k),$v);
+               if (is_array($v)) {
+                    foreach ($v as $k2=>$v2) {
+                         $this->form_hidden .= form::hidden(array($k.'[]'),$v2);
+                    }
+               } else {
+                    $this->form_hidden .= form::hidden(array($k),$v);
+               }
           }
           $this->form_action = $url['path'];
@@ -164 +170 @@
                     }
                }
-               $html_block  = '<table class="clear">';
+               $html_block  = 
+               '<div class="table-outer">'.
+               '<table class="clear">';
                
                if( $filter ) {
@@ -180 +188 @@
                '<th scope="col">'.__('Trackbacks').'</th>'.
                '<th scope="col">'.__('Status').'</th>'.
-               '</tr>%s</table>';
+               '</tr>%s</table></div>';
                
                if ($enclose_block) {
@@ -284 +292 @@
                
                $html_block =
-               '<table class="clear"><caption class="hidden">'.__('Entries list').'</caption><tr>'.
+               '<div class="table-outer clear">'.
+               '<table><caption class="hidden">'.__('Entries list').'</caption><tr>'.
                '<th scope="col">'.__('Title').'</th>'.
                '<th scope="col">'.__('Date').'</th>'.
                '<th scope="col">'.__('Author').'</th>'.
                '<th scope="col">'.__('Status').'</th>'.
-               '</tr>%s</table>';
+               '</tr>%s</table></div>';
                
                if ($enclose_block) {
@@ -375 +384 @@
                $pager = new dcPager($page,$this->rs_count,$nb_per_page,10);
                
+               $comments = array();
+               if (isset($_REQUEST['comments'])) {
+                    foreach ($_REQUEST['comments'] as $v) {
+                         $comments[(integer)$v]=true;
+                    }
+               }              
                $html_block =
+               '<div class="table-outer">'.
                '<table><caption class="hidden">'.__('Comments and trackbacks list').'</caption><tr>'.
                '<th colspan="2" scope="col" abbr="comm" class="first">'.__('Type').'</th>'.
@@ -382 +398 @@
                '<th scope="col" class="txt-center">'.__('Status').'</th>'.
                '<th scope="col" abbr="entry">'.__('Entry title').'</th>'.
-               '</tr>%s</table>';
+               '</tr>%s</table></div>';
 
                if ($enclose_block) {
@@ -396 +412 @@
                while ($this->rs->fetch())
                {
-                    echo $this->commentLine();
+                    echo $this->commentLine(isset($comments[$this->rs->comment_id]));
                }
                
@@ -405 +421 @@
      }
      
-     private function commentLine()
+     private function commentLine($checked=false)
      {
           global $author, $status, $sortby, $order, $nb_per_page;
@@ -484 +500 @@
                
                $html_block =
-               '<table class="clear"><caption class="hidden">'.__('Users list').'</caption><tr>'.
+               '<div class="table-outer clear">'.
+               '<table><caption class="hidden">'.__('Users list').'</caption><tr>'.
                '<th colspan="2" scope="col" class="first">'.__('Username').'</th>'.
                '<th scope="col">'.__('First Name').'</th>'.
@@ -490 +507 @@
                '<th scope="col">'.__('Display name').'</th>'.
                '<th scope="col" class="nowrap">'.__('Entries (all types)').'</th>'.
-               '</tr>%s</table>';
+               '</tr>%s</table></div>';
                
                if ($enclose_block) {