Changeset 887:c8f4fe2ab8a1

Timestamp:

10/16/12 11:58:24 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add default attributes settings for image insertion

Files:

• admin/blog_pref.php (modified) (3 diffs)
• admin/media_item.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -98 +98 @@
      $img_title_combo[html::escapeHTML($blog_settings->system->media_img_title_pattern)] = html::escapeHTML($blog_settings->system->media_img_title_pattern);
 }
+
+# Image default size combo
+$img_default_size_combo = array();
+$media = new dcMedia($core);
+$img_default_size_combo[__('original')] = 'o';
+foreach ($media->thumb_sizes as $code => $size) {
+     $img_default_size_combo[__($size[2])] = $code;
+}
+
+# Image default alignment combo
+$img_default_alignment_combo = array(
+     __('None') => 'none',
+     __('Left') => 'left',
+     __('Right') => 'right',
+     __('Center') => 'center'
+);
 
 # Robots policy options
@@ -198 +214 @@
           $blog_settings->system->put('media_img_m_size',$media_img_m_size);
           $blog_settings->system->put('media_img_title_pattern',$_POST['media_img_title_pattern']);
+          $blog_settings->system->put('media_img_default_size',$_POST['media_img_default_size']);
+          $blog_settings->system->put('media_img_default_alignment',$_POST['media_img_default_alignment']);
+          $blog_settings->system->put('media_img_default_link',!empty($_POST['media_img_default_link']));
           $blog_settings->system->put('nb_post_per_feed',$nb_post_per_feed);
           $blog_settings->system->put('nb_comment_per_feed',$nb_comment_per_feed);
@@ -431 +450 @@
      '<p>'.form::combo('media_img_title_pattern',$img_title_combo,html::escapeHTML($blog_settings->system->media_img_title_pattern)).'</p>'.
      '</div>'.
-     '</div>'.
+
+     '<div class="col">'.
+     '<h4>'.__('Default image insertion attributes').'</h4>'.
+     '<p><label for="media_img_default_size">'.__('Image size:').
+     form::combo('media_img_default_size',$img_default_size_combo,
+          (html::escapeHTML($blog_settings->system->media_img_default_size) != '' ? html::escapeHTML($blog_settings->system->media_img_default_size) : 'm')).
+     '</label></p>'.
+     '<p><label for="media_img_default_alignment">'.__('Image alignment').
+     form::combo('media_img_default_alignment',$img_default_alignment_combo,html::escapeHTML($blog_settings->system->media_img_default_alignment)).
+     '</label></p>'.
+     '<p><label for="media_img_default_link" class="classic">'.
+     form::checkbox('media_img_default_link','1',$blog_settings->system->media_img_default_link).
+     __('As a link to original image').'</label></p>'.
+     '</div>'.
+     '</div>'.
+
      '</fieldset>';
      

admin/media_item.php

@@ -202 +202 @@
                $media_desc = '';
           }
-          
+
+          $media_img_default_size = $core->blog->settings->system->media_img_default_size;
+          if ($media_img_default_size == '') {
+               $media_img_default_size = 'm';
+          }
+          $media_img_default_alignment = $core->blog->settings->system->media_img_default_alignment;
+          if ($media_img_default_alignment == '') {
+               $media_img_default_alignment = 'none';
+          }
+          $media_img_default_link = (boolean)$core->blog->settings->system->media_img_default_link;
+
           echo
           '<h3>'.__('Image size:').'</h3> ';
@@ -209 +219 @@
           echo '<p>';
           foreach (array_reverse($file->media_thumb) as $s => $v) {
-               $s_checked = ($s == 'm');
+               $s_checked = ($s == $media_img_default_size);
                echo '<label class="classic">'.
                form::radio(array('src'),html::escapeHTML($v),$s_checked).' '.
                $core->media->thumb_sizes[$s][2].'</label><br /> ';
           }
-          $s_checked = (!isset($file->media_thumb['m']));
+          $s_checked = (!isset($file->media_thumb[$media_img_default_size]));
           echo '<label class="classic">'.
           form::radio(array('src'),$file->file_url,$s_checked).' '.__('original').'</label><br /> ';
@@ -222 +232 @@
           echo '<h3>'.__('Image alignment').'</h3>';
           $i_align = array(
-               'none' => array(__('None'),1),
-               'left' => array(__('Left'),0),
-               'right' => array(__('Right'),0),
-               'center' => array(__('Center'),0)
+               'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
+               'left' => array(__('Left'),($media_img_default_alignment == 'left' ? 1 : 0)),
+               'right' => array(__('Right'),($media_img_default_alignment == 'right' ? 1 : 0)),
+               'center' => array(__('Center'),($media_img_default_alignment == 'center' ? 1 : 0))
           );
           
@@ -238 +248 @@
           '<h3>'.__('Image insertion').'</h3>'.
           '<p>'.
-          '<label for="insert1" class="classic">'.form::radio(array('insertion','insert1'),'simple',true).
+          '<label for="insert1" class="classic">'.form::radio(array('insertion','insert1'),'simple',!$media_img_default_link).
           __('As a single image').'</label><br />'.
-          '<label for="insert2" class="classic">'.form::radio(array('insertion','insert2'),'link',false).
+          '<label for="insert2" class="classic">'.form::radio(array('insertion','insert2'),'link',$media_img_default_link).
           __('As a link to original image').'</label>'.
           '</p>';

locales/fr/main.po

@@ -2823 +2823 @@
 #~ msgid "users"
 #~ msgstr "utilisateurs"
+
+msgid "Default image insertion attributes"
+msgstr "Attributs par défaut pour l'insertion d'image"