Changeset 1490:60501ef579eb

Timestamp:

08/19/13 08:04:33 (10 years ago)

Author:

Dsls

Branch:

twig

Parents:

1489:f2398e7f3395 (diff), 1466:e67efe636ce1 (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

Files:

• admin/images/help.png (deleted)
• admin/images/minus.png (deleted)
• admin/index.php (modified) (7 diffs)
• admin/js/_post.js (modified) (2 diffs)
• admin/plugin.php (modified) (2 diffs)
• admin/post.php (modified) (9 diffs)
• admin/posts.php (modified) (5 diffs)
• admin/style/add.png (deleted)
• admin/style/default.css (modified) (52 diffs)
• admin/style/magnifier.png (deleted)
• inc/admin/lib.dc.page.php (modified) (11 diffs)
• inc/admin/prepend.php (modified) (3 diffs)
• inc/core/class.dc.blog.php (modified) (5 diffs)
• plugins/aboutConfig/index.php (modified) (2 diffs)

admin/index.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -13 +13 @@
 if (!empty($_GET['pf'])) {
      require dirname(__FILE__).'/../inc/load_plugin_file.php';
+     exit;
+}
+if (!empty($_GET['tf'])) {
+     define('DC_CONTEXT_ADMIN',true);
+     require dirname(__FILE__).'/../inc/load_theme_file.php';
      exit;
 }
@@ -43 +48 @@
 $plugins_install = $core->plugins->installModules();
 
+# Send plugins install messages to templates
+if (!empty($plugins_install['success'])) {
+     $_ctx->addMessagesList(__('Following plugins have been installed:'),$plugins_install['success']);
+}
+if (!empty($plugins_install['failure'])) {
+     $_ctx->addMessagesList(__('Following plugins have not been installed:'),$plugins_install['failure']);
+}
+
+# Send plugins errors messages to templates
+$_ctx->modules_errors = $core->auth->isSuperAdmin() ? $core->plugins->getErrors() : array();
+
+# Send Dotclear updates notifications to tempaltes
+$_ctx->updater = array();
+if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS)) {
+
+     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
+     $new_v = $updater->check(DC_VERSION);
+     $version_info = $new_v ? $updater->getInfoURL() : '';
+     
+     if ($updater->getNotify() && $new_v) {
+          $_ctx->updater = array(
+               'new_version'  => $new_v,
+               'version_info' => $version_info
+          );
+     }
+}
+
 # Check dashboard module prefs
 $ws = $core->auth->user_prefs->addWorkspace('dashboard');
+
+# Doclinks prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('doclinks',true)) {
@@ -51 +85 @@
      $core->auth->user_prefs->dashboard->put('doclinks',true,'boolean');
 }
+
+# Send doclinks to templates
+$_ctx->dashboard_doclinks = array();
+if ($core->auth->user_prefs->dashboard->doclinks && !empty($__resources['doc'])) {
+     $_ctx->dashboard_doclinks = $__resources['doc'];
+}
+
+# Dcnews prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('dcnews')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('dcnews',true)) {
@@ -57 +99 @@
      $core->auth->user_prefs->dashboard->put('dcnews',true,'boolean');
 }
+
+# Send dcnews to templates
+$_ctx->dashboard_dcnews = array();
+if ($core->auth->user_prefs->dashboard->dcnews && !empty($__resources['rss_news'])) {
+     try
+     {
+          $feed_reader = new feedReader;
+          $feed_reader->setCacheDir(DC_TPL_CACHE);
+          $feed_reader->setTimeout(2);
+          $feed_reader->setUserAgent('Dotclear - http://www.dotclear.org/');
+          $feed = $feed_reader->parse($__resources['rss_news']);
+          if ($feed) {
+               $items = array();
+               $i = 1;
+               foreach ($feed->items as $item) {
+                    $items[] = array(
+                         'title' => $item->title,
+                         'link' => isset($item->link) ? $item->link : '',
+                         'date' => dt::dt2str(__('%d %B %Y'),$item->pubdate,'Europe/Paris'),
+                         'content' => html::clean($item->content)
+                    );
+                    $i++;
+                    if ($i > 3) { break; }
+               }
+               $_ctx->dashboard_dcnews = $items;
+          }
+     }
+     catch (Exception $e) {}
+}
+
+# Quick entry prefs
 if (!$core->auth->user_prefs->dashboard->prefExists('quickentry')) {
      if (!$core->auth->user_prefs->dashboard->prefExists('quickentry',true)) {
@@ -62 +135 @@
      }
      $core->auth->user_prefs->dashboard->put('quickentry',true,'boolean');
+}
+
+# Send quick entry to templates
+$_ctx->dashboard_quickentry = false;
+if ($core->auth->user_prefs->dashboard->quickentry &&$core->auth->check('usage,contentadmin',$core->blog->id))
+{
+     $categories_combo = array(' ' => '');
+     try {
+          $categories = $core->blog->getCategories(array('post_type'=>'post'));
+          while ($categories->fetch()) {
+               $categories_combo[$categories->cat_id] = 
+                    str_repeat('  ',$categories->level-1).
+                    ($categories->level-1 == 0 ? '' : '• ').
+                    html::escapeHTML($categories->cat_title);
+          }
+     } catch (Exception $e) { }
+     
+     $form = new dcForm($core,array('quickentry','quick-entry'),'post.php');
+     $form
+          ->addField(
+               new dcFieldText('post_title','', array(
+                    'size'         => 20,
+                    'required'     => true,
+                    'label'        => __('Title'))))
+          ->addField(
+               new dcFieldTextArea('post_content','', array(
+                    'required'     => true,
+                    'label'        => __("Content:"))))
+          ->addField(
+               new dcFieldCombo('cat_id','',$categories_combo,array(
+                    "label" => __('Category:'))))
+          ->addField(
+               new dcFieldSubmit('save',__('Save'),array(
+                    'action' => 'savePost')))
+          ->addField(
+               new dcFieldHidden ('post_status',-2))
+          ->addField(
+               new dcFieldHidden ('post_format',$core->auth->getOption('post_format')))
+          ->addField(
+               new dcFieldHidden ('post_excerpt',''))
+          ->addField(
+               new dcFieldHidden ('post_lang',$core->auth->getInfo('user_lang')))
+          ->addField(
+               new dcFieldHidden ('post_notes',''))
+     ;
+     if ($core->auth->check('publish',$core->blog->id)) {
+          $form->addField(
+               new dcFieldHidden ('save-publish',__('Save and publish')));
+     }
+     
+     $_ctx->dashboard_quickentry = true;
 }
 
@@ -118 +242 @@
 }
 
-# Latest news for dashboard
+# Send dashboard icons to templates
+$icons = array();
+foreach ($__dashboard_icons as $i) {
+     $icons[] = array(
+          'title'   => $i[0],
+          'url'     => $i[1],
+          'img'     => dc_admin_icon_url($i[2])
+     );
+}
+$_ctx->dashboard_icons = $icons;
+
+# Dashboard items
 $__dashboard_items = new ArrayObject(array(new ArrayObject,new ArrayObject));
-
-$dashboardItem = 0;
-
-if ($core->auth->user_prefs->dashboard->dcnews) {
-     try
-     {
-          if (empty($__resources['rss_news'])) {
-               throw new Exception();
-          }
-     
-          $feed_reader = new feedReader;
-          $feed_reader->setCacheDir(DC_TPL_CACHE);
-          $feed_reader->setTimeout(2);
-          $feed_reader->setUserAgent('Dotclear - http://www.dotclear.org/');
-          $feed = $feed_reader->parse($__resources['rss_news']);
-          if ($feed)
-          {
-               $latest_news = '<h3>'.__('Latest news').'</h3><dl id="news">';
-               $i = 1;
-               foreach ($feed->items as $item)
-               {
-                    $dt = isset($item->link) ? '<a href="'.$item->link.'" title="'.$item->title.' '.__('(external link)').'">'.
-                         $item->title.'</a>' : $item->title;
-               
-                    if ($i < 3) {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd><p><strong>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</strong> '.
-                         '<em>'.text::cutString(html::clean($item->content),120).'...</em></p></dd>';
-                    } else {
-                         $latest_news .=
-                         '<dt>'.$dt.'</dt>'.
-                         '<dd>'.dt::dt2str(__('%d %B %Y:'),$item->pubdate,'Europe/Paris').'</dd>';
-                    }
-                    $i++;
-                    if ($i > 3) { break; }
-               }
-               $latest_news .= '</dl>';
-               $__dashboard_items[$dashboardItem][] = $latest_news;
-               $dashboardItem++;
-          }
-     }
-     catch (Exception $e) {}
-}
-
-# Documentation links
-if ($core->auth->user_prefs->dashboard->doclinks) {
-     if (!empty($__resources['doc']))
-     {
-          $doc_links = '<h3>'.__('Documentation and support').'</h3><ul>';
-     
-          foreach ($__resources['doc'] as $k => $v) {
-               $doc_links .= '<li><a href="'.$v.'" title="'.$k.' '.__('(external link)').'">'.$k.'</a></li>';
-          }
-     
-          $doc_links .= '</ul>';
-          $__dashboard_items[$dashboardItem][] = $doc_links;
-          $dashboardItem++;
-     }
-}
-
 $core->callBehavior('adminDashboardItems', $core, $__dashboard_items);
 
+# Send dashboard items to templates
+$items = array();
+foreach ($__dashboard_items as $i) {    
+     if ($i->count() > 0) {
+          foreach ($i as $v) {
+               $items[] = $v;
+          }
+     }
+}
+$_ctx->dashboard_items = $items;
+
 # Dashboard content
-$dashboardContents = '';
 $__dashboard_contents = new ArrayObject(array(new ArrayObject,new ArrayObject));
 $core->callBehavior('adminDashboardContents', $core, $__dashboard_contents);
 
