Changeset 851:0993f64c4809 for inc/admin

Timestamp:

07/31/12 13:52:11 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

sexy step 2 : no more cats.

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (1 diff)
• lib.pager.php (modified) (3 diffs)
• prepend.php (modified) (2 diffs)

inc/admin/lib.dc.page.php

@@ -414 +414 @@
           self::jsVar('dotclear.msg.confirm_delete_user',
                __('Are you sure you want to delete selected users (%s)?')).
-          self::jsVar('dotclear.msg.confirm_delete_category',
-               __('Are you sure you want to delete category "%s"?')).
-          self::jsVar('dotclear.msg.confirm_reorder_categories',
-               __('Are you sure you want to reorder all categories?')).
           self::jsVar('dotclear.msg.confirm_delete_media',
                __('Are you sure you want to remove media "%s"?')).

inc/admin/lib.pager.php

@@ -47 +47 @@
                '<th colspan="2">'.__('Title').'</th>'.
                '<th>'.__('Date').'</th>'.
-               '<th>'.__('Category').'</th>'.
                '<th>'.__('Author').'</th>'.
                '<th>'.__('Status').'</th>'.
@@ -75 +74 @@
      private function postLine()
      {
-          if ($this->core->auth->check('categories',$this->core->blog->id)) {
-               $cat_link = '<a href="category.php?id=%s">%s</a>';
-          } else {
-               $cat_link = '%2$s';
-          }
-          
-          if ($this->rs->cat_title) {
-               $cat_title = sprintf($cat_link,$this->rs->cat_id,
-               html::escapeHTML($this->rs->cat_title));
-          } else {
-               $cat_title = __('None');
-          }
-          
           $img = '<img alt="%1$s" title="%1$s" src="images/%2$s" />';
           switch ($this->rs->post_status) {
@@ -130 +116 @@
           html::escapeHTML($this->rs->post_title).'</a></td>'.
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
-          '<td class="nowrap">'.$cat_title.'</td>'.
           '<td class="nowrap">'.$this->rs->user_id.'</td>'.
           '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.

inc/admin/prepend.php

@@ -238 +238 @@
           'images/menu/search.png','images/menu/search-b.png',
           'usage,contentadmin',null,null));
-     $_fav['categories'] = new ArrayObject(array('categories','Categories','categories.php',
-          'images/menu/categories.png','images/menu/categories-b.png',
-          'categories',null,null));
      $_fav['media'] = new ArrayObject(array('media','Media manager','media.php',
           'images/menu/media.png','images/menu/media-b.png',
@@ -302 +299 @@
           preg_match('/media(_item)?.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('media,media_admin',$core->blog->id));
-     $_menu['Blog']->prependItem(__('Categories'),'categories.php','images/menu/categories.png',
-          preg_match('/categories.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('categories',$core->blog->id));
      $_menu['Blog']->prependItem(__('Search'),'search.php','images/menu/search.png',
           preg_match('/search.php(\?.*)?$/',$_SERVER['REQUEST_URI']),