Changeset 1147:2e5cb79e4782

Timestamp:

03/08/13 15:37:34 (12 years ago)

Author:

Dsls <dsls@…>

Branch:

twig

Message:

Oops, I did it again (c).

Fist draft of merge from formfilters to dctwig. lists need to be broken up too.

From now all post lists are broken.

Files:

• admin/posts.php (modified) (4 diffs)
• admin/style/default.css (modified) (41 diffs)
• inc/admin/class.dc.admincontext.php (modified) (1 diff)
• inc/admin/class.dc.filter.php (added)
• inc/admin/class.dc.form.php (modified) (20 diffs)
• inc/admin/default-templates/auth.html.twig (modified) (1 diff)
• inc/admin/default-templates/form_layout.html.twig (modified) (4 diffs)
• inc/admin/default-templates/formfilter_layout.html.twig (added)
• inc/admin/default-templates/index.html.twig (modified) (1 diff)
• inc/admin/default-templates/layout.html.twig (modified) (1 diff)
• inc/admin/default-templates/post.html.twig (modified) (1 diff)
• inc/admin/default-templates/posts.html.twig (added)
• inc/admin/default-templates/style/default.css (modified) (1 diff)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• plugins/aboutConfig/admtpl/index.html.twig (modified) (2 diffs)

admin/posts.php

@@ -12 +12 @@
 
 require dirname(__FILE__).'/../inc/admin/prepend.php';
-
+global $_ctx;
 dcPage::check('usage,contentadmin');
 
@@ -48 +48 @@
      # Filter form we'll put in html_block
      $users_combo = $categories_combo = array();
-     $users_combo['-'] = $categories_combo['-'] = '';
      while ($users->fetch())
      {
@@ -61 +60 @@
      }
      
-     $categories_combo[__('None')] = 'NULL';
+
+# Getting categories
+$categories_combo = array();
+try {
+     $categories = $core->blog->getCategories(array('post_type'=>'post'));
      while ($categories->fetch()) {
-          $categories_combo[str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').
-               html::escapeHTML($categories->cat_title).
-               ' ('.$categories->nb_post.')'] = $categories->cat_id;
+          $categories_combo[$categories->cat_id] = 
+               str_repeat('  ',$categories->level-1).
+               ($categories->level-1 == 0 ? '' : '• ').
+               html::escapeHTML($categories->cat_title);
      }
-     
+} catch (Exception $e) { }
      $status_combo = array(
-     '-' => ''
      );
      foreach ($core->blog->getAllPostStatus() as $k => $v) {
-          $status_combo[$v] = (string) $k;
+          $status_combo[(string) $k] = (string)$v;
      }
      
      $selected_combo = array(
-     '-' => '',
-     __('selected') => '1',
-     __('not selected') => '0'
+     '1' => __('is selected'),
+     '0' => __('is not selected')
      );
      
      # Months array
-     $dt_m_combo['-'] = '';
      while ($dates->fetch()) {
-          $dt_m_combo[dt::str('%B %Y',$dates->ts())] = $dates->year().$dates->month();
+          $dt_m_combo[$dates->year().$dates->month()] = dt::str('%B %Y',$dates->ts());
      }
      
-     $lang_combo['-'] = '';
      while ($langs->fetch()) {
           $lang_combo[$langs->post_lang] = $langs->post_lang;
      }
-     
-     $sortby_combo = array(
-     __('Date') => 'post_dt',
-     __('Title') => 'post_title',
-     __('Category') => 'cat_title',
-     __('Author') => 'user_id',
-     __('Status') => 'post_status',
-     __('Selected') => 'post_selected'
-     );
-     
-     $order_combo = array(
-     __('Descending') => 'desc',
-     __('Ascending') => 'asc'
-     );
 }
+$form = new dcForm($core,'post','post.php');
+
 
 # Actions combo box
@@ -136 +124 @@
 $core->callBehavior('adminPostsActionsCombo',array(&$combo_action));
 
-/* Get posts
--------------------------------------------------------- */
-$user_id = !empty($_GET['user_id']) ?   $_GET['user_id'] : '';
-$cat_id = !empty($_GET['cat_id']) ?     $_GET['cat_id'] : '';
-$status = isset($_GET['status']) ? $_GET['status'] : '';
-$selected = isset($_GET['selected']) ?  $_GET['selected'] : '';
-$month = !empty($_GET['month']) ?       $_GET['month'] : '';
-$lang = !empty($_GET['lang']) ?         $_GET['lang'] : '';
-$sortby = !empty($_GET['sortby']) ?     $_GET['sortby'] : 'post_dt';
-$order = !empty($_GET['order']) ?       $_GET['order'] : 'desc';
 
-$show_filters = false;
 