-/* DISPLAY
--------------------------------------------------------- */
-dcPage::open(__('Dashboard'),
-     dcPage::jsToolBar().
-     dcPage::jsLoad('js/_index.js').
-     # --BEHAVIOR-- adminDashboardHeaders
-     $core->callBehavior('adminDashboardHeaders'),
-     dcPage::breadcrumb(
-          array(
-          '<span class="page-title">'.__('Dashboard').' : '.html::escapeHTML($core->blog->name).'</span>' => ''
-          ),
-          false)
-);
-
-# Dotclear updates notifications
-if ($core->auth->isSuperAdmin() && is_readable(DC_DIGESTS))
-{
-     $updater = new dcUpdate(DC_UPDATE_URL,'dotclear',DC_UPDATE_VERSION,DC_TPL_CACHE.'/versions');
-     $new_v = $updater->check(DC_VERSION);
-     $version_info = $new_v ? $updater->getInfoURL() : '';
-
-     if ($updater->getNotify() && $new_v) {
-          $message =
-          '<div><p>'.sprintf(__('Dotclear %s is available!'),$new_v).'</p> '.
-          '<ul><li><strong><a href="update.php">'.sprintf(__('Upgrade now'),$new_v).'</a></strong>'.
-          '</li><li><a href="update.php?hide_msg=1">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </li><li><a href="'.$version_info.'">'.__('information about this version').'</a>' : '').
-          '</li></ul></div>';
-          dcPage::message($message,false,true);
-     }
-}
-
-if ($core->auth->getInfo('user_default_blog') != $core->blog->id && $core->auth->blog_count > 1) {
-     echo
-     '<p><a href="index.php?default_blog=1" class="button">'.__('Make this blog my default blog').'</a></p>';
-}
-
+# Send dashboard contents to templates
+$contents = array();
+foreach ($__dashboard_contents as $i) { 
+     if ($i->count() > 0) {
+          foreach ($i as $v) {
+               $contents[] = $v;
+          }
+     }
+}
+$_ctx->dashboard_contents = $contents;
+
+# Blog status message
 if ($core->blog->status == 0) {
-     echo '<p class="static-msg">'.__('This blog is offline').'</p>';
+     $_ctx->addMessageStatic(__('This blog is offline'));
 } elseif ($core->blog->status == -1) {
-     echo '<p class="static-msg">'.__('This blog is removed').'</p>';
-}
-
+     $_ctx->addMessageStatic(__('This blog is removed'));
+}
+
+# Config errors messages
 if (!defined('DC_ADMIN_URL') || !DC_ADMIN_URL) {
-     echo
-     '<p class="static-msg">'.
-     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_URL').
-     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
-     '</p>';
-}
-
+     $_ctx->addMessageStatic(
+          sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_URL').' '.
+          __('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.')
+     );
+}
 if (!defined('DC_ADMIN_MAILFROM') || !DC_ADMIN_MAILFROM) {
-     echo
-     '<p class="static-msg">'.
-     sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_MAILFROM').
-     ' '.__('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.').
-     '</p>';
-}
-
-# Plugins install messages
-if (!empty($plugins_install['success']))
-{
-     echo '<div class="static-msg">'.__('Following plugins have been installed:').'<ul>';
-     foreach ($plugins_install['success'] as $k => $v) {
-          echo '<li>'.$k.'</li>';
-     }
-     echo '</ul></div>';
-}
-if (!empty($plugins_install['failure']))
-{
-     echo '<div class="error">'.__('Following plugins have not been installed:').'<ul>';
-     foreach ($plugins_install['failure'] as $k => $v) {
-          echo '<li>'.$k.' ('.$v.')</li>';
-     }
-     echo '</ul></div>';
-}
-
-# Dashboard columns (processed first, as we need to know the result before displaying the icons.)
-$dashboardItems = '';
-
-# Errors modules notifications
-if ($core->auth->isSuperAdmin())
-{
-     $list = array();
-     foreach ($core->plugins->getErrors() as $k => $error) {
-          $list[] = '<li>'.$error.'</li>';
-     }
-     
-     if (count($list) > 0) {
-          $dashboardItems .=
-          '<div id="module-errors" class="error"><p>'.__('Some plugins are installed twice:').'</p> '.
-          '<ul>'.implode("\n",$list).'</ul></div>';
-     }
-     
-}
-
-foreach ($__dashboard_items as $i)
-{    
-     if ($i->count() > 0)
-     {
-          $dashboardItems .= '<div class="db-item">';
-          foreach ($i as $v) {
-               $dashboardItems .= $v;
-          }
-          $dashboardItems .= '</div>';
-     }
-}
-
-# Dashboard icons
-echo '<div id="dashboard-main"'.($dashboardItems ? '' : ' class="fullwidth"').'><div id="icons">';
-foreach ($__dashboard_icons as $i)
-{
-     echo
-     '<p><a href="'.$i[1].'"><img src="'.dc_admin_icon_url($i[2]).'" alt="" />'.
-     '<br /><span>'.$i[0].'</span></a></p>';
-}
-echo '</div>';
-
-if ($core->auth->user_prefs->dashboard->quickentry) {
-     if ($core->auth->check('usage,contentadmin',$core->blog->id))
-     {
-          $categories_combo = array('&nbsp;' => '');
-          try {
-               $categories = $core->blog->getCategories(array('post_type'=>'post'));
-               while ($categories->fetch()) {
-                    $categories_combo[] = new formSelectOption(
-                         str_repeat('&nbsp;&nbsp;',$categories->level-1).
-                         ($categories->level-1 == 0 ? '' : '&bull; ').html::escapeHTML($categories->cat_title),
-                         $categories->cat_id
-                    );
-               }
-          } catch (Exception $e) { }
-     
-          echo
-          '<div id="quick">'.
-          '<h3>'.__('Quick entry').'</h3>'.
-          '<form id="quick-entry" action="post.php" method="post">'.
-          '<fieldset><legend>'.__('New entry').'</legend>'.
-          '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
-          form::field('post_title',20,255,'','maximal').
-          '</p>'.
-          '<p class="area"><label class="required" '.
-          'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-          form::textarea('post_content',50,7).
-          '</p>'.
-          '<p><label for="cat_id" class="classic">'.__('Category:').'</label> '.
-          form::combo('cat_id',$categories_combo).'</p>'.
-          '<p><input type="submit" value="'.__('Save').'" name="save" /> '.
-          ($core->auth->check('publish',$core->blog->id)
-               ? '<input type="hidden" value="'.__('Save and publish').'" name="save-publish" />'
-               : '').
-          $core->formNonce().
-          form::hidden('post_status',-2).
-          form::hidden('post_format',$core->auth->getOption('post_format')).
-          form::hidden('post_excerpt','').
-          form::hidden('post_lang',$core->auth->getInfo('user_lang')).
-          form::hidden('post_notes','').
-          '</p>'.
-          '</fieldset>'.
-          '</form>'.
-          '</div>';
-     }
-}
-
-foreach ($__dashboard_contents as $i)
-{    
-     if ($i->count() > 0)
-     {
-          $dashboardContents .= '<div>';
-          foreach ($i as $v) {
-               $dashboardContents .= $v;
-          }
-          $dashboardContents .= '</div>';
-     }
-}
-echo ($dashboardContents ? '<div id="dashboard-contents">'.$dashboardContents.'</div>' : '');
-
-echo '</div>';
-
-echo ($dashboardItems ? '<div id="dashboard-items">'.$dashboardItems.'</div>' : '');
-
-dcPage::close();
+     $_ctx->addMessageStatic(
+          sprintf(__('%s is not defined, you should edit your configuration file.'),'DC_ADMIN_MAILFROM').' '.
+          __('See <a href="http://dotclear.org/documentation/2.0/admin/config">documentation</a> for more information.')
+     );
+}
+
+$_ctx->setBreadCrumb(__('Dashboard').' : '.html::escapeHTML($core->blog->name), false);
+$core->tpl->display('index.html.twig');
 ?>

admin/js/_post.js

@@ -122 +122 @@
                hide: $('#post_password').val() == ''
           });
-          
+          $('#post_status').parent().toggleWithLegend($('#post_status'),{
+               cookie: 'dcx_post_status'
+          });
+          $('#post_dt').parent().toggleWithLegend($('#post_dt').parent().children().not('label'),{
+               cookie: 'dcx_post_dt'
+          });
+          $('#post_format').parent().toggleWithLegend($('#post_format').parent().children().not('label').add($('#post_format').parents('p').next()),{
+               cookie: 'dcx_post_format'
+          });
+          $('#cat_id').parent().toggleWithLegend($('#cat_id'),{
+               cookie: 'cat_id'
+          });
+          $('#post_url').parent().toggleWithLegend($('#post_url').parent().children().not('label'),{
+               cookie: 'post_url'
+          });
           // We load toolbar on excerpt only when it's ready
           $('#excerpt-area label').toggleWithLegend($('#excerpt-area').children().not('label'),{
                fn: function() { excerptTb.switchMode(formatField.value); },
                cookie: 'dcx_post_excerpt',
-               hide: $('#post_excerpt').val() == '',
-               legend_click: true
+               hide: $('#post_excerpt').val() == ''
           });
           
@@ -150 +163 @@
           var a = document.createElement('a');
           a.href = '#';
