Changeset 2510:22eb32a28268

Timestamp:

11/03/13 08:41:12 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

2.6

Message:

Displays media popup with columns. Closes #1837.
Add some margin over auth fieldset.

Location:

admin

Files:

• media_item.php (modified) (8 diffs)
• style/default.css (modified) (1 diff)

admin/media_item.php

@@ -289 +289 @@
           echo '</p>';
           
-          
-          echo '<h3>'.__('Image alignment').'</h3>';
+          echo
+          '<div class="two-boxes">'.         
+          '<h3>'.__('Image alignment').'</h3>';
           $i_align = array(
                'none' => array(__('None'),($media_img_default_alignment == 'none' ? 1 : 0)),
@@ -304 +305 @@
           }
           echo '</p>';
-          
-          echo
+          echo '</div>';
+          
+          echo
+          '<div class="two-boxes">'.
           '<h3>'.__('Image insertion').'</h3>'.
           '<p>'.
@@ -312 +315 @@
           '<label for="insert2" class="classic">'.form::radio(array('insertion','insert2'),'link',$media_img_default_link).
           __('As a link to the original image').'</label>'.
-          '</p>';
+          '</p>'.
+          '</div>';
      }
      elseif ($file->type == 'audio/mpeg3')
@@ -318 +322 @@
           $media_type = 'mp3';
           
-          echo '<h3>'.__('MP3 disposition').'</h3>';
+          echo 
+          '<div class="two-boxes">'.
+          '<h3>'.__('MP3 disposition').'</h3>';
           dcPage::message(__("Please note that you cannot insert mp3 files with visual editor."),false);
           
@@ -338 +344 @@
           echo form::hidden('public_player',html::escapeHTML($public_player));
           echo '</p>';
+          echo '</div>';
      }
      elseif ($file->type == 'video/x-flv' || $file->type == 'video/mp4' || $file->type == 'video/x-m4v')
@@ -346 +353 @@
           
           echo
+          '<div class="two-boxes">'.
           '<h3>'.__('Video size').'</h3>'.
           '<p><label for="video_w" class="classic">'.__('Width:').'</label> '.
@@ -351 +359 @@
           '<label for="video_h" class="classic">'.__('Height:').'</label> '.
           form::field('video_h',3,4,300).
-          '</p>';
-          
-          echo '<h3>'.__('Video disposition').'</h3>';
+          '</p>'.
+          '</div>';
+
+          
+          echo 
+          '<div class="two-boxes">'.
+          '<h3>'.__('Video disposition').'</h3>';
           
           $i_align = array(
@@ -372 +384 @@
           echo form::hidden('public_player',html::escapeHTML($public_player));
           echo '</p>';
+          echo '</div>';
      }
      else

admin/style/default.css

@@ -1423 +1423 @@
      background: #fff;
      margin-bottom: 0;
+     margin-top: 1em;
      }
 #login-screen input[type=text], #login-screen input[type=password], #login-screen input[type=submit],