-$page = !empty($_GET['page']) ? (integer) $_GET['page'] : 1;
-$nb_per_page =  30;
-
-if (!empty($_GET['nb']) && (integer) $_GET['nb'] > 0) {
-     if ($nb_per_page != $_GET['nb']) {
-          $show_filters = true;
+class monthComboFilter extends comboFilter {
+     public function applyFilter($params) {
+          $month=$this->avalues['values'][0];
+          $params['post_month'] = substr($month,4,2);
+          $params['post_year'] = substr($month,0,4);
      }
-     $nb_per_page = (integer) $_GET['nb'];
 }
-
-$params['limit'] = array((($page-1)*$nb_per_page),$nb_per_page);
-$params['no_content'] = true;
-
-# - User filter
-if ($user_id !== '' && in_array($user_id,$users_combo)) {
-     $params['user_id'] = $user_id;
-     $show_filters = true;
-} else {
-     $user_id='';
-}
-
-# - Categories filter
-if ($cat_id !== '' && in_array($cat_id,$categories_combo)) {
-     $params['cat_id'] = $cat_id;
-     $show_filters = true;
-} else {
-     $cat_id='';
-}
-
-# - Status filter
-if ($status !== '' && in_array($status,$status_combo)) {
-     $params['post_status'] = $status;
-     $show_filters = true;
-} else {
-     $status='';
-}
-
-# - Selected filter
-if ($selected !== '' && in_array($selected,$selected_combo)) {
-     $params['post_selected'] = $selected;
-     $show_filters = true;
-} else {
-     $selected='';
-}
-
-# - Month filter
-if ($month !== '' && in_array($month,$dt_m_combo)) {
-     $params['post_month'] = substr($month,4,2);
-     $params['post_year'] = substr($month,0,4);
-     $show_filters = true;
-} else {
-     $month='';
-}
-
-# - Lang filter
-if ($lang !== '' && in_array($lang,$lang_combo)) {
-     $params['post_lang'] = $lang;
-     $show_filters = true;
-} else {
-     $lang='';
-}
-
-# - Sortby and order filter
-if ($sortby !== '' && in_array($sortby,$sortby_combo)) {
-     if ($order !== '' && in_array($order,$order_combo)) {
-          $params['order'] = $sortby.' '.$order;
-     } else {
-          $order='desc';
-     }
-     
-     if ($sortby != 'post_dt' || $order != 'desc') {
-          $show_filters = true;
-     }
-} else {
-     $sortby='post_dt';
-     $order='desc';
-}
-
-# Get posts
-try {
-     $posts = $core->blog->getPosts($params);
-     $counter = $core->blog->getPosts($params,true);
-     $post_list = new adminPostList($core,$posts,$counter->f(0));
-} catch (Exception $e) {
-     $core->error->add($e->getMessage());
-}
-
 /* DISPLAY
 -------------------------------------------------------- */
-$starting_script = dcPage::jsLoad('js/_posts_list.js');
-if (!$show_filters) {
-     $starting_script .= dcPage::jsLoad('js/filter-controls.js');
-}
+$filterSet = new dcFilterSet($core,'fposts','posts.php');
 
-dcPage::open(__('Entries'),$starting_script);
+$filterSet
+     ->addFilter(new comboFilter(
+          'users',__('Author'), __('Author'), 'user_id', $users_combo))
+     ->addFilter(new comboFilter(
+          'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
+     ->addFilter(new comboFilter(
+          'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
+     ->addFilter(new comboFilter(
+          'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
+     ->addFilter(new booleanFilter(
+          'selected',__('Selected'), __('The post : '),'post_selected', $selected_combo))
+     ->addFilter(new monthComboFilter(
+          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+     ->addFilter(new textFilter(
+          'search',__('Contains'),__('The entry contains'), 'search',20,255));
 
-if (!$core->error->flag())
-{
-     echo 
-     '<h2>'.html::escapeHTML($core->blog->name).' &rsaquo; <span class="page-title">'.__('Entries').'</span></h2>'.
-     '<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="#">'.
-          __('Filters').'</a></p>';
-     }
-     
-     echo
-     '<form action="posts.php" method="get" id="filters-form">'.
-     '<fieldset><legend>'.__('Filters').'</legend>'.
-     '<div class="three-cols">'.
-     '<div class="col">'.
-     '<label for="user_id">'.__('Author:').
-     form::combo('user_id',$users_combo,$user_id).'</label> '.
-     '<label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id).'</label> '.
-     '<label for="status">'.__('Status:').
-     form::combo('status',$status_combo,$status).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<label for="selected">'.__('Selected:').
-     form::combo('selected',$selected_combo,$selected).'</label> '.
-     '<label for="month">'.__('Month:').
-     form::combo('month',$dt_m_combo,$month).'</label> '.
-     '<label for="lang">'.__('Lang:').
-     form::combo('lang',$lang_combo,$lang).'</label> '.
-     '</div>'.
-     
-     '<div class="col">'.
-     '<p><label for="sortby">'.__('Order by:').
-     form::combo('sortby',$sortby_combo,$sortby).'</label> '.
-     '<label for="order">'.__('Sort:').
-     form::combo('order',$order_combo,$order).'</label></p>'.
-     '<p><label for="nb" class="classic">'.  form::field('nb',3,3,$nb_per_page).' '.
-     __('Entries per page').'</label></p> '.
-     '<p><input type="submit" value="'.__('Apply filters').'" /></p>'.
-     '</div>'.
-     '</div>'.
-     '<br class="clear" />'. //Opera sucks
-     '</fieldset>'.
-     '</form>';
-     
-     # Show posts
-     $post_list->display($page,$nb_per_page,
-     '<form action="posts_actions.php" method="post" id="form-entries">'.
-     
-     '%s'.
-     
-     '<div class="two-cols">'.
-     '<p class="col checkboxes-helpers"></p>'.
-     
-     '<p class="col right"><label for="action" class="classic">'.__('Selected entries action:').'</label> '.
-     form::combo('action',$combo_action).
-     '<input type="submit" value="'.__('ok').'" /></p>'.
-     form::hidden(array('user_id'),$user_id).
-     form::hidden(array('cat_id'),$cat_id).
-     form::hidden(array('status'),$status).
-     form::hidden(array('selected'),$selected).
-     form::hidden(array('month'),$month).
-     form::hidden(array('lang'),$lang).
-     form::hidden(array('sortby'),$sortby).
-     form::hidden(array('order'),$order).
-     form::hidden(array('page'),$page).
-     form::hidden(array('nb'),$nb_per_page).
-     $core->formNonce().
-     '</div>'.
-     '</form>'
-     );
-}
+$filterSet->setup();
 
-dcPage::helpBlock('core_posts');
-dcPage::close();
+$_ctx
+     ->fillPageTitle(__('Entries'),'posts.php');
+$params=new ArrayObject();
+$filterSet->applyFilters($params);
+$_ctx->filters = '['.print_r($params->getArrayCopy(),true).']';
+
+$core->tpl->display('posts.html.twig');
+
+
 ?>

admin/style/default.css

@@ -11 +11 @@
 # -- END LICENSE BLOCK -----------------------------------------
 */
-
-/* ------------------------------------------------------------------ html */
 body {
      font: 75%/1.5em Helvetica,Arial,sans-serif;
@@ -40 +38 @@
      margin-bottom: 0.6em;
 }
+
 h2 {
      color: #666;
@@ -52 +51 @@
      font-size: 1.2em;
 }
+
 p, div.p {
      margin: 0 0 1em 0;
 }
+
 hr {
      height: 1px;
@@ -61 +62 @@
      border-style: solid;
 }
+
 pre, code {
      font: 100% "Andale Mono","Courier New",monospace;
@@ -77 +79 @@
      cursor: help;
 }
+
 
 /* LAYOUT
@@ -148 +151 @@
      height: 2em;
 }
-#info-box1 p {
-     margin: 0;
-     display: inline;
-}
 #info-box1 select {
      width: 15em;
@@ -197 +196 @@
      padding: 1em;
      background: #fff;
+     -webkit-border-radius: .5em;
+     -moz-border-radius: .5em;
      border-radius: .5em;
      border: 1px solid #ddd;
@@ -254 +255 @@
      background: #dfdfdf;
      text-decoration: none;
+     -webkit-border-top-left-radius: .3em;
+     -webkit-border-top-right-radius: .3em;
+     -moz-border-radius-topleft: .3em;
+     -moz-border-radius-topright: .3em;
      border-top-left-radius: .3em;
      border-top-right-radius: .3em;
@@ -277 +282 @@
      float: left;
      margin-top: 1.2em;
-     margin-bottom: 3em;
+     margin-bottom: 1em;
 }
 #main-menu h3 {
@@ -297 +302 @@
      padding: .2em 0 0 32px;
      background-repeat: no-repeat;
-     background-position: 12px .4em;
+     background-position: 12px .2em;
 }
 #main-menu a {
@@ -335 +340 @@
 #footer {
      clear: both;
-     padding: .75em 0;
-     background: #575859 url(dc_logo_small.png) no-repeat 8px bottom;
+     padding: .75em 2em;
+     margin: 6em 15px .5em 15px;
+     -webkit-border-radius: .3em;
+     -moz-border-radius: .3em;
+     border-radius: .3em;
+     background: #575859 url(dc_logo_small.png) no-repeat right bottom;
      color: #fff;
 }
@@ -369 +378 @@
      border: 1px solid #999;
      padding: 1em 1em 0 1em;
+     -moz-border-radius: 4px;
+     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -433 +444 @@
      color: #666;
 }
+
 #dashboard-items {
      float: left;
@@ -501 +513 @@
      border: 1px solid #ccc;
      border-left: 1em solid #E5E3DA;
+     -moz-border-radius: .3em;
+     -webkit-border-radius: .3em;
      border-radius: .3em;
 }
@@ -538 +552 @@
      height: 500px;
 }
+
 #add-file-f {
      position: relative;
@@ -621 +636 @@
      display: inline;
 }
+
 #default-favs h3 {
      margin-top: 2em;
      margin-bottom: 1em;
 }
+
 .fav-list {
      list-style-type: none;
@@ -651 +668 @@
      border: 1px solid #ddd;
      padding: .2em;
+     -moz-border-radius: .5em;
+     -webkit-border-radius: .5em;
      border-radius: .5em;
 }
@@ -745 +764 @@
      border: 1px solid #f3f3f3;
      cursor: pointer;
+     -moz-border-radius: 4px;
+     -webkit-border-radius: 4px;
      border-radius: 4px;
 }
@@ -783 +804 @@
 }
 #help-button {
-     position: fixed;
-     top: 3.2em;
+     position: absolute;
+     top: 6.2em;
      right: 0px;
      cursor: pointer;
@@ -794 +815 @@
      text-transform: capitalize;
      padding: .33em .75em .33em 1em;
-     border-radius: 1em 0 0 1em;
+     -moz-border-radius: 1em 0 0 1em;
+     -webkit-border-top-left-radius: 1em;
+     -webkit-border-bottom-left-radius: 1em;
      color: #444;
 }
@@ -856 +879 @@
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     padding: 0.5em 0.5em 0.5em 48px;
+     padding: 0.5em 0.5em 0.5em 40px;
      margin-bottom: 1em;
+     -moz-border-radius: 8px;
+     -webkit-border-radius: 8px;
      border-radius: 8px;
 }
@@ -865 +890 @@
 }
 div.error, p.error {
-     background: #ffdec8 url(msg-error.png) no-repeat .7em .7em;
-     color: #000;
+     background: #e5bfbf url(msg-error.png) no-repeat 5px 5px;
+     color: #600;
 }
 div.message, p.message, 
 div.static-msg, p.static-msg {
-     background: #666 url(msg-std.png) no-repeat .7em .7em;
+     background: #666 url(msg-std.png) no-repeat 5px 5px;
      color: #fff;
 }
@@ -917 +942 @@
      vertical-align: middle;
 }
+
 /* Si quelque chose a besoin d'être caché sauf pour les revues d'écran */
 .hidden {
@@ -951 +977 @@
      overflow: auto;
 }
+
 .grid {
      background: transparent repeat url('grid.png') 0 0;
 }
+
 .line p {
      margin: 0;
@@ -960 +988 @@
      color: #666;
 }
+
 ul.nice {
      margin: 1em 0;
@@ -986 +1015 @@
      right: 0;
 }
-.distrib img {
-     display: block;
-     float: right;
-     margin-top: -1em;
-}
 /* TABLES
 -------------------------------------------------------- */
@@ -1008 +1032 @@
      margin-bottom: .5em;
 }
-
 th, td {
      border-width: 0 0 1px 0;
@@ -1018 +1041 @@
 th {
      text-align: left;
-     border-bottom-color: #666;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
      border-width: 0;
 }
+
 table .maximal, table.maximal {
      width: 100%;
@@ -1029 +1052 @@
      width: 1px;
 }
+
 table .nowrap {
      white-space: nowrap;
      vertical-align: top;
-}
-table.settings, table.prefs {
-     width: 80%;
-}
-table.settings th:first-child, table.prefs th:first-child {
-     width: 20%;
-}
-table.settings th + th, table.prefs th + th {
-     width: 30%;
-}
-table.settings th + th + th, table.prefs th + th + th {
-     width: 10%;
-}
-table.settings th:last-child, table.prefs th:last-child {
-     width: 40%;
 }
 
@@ -1119 +1128 @@
      font-weight: normal;
 }
+
 input, textarea, select {
      background: #f9f9f9;
@@ -1126 +1136 @@
      border-color: #000 #ccc #ccc #000;
 }
-input.invalid, textarea.invalid, select.invalid {
-     border: 1px solid red;
-     background: #fff; 
-     color: red;
-     box-shadow: 0 0 0 1px rgba(218, 62, 90, 0.3)
-}
 input, textarea, select, option {
      font: 1em "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
@@ -1151 +1155 @@
      background: transparent;
 }
+
 label {
      display: block;
@@ -1162 +1167 @@
      color: #666;
 }
-span.form-note {
-     font-style:italic;
-     font-weight: normal;
-     color: #666;
-}
 p.form-note.warn, p.form-note.info, p.warning {
      font-style: normal;
@@ -1172 +1172 @@
 }
 p.form-note.warn, p.warning {
-     background: #ffd url(warning.png) no-repeat .3em .3em;
+     background: #ffd url(warning.png) no-repeat .2em .2em;
      border: 1px solid #f0c020;
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .3em .2em;
+     background: #eef url(info.png) no-repeat .2em .2em;
      border: 1px solid #99f;
 }
@@ -1196 +1196 @@
      resize: vertical;
 }
+
 label.required {
      font-weight: bold;
@@ -1208 +1209 @@
 p.field {
      position: relative;
-     
+
 }
 p.field label {
@@ -1220 +1221 @@
      top: 0;
 }
+
 label .maximal, textarea.maximal, input.maximal {
      width: 100%;
@@ -1234 +1236 @@
      padding-left: 20px;
 }
+
+a#toggle-filters {
+     font-weight: bold;
+     background: url(../images/plus.png) no-repeat 0 0;
+     padding-left: 20px;
+}
+
+a#toggle-filters.opened {
+     background: url(../images/minus.png) no-repeat 0 0;
+}
+
 .constrained {
      margin: 0;
@@ -1262 +1275 @@
      padding: .1em .5em 0 .5em;
      text-shadow: 0 1px 1px rgba(0,0,0,.3);
+     -webkit-border-radius: .2em;
+     -moz-border-radius: .2em;
      border-radius: .2em;
      margin-bottom: .1em;
@@ -1343 +1358 @@
 }
 a.button.add {
+     -webkit-border-radius: .5em;
+     -moz-border-radius: .5em;
      border-radius: .5em;
      margin-bottom: .1em;     
-     background: #2C8FD1 url(../images/add.png) no-repeat 6px center;
+     background: #2C8FD1 url(add.png) no-repeat 6px center;
      color: #fff;
      padding: .2em 16px .2em 30px;
@@ -1354 +1371 @@
 }
 
-/* jQuery Autocomplete plugin */
-.ac_results {
-     padding: 0px;
-     border: 1px dotted #f90;
-     background-color: white;
-     overflow: hidden;
-     z-index: 99999;
-}
-.ac_results ul {
-     width: 100%;
-     list-style-position: outside;
-     list-style: none;
-     padding: 0;
-     margin: 0;
-}
-.ac_results li {
-     margin: 0px;
-     padding: 2px 5px;
-     cursor: default;
-     display: block;
-     font: menu;
-     font-size: 1em;
-     line-height: 16px;
-     overflow: hidden;
-}
-.ac_loading {
-     background: transparent url('loader.gif') right center no-repeat;
-}
-.ac_over {
-     background-color: #06c;
-     color: white;
-}
+form#filters {font-size: 100%; background: #f0f0f0; padding: 1em; border-radius: .5em; border: 1px solid #ddd;}
+form#filters .margintop {padding-top: 1.33em;}
+form#filters ul, form#filters p {list-style-type:none;margin: 0; padding: 0 0 .5em 0; margin-left: 1em;}
+form#filters .col30 {border-left: 1px solid #999;}
+form#filters .col30 h3 {margin-left: 1em;}
+
+p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
+li.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
+li.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
+li.line select { margin-right: 2em;}
+li.line label { display: block; width: 8em; float: left;}
+li.line label img {margin-right: 8px;}
+li.line span.or {
+     text-align: right;
+     margin-left: 5em;
+     font-weight: bold;
+}
+p.line label.or + select {margin-left: 2em;}
+li.line { padding: 0 0 0 20px; height: 1em;}
+li.line label {width: auto;}
+
+#available_filters input[type=submit] {padding: 0 .1em; margin-left: .5em;}
+
+div.pagination span, div.pagination a {
+     margin-right: 1em;
+}

inc/admin/class.dc.admincontext.php

@@ -45 +45 @@
                
                'admin_url'    => DC_ADMIN_URL,
-               'theme_url'    => DC_ADMIN_URL.'index.php?tf=',
+               'theme_url'    => '',
                'plugin_url'   => DC_ADMIN_URL.'index.php?pf=',
                

inc/admin/class.dc.form.php

@@ -13 +13 @@
 
 /**
- * Template form node
- */
+* dcFormNode
+*
+* @uses     Twig_Node
+*
+*/
 class dcFormNode extends Twig_Node
 {
@@ -30 +33 @@
      {
           $compiler
-               ->addDebugInfo($this)
-               ->write("\$context['dc_form']->beginForm('".
-                    $this->getAttribute('name')."');\n")
+               ->addDebugInfo($this);
+          $compiler
+               ->write("\$context['dc_form']->beginForm(")
+               ->subcompile($this->getAttribute('name'))
+               ->write(");\n");
+          $compiler
                ->subcompile($this->getNode('body'))
                ->write("\$context['dc_form']->renderHiddenWidgets();\n")
@@ -49 +55 @@
           $lineno = $token->getLine();
           $stream = $this->parser->getStream();
-          $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
+          $name = $this->parser->getExpressionParser()->parseExpression();
           $stream->expect(Twig_Token::BLOCK_END_TYPE);
           $body = $this->parser->subparse(array($this,'decideBlockEnd'),true);
@@ -77 +83 @@
      protected $core;
      protected $twig;
-     protected $blocks;
      protected $forms;
      protected $currentForm;
+     protected $blocks;
      
      public function __construct($core)
@@ -96 +102 @@
      }
      
+     public function addTemplate($tpl) {
+          $t = $this->twig->loadTemplate($tpl);
+          $this->blocks = array_merge($this->blocks,$t->getBlocks());
+     }
+
      public function getGlobals()
      {
@@ -137 +148 @@
      }
      
-     public function renderWidget($name,$attributes=array())
+     public function renderBlock($name,$attr) {
+          echo $this->template->renderBlock(
+               $name,
+               $attr,
+               $this->blocks
+          );
+     }
+
+     public function getCurrentForm() {
+          return $this->currentForm;
+     }
+
+     public function renderWidget($name,$attributes=array(),$extra=array())
      {
           $field = $this->currentForm->$name;
           if ($field) {
-               echo $this->template->renderBlock(
+               $attr = $field->getAttributes();
+               if (isset($attr['attr'])) {
+                    $attr['attr'] = array_merge($attr['attr'],$attributes);
+               } else {
+                    $attr['attr'] = $attributes;
+               }
+               $this->renderBlock(
                     $field->getWidgetBlock(),
                     array_merge(
-                         $field->getAttributes(),
-                         array('attr' => $attributes)
-                    ),
-                    $this->blocks
+                         $attr,
+                         $extra
+                    )
                );
           }
@@ -197 +225 @@
 
 /**
- * Template form
- */
+* dcForm - Template form
+*
+*/
 class dcForm
 {
@@ -211 +240 @@
      protected $errors;
      
-     private function addNonce()
+
+    /**
+     * addNonce -- adds dc nonce to form fields
+     * 
+     * @access protected
+     *
+     * @return nothing
+     */
+     protected function addNonce()
      {
           $this->addField(
@@ -219 +256 @@
      }
      
-     protected function getNID($nid)
+
+    /**
+     * Defines Name & ID from field
+     * 
+     * @param mixed $nid either an array (name, id) or a string (name only, id will be set to null).
+     *
+     * @access protected
+     *
+     * @return nothing.
+     */
+     protected function setNID($nid)
      {
           if (is_array($nid)) {
@@ -231 +278 @@
      }
      
+     public function getContext() {
+          return array();
+     }
+
+    /**
+     * Class constructor
+     * 
+     * @param mixed  $core   dotclear core
+     * @param mixed  $name   form name
+     * @param mixed  $action form action
+     * @param string $method form method ('GET' or 'POST')
+     *
+     * @access public
+     *
+     * @return mixed Value.
+     */
      public function __construct($core,$name,$action,$method='POST')
      {
           $this->core = $core;
-          $this->getNID($name);
+          $this->setNID($name);
           $this->method = $method;
           $this->action = $action;
@@ -247 +310 @@
      }
      
+
+    /**
+     * Returns form name
+     * 
+     * @access public
+     *
+     * @return mixed Value.
+     */
      public function getName()
      {
@@ -270 +341 @@
      }
      
+     public function removeField(dcField $f) {
+          $n = $f->getName();
+          if (isset($this->fields[$n])){
+               unset($this->fields[$n]);
+          }
+
+     }
+     public function renameField($field,$newname) {
+          $oldname = $field->getName();
+          if (isset($this->fields[$oldname])) {
+               unset($this->fields[$oldname]);
+               $field->setName($newname);
+               $this->fields[$newname] = $field;
+          }
+          //print_r($this->fields);
+     }
      public function begin()
      {
@@ -292 +379 @@
      public function __get($name)
      {
-          return isset($this->fields[$name]) ? 
+          return isset($this->fields[$name]) ?
                $this->fields[$name] : null;
      }
-     
+
      public function __set($name,$value)
      {
@@ -302 +389 @@
           }
      }
-     
+
      public function isSubmitted()
      {
           $from = $this->method == 'POST' ? $_POST : $_GET;
-          echo "form fields :\n";
-     }
-     
-     public function setup()
-     {
+     }
+
+     protected function setupFields() {
           $from = $this->method == 'POST' ? $_POST : $_GET;
           foreach ($this->fields as $f) {
                $f->setup($from);
           }
+     }
+
+     protected function handleActions($submitted) {
+          foreach ($submitted as $f) {
+               $action = $f->getAction();
+               if ($action != NULL) {
+                    $ret = call_user_func($action,$this);
+               }
+          }
+     }
+
+     protected function getSubmittedFields() {
+          $s = array();
           foreach ($this->submitfields as $f) {
                if ($f->isDefined()) {
-                    $ret = call_user_func($f->getAction(),$this);
-                    return;
+                    $s[$f->getName()] = $f;
                }
           }
-     }
-     
+          return $s;
+     }
+
+     public function setup()
+     {
+          $this->setupFields();
+          $submitted = $this->getSubmittedFields();
+          $this->handleActions($submitted);
+     }
+
      public function check()
      {
@@ -352 +457 @@
      protected $defined;
      
-     protected function getNID($nid)
+     protected function setNID($nid)
      {
           if (is_array($nid)) {
@@ -365 +470 @@
      public function __construct($name,$value,$attributes=array())
      {
-          $this->getNID($name);
+          $this->setNID($name);
           $this->attributes = $attributes;
-          $this->value = $value;
+          $this->setValue($value);
           $this->attributes['name'] = $this->name;
           $this->attributes['id'] = $this->id;
+          $this->defined = false;
+     }
+     
+     public function setValue($value) {
+          $this->value = $value;
           $this->attributes['value'] = $this->value;
-          $this->defined = false;
-     }
-     
+     }
+
+     public function getValue() {
+          return $this->value;
+     }
+
      public function __toString()
      {
@@ -395 +508 @@
           return $this->name;
      }
-     
+     public function setName($name) {
+          $this->setNID($name);
+          $this->attributes['name'] = $this->name;
+          $this->attributes['id'] = $this->id;
+     }
+
      public function check()
      {
@@ -406 +524 @@
      }
      
+     public function parseValue($from) {
+          if (isset($from[$this->id])) {
+               return $from[$this->id];
+          }
+          return null;
+     }
+
      public function setup($from)
      {
-          if (isset($from[$this->id])) {
-               $this->value = $from[$this->id];
+          $value = $this->parseValue($from);
+          if ($value !== null) {
+               $this->setValue($value);
                $this->defined = true;
           }
@@ -488 +614 @@
           if (isset($attributes['action'])) {
                $this->action = $attributes['action'];
+          } else {
+               $this->action = NULL;
           }
      }
@@ -527 +655 @@
      }
 
+     public function parseValue($from) {
+
+          $v = parent::parseValue($from);
+          if (!isset($this->options[$v])) {
+               return $this->value;
+          } else {
+               return $v;
+          }
+     }
 }
 ?>

inc/admin/default-templates/auth.html.twig

@@ -18 +18 @@
 <body id="dotclear-admin" class="auth">
 
-{% form auth %}
+{% form 'auth' %}
 <div id="login-screen">
 <h1>{{vendor_name}}</h1>

inc/admin/default-templates/form_layout.html.twig

@@ -18 +18 @@
 {% block field_textarea %}
 {% spaceless %}
-     {{ block('label') }}
+     {{ block('startlabel') }}
     <textarea {{ block('field_attr') }}>{{ value }}</textarea>
+    {{ block('endlabel') }}
 {% endspaceless %}
 {% endblock field_textarea %}
@@ -38 +39 @@
 {% spaceless %}
     {% set type = type|default('text') %}
-    {{ block('label') }}
+    {{ block('startlabel') }}
      <input type="{{ type }}" {{ block('field_attr') }} {% if value is not empty %}value="{{ value }}" {% endif %} />
+    {{ block('endlabel') }}
 {% endspaceless %}
 {% endblock field_input %}
@@ -80 +82 @@
 {% block field_combo %}
 {% spaceless %}
-    {{ block('label') }}
+    {{ block('startlabel') }}
     <select {{ block('field_attr') }}>
         {{ block('field_options') }}
     </select>
+    {{ block('endlabel') }}
 {% endspaceless %}
 {% endblock field_combo %}
-
+{#
 {% block label %}
 {% spaceless %}
@@ -94 +97 @@
 {% endspaceless %}
 {% endblock label %}
+#}
+
+{% block startlabel %}
+{% spaceless %}
+    {% if label is not empty %}
+        {% if required is not empty %}
+            {% set labelclass = labelclass + " required" %}
+        {% endif %}
+        <label for="{{name}}" {% if labelclass is not empty %}class="{{labelclass}}"{% endif %} {% if required is not empty %}<abbr title="{{__('Required field')}}">*</abbr>{% else %}>{% endif %} {{label}}
+        {% if nestedlabel is empty %}</label> {% endif %}
+    {% endif %}
+{% endspaceless %}
+{% endblock startlabel %}
+
+{% block endlabel %}
+{% spaceless %}
+    {% if label is not empty %}
+        {% if nestedlabel is not empty %}</label>{% endif %}
+    {% endif %}
+{% endspaceless %}
+{% endblock endlabel %}
+

inc/admin/default-templates/index.html.twig

@@ -28 +28 @@
           <div id="quick">
                <h3>{{__('Quick entry')}}</h3>
-               {% form quickentry %}
+               {% form 'quickentry' %}
                     <fieldset><legend>{{__('New entry')}}</legend>
                          <p class="col">{{ form_field('post_title',{'class':'maximal'}) }}</p>

inc/admin/default-templates/layout.html.twig

@@ -19 +19 @@
 <body id="dotclear-admin{% if safe_mode %} safe-mode{% endif %}">
      <div id="header">
-          <ul id="prelude">
-               <li><a href="#content">{{__('To content')}}</a></li>
-               <li><a href="#main-menu">{{__('To menu')}}</a></li>
-          </ul>
+          {% block prelude %}
+               <ul id="prelude">
+                    <li><a href="#content">{{__('To content')}}</a></li>
+                    <li><a href="#main-menu">{{__('To menu')}}</a></li>
+               </ul>
+          {% endblock %}
           <div id="top"><h1><a href="index.php">{{vendor_name}}</a></h1></div>
           <div id="info-boxes">
                <div id="info-box1">
-                 {% form switchblog_menu %}
+                 {% form 'switchblog_menu' %}
                     {% if blog_count > 1 and blog_count < 20 %}
-                         <p>{{ form_field('switchblog') }}</p>
-                         <noscript><p>{{ form_field('switchblog_submit') }}</p></noscript>
+                         {{ form_field('switchblog',{},{'nestedlabel' : true, labelclass:'classic'}) }}
+                         <noscript>{{ form_field('switchblog_submit') }}</noscript>
                     {% else %}
-                         <p>{{__('Blog:')}} <strong title="{{current_blog.url}}">{{current_blog.name}}</strong>
-                         {% if blogs is not empty %} - <a href="blogs.php">{{__('Change blog')}}</a>{% endif %}</p>
+                         {{__('Blog:')}} <strong title="{{current_blog.url}}">{{current_blog.name}}</strong>
+                         {% if blogs is not empty %} - <a href="blogs.php">{{__('Change blog')}}</a>{% endif %}
                     {% endif %}
-                    <p><a href="{{current_blog.url}}" onclick="window.open(this.href);return false;" title="{{__('Go to site')}} ({{__('new window')}})">{{__('Go to site')}} <img src="{{theme_url}}images/outgoing.png" alt="" /></a></p>
+                    <a href="{{current_blog.url}}" onclick="window.open(this.href);return false;" title="{{__('Go to site')}} ({{__('new window')}})">{{__('Go to site')}} <img src="{{theme_url}}images/outgoing.png" alt="" /></a>
                  {% endform %}
                </div>

inc/admin/default-templates/post.html.twig

@@ -16 +16 @@
 
 <div class="multi-part" title="{{__('Edit entry')}}" id="edit-entry">
-{% form post %}
+{% form 'post' %}
 <div id="entry-wrapper">
      <div id="entry-content">

inc/admin/default-templates/style/default.css

@@ -1356 +1356 @@
      background-color: #2373A8;
 }
-
+form#filters {font-size: 100%; background: #f0f0f0; padding: 1em; border-radius: .5em; border: 1px solid #ddd;}
+form#filters .margintop {padding-top: 1.33em;}
+form#filters ul, form#filters p {list-style-type:none;margin: 0; padding: 0 0 .5em 0; margin-left: 1em;}
+form#filters .col30 {border-left: 1px solid #999;}
+form#filters .col30 h3 {margin-left: 1em;}
+
+p.line, li.line { position: relative; padding: 3px 0 0 28px; margin: 0 0 1em 0;}
+li.line input[type=submit] {position: absolute; left:0;top:0; padding: 0 .1em; margin: 0;}
+li.line input[type=checkbox], li.line input[type=checkbox] {position: absolute; left: 0; top: .2em; padding: 0 .1em; margin: 0;}
+li.line select { margin-right: 2em;}
+li.line label { display: block; width: 8em; float: left;}
+li.line label img {margin-right: 8px;}
+li.line span.or {
+     text-align: right;
+     margin-left: 5em;
+     font-weight: bold;
+}
+p.line label.or + select {margin-left: 2em;}
+li.line { padding: 0 0 0 20px; height: 1em;}
+li.line label {width: auto;}
+
+#available_filters input[type=submit] {padding: 0 .1em; margin-left: .5em;}
+
+div.pagination span, div.pagination a {
+     margin-right: 1em;
+}
 /* jQuery Autocomplete plugin */
 .ac_results {

inc/core/class.dc.core.php

@@ -155 +155 @@
           );
           $this->tpl->addExtension(new dcFormExtension($this));
+          $this->tpl->addExtension(new dcFilterSetExtension($this));
           $this->tpl->addExtension(new dcTabExtension($this));
      }

inc/prepend.php

@@ -68 +68 @@
 $__autoload['dcFormExtension']               = dirname(__FILE__).'/admin/class.dc.form.php';
 $__autoload['dcTabExtension']           = dirname(__FILE__).'/admin/class.dc.tab.php';
+$__autoload['dcFilterSetExtension']               = dirname(__FILE__).'/admin/class.dc.filter.php';
 
 # Clearbricks extensions

plugins/aboutConfig/admtpl/index.html.twig

@@ -13 +13 @@
   {% tab local('local',__('blog settings')) %}
     {% if local_settings is not empty %}
-    {% form local_nav_form %}
+    {% form 'local_nav_form' %}
      <p class="anchor-nav">{{ form_field('local_nav') }} {{ form_field('local_nav_submit') }}</p>
     {% endform %}
     {% endif %}
 
-    {% form local_settings_form %}
+    {% form 'local_settings_form' %}
     {% for ns, setting in local_settings %}
      <table class="settings" id="local_{{ ns }}"><caption>{{ ns }}</caption>
@@ -47 +47 @@
   {% tab global('global',__('global settings')) %}
     {% if global_settings is not empty %}
-    {% form global_nav_form %}
+    {% form 'global_nav_form' %}
      <p class="anchor-nav">{{ form_field('global_nav') }} {{ form_field('global_nav_submit') }}</p>
     {% endform %}
     {% endif %}
 
-    {% form global_settings_form %}
+    {% form 'global_settings_form' %}
     {% for ns, setting in global_settings %}
      <table class="settings" id="global_{{ ns }}"><caption>{{ ns }}</caption>