+          a.className = 'button';
           $(a).click(function() {
                var params = {

admin/plugin.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
+$has_content = false;
 $p_file = '';
 $p = !empty($_REQUEST['p']) ? $_REQUEST['p'] : null;
-$popup = (integer) !empty($_REQUEST['popup']);
-
-if ($popup) {
-     $open_f = array('dcPage','openPopup');
-     $close_f = array('dcPage','closePopup');
-} else {
-     $open_f = array('dcPage','open');
-     $close_f = array('dcPage','close');
-}
+$popup = $_ctx->popup = (integer) !empty($_REQUEST['popup']);
 
 if ($core->plugins->moduleExists($p)) {
      $p_file = $core->plugins->moduleRoot($p).'/index.php';
 }
+if (file_exists($p_file)) {
 
-if (file_exists($p_file))
-{
-     # Loading plugin
+//* Keep this for old style plugins using dcPage
+     if ($popup) {
+          $open_f = array('dcPage','openPopup');
+          $close_f = array('dcPage','closePopup');
+     } else {
+          $open_f = array('dcPage','open');
+          $close_f = array('dcPage','close');
+     }
+     
      $p_info = $core->plugins->getModules($p);
-     
      $p_url = 'plugin.php?p='.$p;
-     
-     $p_title = 'no content - plugin';
-     $p_head = '';
-     $p_content = '<p>'.__('No content found on this plugin.').'</p>';
-     
+     $p_title = $p_head = $p_content = '';
+//*/ 
+     # Get page content
      ob_start();
      include $p_file;
      $res = ob_get_contents();
      ob_end_clean();
-     
-     if (preg_match('|<head>(.*?)</head|ms',$res,$m)) {
-          if (preg_match('|<title>(.*?)</title>|ms',$m[1],$mt)) {
-               $p_title = $mt[1];
-          }
+
+     # Check context and display
+     if ($_ctx->hasPageTitle() && !empty($res)) {
+          $has_content = true;
+          echo $res;
+     }
+//* Keep this for old style plugins using dcPage
+     elseif (!$_ctx->hasPageTitle()) {
           
-          if (preg_match_all('|(<script.*?>.*?</script>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
+          if (preg_match('|<head>(.*?)</head|ms',$res,$m)) {
+               if (preg_match('|<title>(.*?)</title>|ms',$m[1],$mt)) {
+                    $p_title = $mt[1];
+               }
+               
+               if (preg_match_all('|(<script.*?>.*?</script>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
+               }
+               
+               if (preg_match_all('|(<style.*?>.*?</style>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
+               }
+               
+               if (preg_match_all('|(<link.*?/>)|ms',$m[1],$ms)) {
+                    foreach ($ms[1] as $v) {
+                         $p_head .= $v."\n";
+                    }
                }
           }
           
-          if (preg_match_all('|(<style.*?>.*?</style>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
-               }
-          }
-          
-          if (preg_match_all('|(<link.*?/>)|ms',$m[1],$ms)) {
-               foreach ($ms[1] as $v) {
-                    $p_head .= $v."\n";
-               }
+          if (preg_match('|<body.*?>(.+)</body>|ms',$res,$m)) {
+               $p_content = $m[1];
+               
+               call_user_func($open_f,$p_title,$p_head);
+               echo $p_content;
+               call_user_func($close_f);
+               
+               $has_content = true;
           }
      }
-     
-     if (preg_match('|<body.*?>(.+)</body>|ms',$res,$m)) {
-          $p_content = $m[1];
-     }
-     
-     call_user_func($open_f,$p_title,$p_head);
-     echo $p_content;
-     call_user_func($close_f);
+//*/
 }
-else
-{
-     call_user_func($open_f,__('Plugin not found'),'',
-          dcPage::breadcrumb(
-               array(
-                    __('System') => '',
-                    '<span class="page-title">'.__('Plugin not found').'</span>' => ''
-               ))
-     );
-     
-     echo '<p>'.__('The plugin you reached does not exist or does not have an admin page.').'</p>';
-     
-     call_user_func($close_f);
+# No plugin or content found
+if (!$has_content) {
+     $_ctx->setBreadcrumb(__('Plugin not found'));
+     $_ctx->addError(__('The plugin you reached does not exist or does not have an admin page.'));
+     $core->tpl->display('plugin.html.twig');
 }
 ?>

admin/post.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -15 +15 @@
 dcPage::check('usage,contentadmin');
 
-$post_id = '';
-$cat_id = '';
-$post_dt = '';
-$post_format = $core->auth->getOption('post_format');
-$post_password = '';
-$post_url = '';
-$post_lang = $core->auth->getInfo('user_lang');
-$post_title = '';
-$post_excerpt = '';
-$post_excerpt_xhtml = '';
-$post_content = '';
-$post_content_xhtml = '';
-$post_notes = '';
-$post_status = $core->auth->getInfo('user_post_status');
-$post_selected = false;
-$post_open_comment = $core->blog->settings->system->allow_comments;
-$post_open_tb = $core->blog->settings->system->allow_trackbacks;
+class PostActions 
+{
+     public static function savePost($form) {
+          global $_ctx, $core;
+          try {
+               $form->check($_ctx);
+               $_ctx->setAlert('save');
+               $form->cat_id = (integer) $form->cat_id;
+     
+               if (!empty($form->post_dt)) {
+                    try
+                    {
+                         $post_dt = strtotime($form->post_dt);
+                         if ($post_dt == false || $post_dt == -1) {
+                              $bad_dt = true;
+                              throw new Exception(__('Invalid publication date'));
+                         }
+                         $form->post_dt = date('Y-m-d H:i',$post_dt);
+                    }
+                    catch (Exception $e)
+                    {
+                         $core->error->add($e->getMessage());
+                    }
+               }
+               $post_excerpt = $form->post_excerpt;
+               $post_content = $form->post_content;
+               $post_excerpt_xhtml = '';
+               $post_content_xhtml = '';
+               $core->blog->setPostContent(
+                    $form->id,$form->post_format,$form->post_lang,
+                    $post_excerpt,$post_excerpt_xhtml,$post_content,$post_content_xhtml
+               );
+               $form->post_excerpt = $post_excerpt;
+               $form->post_content = $post_content;
+               $form->post_excerpt_xhtml = $post_excerpt_xhtml;
+               $form->post_content_xhtml = $post_content_xhtml;
+               
+               $cur = $core->con->openCursor($core->prefix.'post');
+     
+               $cur->post_title = $form->post_title;
+               $cur->cat_id = $form->cat_id ? $form->cat_id : null;
+               $cur->post_dt = $form->post_dt ? date('Y-m-d H:i:00',strtotime($form->post_dt)) : '';
+               $cur->post_format = $form->post_format;
+               $cur->post_password = $form->post_password;
+               $cur->post_lang = $form->post_lang;
+               $cur->post_title = $form->post_title;
+               $cur->post_excerpt = $form->post_excerpt;
+               $cur->post_excerpt_xhtml = $form->post_excerpt_xhtml;
+               $cur->post_content = $form->post_content;
+               $cur->post_content_xhtml = $form->post_content_xhtml;
+               $cur->post_notes = $form->post_notes;
+               $cur->post_status = $form->post_status;
+               $cur->post_selected = (integer) $form->post_selected;
+               $cur->post_open_comment = (integer) $form->post_open_comment;
+               $cur->post_open_tb = (integer) $form->post_open_tb;
+     
+               if (!empty($form->post_url)) {
+                    $cur->post_url = $form->post_url;
+               }
+     
+               # Update post
+               if ($form->id)
+               {
+                    # --BEHAVIOR-- adminBeforePostUpdate
+                    $core->callBehavior('adminBeforePostUpdate',$cur,$form->id);
+                    
+                    $core->blog->updPost($form->id,$cur);
+                    
+                    # --BEHAVIOR-- adminAfterPostUpdate
+                    $core->callBehavior('adminAfterPostUpdate',$cur,$form->id);
+                    
+                    http::redirect('post.php?id='.$form->id.'&upd=1');
+               }
+               else
+               {
+                    $cur->user_id = $core->auth->userID();
+                                        # --BEHAVIOR-- adminBeforePostCreate
+                    $core->callBehavior('adminBeforePostCreate',$cur);
+                    
+                    $return_id = $core->blog->addPost($cur);
+                    
+                    # --BEHAVIOR-- adminAfterPostCreate
+                    $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
+                    
+                    http::redirect('post.php?id='.$return_id.'&crea=1');
+               }
+
+     } catch (Exception $e) {
+          $ctx->setError($e->getMessage());
+     }
+}
+     function deletePost($form) {
+          echo $form->id->getValue(); exit;
+     }
+}
 
 $page_title = __('New entry');
-
+$post_id='';
 $can_view_page = true;
 $can_edit_post = $core->auth->check('usage,contentadmin',$core->blog->id);
@@ -47 +125 @@
 # If user can't publish
 if (!$can_publish) {
-     $post_status = -2;
+     $form->post_status = -2;
 }
 
@@ -55 +133 @@
      $categories = $core->blog->getCategories(array('post_type'=>'post'));
      while ($categories->fetch()) {
-          $categories_combo[] = new formSelectOption(
-               str_repeat('  ',$categories->level-1).($categories->level-1 == 0 ? '' : '• ').html::escapeHTML($categories->cat_title),
-               $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) { }
@@ -64 +142 @@
 # Status combo
 foreach ($core->blog->getAllPostStatus() as $k => $v) {
-     $status_combo[$v] = (string) $k;
-}
-$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
+     $status_combo[$k] = $v;
+}
 
 # Formaters combo
@@ -76 +153 @@
 $rs = $core->blog->getLangs(array('order'=>'asc'));
 $all_langs = l10n::getISOcodes(0,1);
-$lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(1,1));
+$lang_combo = array('' => '', __('Most used') => array(), __('Available') => l10n::getISOcodes(0,1));
 while ($rs->fetch()) {
      if (isset($all_langs[$rs->post_lang])) {
-          $lang_combo[__('Most used')][$all_langs[$rs->post_lang]] = $rs->post_lang;
-          unset($lang_combo[__('Available')][$all_langs[$rs->post_lang]]);
+          $lang_combo[__('Most used')][$rs->post_lang] = $all_langs[$rs->post_lang];
+          unset($lang_combo[__('Available')][$rs->post_lang]);
      } else {
-          $lang_combo[__('Most used')][$rs->post_lang] = $rs->post_lang;
+          $lang_combo[__('Most used')][$rs->post_lang] = $all_langs[$rs->post_lang];
      }
 }
@@ -88 +165 @@
 unset($rs);
 
-# Validation flag
-$bad_dt = false;
-
+$form = new dcForm($core,'post','post.php');
+$form
+     ->addField(
+          new dcFieldText('post_title','', array(
+               'maxlength'         => 255,
+               'required'     => true,
+               'label'        => __('Title'))))
+     ->addField(
+          new dcFieldTextArea('post_excerpt','', array(
+               'cols'         => 50,
+               'rows'         => 5,
+               'label'        => __("Excerpt:"))))
+     ->addField(
+          new dcFieldTextArea('post_content','', array(
+               'required'     => true,
+               'label'        => __("Content:"))))
+     ->addField(
+          new dcFieldTextArea('post_notes','', array(
+               'label'        => __("Notes"))))
+     ->addField(
+          new dcFieldSubmit('save',__('Save'),array(
+               'action' => array('PostActions','savePost'))))
+     ->addField(
+          new dcFieldSubmit('delete',__('Delete'),array(
+               'action' => 'deletePost')))
+     ->addField(
+          new dcFieldCombo('post_status',$core->auth->getInfo('user_post_status'),$status_combo,array(
+               'disabled' => !$can_publish,
+               'label' => __('Entry status:'))))
+     ->addField(
+          new dcFieldCombo('cat_id','',$categories_combo,array(
+               "label" => __('Category:'))))
+     ->addField(
+          new dcFieldText('post_dt','',array(
+               "label" => __('Published on:'))))
+     ->addField(
+          new dcFieldCombo('post_format',$core->auth->getOption('post_format'),$formaters_combo,array(
+               "label" => __('Text formating:'))))
+     ->addField(
+          new dcFieldCheckbox ('post_open_comment',$core->blog->settings->system->allow_comments,array(
+               "label" => __('Accept comments'))))
+     ->addField(
+          new dcFieldCheckbox ('post_open_tb',$core->blog->settings->system->allow_trackbacks,array(
+               "label" => __('Accept trackbacks'))))
+     ->addField(
+          new dcFieldCheckbox ('post_selected',array(1=>false),array(
+               "label" => __('Selected entry'))))
+     ->addField(
+          new dcFieldCombo ('post_lang',$core->auth->getInfo('user_lang'),$lang_combo, array(
+               "label" => __('Entry lang:'))))
+     ->addField(
+          new dcFieldText('post_password','',array(
+               "maxlength" => 32,
+               "label" => __('Entry password:'))))
+     ->addField(
+          new dcFieldText('post_url','',array(
+               "maxlength" => 255,
+               "label" => __('Basename:'))))
+     ->addField(
+          new dcFieldHidden ('id',''))
+;
 # Get entry informations
 if (!empty($_REQUEST['id']))
 {
-     $page_title = __('Edit entry');
-     
      $params['post_id'] = $_REQUEST['id'];
      
@@ -107 +240 @@
      else
      {
-          $post_id = $post->post_id;
-          $cat_id = $post->cat_id;
-          $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
-          $post_format = $post->post_format;
-          $post_password = $post->post_password;
-          $post_url = $post->post_url;
-          $post_lang = $post->post_lang;
-          $post_title = $post->post_title;
-          $post_excerpt = $post->post_excerpt;
-          $post_excerpt_xhtml = $post->post_excerpt_xhtml;
-          $post_content = $post->post_content;
-          $post_content_xhtml = $post->post_content_xhtml;
-          $post_notes = $post->post_notes;
-          $post_status = $post->post_status;
-          $post_selected = (boolean) $post->post_selected;
-          $post_open_comment = (boolean) $post->post_open_comment;
-          $post_open_tb = (boolean) $post->post_open_tb;
+          $form->id = $post_id = $post->post_id;
+          $form->cat_id = $post->cat_id;
+          $form->post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
+          $form->post_format = $post->post_format;
+          $form->post_password = $post->post_password;
+          $form->post_url = $post->post_url;
+          $form->post_lang = $post->post_lang;
+          $form->post_title = $post->post_title;
+          $form->post_excerpt = $post->post_excerpt;
+          $form->post_excerpt_xhtml = $post->post_excerpt_xhtml;
+          $form->post_content = $post->post_content;
+          $form->post_content_xhtml = $post->post_content_xhtml;
+          $form->post_notes = $post->post_notes;
+          $form->post_status = $post->post_status;
+          $form->post_selected = (boolean) $post->post_selected;
+          $form->post_open_comment = (boolean) $post->post_open_comment;
+          $form->post_open_tb = (boolean) $post->post_open_tb;
+          $form->can_edit_post = $post->isEditable();
+          $form->can_delete= $post->isDeletable();
+          $page_title = __('Edit entry');
+
+     }
+}
+if ($post_id) {
+     $_ctx->post_id = $post->post_id;
+
+     $_ctx->preview_url =
+          $core->blog->url.$core->url->getURLFor('preview',$core->auth->userID().'/'.
+          http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
+          '/'.$post->post_url);
           
-          $can_edit_post = $post->isEditable();
-          $can_delete= $post->isDeletable();
-          
-          $next_rs = $core->blog->getNextPost($post,1);
-          $prev_rs = $core->blog->getNextPost($post,-1);
-          
-          if ($next_rs !== null) {
-               $next_link = sprintf($post_link,$next_rs->post_id,
-                    html::escapeHTML($next_rs->post_title),__('Next entry').'&nbsp;&#187;');
-               $next_headlink = sprintf($post_headlink,'next',
-                    html::escapeHTML($next_rs->post_title),$next_rs->post_id);
-          }
-          
-          if ($prev_rs !== null) {
-               $prev_link = sprintf($post_link,$prev_rs->post_id,
-                    html::escapeHTML($prev_rs->post_title),'&#171;&nbsp;'.__('Previous entry'));
-               $prev_headlink = sprintf($post_headlink,'previous',
-                    html::escapeHTML($prev_rs->post_title),$prev_rs->post_id);
-          }
-          
-          try {
-               $core->media = new dcMedia($core);
-          } catch (Exception $e) {}
-     }
-}
-
-# Format excerpt and content
-if (!empty($_POST) && $can_edit_post)
-{
-     $post_format = $_POST['post_format'];
-     $post_excerpt = $_POST['post_excerpt'];
-     $post_content = $_POST['post_content'];
-     
-     $post_title = $_POST['post_title'];
-     
-     $cat_id = (integer) $_POST['cat_id'];
-     
-     if (isset($_POST['post_status'])) {
-          $post_status = (integer) $_POST['post_status'];
-     }
-     
-     if (empty($_POST['post_dt'])) {
-          $post_dt = '';
-     } else {
-          try
-          {
-               $post_dt = strtotime($_POST['post_dt']);
-               if ($post_dt == false || $post_dt == -1) {
-                    $bad_dt = true;
-                    throw new Exception(__('Invalid publication date'));
-               }
-               $post_dt = date('Y-m-d H:i',$post_dt);
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     
-     $post_open_comment = !empty($_POST['post_open_comment']);
-     $post_open_tb = !empty($_POST['post_open_tb']);
-     $post_selected = !empty($_POST['post_selected']);
-     $post_lang = $_POST['post_lang'];
-     $post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
-     
-     $post_notes = $_POST['post_notes'];
-     
-     if (isset($_POST['post_url'])) {
-          $post_url = $_POST['post_url'];
-     }
-     
-     $core->blog->setPostContent(
-          $post_id,$post_format,$post_lang,
-          $post_excerpt,$post_excerpt_xhtml,$post_content,$post_content_xhtml
-     );
-}
-
-# Delete post
-if (!empty($_POST['delete']) && $can_delete)
-{
-     try {
-          # --BEHAVIOR-- adminBeforePostDelete
-          $core->callBehavior('adminBeforePostDelete',$post_id);
-          $core->blog->delPost($post_id);
-          http::redirect('posts.php');
-     } catch (Exception $e) {
-          $core->error->add($e->getMessage());
-     }
-}
-
-# Create or update post
-if (!empty($_POST) && !empty($_POST['save']) && $can_edit_post && !$bad_dt)
-{
-     $cur = $core->con->openCursor($core->prefix.'post');
-     
-     $cur->post_title = $post_title;
-     $cur->cat_id = ($cat_id ? $cat_id : null);
-     $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
-     $cur->post_format = $post_format;
-     $cur->post_password = $post_password;
-     $cur->post_lang = $post_lang;
-     $cur->post_title = $post_title;
-     $cur->post_excerpt = $post_excerpt;
-     $cur->post_excerpt_xhtml = $post_excerpt_xhtml;
-     $cur->post_content = $post_content;
-     $cur->post_content_xhtml = $post_content_xhtml;
-     $cur->post_notes = $post_notes;
-     $cur->post_status = $post_status;
-     $cur->post_selected = (integer) $post_selected;
-     $cur->post_open_comment = (integer) $post_open_comment;
-     $cur->post_open_tb = (integer) $post_open_tb;
-     
-     if (isset($_POST['post_url'])) {
-          $cur->post_url = $post_url;
-     }
-     
-     # Update post
-     if ($post_id)
-     {
-          try
-          {
-               # --BEHAVIOR-- adminBeforePostUpdate
-               $core->callBehavior('adminBeforePostUpdate',$cur,$post_id);
-               
-               $core->blog->updPost($post_id,$cur);
-               
-               # --BEHAVIOR-- adminAfterPostUpdate
-               $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
-               
-               http::redirect('post.php?id='.$post_id.'&upd=1');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-     else
-     {
-          $cur->user_id = $core->auth->userID();
-          
-          try
-          {
-               # --BEHAVIOR-- adminBeforePostCreate
-               $core->callBehavior('adminBeforePostCreate',$cur);
-               
-               $return_id = $core->blog->addPost($cur);
-               
-               # --BEHAVIOR-- adminAfterPostCreate
-               $core->callBehavior('adminAfterPostCreate',$cur,$return_id);
-               
-               http::redirect('post.php?id='.$return_id.'&crea=1');
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
-}
+     
+     $form_comment = new dcForm($core,'add-comment','post.php');
+     $form_comment
+          ->addField(
+               new dcFieldText('comment_author','', array(
+                    'maxlength'         => 255,
+                    'required'     => true,
+                    'label'        => __('Name:'))))
+          ->addField(
+               new dcFieldText('comment_email','', array(
+                    'maxlength'         => 255,
+                    'required'     => true,
+                    'label'        => __('Email:'))))
+          ->addField(
+               new dcFieldText('comment_site','', array(
+                    'maxlength'         => 255,
+                    'label'        => __('Web site:'))))
+          ->addField(
+               new dcFieldTextArea('comment_content','', array(
+                    'required'     => true,
+                    'label'        => __('Comment:'))))
+          ->addField(
+               new dcFieldSubmit('add',__('Save'),array(
+                    'action' => 'addComment')))
+          ;
+
+     
+}
+
+$form->setup();
 
 /* DISPLAY
@@ -293 +311 @@
      $default_tab = 'comments';
 }
-
-if ($post_id) {
-     switch ($post_status) {
-          case 1:
-               $img_status = sprintf($img_status_pattern,__('Published'),'check-on.png');
-               break;
-          case 0:
-               $img_status = sprintf($img_status_pattern,__('Unpublished'),'check-off.png');
-               break;
-          case -1:
-               $img_status = sprintf($img_status_pattern,__('Scheduled'),'scheduled.png');
-               break;
-          case -2:
-               $img_status = sprintf($img_status_pattern,__('Pending'),'check-wrn.png');
-               break;
-          default:
-               $img_status = '';
-     }
-     $edit_entry_str = __('&ldquo;%s&rdquo;');
-     $page_title_edit = sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
-} else {
-     $img_status = '';
-}
-
-
-dcPage::open($page_title.' - '.__('Entries'),
-     dcPage::jsDatePicker().
-     dcPage::jsToolBar().
-     dcPage::jsModal().
-     dcPage::jsMetaEditor().
-     dcPage::jsLoad('js/_post.js').
-     dcPage::jsConfirmClose('entry-form','comment-form').
-     # --BEHAVIOR-- adminPostHeaders
-     $core->callBehavior('adminPostHeaders').
-     dcPage::jsPageTabs($default_tab).
-     $next_headlink."\n".$prev_headlink,
-     dcPage::breadcrumb(
+$page_title_edit = __('Edit entry');
+$_ctx
+     ->setBreadCrumb(
           array(
                html::escapeHTML($core->blog->name) => '',
                __('Entries') => 'posts.php',
-               '<span class="page-title">'.($post_id ? $page_title_edit : $page_title).'</span>' => ''
-          ))
-);
-
-if (!empty($_GET['upd'])) {
-     dcPage::message(__('Entry has been successfully updated.'));
-}
-elseif (!empty($_GET['crea'])) {
-     dcPage::message(__('Entry has been successfully created.'));
-}
-elseif (!empty($_GET['attached'])) {
-     dcPage::message(__('File has been successfully attached.'));
-}
-elseif (!empty($_GET['rmattach'])) {
-     dcPage::message(__('Attachment has been successfully removed.'));
-}
-
-if (!empty($_GET['creaco'])) {
-     dcPage::message(__('Comment has been successfully created.'));
-}
-
-# XHTML conversion
-if (!empty($_GET['xconv']))
-{
-     $post_excerpt = $post_excerpt_xhtml;
-     $post_content = $post_content_xhtml;
-     $post_format = 'xhtml';
-     
-     dcPage::message(__('Don\'t forget to validate your XHTML conversion by saving your post.'));
-}
-
-if ($post_id && $post->post_status == 1) {
-     echo '<p><a class="onblog_link" href="'.$post->getURL().'" onclick="window.open(this.href);return false;" title="'.$post_title.' ('.__('new window').')'.'">'.__('Go to this entry on the site').' <img src="images/outgoing-blue.png" alt="" /></a></p>';
-}
-if ($post_id)
-{
-     echo '<p class="nav_prevnext">';
-     if ($prev_link) { echo $prev_link; }
-     if ($next_link && $prev_link) { echo ' | '; }
-     if ($next_link) { echo $next_link; }
-     
-     # --BEHAVIOR-- adminPostNavLinks
-     $core->callBehavior('adminPostNavLinks',isset($post) ? $post : null);
-     
-     echo '</p>';
-}
-
-# Exit if we cannot view page
-if (!$can_view_page) {
-     dcPage::helpBlock('core_post');
-     dcPage::close();
-     exit;
-}
-/* Post form if we can edit post
--------------------------------------------------------- */
-if ($can_edit_post)
-{
-     $sidebar_items = new ArrayObject(array(
-          'status-box' => array(
-               'title' => __('Status'),
-               'items' => array(
-                    'post_status' => 
-                         '<p class="entry-status"><label for="post_status" class="ib">'.__('Entry status').' '.$img_status.'</label>'.
-                         form::combo('post_status',$status_combo,$post_status,'maximal','',!$can_publish).
-                         '</p>',
-                    'post_dt' => 
-                         '<p><label for="post_dt" class="ib">'.__('Publication date and hour').'</label>'.
-                         form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
-                         '</p>',
-                    'post_lang' =>
-                         '<p><label for="post_lang" class="ib">'.__('Entry lang').'</label>'.
-                         form::combo('post_lang',$lang_combo,$post_lang).
-                         '</p>',
-                    'post_format' =>
-                         '<p><label for="post_format" class="ib">'.__('Text formating').'</label>'.
-                         form::combo('post_format',$formaters_combo,$post_format,'maximal').
-                         '</p>'.
-                         '<p>'.($post_id && $post_format != 'xhtml' ? 
-                         '<a id="convert-xhtml" class="button maximal" href="post.php?id='.$post_id.'&amp;xconv=1">'.
-                         __('Convert to XHTML').'</a>' : '').'</p>')),
-          'metas-box' => array(
-               'title' => __('Ordering'),
-               'items' => array(
-                    'post_selected' => 
-                         '<p><label for="post_selected" class="classic">'.
-                         form::checkbox('post_selected',1,$post_selected).' '.
-                         __('Selected entry').'</label></p>',
-                    'cat_id' =>
-                         '<p><label for="cat_id" class="ib">'.__('Category').'</label>'.
-                         form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-                         '</p>')),
-          'options-box' => array(
-               'title' => __('Options'),
-               'items' => array(
-                    'post_open_comment' =>
-                         '<p><label for="post_open_comment" class="classic">'.
-                         form::checkbox('post_open_comment',1,$post_open_comment).' '.
-                         __('Accept comments').'</label></p>'.
-                         ($core->blog->settings->system->allow_comments ? 
-                              (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
-                                   '' :
-                                   '<p class="form-note warn">'.
-                                   __('Warning: Comments are not more accepted for this entry.').'</p>') : 
-                              '<p class="form-note warn">'.
-                              __('Warning: Comments are not accepted on this blog.').'</p>'),
-                    'post_open_tb' =>
-                         '<p><label for="post_open_tb" class="classic">'.
-                         form::checkbox('post_open_tb',1,$post_open_tb).' '.
-                         __('Accept trackbacks').'</label></p>'.
-                         ($core->blog->settings->system->allow_trackbacks ? 
-                              (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
-                                   '' :
-                                   '<p class="form-note warn">'.
-                                   __('Warning: Trackbacks are not more accepted for this entry.').'</p>') : 
-                              '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>'),
-                    'post_password' =>
-                         '<p><label for="post_password" class="ib">'.__('Password').'</label>'.
-                         form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-                         '</p>',
-                    'post_url' =>
-                         '<div class="lockable">'.
-                         '<p><label for="post_url" class="ib">'.__('Edit basename').'</label>'.
-                         form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-                         '</p>'.
-                         '<p class="form-note warn">'.
-                         __('Warning: If you set the URL manually, it may conflict with another entry.').
-                         '</p></div>'
-     ))));
-
-     $main_items = new ArrayObject(array(
-          "post_title" =>
-               '<p class="col">'.
-               '<label class="required no-margin"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.
-               form::field('post_title',20,255,html::escapeHTML($post_title),'maximal').
-               '</p>',
-          
-          "post_excerpt" =>
-               '<p class="area" id="excerpt-area"><label for="post_excerpt">'.__('Excerpt:').'<span class="form-note">'.
-               __('Add an introduction to the post.').'</span></label> '.
-               form::textarea('post_excerpt',50,5,html::escapeHTML($post_excerpt)).
-               '</p>',
-          
-          "post_content" =>
-               '<p class="area"><label class="required" '.
-               'for="post_content"><abbr title="'.__('Required field').'">*</abbr> '.__('Content:').'</label> '.
-               form::textarea('post_content',50,$core->auth->getOption('edit_size'),html::escapeHTML($post_content)).
-               '</p>',
-          
-          "post_notes" =>
-               '<p class="area" id="notes-area"><label for="post_notes">'.__('Personal notes:').'<span class="form-note">'.
-               __('Add unpublished notes.').'</span></label>'.
-               form::textarea('post_notes',50,5,html::escapeHTML($post_notes)).
-               '</p>'
-          )
-     );
-     
-     # --BEHAVIOR-- adminPostFormItems
-     $core->callBehavior('adminPostFormItems',$main_items,$sidebar_items, isset($post) ? $post : null);
-
-     echo '<div class="multi-part" title="'.($post_id ? __('Edit entry') : __('New entry')).'" id="edit-entry">';
-     echo '<form action="post.php" method="post" id="entry-form">';
-     echo '<div id="entry-wrapper">';
-     echo '<div id="entry-content"><div class="constrained">';
-
-     echo '<h3 class="hidden">'.__('Edit post').'</h3>';
-     
-     foreach ($main_items as $id => $item) {
-          echo $item;
-     }
-
-     # --BEHAVIOR-- adminPostForm (may be deprecated)
-     $core->callBehavior('adminPostForm',isset($post) ? $post : null);
-     
-     echo
-     '<p class="border-top">'.
-     ($post_id ? form::hidden('id',$post_id) : '').
-     '<input type="submit" value="'.__('Save').' (s)" '.
-     'accesskey="s" name="save" /> ';
-     if ($post_id) {
-          $preview_url =
-          $core->blog->url.$core->url->getURLFor('preview',$core->auth->userID().'/'.
-          http::browserUID(DC_MASTER_KEY.$core->auth->userID().$core->auth->getInfo('user_pwd')).
-          '/'.$post->post_url);
-          echo '<a id="post-preview" href="'.$preview_url.'" class="button" accesskey="p">'.__('Preview').' (p)'.'</a> ';
-     } else {
-          echo
-          '<a id="post-cancel" href="index.php" class="button" accesskey="c">'.__('Cancel').' (c)</a>';
-     }
-
-     echo
-     ($can_delete ? '<input type="submit" class="delete" value="'.__('Delete').'" name="delete" />' : '').
-     $core->formNonce().
-     '</p>';
-     
-     echo '</div></div>';          // End #entry-content
-     echo '</div>';      // End #entry-wrapper
-
-     echo '<div id="entry-sidebar">';
-     
-     foreach ($sidebar_items as $id => $c) {
-          echo '<div id="'.$id.'" class="box">'.
-               '<h4>'.$c['title'].'</h4>';
-          foreach ($c['items'] as $e_name=>$e_content) {
-               echo $e_content;
-          }
-          echo '</div>';
-     }
-     
-     
-     # --BEHAVIOR-- adminPostFormSidebar (may be deprecated)
-     $core->callBehavior('adminPostFormSidebar',isset($post) ? $post : null);
-     echo '</div>';      // End #entry-sidebar
-
-     echo '</form>';
-     
-     # --BEHAVIOR-- adminPostForm
-     $core->callBehavior('adminPostAfterForm',isset($post) ? $post : null);
-     
-     echo '</div>';
-     
-     if ($post_id && $post->post_status == 1) {
-          echo '<p><a href="trackbacks.php?id='.$post_id.'" class="multi-part">'.
-          __('Ping blogs').'</a></p>';
-     }
-     
-}
-
-
-/* Comments and trackbacks
--------------------------------------------------------- */
-if ($post_id)
-{
-     $params = array('post_id' => $post_id, 'order' => 'comment_dt ASC');
-     
-     $comments = $core->blog->getComments(array_merge($params,array('comment_trackback'=>0)));
-     $trackbacks = $core->blog->getComments(array_merge($params,array('comment_trackback'=>1)));
-     
-     # Actions combo box
-     $combo_action = array();
-     if ($can_edit_post && $core->auth->check('publish,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('Publish')] = 'publish';
-          $combo_action[__('Unpublish')] = 'unpublish';
-          $combo_action[__('Mark as pending')] = 'pending';
-          $combo_action[__('Mark as junk')] = 'junk';
-     }
-     
-     if ($can_edit_post && $core->auth->check('delete,contentadmin',$core->blog->id))
-     {
-          $combo_action[__('Delete')] = 'delete';
-     }
-     
-     # --BEHAVIOR-- adminCommentsActionsCombo
-     $core->callBehavior('adminCommentsActionsCombo',array(&$combo_action));
-     
-     $has_action = !empty($combo_action) && (!$trackbacks->isEmpty() || !$comments->isEmpty());
-     
-     echo
-     '<div id="comments" class="multi-part" title="'.__('Comments').'">';
-     
-     if ($has_action) {
-          echo '<form action="comments_actions.php" id="form-comments" method="post">';
-     }
-     
-     echo '<h3>'.__('Trackbacks').'</h3>';
-     
-     if (!$trackbacks->isEmpty()) {
-          showComments($trackbacks,$has_action,true);
-     } else {
-          echo '<p>'.__('No trackback').'</p>';
-     }
-     
-     echo '<h3>'.__('Comments').'</h3>';
-     if (!$comments->isEmpty()) {
-          showComments($comments,$has_action);
-     } else {
-          echo '<p>'.__('No comment').'</p>';
-     }
-     
-     if ($has_action) {
-          echo
-          '<div class="two-cols">'.
-          '<p class="col checkboxes-helpers"></p>'.
-          
-          '<p class="col right"><label for="action" class="classic">'.__('Selected comments action:').'</label> '.
-          form::combo('action',$combo_action).
-          form::hidden('redir','post.php?id='.$post_id.'&amp;co=1').
-          $core->formNonce().
-          '<input type="submit" value="'.__('ok').'" /></p>'.
-          '</div>'.
-          '</form>';
-     }
-     
-     echo '</div>';
-}
-
-/* Add a comment
--------------------------------------------------------- */
-if ($post_id)
-{
-     echo
-     '<div class="multi-part" id="add-comment" title="'.__('Add a comment').'">'.
-     '<h3>'.__('Add a comment').'</h3>'.
-     
-     '<form action="comment.php" method="post" id="comment-form">'.
-     '<div class="constrained">'.
-     '<p><label for="comment_author" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Name:').'</label>'.
-     form::field('comment_author',30,255,html::escapeHTML($core->auth->getInfo('user_cn'))).
-     '</p>'.
-     
-     '<p><label for="comment_email">'.__('Email:').'</label>'.
-     form::field('comment_email',30,255,html::escapeHTML($core->auth->getInfo('user_email'))).
-     '</p>'.
-     
-     '<p><label for="comment_site">'.__('Web site:').'</label>'.
-     form::field('comment_site',30,255,html::escapeHTML($core->auth->getInfo('user_url'))).
-     '</p>'.
-     
-     '<p class="area"><label for="comment_content" class="required"><abbr title="'.__('Required field').'">*</abbr> '.
-     __('Comment:').'</label> '.
-     form::textarea('comment_content',50,8,html::escapeHTML('')).
-     '</p>'.
-     
-     '<p>'.form::hidden('post_id',$post_id).
-     $core->formNonce().
-     '<input type="submit" name="add" value="'.__('Save').'" /></p>'.
-     '</div>'.
-     '</form>'.
-     '</div>';
-}
-
-# Controls comments or trakbacks capabilities
-function isContributionAllowed($id,$dt,$com=true)
-{
-     global $core;
-
-     if (!$id) {
-          return true;
-     }
-     if ($com) {
-          if (($core->blog->settings->system->comments_ttl == 0) || 
-               (time() - $core->blog->settings->system->comments_ttl*86400 < $dt)) {
-               return true;
-          }
-     } else {
-          if (($core->blog->settings->system->trackbacks_ttl == 0) || 
-               (time() - $core->blog->settings->system->trackbacks_ttl*86400 < $dt)) {
-               return true;
-          }
-     }
-     return false;
-}
-
-# Show comments or trackbacks
-function showComments($rs,$has_action,$tb=false)
-{
-     echo
-     '<table class="comments-list"><tr>'.
-     '<th colspan="2">'.__('Author').'</th>'.
-     '<th>'.__('Date').'</th>'.
-     '<th class="nowrap">'.__('IP address').'</th>'.
-     '<th>'.__('Status').'</th>'.
-     '<th>&nbsp;</th>'.
-     '</tr>';
-     
-     while($rs->fetch())
-     {
-          $comment_url = 'comment.php?id='.$rs->comment_id;
-          
-          $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
-          switch ($rs->comment_status) {
-               case 1:
-                    $img_status = sprintf($img,__('Published'),'check-on.png');
-                    break;
-               case 0:
-                    $img_status = sprintf($img,__('Unpublished'),'check-off.png');
-                    break;
-               case -1:
-                    $img_status = sprintf($img,__('Pending'),'check-wrn.png');
-                    break;
-               case -2:
-                    $img_status = sprintf($img,__('Junk'),'junk.png');
-                    break;
-          }
-          
-          echo
-          '<tr class="line'.($rs->comment_status != 1 ? ' offline' : '').'"'.
-          ' id="c'.$rs->comment_id.'">'.
-          
-          '<td class="nowrap">'.
-          ($has_action ? form::checkbox(array('comments[]'),$rs->comment_id,'','','',0,'title="'.($tb ? __('select this trackback') : __('select this comment')).'"') : '').'</td>'.
-          '<td class="maximal">'.html::escapeHTML($rs->comment_author).'</td>'.
-          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$rs->comment_dt).'</td>'.
-          '<td class="nowrap"><a href="comments.php?ip='.$rs->comment_ip.'">'.$rs->comment_ip.'</a></td>'.
-          '<td class="nowrap status">'.$img_status.'</td>'.
-          '<td class="nowrap status"><a href="'.$comment_url.'">'.
-          '<img src="images/edit-mini.png" alt="" title="'.__('Edit this comment').'" /></a></td>'.
-          
-          '</tr>';
-     }
-     
-     echo '</table>';
-}
-
-dcPage::helpBlock('core_post','core_trackbacks','core_wiki');
-dcPage::close();
+               ($post_id ? $page_title_edit : $page_title) => ''
+     ))
+     ->default_tab = $default_tab;
+
+$core->tpl->display('post.html.twig');
 ?>

admin/posts.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -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
@@ -138 +126 @@
 $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 monthdcFilterCombo extends dcFilterCombo {
+     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;
+class PostsFetcher extends dcListFetcher {
 
-# - User filter
-if ($user_id !== '' && in_array($user_id,$users_combo)) {
-     $params['user_id'] = $user_id;
-     $show_filters = true;
-} else {
-     $user_id='';
-}
+     public function getEntries($params,$offset,$limit) {
+          $params['limit'] = array($offset,$limit);
+          return $this->core->blog->getPosts($params);
+     }
 
-# - 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';
+     public function getEntriesCount($params) {
+          $count = $this->core->blog->getPosts($params,true);
+          return $count->f(0);
      }
-     
-     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,
-     dcPage::breadcrumb(
-          array(
-               html::escapeHTML($core->blog->name) => '',
-               '<span class="page-title">'.__('Entries').'</span>' => ''
-          ))
-);
+$filterSet
+     ->addFilter(new dcFilterRichCombo(
+          'users',__('Author'), __('Author'), 'user_id', $users_combo,array(
+               'multiple' => true)))
+     ->addFilter(new dcFilterRichCombo(
+          'category',__('Category'), __('Category'), 'cat_id', $categories_combo))
+     ->addFilter(new dcFilterRichCombo(
+          'post_status',__('Status'), __('Status'), 'post_status', $status_combo))
+     ->addFilter(new dcFilterRichCombo(
+          'lang',__('Lang'), __('Lang'), 'post_lang', $lang_combo))
+     ->addFilter(new dcFilterCombo(
+          'selected',__('Selected'), __('The post : '),'post_selected', $selected_combo))
+     ->addFilter(new monthdcFilterCombo(
+          'month',__('Month'),__('Month'), 'post_month', $dt_m_combo,array('singleval' => 1)))
+     ->addFilter(new dcFilterText(
+          'search',__('Contains'),__('The entry contains'), 'search',20,255));
 
-if (!$core->error->flag())
-{
-     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
-     '<form action="posts.php" method="get" id="filters-form">'.
-     '<h3>'.__('Filter posts list').'</h3>'.
 
-     '<div class="table">'.
-     '<div class="cell">'.
-     '<p><label for="user_id" class="ib">'.__('Author:').'</label> '.
-     form::combo('user_id',$users_combo,$user_id).'</p>'.
-     '<p><label for="cat_id" class="ib">'.__('Category:').'</label> '.
-     form::combo('cat_id',$categories_combo,$cat_id).'</p>'.
-     '<p><label for="status" class="ib">'.__('Status:').'</label> ' .
-     form::combo('status',$status_combo,$status).'</p> '.
-     '</div>'.
-     
-     '<div class="cell">'.
-     '<p><label for="selected" class="ib">'.__('Selected:').'</label> '.
-     form::combo('selected',$selected_combo,$selected).'</p>'.
-     '<p><label for="month" class="ib">'.__('Month:').'</label> '.
-     form::combo('month',$dt_m_combo,$month).'</p>'.
-     '<label for="lang" class="ib">'.__('Lang:').'</label> '.
-     form::combo('lang',$lang_combo,$lang).'</p> '.
-     '</div>'.
-     
-     '<div class="cell filters-options">'.
-     '<p><label for="sortby" class="ib">'.__('Order by:').'</label> '.
-     form::combo('sortby',$sortby_combo,$sortby).'</p>'.
-     '<p><label for="order" class="ib">'.__('Sort:').'</label> '.
-     form::combo('order',$order_combo,$order).'</p>'.
-     '<p><span class="label ib">'.__('Show').'</span> <label for="nb" class="classic">'.
-     form::field('nb',3,3,$nb_per_page).' '.
-     __('entries per page').'</label></p>'.
-     '</div>'.
-     '</div>'.
+$lfetcher = new PostsFetcher($core);
+$lposts = new dcItemList ($core,array('lposts','form-entries'),$filterSet,$lfetcher,'posts_actions.php');
+$lposts->addTemplate('posts_cols.html.twig');
 
-     '<p><input type="submit" value="'.__('Apply filters').'" />'.
-     '<br class="clear" /></p>'. //Opera sucks
-     '</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>'
-     );
-}
+$lposts
+     ->addColumn(new dcColumn('title',__('Title'),'post_title'))
+     ->addColumn(new dcColumn('cat',__('Category'),'cat_title'))
+     ->addColumn(new dcColumn('date',__('Date'),'post_date'))
+     ->addColumn(new dcColumn('datetime',__('Date and Time'),'post_dt'))
+     ->addColumn(new dcColumn('author',__('Author'),'user_id'))
+     ->addColumn(new dcColumn('status',__('Status'),'post_status'));
 
-dcPage::helpBlock('core_posts');
-dcPage::close();
+
+$lposts->setup();
+
+$_ctx
+     ->setBreadCrumb(array(__('Entries') => 'posts.php'));
+
+
+$core->tpl->display('posts.html.twig');
+
+
 ?>

admin/style/default.css

@@ -36 +36 @@
 }
 
-h1, h2, h3, h4, h5, h6, p {
+h1, h2, h3, .as_h3, h4, h5, h6, p {
      margin-top: 0;
      margin-bottom: 1rem;
@@ -53 +53 @@
      color: #d30e60;
 }
+.page-title img {
+     padding-left: .6rem;
+     vertical-align: middle;
+}
 #content > h2 {
      padding: 0 1.8rem .6rem;
@@ -58 +62 @@
      background: #fff url(bg_h2.png) repeat-x center bottom;
 }
-h3 {
+h3, .as_h3 {
      color: #575859;
      font-size: 1.4rem;
+}
+h4 {
+     font-size: 1.1em;
+     color: #575859;
+}
+h5 {
+     font-size: 1em;
+     color: #575859;
+}
+#entry-sidebar h5 {
+     font-weight: normal;
+     color: #333;
+}
+.entry-status label img {
+     padding-left: .4rem;
+     vertical-align: text-top;
 }
 p, div.p {
@@ -232 +252 @@
 }
 .two-cols .col {
-     width: 49%;
+     width: 47%;
      margin-left: 2%;
      float: left;
 }
-.two-cols .col:first-child {
-     width: 49%;
-     margin-left: 0;
-}
 .two-cols .col70{
-     width: 69%;
+     width: 68%;
      margin-left: 0;
      float: left;
 }
-.two-cols .col30 {
+.col30 {
      width: 28%;
      margin-left: 2%;
      float: left;
 }
+.two-cols .col:first-child,
+.two-cols .col30.first-col {
+     margin-left: 0;
+     margin-right: 2%;
+}
+.two-cols .col:last-child,
+.two-cols .col70.last-col {
+     margin-left: 2%;
+     margin-right: 0;
+}
 /* -------------------------------------------------------------- layout - onglets */
 .part-tabs ul {
-     padding: .5em 0 .3em 1em;
-     border-bottom: 1px solid #ccc;
+     padding: .5em 0 .3em 1.2rem;
+     border-bottom: 1px solid #ddd;
 }
 .part-tabs li {
@@ -261 +287 @@
 }
 .part-tabs li a {
-     padding: .5em 0.5em;
-     margin-right: .5em;
-     border: 1px solid #ccc;
+     padding: .5em 2em;
+     margin-right: -1px;
+     border: 1px solid #aaa;
      border-bottom: none;
-     background: #dfdfdf;
      text-decoration: none;
-     color: #000;
-     background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #dfdfdf), color-stop(1, #fafafa) );
-     background:-moz-linear-gradient( center top, #dfdfdf 5%, #fafafa 100% );
-     filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#fafafa');
-     background-color:#ededed;
-}
-.part-tabs li.part-tabs-link a {
-     background: #ffe;
+     color: #333;
+     background-color:#E4E0EC;
 }
 .part-tabs li a:hover, .part-tabs li a:focus {
@@ -283 +302 @@
 .part-tabs li.part-tabs-active a {
      background: #fff;
-     border: 1px solid #d30e60;
-     color: #d30e60;
      font-weight: bold;
      border-bottom-color: #fff;
+     padding-bottom: .7rem;
 }
 /* ------------------------------------------------------------------ main-menu */
@@ -293 +311 @@
      float: left;
      margin:0;
-     padding-top: .5em;
+     padding-top: 4.5em;
      padding-bottom: 1em;
      background: #f7f7f7;
@@ -318 +336 @@
      background-repeat: no-repeat;
      background-position: 8px .3em;
+}
+#main-menu li.active {
+     background-color: #fff;
 }
 #main-menu a {
@@ -356 +377 @@
      background: #dfdfdf;
      border-color: #999;
-     color: #666;
+     color: #444;
      border-bottom-right-radius: .6em;
      border-top-right-radius: .6em;
@@ -378 +399 @@
      color: #000;
      font-variant: small-caps;
-}
-#favorites-menu a {
-     color: #333;
+     padding-top: .6rem;
 }
 /* ------------------------------------------------------------------ footer */
@@ -416 +435 @@
      padding: 1em 1em 0 1em;
      border-radius: 4px;
+     background: #fff;
 }
 #login-screen legend {
@@ -432 +452 @@
 /* ------------------------------------------------------------------ dashboard */
 #dashboard-main {
-     float: left;
-     overflow: hidden;
-     padding: 1em 2% 1em 0;
-     width: 70%;
-}
-#dashboard-main.fullwidth {
-     width: 100%;
      padding: 1em 0;
-     float: none;
 }
 #icons {
@@ -450 +462 @@
      width: 210px;
      text-align: center;
-     margin: 2em 0;
+     margin: 1em 0 2em;
+     padding: 1em 0;
      display:inline-block;
+     vertical-align: top;
 }
 #icons a,
@@ -463 +477 @@
 #icons a span {
      border-bottom: 1px dotted #f90;
+     color: #333;
+}
+#icons a img {
+     padding: 2em;
+     background: #eee;
+     border-radius: 1.6rem;
+     box-shadow: 0 3px 3px 0 #ccc;
+     margin-bottom: .6rem;
+}
+#icons a img:hover, #icons a:focus img {
+     background-color: #BBDB58;
 }
 #icons a:focus span, #icons a:hover span {
@@ -468 +493 @@
 }
 #quick {
-     clear: left;
      margin-top: 2em;
 }
