Changeset 852:969647a6c35e for inc/admin

Timestamp:

07/31/12 15:15:32 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

sexy step 3 : no more media.

Location:

inc/admin

Files:

• lib.dc.page.php (modified) (2 diffs)
• lib.pager.php (modified) (4 diffs)
• prepend.php (modified) (3 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_media',
-               __('Are you sure you want to remove media "%s"?')).
           self::jsVar('dotclear.msg.confirm_extract_current',
                __('Are you sure you want to extract archive in current directory?')).
@@ -623 +621 @@
           "jsToolBar.prototype.elements.img.src_prompt = '".html::escapeJS(__('URL?'))."'; ".
           
-          "jsToolBar.prototype.elements.img_select.title = '".html::escapeJS(__('Media chooser'))."'; ".
           "jsToolBar.prototype.elements.post_link.title = '".html::escapeJS(__('Link to an entry'))."'; ";
           
-          if (!$GLOBALS['core']->auth->check('media,media_admin',$GLOBALS['core']->blog->id)) {
-               $res .= "jsToolBar.prototype.elements.img_select.disabled = true;\n";
-          }
           
           $res .=

inc/admin/lib.pager.php

@@ -100 +100 @@
           }
           
-          $attach = '';
-          $nb_media = $this->rs->countMedia();
-          if ($nb_media > 0) {
-               $attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
-               $attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
-          }
           
           $res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
@@ -117 +111 @@
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
           '<td class="nowrap">'.$this->rs->user_id.'</td>'.
-          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
+          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.'</td>'.
           '</tr>';
           
@@ -196 +190 @@
           }
           
-          $attach = '';
-          $nb_media = $this->rs->countMedia();
-          if ($nb_media > 0) {
-               $attach_str = $nb_media == 1 ? __('%d attachment') : __('%d attachments');
-               $attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
-          }
           
           $res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
@@ -212 +200 @@
           '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
           '<td class="nowrap">'.$this->rs->user_id.'</td>'.
-          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
+          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.'</td>'.
           '</tr>';
           

inc/admin/prepend.php

@@ -146 +146 @@
      {
           $_SESSION['sess_blog_id'] = $_REQUEST['switchblog'];
-          if (isset($_SESSION['media_manager_dir'])) {
-               unset($_SESSION['media_manager_dir']);
-          }
-          if (isset($_SESSION['media_manager_page'])) {
-               unset($_SESSION['media_manager_page']);
-          }
-          
+
           # Removing switchblog from URL
           $redir = $_SERVER['REQUEST_URI'];
@@ -238 +232 @@
           'images/menu/search.png','images/menu/search-b.png',
           'usage,contentadmin',null,null));
-     $_fav['media'] = new ArrayObject(array('media','Media manager','media.php',
-          'images/menu/media.png','images/menu/media-b.png',
-          'media,media_admin',null,null));
      $_fav['blog_pref'] = new ArrayObject(array('blog_pref','Blog settings','blog_pref.php',
           'images/menu/blog-pref.png','images/menu/blog-pref-b.png',
@@ -296 +287 @@
           preg_match('/blog_pref.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
           $core->auth->check('admin',$core->blog->id));
-     $_menu['Blog']->prependItem(__('Media manager'),'media.php','images/menu/media.png',
-          preg_match('/media(_item)?.php(\?.*)?$/',$_SERVER['REQUEST_URI']),
-          $core->auth->check('media,media_admin',$core->blog->id));
      $_menu['Blog']->prependItem(__('Search'),'search.php','images/menu/search.png',
           preg_match('/search.php(\?.*)?$/',$_SERVER['REQUEST_URI']),