Changeset 1392:f654316f6e43

Timestamp:

08/16/13 10:39:47 (11 years ago)

Author:

Dsls

Branch:

default

Message:

• Added foldable sidebar entries,
• Added new behavior : adminPostFormSidebarItems
• Sidebar entries are now manageable from plugins

see #1533

Files:

• admin/js/_post.js (modified) (1 diff)
• admin/post.php (modified) (1 diff)
• plugins/attachments/_admin.php (modified) (4 diffs)
• plugins/pings/_admin.php (modified) (1 diff)
• plugins/pings/lib.pings.php (modified) (3 diffs)
• plugins/tags/_admin.php (modified) (3 diffs)
• plugins/tags/_define.php (modified) (1 diff)
• plugins/tags/js/post.js (modified) (1 diff)

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'),{

admin/post.php

@@ -445 +445 @@
      echo '<div id="entry-sidebar">';
      
-     echo
-     '<div id="status-box" class="box">'.
-     '<h4>Statut</h4>'.
-
-     '<p><label for="post_status">'.__('Entry status:').
-     form::combo('post_status',$status_combo,$post_status,'maximal','',!$can_publish).
-     '</label></p>'.
-     
-     '<p><label for="post_dt">'.__('Published on:').
-     form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
-     '</label></p>'.
-     
-     '<p><label for="post_format">'.__('Text formating:').
-     form::combo('post_format',$formaters_combo,$post_format,'maximal').
-     '</label>'.
-     '</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>'.
-
-     '<p><label for="post_lang">'.__('Entry lang:').
-     form::combo('post_lang',$lang_combo,$post_lang).
-     '</label></p>'.
-     
-     '</div>'. // End status box
-     
-     '<div id="metas-box" class="box">'.
-     '<h4>Classement</h4>'.
-
-     '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
-     __('Selected entry').'</label></p>'.
-
-     '<p><label for="cat_id">'.__('Category:').
-     form::combo('cat_id',$categories_combo,$cat_id,'maximal').
-     '</label></p>'.
-
-     '</div>'. // End metas box
-     
-     '<div id="options-box" class="box">'.
-     '<h4>Options</h4>'.
-     '<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>').
-
-     '<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>').
-
-     '<p><label for="post_password">'.__('Password:').
-     form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-     '</label></p>'.
-     
-     '<div class="lockable">'.
-     '<p><label for="post_url">'.__('Edit basename:').
-     form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
-     '</label></p>'.
-     '<p class="form-note warn">'.
-     __('Warning: If you set the URL manually, it may conflict with another entry.').
-     '</p>'.
-     '</div>';
+     $post_sidebar = new ArrayObject(array(
+          'status-box' => array(
+               'title' => __('Status'),
+               'items' => array(
+                    'post_status' => 
+                         '<p><label for="post_status">'.__('Entry status:').
+                         form::combo('post_status',$status_combo,$post_status,'maximal','',!$can_publish).
+                         '</label></p>',
+                    'post_dt' => 
+                         '<p><label for="post_dt">'.__('Published on:').
+                         form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).
+                         '</label></p>',
+                    'post_lang' =>
+                         '<p><label for="post_lang">'.__('Entry lang:').
+                         form::combo('post_lang',$lang_combo,$post_lang).
+                         '</label></p>',
+                    'post_format' =>
+                         '<p><label for="post_format">'.__('Text formating:').
+                         form::combo('post_format',$formaters_combo,$post_format,'maximal').
+                         '</label></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">'.__('Category:').
+                         form::combo('cat_id',$categories_combo,$cat_id,'maximal').
+                         '</label></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">'.__('Password:').
+                         form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
+                         '</label></p>',
+                    'post_url' =>
+                         '<div class="lockable">'.
+                         '<p><label for="post_url">'.__('Edit basename:').
+                         form::field('post_url',10,255,html::escapeHTML($post_url),'maximal').
+                         '</label></p>'.
+                         '<p class="form-note warn">'.
+                         __('Warning: If you set the URL manually, it may conflict with another entry.').
+                         '</p></div>'
+     ))));
+     $core->callBehavior('adminPostFormSidebarItems',$post_sidebar, isset($post) ? $post : null);
+     foreach ($post_sidebar 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
      $core->callBehavior('adminPostFormSidebar',isset($post) ? $post : null);
-
-     echo '</div>'; // End options box
-     
      echo '</div>';      // End #entry-sidebar
 

plugins/attachments/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar'));
+$core->addBehavior ('adminPostFormSidebarItems',array('attachmentAdmin','adminPostFormSidebarItems'));
 $core->addBehavior ('adminPostAfterForm',array('attachmentAdmin','adminPostAfterForm'));
+$core->addBehavior('adminPostHeaders',array('attachmentAdmin','postHeaders'));
 
 class attachmentAdmin
 {
-     public static function adminPostFormSidebar($post) 
+     public static function postHeaders()
+     {
+          return 
+          '<script type="text/javascript" src="index.php?pf=attachments/js/post.js"></script>';
+     }
+     public static function adminPostFormSidebarItems($items,$post) 
      {
           if ($post !== null)
@@ -23 +29 @@
                $core =& $GLOBALS['core'];
                $post_media = $core->media->getPostMedia($post->post_id);
-               echo
-               '<h5 class="clear">'.__('Attachments').'</h5>';
+               $item = '<h5 class="clear s-attachments">'.__('Attachments').'</h5>';
                foreach ($post_media as $f)
                {
@@ -31 +36 @@
                          $ftitle = substr($ftitle,0,16).'...';
                     }
-                    echo
-                    '<div class="media-item">'.
+                    $item .=
+                    '<div class="media-item s-attachments">'.
                     '<a class="media-icon" href="media_item.php?id='.$f->media_id.'">'.
                     '<img src="'.$f->media_icon.'" alt="" title="'.$f->basename.'" /></a>'.
@@ -53 +58 @@
                
                if (empty($post_media)) {
-                    echo '<p class="form-note">'.__('No attachment.').'</p>';
-               } else {
-               }
-               echo '<p><a class="button" href="media.php?post_id='.$post->post_id.'">'.__('Add files to this entry').'</a></p>';
+                    $item .= '<p class="form-note s-attachments">'.__('No attachment.').'</p>';
+               } 
+               $item .= '<p class="s-attachments"><a class="button" href="media.php?post_id='.$post->post_id.'">'.__('Add files to this entry').'</a></p>';
+               $items['metas-box']['items']['attachments']= $item;
           }
      }