@@ -483 +507 @@
 }
 #dashboard-items {
-     float: left;
-     width: 27%;
-     overflow: hidden;
-     padding-bottom: 1em;
-     padding-top: 3em;
+     margin: 3em auto;
+     display: table;
+     width: 100%;
+     border-collapse: collapse;
+}
+.db-item {
+     display: table-cell;
+     padding: 1em 3em;
+     vertical-align: top;
+     border: 1px solid #ccc;
 }
 #dashboard-items img {
@@ -512 +541 @@
 }
 
-#upg-notify {
-}
-#upg-notify ul {
-     padding-left: 15px;
-}
-#upg-notify li {
-     color: #fff;
-}
 /* ------------------------------------------------------------------ post */
 #entry-wrapper {
@@ -528 +549 @@
 #entry-content {
      margin-right: 19em;
-     margin-left: 1.2rem;
+     margin-left: 0;
+}
+.multi-part {
+     padding-left: 1.2rem;
+}
+#entry-content label {
+     text-transform: uppercase;
+     font-weight: bold;
+     margin-top: 2em;
 }
 #entry-sidebar {
@@ -534 +563 @@
      float: right;
 }
+#entry-sidebar input[type="text"],
+#entry-sidebar select {
+     width: 14em; /* to prevent inline with label */
+}
+.box {
+     border-bottom: 1px solid #ddd;
+     margin-bottom: 1em;
+}
 #comments {
      clear: both;
