Changeset 2130:9571f9d492ef for admin

Timestamp:

09/22/13 18:04:14 (12 years ago)

Author:

Lepeltier kévin <kevin@…>

Branch:

Ticket #1548

Parents:

2129:8bc6a4f0ac8f (diff), 2013:da9c70e5fd18 (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/ie7/ie7-hashchange.js (deleted)
• posts.php (modified) (3 diffs)
• posts.php (modified) (3 diffs)
• style/default.css (modified) (23 diffs)

admin/posts.php

@@ -210 +210 @@
 /* DISPLAY
 -------------------------------------------------------- */
-$starting_script = dcPage::jsLoad('js/_posts_list.js');
-if (!$show_filters) {
-     $starting_script .= dcPage::jsLoad('js/filter-controls.js');
-}
-
-dcPage::open(__('Entries'),$starting_script,
+
+dcPage::open(__('Entries'),
+     dcPage::jsLoad('js/_posts_list.js').
+     dcPage::jsLoad('js/filter-controls.js').
+     '<script type="text/javascript">'."\n".
+     "//<![CDATA["."\n".
+     dcPage::jsVar('dotclear.msg.show_filters', $show_filters ? 'true':'false')."\n".
+     dcPage::jsVar('dotclear.msg.filter_posts_list',__('Filter posts list'))."\n".
+     dcPage::jsVar('dotclear.msg.cancel_the_filter',__('Cancel the filter'))."\n".
+     "//]]>".
+     "</script>",
      dcPage::breadcrumb(
           array(
@@ -230 +235 @@
 {
      echo
-     '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>';
-     
-     if (!$show_filters) {
-          echo '<p><a id="filter-control" class="form-control" href="#">'.
-          __('Filter posts list').'</a></p>';
-     }
-     
-     echo
+     '<p class="top-add"><a class="button add" href="post.php">'.__('New entry').'</a></p>'.
      '<form action="posts.php" method="get" id="filters-form">'.
-     '<h3 class="hidden">'.__('Filter posts list').'</h3>'.
-
+     '<h3 class="out-of-screen-if-js">'.__('Filters and display options').'</h3>'.
+     
      '<div class="table">'.
      '<div class="cell">'.
@@ -301 +299 @@
      $core->formNonce().
      '</div>'.
-     '</form>'
+     '</form>',
+     $show_filters
      );
 }

admin/posts.php

@@ -103 +103 @@
 
 # Actions combo box
-$combo_action = array();
-if ($core->auth->check('publish,contentadmin',$core->blog->id))
-{
-     $combo_action[__('Status')] = array(
-          __('Publish') => 'publish',
-          __('Unpublish') => 'unpublish',
-          __('Schedule') => 'schedule',
-          __('Mark as pending') => 'pending'
-     );
-}
-$combo_action[__('Mark')] = array(
-     __('Mark as selected') => 'selected',
-     __('Mark as unselected') => 'unselected'
-);
-$combo_action[__('Change')] = array(
-     __('Change category') => 'category',
-     __('Change language') => 'lang');
-if ($core->auth->check('admin',$core->blog->id))
-{
-     $combo_action[__('Change')] = array_merge($combo_action[__('Change')],
-          array(__('Change author') => 'author'));
-}
-if ($core->auth->check('delete,contentadmin',$core->blog->id))
-{
-     $combo_action[__('Delete')] = array(__('Delete') => 'delete');
-}
-
-# --BEHAVIOR-- adminPostsActionsCombo
-$core->callBehavior('adminPostsActionsCombo',array(&$combo_action));
+
+$posts_actions_page = new dcPostsActionsPage($core,'posts.php');
+
+$posts_actions_page->process();
 
 /* Get posts
@@ -302 +277 @@
      # Show posts
      $post_list->display($page,$nb_per_page,
-     '<form action="posts_actions.php" method="post" id="form-entries">'.
+     '<form action="posts.php" method="post" id="form-entries">'.
      
      '%s'.
@@ -310 +285 @@
      
      '<p class="col right"><label for="action" class="classic">'.__('Selected entries action:').'</label> '.
-     form::combo('action',$combo_action).
+     form::combo('action',$posts_actions_page->getCombo()).
      '<input type="submit" value="'.__('ok').'" /></p>'.
      form::hidden(array('user_id'),$user_id).

admin/style/default.css

@@ -20 +20 @@
 #header {
      background: #676e78;
-     color: #FFF;
+     position: relative;
      border-bottom: 4px solid #A2CBE9;
      width: 100%;
-     display: table;
-     }
-#wrapper, #wrapper.with-prelude {
+     }
+#wrapper {
      position: relative;
-     padding-top: 1.5em;
+     padding-top: 1em;
+     overflow: hidden;
      float: left;
      width: 100%;
      z-index: 10;
-     background: #F7F7F7 url(bg_wrapper.png) repeat-y 15em;
+     /*background: #f7f7f7 url(bg_wrapper.png) repeat-y 15.5em;*/
      }
 .with-js #wrapper {
@@ -39 +39 @@
      width: 100%;
      float: right;
-     margin-left: -14em;
+     margin-left: -15.5em;
      margin-top: 0;
      }
 #content {
-     margin: 0 0 0 14em;
-     padding: .75em 1.5em .75em 2.5em;
+     margin: 0 0 0 15.5em;
+     padding: .75em 1em;
      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 */
@@ -133 +137 @@
           margin-right: 0;
           }
-     .two-cols table {
-          width: 90%;
-          }
 /* -------------------------------------------------------------- layout: three-cols */
 .three-cols {
@@ -200 +201 @@
      }
 /* ---------------------------------------------------------------- layout: popups */
-.popup h1 {
-     display: block;
+.popup #wrapper, .popup #top {
      width: 100%;
+     padding: 0;
+     }
+.popup h1, .popup #top {
      margin: 0;
+     border-bottom: 1px solid;
+     font-weight: normal;
+     color: #fff;
      background: #676e78;
      font-size: 1.5em;
-     text-indent: 1em;
-     line-height: 1.5em;
-     font-weight: normal;
-     color: #fff;
+     text-indent: .5em;
+     line-height: 1.3em;
      }
 .popup #wrapper {