plugins/pings/_admin.php

@@ -33 +33 @@
 
 $core->addBehavior('adminPostHeaders',array('pingsBehaviors','pingJS'));
-$core->addBehavior('adminPostFormSidebar',array('pingsBehaviors','pingsForm'));
+$core->addBehavior('adminPostFormSidebarItems',array('pingsBehaviors','pingsFormItems'));
 $core->addBehavior('adminAfterPostCreate',array('pingsBehaviors','doPings'));
 $core->addBehavior('adminAfterPostUpdate',array('pingsBehaviors','doPings'));

plugins/pings/lib.pings.php

@@ -41 +41 @@
      }
      
-     public static function pingsForm($post)
+     public static function pingsFormItems($items,$post)
      {
           $core =& $GLOBALS['core'];
@@ -59 +59 @@
           }
           
-          echo '<h5 class="ping-services">'.__('Pings:').'</h5>';
+          $item = '<h5 class="ping-services">'.__('Pings:').'</h5>';
           $i = 0;
           foreach ($pings_uris as $k => $v)
           {
-               echo
+               $item .=
                '<p class="ping-services"><label for="pings_do-'.$i.'" class="classic">'.
                form::checkbox(array('pings_do[]','pings_do-'.$i),html::escapeHTML($v),in_array($v,$pings_do)).' '.
@@ -69 +69 @@
                $i++;
           }
+          $items['options-box']['items']['pings']=$item;
+          
      }
      

plugins/tags/_admin.php

@@ -18 +18 @@
 require dirname(__FILE__).'/_widgets.php';
 
-$core->addBehavior('adminPostFormSidebar',array('tagsBehaviors','tagsField'));
+$core->addBehavior('adminPostFormSidebarItems',array('tagsBehaviors','tagsField'));
 
 $core->addBehavior('adminAfterPostCreate',array('tagsBehaviors','setTags'));
@@ -71 +71 @@
      }
      
-     public static function tagsField($post)
+     public static function tagsField($items,$post)
      {
           $meta =& $GLOBALS['core']->meta;
@@ -80 +80 @@
                $value = ($post) ? $meta->getMetaStr($post->post_meta,'tag') : '';
           }
-          
-          echo
-          '<h5><label for="post_tags">'.__('Tags:').'</label></h5>'.
-          '<div class="p" id="tags-edit">'.form::textarea('post_tags',20,3,$value,'maximal').'</div>';
+          $items['metas-box']['items']['post_tags']=
+          '<h5><label class="s-tags" for="post_tags">'.__('Tags:').'</label></h5>'.
+          '<div class="p s-tags" id="tags-edit">'.form::textarea('post_tags',20,3,$value,'maximal').'</div>';
      }
      

plugins/tags/_define.php

@@ -18 +18 @@
      /* Version */            '1.2',
      array(
-          'permissions' =>    'usage,contentadmin'
+          'permissions' =>    'usage,contentadmin',
+          'priority' =>       998
      )
 );

plugins/tags/js/post.js

@@ -58 +58 @@
           });
      });
+               
+     $('h5 .s-tags').toggleWithLegend($('.s-tags').not('label'),{
+               cookie: 'post_tags'
+     });
+
 });