-}
-.preview_entry a {
-     border: 1px solid #ccc;
-     padding: .2rem .5rem;
-     background: #eef;
 }
 /* ------------------------------------------------------------------ categories */
@@ -575 +607 @@
 }
 #media-details {
+}
+.near-icon {
      margin-left: 70px;
+     margin-bottom: 3em;
 }
 #media-details ul {
@@ -710 +745 @@
 /* -------------------------------------------------------------------- Themes */
 #themes {
-     border-bottom: 1px solid #ccc;
-     margin: 1em 0;
+     margin: 0;
+     width: 100%;
+     padding: 0;
+}
+#themes h3 {
 }
 #themes div.theme-details {
-     clear: left;
      border-top: 1px solid #ccc;
-     padding: 1em 0;
+     padding: 12px;
+     display: inline-block;
+     vertical-align: top;
+     width: 284px;
+}
+.current-theme {
+     background: #eef;
 }
 #themes div.theme-details:hover {
-     background: #eee;
+     background: #f0f0f0;
 }
 #themes div.theme-details div.theme-shot {
-     float: left;
 }
 #themes div.theme-details div.theme-shot img {
      display: block;
-     width: 57px;
-     height: 50px;
      border: 1px solid #ccc;
+     margin-bottom: 1.5em;
 }
 #themes div.theme-details div.theme-info {