+     float: none;
+     margin:0;
      display: block;
-     float: 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;
-     }
+     }
+     .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;
+          }
 /* -------------------------------------------------------- layout: classes de complément */
 .constrained {
@@ -302 +301 @@
      /* titre de page */
      #content > h2 {
-          padding: 0 1em .5em 1em;
-          margin: 0 -1em .5em -1em;
+          padding: 0 18px 6px; /* ie < 9 sucks */
+          padding: 0 1.8rem .6rem;
+          margin: 0 -18px .5em; /* ie < 9 sucks */
+          margin: 0 -1.8rem 1rem;
           background: #fff url(bg_h2.png) repeat-x center bottom;
           }
@@ -365 +366 @@
      }
 /* ---------------------------------------------------------------- tableaux */
-.table-outer {
-     width: 100%;
-     overflow: auto;
-     }
 table {
      font-size: 12px; /* ie < 9 sucks */
@@ -374 +371 @@
      border-collapse: collapse;
      margin: 0 0 1em 0;
-     width: 100%;
      }
 caption {
@@ -442 +438 @@
      }
 a:hover, a:active, a:focus {
-     border-bottom-style: solid;
+     text-decoration: underline;
      }
 a img, a:link img, a:visited img {
@@ -576 +572 @@
           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;
@@ -741 +746 @@
      display: block;
      padding: 1em 1em .33em 1em;
-     margin-bottom: 1em;
      }
      .warn, .warning {
@@ -790 +794 @@
                border: 1px solid #F7E07E;
                }
-          .success a, .warning-msg a, .info a {
+          .success a, .warning-msg a {
                color: #333;
                }
@@ -852 +856 @@
           border-bottom-color: #A2CBE9;
           }
-/* 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;
+/* top (h1) */
+#top {
      margin: 0;
-     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;
+     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;
           color: #fff;
-          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;
-     }
+          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;
+               }
 /* ---------------------------------------------------------- MAIN-MENU ELEMENTS */
 #favorites-menu, #blog-menu, #system-menu, #plugins-menu {
@@ -1007 +1030 @@
           }
           #qx:focus {
-               border: 1px solid #bee74b;
+               border-color: #bee74b;
                }
      #search-menu input[type="submit"] {
@@ -1097 +1120 @@
      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;
@@ -1115 +1128 @@
           }
      #content.with-help #help-button {
-          right: 280px; /* ie < 9 sucks */
+          right: 282px; /* ie < 9 sucks */
           right: 28rem;
           background-color: #f5f5f5;
           position: fixed;
-          top: 50px;
+          top: 54px;
           z-index: 100;
           border-top: 2px solid #FFD478;
@@ -1135 +1148 @@
           }
      #content.with-help .help-content {
-          padding: 0 1em 1em;
+          padding: 0 .5em 1em;
           }
           .help-content dt {
@@ -1253 +1266 @@
      }
 /* ----------------------------------------------------------- BOITES À FILTRES */
-a.form-control {
-     display: none;
-     background: url(../images/expand.png) no-repeat 4px center;
-     padding-left: 20px;
-     color: #000;
-     }
 #filters-form {
      border: 1px dashed #999;
@@ -1362 +1369 @@
      #icons a:hover,
      #icons a:focus {
-          border-bottom-width: 0;
+          border-bottom-width: 0px;
           text-decoration: none;
           }
@@ -1382 +1389 @@
                     }
                #icons a:focus span, #icons a:hover span {
-                    border-bottom-style: solid;
+                    text-decoration: underline;
                     }
 /* billet rapide */
@@ -2084 +2091 @@
      }
 /* password indicator */
-.install .pw-table, .install .pw-cell, .install .pwindicator {
-     display: block;
-     }
 .pw-table {
      display: table;
@@ -2330 +2334 @@
 /* ------------------------------------------------------------------------------------
                                                                            UN POIL DE MEDIA QUERIES
-------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------ */
 @media screen and (max-width: 920px) {
      #top, #top h1 a {
@@ -2400 +2404 @@
      #info-box1 p.nomobile, label.nomobile { display: none; }
      }
-*/