Changeset 1468:3132a0aca046 for plugins/attachments

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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:

Merge 2.5 commits into default branch (should be verified)

Files:

• plugins/attachments/_admin.php (modified) (1 diff)
• plugins/attachments/_admin.php (modified) (4 diffs)

plugins/attachments/_admin.php

@@ -41 +41 @@
                     '<img src="'.$f->media_icon.'" alt="" title="'.$f->basename.'" /></a>'.
                     '<ul>'.
-                    '<li><a class="media-link" href="media_item.php?id='.$f->media_id.'"'.
+                    '<li><a class="media-link" href="media_item.php?id='.$f->media_id.'" '.
                     'title="'.$f->basename.'">'.$ftitle.'</a></li>'.
                     '<li>'.$f->media_dtstr.'</li>'.

plugins/attachments/_admin.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$core->addBehavior ('adminPostFormSidebar',array('attachmentAdmin','adminPostFormSidebar'));
+$core->addBehavior ('adminPostFormItems',array('attachmentAdmin','adminPostFormItems'));
 $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 adminPostFormItems($main,$sidebar,$post) 
      {
           if ($post !== null)
@@ -23 +29 @@
                $core =& $GLOBALS['core'];
                $post_media = $core->media->getPostMedia($post->post_id);
-               echo
-               '<h3 class="clear">'.__('Attachments').'</h3>';
+               $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>'.__('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>';
+               $sidebar['metas-box']['items']['attachments']= $item;
           }
      }