-     margin-left: 67px;
 }
 #themes div.theme-details div.theme-info span.theme-desc {
@@ -740 +780 @@
 }
 #themes div.theme-details div.theme-actions {
-     margin-left: 67px;
-}
+}
+#themes-actions {
+     border-bottom: 1px solid #999;
+     margin-bottom: 3em;
+}
+.theme-css {
+     display: block;
+}
+
 /* Themes list, JS version */
 #themes-wrapper {
+     display: table;
+}
+#themes-wrapper #themes {
+     display: table-cell;
+     vertical-align: top;
+     padding-left: 1em;
 }
 #theme-box {
-     border: 1px solid #999;
-     border-left: none;
-     padding: 5px;
-     float: right;
-     height: 420px;
-     width: 320px;
-     overflow: auto;
+     display: table-cell;
+     vertical-align: top;
+     padding: 1rem 0; 
+     width: 312px;
+     background: #eef;
+     border: 1px solid #ccc;
+     border-radius: 3px;
 }
 #theme-box div.theme-shot img {
      display: block;
-     margin: 0 0 0 10px;
+     margin: 0 16px;
      width: 280px;
      height: 245px;
@@ -762 +815 @@
 }
 #theme-box div.theme-info {
-     margin: 1em 0 0 10px;
-}
-#theme-box h3 {
-     margin: 0;
-}
-#theme-box div.theme-info span {
-     display: block;
+     margin: 1em 16px;
+}
+#theme-box h4 {
+     color: #000;
 }
 #theme-box span.theme-version {
@@ -781 +831 @@
 }
 #theme-box div.theme-actions {
-     margin-left: 10px;
-}
-#themes-wrapper #themes {
-     border: 1px solid #999;
-     overflow: auto;
-     height: 420px;
-     padding: 5px;
-     margin: 0;
+     padding: 0 16px;
 }
 #themes div.theme-details-js {
@@ -794 +837 @@
      width: 120px;
      height: 150px;
-     margin: 0 10px 20px;
-     padding: 10px 10px 0;
+     margin: 0 12px 24px;
+     padding: 12px 12px 0;
      text-align: center;
      background: #f3f3f3;
-     border: 1px solid #f3f3f3;
+     border: 1px solid #ddd;
      cursor: pointer;
      border-radius: 4px;
@@ -806 +849 @@
 }
 #themes div.theme-details-js.theme-selected {
-     background: #E5E3DA;
+     background: #ddd;
      border: 1px solid #999;
 }
@@ -813 +856 @@
      height: 105px;
      border: 1px solid #fff;
-}
-#themes div.theme-details-js h3 {
-     font-family: inherit;
-     font-weight: normal;
-     margin: 0;
-     padding: 0;
 }
 /* ----------------------------------------------------------  Plugins list */
@@ -949 +986 @@
      color: #fff;
 }
-#content > .message, #content > .error {
-     margin-right: 14em
-}
 /* ------------------------------------------------------------------ navigation */
 .anchor-nav {
@@ -958 +992 @@
      padding: .4rem 1.2rem;
      float: right;
+}
+.nav_prevnext {
+     margin-bottom: 2em;
+     color: #fff;
+}
+.nav_prevnext a, a.back {
+     border: 1px solid #ddd;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #f0f0f0;
+}
+a.back:before {
+     content: "\ab\a0";
+}
+a.onblog_link {
+     color: #333;
+     float: right;
+     border: 1px solid #eee;
+     padding: .2rem 2rem;
+     border-radius: 1rem;
+     background-color: #ffe;
 }
 /* ------------------------------------------------------------------ debug */
@@ -982 +1037 @@
 /* -------------------------------------------------------------------- CLASSES COMMUNES */
 
-.no-margin {
-     margin: 0;
+.no-margin, #entry-content label.no-margin {
+     margin: 0;
+}
+.border-top {
+     border-top: 1px solid #999;
+     padding-top: 1em;
+     margin-top:    1em;
+}
+.fieldset {
+     background: #fff;
+     border: 1px solid #aaa;
+     border-radius: 6px; 
+     padding: 1em .7em .5em;
+     margin-bottom: 1em;
+}
+.fieldset h3 {
+     color: #333;
 }
 
@@ -1090 +1160 @@
 }
 
-th, td {
+td {
      border-width: 0 0 1px 0;
      border-style: solid;
@@ -1098 +1168 @@
 }
 th {
+     border-width: 1px 0 1px 0;
+     border-style: solid;
+     border-color: #ccc;
+     background: #f3f3ff;
+     padding: .4rem .5rem;
+     vertical-align: top;
      text-align: left;
-     border-bottom-color: #aaa;
 }
 .noborder td, td.noborder, .noborder th, th.noborder {
-     border-width: 0;
+     border-width: 0 0 1px 0;
+     border-color: #ddd;
+     line-height: 2.4rem;
+     padding-bottom: 0;
+}
+.noborder p {
+     margin-bottom: 0;
 }
 table .maximal, table.maximal {
@@ -1116 +1197 @@
 table.settings, table.prefs {
      width: 80%;
+     border: 1px solid #999;
+     margin-bottom: 3em; 
+}
+table.settings th, table.prefs th {
+     background: #eef;
 }
 table.settings th:first-child, table.prefs th:first-child {
@@ -1129 +1215 @@
      width: 40%;
 }
-
 td.status {
      vertical-align: middle;
@@ -1168 +1253 @@
      padding-left: 15px;
 }
-
 /* ----------------------------------------------------------------- FORMS */
 form {
@@ -1175 +1259 @@
      padding: 0;
 }
-fieldset, .fieldset {
+fieldset {
      display: block;
      margin: 0 0 1em 0;
@@ -1189 +1273 @@
      border-width: 1px;
      border-style: solid;
-     border-color: #ccc;
-     background: #f5f5f5;
+     border-color: #333;
+     background: #fff;
      margin-bottom: 0.5em;
+     border-radius: 3px;
 }
 optgroup {
@@ -1243 +1328 @@
      font-style:italic;
      font-weight: normal;
+     text-transform: none;
      color: #666;
 }
@@ -1254 +1340 @@
 }
 p.form-note.info {
-     background: #eef url(info.png) no-repeat .3em .2em;
-     border: 1px solid #99f;
-}
-.form-note a {border-bottom: 1px solid #99f;}
-
+     background: #f5eaff url(info.png) no-repeat .3em .2em;
+     border: 1px solid #ddbaff;
+}
+.form-note a {border-bottom: 1px solid #ddbaff;}
+
+label.ib {
+     display: inline-block;
+}
 label.classic {
      display: inline;
@@ -1307 +1396 @@
 a.form-control {
      display: none;
-     font-weight: bold;
-     background: url(magnifier.png) no-repeat 0 0;
-     color: green;
+     background: url(../images/expand.png) no-repeat .4rem center;
      padding-left: 20px;
+     color: #000;
 }
 .constrained {
@@ -1325 +1413 @@
 input[type=button],
 a.button,
-a.back,
 a.submit {
      display: inline-block;
@@ -1337 +1424 @@
      margin-bottom: .1em;
 }
+h4 a.button {font-weight: normal;}
+
 /* validation */
 input[type=submit],
@@ -1361 +1450 @@
 /* suppression et reset */
 a.button,
-a.back,
 input[type=submit].reset,
 input[type=submit].delete {
@@ -1372 +1460 @@
      }
 a.button:hover,
-a.back:hover,
 input[type=reset]:hover,
 input[type=submit].reset:hover,
 input[type=submit].delete:hover,
 a.button:focus,
-a.back:focus,
 input[type=reset]:focus,
 input[type=submit].reset:focus,
@@ -1390 +1476 @@
 input[type=submit].delete {
      color: #c00;
-     padding-bottom: .1em;
+     padding-bottom: .2rem;
 }
 #entry-content .delete {
@@ -1411 +1497 @@
      margin-left: 2em;
 }
-a.back:before {
-     content: "\ab\a0";
-}
 .button.add {
      background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
@@ -1421 +1504 @@
      border:1px solid #83c41a;
      padding:.6rem 1.8rem;
-     text-shadow:1px 1px 0 #689324;
      color: #000;
      text-shadow: 1px 1px 0 #BBDB58;
@@ -1436 +1518 @@
 .button-add:focus {
      outline: dotted 1px;
-}
-.button.add:active {
-     position:relative;
-     top:1px;
 }
 
@@ -1475 +1553 @@
 }
 
+/* ------------------------------------------------------- Filters */
+#filters-form {
+     border: 1px dashed #999;
+     border-radius: .6rem;
+     margin-bottom: 2em;
+     padding: .5em 1em 0;
+}
+#filters-form .table {
+     display: table;
+     width: 100%;
+     padding: 0;
+     margin-bottom: 1em;
+     margin-top: 1.5em;
+}
+#filters-form .cell {
+     padding: 0 2em 0 0;
+     display: table-cell;
+     vertical-align: top;
+}
+#filters-form .filters-options {
+     padding-left: 2em;
+     border-left: 1px solid #ccc;
+}
+#filters-form label.ib, span.ib {
+     width:7em;
+     display: inline-block;
+}
+#filters-form label.ibw, span.ibw {
+     width: 9em;
+     display: inline-block;
+}
+#filters-form select {
+     width: 14em;
+}
+
+/* ---------------------------------------------------- Pagination */
+.pagination {
+     height: 22px;
+     margin-top: 1em;
+     line-height: 22px;
+     padding: 0 1rem; 
+     border: 1px solid #ddd;
+     overflow: hidden; 
+     background: #e1e1e1; 
+     background: -moz-linear-gradient(center top , #f2f2f2, #e1e1e1); 
+     background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f2f2f2), color-stop(100%,#e1e1e1)); 
+     -moz-border-radius: 4px; 
+     -webkit-border-radius: 4px; 
+     border-radius: 4px; 
+     clear: left;
+}
+.pagination a, .pagination strong {
+     height: 20px;
+     border: none;
+     padding: 2px 6px; 
+     background-color : transparent;
+     background-position : 50% 50%;
+     background-repeat: no-repeat;
+}
+.pagination a:hover, .pagination strong {
+     border-color : #ccc;
+     background-color: #fff;
+}
+
 /* ---------------------------------------------------------------------------
      Media queries vite fait en attendant la reprise complète du layout
 ---------------------------------------------------------------------------- */
 @media screen and (max-width: 920px) {
-     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;}
+     #top, #top h1 a {width: 42px !important; height:100%; overflow: hidden;
+}
      #top h1 a:link {
           background: transparent url(dc_logos/b-dotclear120.png) no-repeat -180px 6px; 
@@ -1497 +1640 @@
           line-height: 3.2rem;
      }
+     #info-box1 {margin-left: 1rem;}
      #info-box1 select {width: 14rem;}
      #main-menu, #main, #content, #content h2, #entry-wrapper, #entry-sidebar, #entry-content, .two-cols .col, .two-cols .col:first-child {
@@ -1515 +1659 @@
      .smallscreen {display: none;}
      #help-button {width:20px; overflow: hidden;}
-     #info-box1 {margin-left: 1rem;}
+     #info-box2 {float:none;}
+     #dashboard-items div {display: block;margin-bottom: 1em; padding: 0 1em;}
 }
 @media screen and (max-width: 492px) {
@@ -1522 +1667 @@
      .page-title, #info-boxes, .media-item {display: inline-block;}
      div.media-list .media-item {width: 90%; float: none}
+     #info-box1 select {width: 12rem; margin-right: .6rem;}
      #info-box1 p.nomobile, label.nomobile {display: none;}
      #help-button {height:26px; width:26px; background-color: #A2CBE9; padding: 0; margin:0;font-size: 1rem;line-height: 68px}

inc/admin/lib.dc.page.php

@@ -49 +49 @@
 
      # Top of admin page
-     public static function open($title='',$head='',$breadcrumb='')
+     public static function open($title='', $head='')
      {
           global $core;
@@ -159 +159 @@
           }
 
-          // Display breadcrumb (if given) before any error message
-          echo $breadcrumb;
-
           if ($core->error->flag()) {
                echo
@@ -213 +210 @@
      }
 
-     public static function openPopup($title='',$head='',$breadcrumb='')
+     public static function openPopup($title='', $head='')
      {
           global $core;
@@ -258 +255 @@
           '<div id="content">'."\n";
 
-          // display breadcrumb if given
-          echo $breadcrumb;
-
           if ($core->error->flag()) {
                echo
@@ -279 +273 @@
      }
 
-     public static function breadcrumb($elements=null,$with_home_link=true,$echo=false)
+     public static function breadcrumb($elements=null,$no_home_link=false)
      {
           // First item of array elements should be blog's name, System or Plugins
-          $res = '<h2>'.($with_home_link ?
-               '<a class="go_home" href="index.php"><img src="style/dashboard.png" alt="'.__('Go to dashboard').'" /></a>' :
-               '<img src="style/dashboard-alt.png" alt="" />');
+          $res = '<h2>'.($no_home_link ?
+               '<img src="style/dashboard-alt.png" alt="" />' :
+               '<a class="go_home" href="index.php"><img src="style/dashboard.png" alt="'.__('Go to dashboard').'" /></a>');
           $index = 0;
           foreach ($elements as $element => $url) {
-               $res .= ($with_home_link ? ($index == 1 ? ' : ' : ' &rsaquo; ') : ($index == 0 ? ' ' : ' &rsaquo; ')).
-                    ($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
+               $res .= ($no_home_link ? ' ' : ($index == 1 ? ' : ' : ' &rsaquo; ')).($url ? '<a href="'.$url.'">' : '').$element.($url ? '</a>' : '');
                $index++;
           }
           $res .= '</h2>';
-          if ($echo) {
-               echo $res;
-          }
           return $res;
      }
@@ -365 +355 @@
      {
           $args = func_get_args();
-
-          $args = new ArrayObject($args);
-
-          # --BEHAVIOR-- adminPageHelpBlock
-          $GLOBALS['core']->callBehavior('adminPageHelpBlock',$args);
-
           if (empty($args)) {
                return;
@@ -476 +460 @@
           self::jsVar('dotclear.msg.confirm_delete_post',
                __("Are you sure you want to delete this entry?")).
-          self::jsVar('dotclear.msg.click_to_unlock',
-               __("Click here to unlock the field")).
           self::jsVar('dotclear.msg.confirm_spam_delete',
                __('Are you sure you want to delete all spams?')).
@@ -527 +509 @@
      {
           return
-          '<!--[if lt IE 9]>'."\n".
-          self::jsLoad('js/ie7/IE9.js').
+          '<!--[if lt IE 8]>'."\n".
+          self::jsLoad('js/ie7/IE8.js').
           '<link rel="stylesheet" type="text/css" href="style/iesucks.css" />'."\n".
           '<![endif]-->'."\n";
@@ -730 +712 @@
      '<link rel="stylesheet" type="text/css" href="style/jsUpload/style.css" />'."\n".
 
+     '<script id="template-upload" type="text/x-tmpl">
+     {% for (var i=0, file; file=o.files[i]; i++) { %}
+     <div class="template-upload fade">
+     <div class="upload-file">
+     <div class="upload-fileinfo">
+          <span class="upload-filename">{%=file.name%}</span>
+          <span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span>
+          <span class="upload-filecancel cancel">'.__('Cancel').'</span>
+          {% if (!o.files.error && !i && !o.options.autoUpload) { %}
+          <input type="submit" class="button start"  value="'.__('Send').'"/>
+          {% } %}
+          <span class="upload-filemsg"></span>
+     </div>
+     {% if (!o.files.error) { %}
+     <div class="upload-progress progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
+     {% } %}
+     </div>
+     {% } %}
+     </script>
+     <!-- The template to display files available for download -->
+     <script id="template-download" type="text/x-tmpl">
+     {% for (var i=0, file; file=o.files[i]; i++) { %}
+     <div class="template-download fade">
+     <div class="upload-file">
+     <div class="upload-fileinfo">
+          <span class="upload-filename">{%=file.name%}</span>
+          <span class="upload-filesize">({%=o.formatFileSize(file.size)%})</span>
+          <span class="upload-filemsg{% if (file.error) { %} upload-error{% } %}">
+          {% if (file.error) { %}
+          '.__('Error:').' {%=file.error%}
+          {% } else { %}
+          '.__('File successfully uploaded.').'
+          {% } %}
+          </span>
+     </div>
+     <div class="upload-progress">
+          {% if (!file.error) { %}
+          <div class="bar" style="width:100%;">100%</div>
+          {% } %}
+     </div>
+     </div>
+     {% } %}
+     </script>'.
+
+     self::jsLoad('js/jsUpload/vendor/jquery.ui.widget.js').
+     self::jsLoad('js/jsUpload/tmpl.js').
+     self::jsLoad('js/jsUpload/load-image.js').
+     self::jsLoad('js/jsUpload/jquery.iframe-transport.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-process.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-resize.js').
+     self::jsLoad('js/jsUpload/jquery.fileupload-ui.js').
+
      '<script type="text/javascript">'."\n".
      "//<![CDATA[\n".
@@ -746 +781 @@
      self::jsVar('dotclear.jsUpload.msg.clean',__('Clean')).
      self::jsVar('dotclear.jsUpload.msg.upload',__('Upload')).
-     self::jsVar('dotclear.jsUpload.msg.send',__('Send')).
-     self::jsVar('dotclear.jsUpload.msg.file_successfully_uploaded',__('File successfully uploaded.')).
      self::jsVar('dotclear.jsUpload.msg.no_file_in_queue',__('No file in queue.')).
      self::jsVar('dotclear.jsUpload.msg.file_in_queue',__('1 file in queue.')).
@@ -754 +787 @@
      self::jsVar('dotclear.jsUpload.base_url',$base_url).
      "\n//]]>\n".
-     "</script>\n".
-
-     self::jsLoad('js/jsUpload/vendor/jquery.ui.widget.js').
-     self::jsLoad('js/jsUpload/tmpl.js').
-     self::jsLoad('js/jsUpload/template-upload.js').
-     self::jsLoad('js/jsUpload/template-download.js').
-     self::jsLoad('js/jsUpload/load-image.js').
-     self::jsLoad('js/jsUpload/jquery.iframe-transport.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-process.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-resize.js').
-     self::jsLoad('js/jsUpload/jquery.fileupload-ui.js');
+     "</script>\n";
 }
 

inc/admin/prepend.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -286 +286 @@
      $_menu['System']->title = __('System settings');
      $_menu['Blog']->title = __('Blog');
-     $_menu['Plugins']->title = __('Plugins');
+     $_menu['Plugins']->title = __('Additional plugins');
      if (!$user_ui_nofavmenu)
           $_menu['Favorites']->title = __('My favorites');
@@ -375 +375 @@
      }
 }
+
+# Add admin default templates path
+$core->tpl->getLoader()->addPath(dirname(__FILE__).'/default-templates');
+# Set admin context
+$_ctx = new dcAdminContext($core);
+$core->tpl->addExtension($_ctx);
+
+# --BEHAVIOR-- adminPrepend
+$core->callBehavior('adminPrepend',$core,$_ctx);
 ?>

inc/core/class.dc.blog.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -81 +81 @@
                $this->desc = $b->blog_desc;
                $this->url = $b->blog_url;
-               $this->host = http::getHostFromURL($this->url);
+               $this->host = preg_replace('|^([a-z]{3,}://)(.*?)/.*$|','$1$2',$this->url);
                $this->creadt = strtotime($b->blog_creadt);
                $this->upddt = strtotime($b->blog_upddt);
@@ -91 +91 @@
                $this->public_path = path::fullFromRoot($this->settings->system->public_path,DC_ROOT);
                
-               $this->post_status['-2'] = __('Pending');
-               $this->post_status['-1'] = __('Scheduled');
-               $this->post_status['0'] = __('Unpublished');
-               $this->post_status['1'] = __('Published');
-               
-               $this->comment_status['-2'] = __('Junk');
-               $this->comment_status['-1'] = __('Pending');
-               $this->comment_status['0'] = __('Unpublished');
-               $this->comment_status['1'] = __('Published');
+               $this->post_status['-2'] = __('pending');
+               $this->post_status['-1'] = __('scheduled');
+               $this->post_status['0'] = __('unpublished');
+               $this->post_status['1'] = __('published');
+               
+               $this->comment_status['-2'] = __('junk');
+               $this->comment_status['-1'] = __('pending');
+               $this->comment_status['0'] = __('unpublished');
+               $this->comment_status['1'] = __('published');
                
                # --BEHAVIOR-- coreBlogConstruct
@@ -805 +805 @@
           
           if (!empty($params['user_id'])) {
-               $strReq .= "AND U.user_id = '".$this->con->escape($params['user_id'])."' ";
+               $strReq .= "AND U.user_id ".$this->con->in($params['user_id'])." ";
           }
           
@@ -889 +889 @@
                     $strReq .= 'ORDER BY post_dt DESC ';
                }
-          }
-          
-          if (!$count_only && !empty($params['limit'])) {
-               $strReq .= $this->con->limit($params['limit']);
+               if (!empty($params['limit'])) {
+                    $strReq .= $this->con->limit($params['limit']);
+               }
           }
           

plugins/aboutConfig/index.php

@@ -4 +4 @@
 # This file is part of Dotclear 2.
 #
-# Copyright (c) 2003-2013 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-# Local navigation
-if (!empty($_POST['gs_nav'])) {
-     http::redirect($p_url.$_POST['gs_nav']);
-     exit;
-}
-if (!empty($_POST['ls_nav'])) {
-     http::redirect($p_url.$_POST['ls_nav']);
-     exit;
-}
-
-# Local settings update
-if (!empty($_POST['s']) && is_array($_POST['s']))
+class adminPageAboutConfig
 {
-     try
+     public static $p_url = 'plugin.php?p=aboutConfig';
+     
+     # Update local settings
+     public static function updLocal($form)
      {
-          foreach ($_POST['s'] as $ns => $s)
-          {
-               $core->blog->settings->addNamespace($ns);
+          self::updSettings($form);
+     }
+     
+     # Update global settings
+     public static function updGlobal($form)
+     {
+          self::updSettings($form,true);
+     }
+     
+     # Update settings
+     protected static function updSettings($form,$global=false)
+     {
+          global $core,$_ctx;
+          
+          $part = $global ? 'global' : 'local';
+          $prefix = $part.'_';
+          
+          try {
+               foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
+                    $core->blog->settings->addNamespace($ns);
+                    $ns_settings = $global ? 
+                         $namespace->dumpGlobalSettings() : $namespace->dumpSettings();
+                    
+                    foreach ($ns_settings as $k => $v) {
+                         // need to cast type
+                         $f = (string) $form->{$prefix.$ns.'_'.$k};
+                         settype($f,$v['type']);
+                         
+                         $core->blog->settings->$ns->put($k,$f,null,null,true,$global);
+                         $form->{$prefix.$ns.'_'.$k} = $f;
+                    }
+               }
+               $core->blog->triggerBlog();
                
-               foreach ($s as $k => $v)      {
-                    $core->blog->settings->$ns->put($k,$v);
-               }
-               
-               $core->blog->triggerBlog();
+               http::redirect(self::$p_url.'&upd=1&part='.$part);
+          }
+          catch (Exception $e) {
+               $_ctx->addError($e->getMessage());
+          }
+     }
+     
+     # Set nav and settings forms
+     public static function setForms($global=false)
+     {
+          global $core, $_ctx;
+          
+          $prefix = $global ? 'global_' : 'local_';
+          $action = $global ? 'updGlobal' : 'updLocal';
+          
+          if (!empty($_POST[$prefix.'nav'])) {
+               http::redirect(self::$p_url.$_POST[$prefix.'nav']);
+               exit;
           }
           
-          http::redirect($p_url.'&upd=1');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
+          $nav_form = new dcForm($core,$prefix.'nav_form','plugin.php');
+          $settings_form = new dcForm($core,$prefix.'settings_form','plugin.php');
+          
+          $settings = $combo = array();
+          foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
+               $ns_settings = $global ? 
+                    $namespace->dumpGlobalSettings() : $namespace->dumpSettings();
+               
+               foreach ($ns_settings as $k => $v) {
+                    $settings[$ns][$k] = $v;
+               }
+          }
+          
+          ksort($settings);
+          foreach ($settings as $ns => $s) {
+               $combo['#'.$prefix.$ns] = $ns;
+               ksort($s);
+               foreach ($s as $k => $v) {
+                    if ($v['type'] == 'boolean') {
+                         $settings_form->addField(
+                              new dcFieldCombo($prefix.$ns.'_'.$k,
+                                   '',array(1 => __('yes'),0 => __('no'))));
+                    }
+                    else {
+                         $settings_form->addField(
+                              new dcFieldText($prefix.$ns.'_'.$k,''));
+                    }
+                    $settings_form->{$prefix.$ns.'_'.$k} = $v['value'];
+               }
+          }
+          
+          $nav_form
+               ->addField(
+                    new dcFieldCombo($prefix.'nav','',$combo,array(
+                         "label" => __('Goto:'))))
+               ->addField(
+                    new dcFieldSubmit($prefix.'nav_submit',__('OK')))
+               ->addField(
+                    new dcFieldHidden ('p','aboutConfig'))
+               ;
+          
+          $settings_form
+               ->addField(
+                    new dcFieldSubmit($prefix.'submit',__('Save'),array(
+                         'action' => array('adminPageAboutConfig',$action))))
+               ->addField(
+                    new dcFieldHidden ('p','aboutConfig'))
+               ;
+          
+          $_ctx->{$prefix.'settings'} = $settings;
+          
+          $nav_form->setup();
+          $settings_form->setup();
      }
 }
 
-# Global settings update
-if (!empty($_POST['gs']) && is_array($_POST['gs']))
-{
-     try
-     {
-          foreach ($_POST['gs'] as $ns => $s)
-          {
-               $core->blog->settings->addNamespace($ns);
-               
-               foreach ($s as $k => $v)      {
-                    $core->blog->settings->$ns->put($k,$v,null,null,true,true);
-               }
-               
-               $core->blog->triggerBlog();
-          }
-          
-          http::redirect($p_url.'&upd=1&part=global');
-     }
-     catch (Exception $e)
-     {
-          $core->error->add($e->getMessage());
-     }
+# Local settings forms
+adminPageAboutConfig::setForms();
+
+# Global settings forms
+adminPageAboutConfig::setForms(true);
+
+# Commons
+if (!empty($_GET['upd'])) {
+     $_ctx->setAlert(__('Configuration successfully updated'));
 }
-
-$part = !empty($_GET['part']) && $_GET['part'] == 'global' ? 'global' : 'local';
-
-function settingLine($id,$s,$ns,$field_name,$strong_label)
-{
-     if ($s['type'] == 'boolean') {
-          $field = form::combo(array($field_name.'['.$ns.']['.$id.']',$field_name.'_'.$id),
-          array(__('yes') => 1, __('no') => 0),$s['value'] ? 1 : 0);
-     } else {
-          $field = form::field(array($field_name.'['.$ns.']['.$id.']',$field_name.'_'.$id),40,null,
-          html::escapeHTML($s['value']));
-     }
-     
-     $slabel = $strong_label ? '<strong>%s</strong>' : '%s';
-     
-     return
-     '<tr class="line">'.
-     '<td scope="raw"><label for="s_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'.
-     '<td>'.$field.'</td>'.
-     '<td>'.$s['type'].'</td>'.
-     '<td>'.html::escapeHTML($s['label']).'</td>'.
-     '</tr>';
+if (!empty($_GET['upda'])) {
+     $_ctx->setAlert(__('Settings definition successfully updated'));
 }
+$_ctx->default_tab = !empty($_GET['part']) && $_GET['part'] == 'global' ? 'global' : 'local';
+$_ctx->setBreadCrumb('about:config');
+$core->tpl->display('@aboutConfig/index.html.twig');
 ?>
-<html>
-<head>
-  <title>about:config</title>
-  <?php echo dcPage::jsPageTabs($part); ?>
-  <script type="text/javascript">
-     //<![CDATA[
-     $(function() {
-          $("#gs_submit").hide();
-          $("#ls_submit").hide();
-          $("#gs_nav").change(function() {
-               window.location = $("#gs_nav option:selected").val();
-          })
-          $("#ls_nav").change(function() {
-               window.location = $("#ls_nav option:selected").val();
-          })
-     });
-     //]]>
-     </script>
-</head>
-
-<body>
-<?php
-echo dcPage::breadcrumb(
-     array(
-          __('System') => '',
-          html::escapeHTML($core->blog->name) => '',
-          '<span class="page-title">'.__('about:config').'</span>' => ''
-     ));
-if (!empty($_GET['upd'])) {
-     dcPage::message(__('Configuration successfully updated'));
-}
-
-if (!empty($_GET['upda'])) {
-     dcPage::message(__('Settings definition successfully updated'));
-}
-?>
-
-<div id="local" class="multi-part" title="<?php echo sprintf(__('Settings for %s'),html::escapeHTML($core->blog->name)); ?>">
-
-
-<?php
-$table_header = '<table class="settings" id="%s"><caption class="as_h3">%s</caption>'.
-'<thead>'.
-'<tr>'."\n".
-'  <th class="nowrap">Setting ID</th>'."\n".
-'  <th>'.__('Value').'</th>'."\n".
-'  <th>'.__('Type').'</th>'."\n".
-'  <th class="maximalx">'.__('Description').'</th>'."\n".
-'</tr>'."\n".
-'</thead>'."\n".
-'<tbody>';
-$table_footer = '</tbody></table>';
-
-$settings = array();
-foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
-     foreach ($namespace->dumpSettings() as $k => $v) {
-          $settings[$ns][$k] = $v;
-     }
-}
-ksort($settings);
-if (count($settings) > 0) {
-     $ns_combo = array();
-     foreach ($settings as $ns => $s) {
-          $ns_combo[$ns] = '#l_'.$ns;
-     }
-     echo 
-          '<form action="plugin.php" method="post">'.
-          '<p class="anchor-nav">'.
-          '<label for="ls_nav" class="classic">'.__('Goto:').'</label> '.form::combo('ls_nav',$ns_combo).
-          ' <input type="submit" value="'.__('Ok').'" id="ls_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
-          $core->formNonce().'</p></form>';
-}
-?>
-
-<form action="plugin.php" method="post">
-
-<?php
-foreach ($settings as $ns => $s)
-{
-     ksort($s);
-     echo sprintf($table_header,'l_'.$ns,$ns);
-     foreach ($s as $k => $v)
-     {
-          echo settingLine($k,$v,$ns,'s',!$v['global']);
-     }
-     echo $table_footer;
-}
-?>
-
-<p><input type="submit" value="<?php echo __('Save'); ?>" />
-<input type="hidden" name="p" value="aboutConfig" />
-<?php echo $core->formNonce(); ?></p>
-</form>
-</div>
-
-<div id="global" class="multi-part" title="<?php echo __('global settings'); ?>">
-
-<?php
-$settings = array();
-
-foreach ($core->blog->settings->dumpNamespaces() as $ns => $namespace) {
-     foreach ($namespace->dumpGlobalSettings() as $k => $v) {
-          $settings[$ns][$k] = $v;
-     }
-}
-
-ksort($settings);
-
-if (count($settings) > 0) {
-     $ns_combo = array();
-     foreach ($settings as $ns => $s) {
-          $ns_combo[$ns] = '#g_'.$ns;
-     }
-     echo 
-          '<form action="plugin.php" method="post">'.
-          '<p class="anchor-nav">'.
-          '<label for="gs_nav" class="classic">'.__('Goto:').'</label> '.form::combo('gs_nav',$ns_combo).
-          ' <input type="submit" value="'.__('Ok').'" id="gs_submit" />'.
-          '<input type="hidden" name="p" value="aboutConfig" />'.
-          $core->formNonce().'</p></form>';
-}
-?>
-
-<form action="plugin.php" method="post">
-
-<?php
-foreach ($settings as $ns => $s)
-{
-     ksort($s);
-     echo sprintf($table_header,'g_'.$ns,$ns);
-     foreach ($s as $k => $v)
-     {
-          echo settingLine($k,$v,$ns,'gs',false);
-     }
-     echo $table_footer;
-}
-?>
-
-<p><input type="submit" value="<?php echo __('Save'); ?>" />
-<input type="hidden" name="p" value="aboutConfig" />
-<?php echo $core->formNonce(); ?></p>
-</form>
-</div>
-
-</body>
-</html>