Changeset 2168

Timestamp:

09/09/10 14:53:11 (17 months ago)

Author:

rickybanister

Message:

cleaned up media library upload controls design, moved media item controls out of the thumbnail list item so they now sit on top of the selected overlay

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/aMedia/templates/_editLinks.php (modified) (2 diffs)
• modules/aMedia/templates/_mediaItem.php (modified) (1 diff)
• modules/aMedia/templates/_selectMultiple.php (modified) (1 diff)
• modules/aMedia/templates/indexSuccess.php (modified) (1 diff)
• web/css/a-engines.css (modified) (4 diffs)

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_editLinks.php

@@ -6 +6 @@
 <?php if ($mediaItem->userHasPrivilege('edit')): ?>
         <ul class="a-ui a-controls">
-
     <li><?php echo link_to(a_("Edit"), "aMedia/edit", array("query_string" => http_build_query(array("slug" => $mediaItem->getSlug())), "class" => "a-btn icon a-edit")) ?></li>
 
@@ -21 +20 @@
                 <?php endif ?>
 
-                <li><?php echo link_to(__("Delete", null, 'apostrophe'), "aMedia/delete?" . http_build_query(
-        array("slug" => $mediaItem->getSlug())),
-        array("confirm" => __("Are you sure you want to delete this item?", null, 'apostrophe'), "class"=>"a-btn icon a-delete no-label")) ?></li>
+                <li><?php echo link_to(__("Delete", null, 'apostrophe'), "aMedia/delete?" . http_build_query(array("slug" => $mediaItem->getSlug())),array("confirm" => __("Are you sure you want to delete this item?", null, 'apostrophe'), "class"=>"a-btn icon a-delete no-label")) ?></li>
 
         </ul>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_mediaItem.php

@@ -28 +28 @@
 
 <?php endif ?>
-
+<li class="a-media-item-controls">
+        <?php include_partial('aMedia/editLinks', array('mediaItem' => $mediaItem)) ?>
+</li>
 <li class="a-media-item-thumbnail">
-<?php include_partial('aMedia/editLinks', array('mediaItem' => $mediaItem)) ?>
   <a <?php echo $linkAttributes ?> class="a-media-thumb-link">
     <?php if ($type == 'video'): ?><span class="a-media-play-btn"></span><?php endif ?>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/_selectMultiple.php

@@ -25 +25 @@
                         <div class="a-media-selection-help">
                           <?php if (aMediaTools::isMultiple()): ?>
-                                <h4><?php echo __('Add images to your slideshow', null, 'apostrophe') ?></h4>
+                                <h4><?php echo __('Select images for your slideshow', null, 'apostrophe') ?></h4>
                         <?php else: ?>
                           <h4><?php echo __('Select an image', null, 'apostrophe') ?></h4>

plugins/apostrophePlugin/trunk/modules/aMedia/templates/indexSuccess.php

@@ -32 +32 @@
 
 <div class="a-media-library">
-        
+
         <h3>Media Library</h3>
         
         <?php include_partial('aMedia/describeConstraints', array('limitSizes' => $limitSizes)) ?>
+
+        <?php if (aMediaTools::userHasUploadPrivilege()): ?>
+          <ul class="a-ui a-controls a-media-upload-controls">
+
+            <?php $typeLabel = aMediaTools::getBestTypeLabel() ?>
+            <?php if ($uploadAllowed): ?>
+              <li><a href="<?php echo url_for("aMedia/upload") ?>" class="a-btn icon big a-add"><?php echo a_('Upload ' . $typeLabel) ?></a></li>
+            <?php endif ?>
+            <?php if ($embedAllowed): ?>
+              <li><a href="<?php echo url_for("aMedia/embed") ?>" class="a-btn icon big a-add"><?php echo a_('Embed ' . $typeLabel) ?></a></li>
+            <?php endif ?>
+         </ul>
+        <?php endif ?>
         
-        <?php if (aMediaTools::userHasUploadPrivilege()): ?>
-    <ul class="a-ui a-controls">
-
-      <?php $typeLabel = aMediaTools::getBestTypeLabel() ?>
-      <?php if ($uploadAllowed): ?>
-        <li><a href="<?php echo url_for("aMedia/upload") ?>" class="a-btn icon big a-add"><?php echo a_('Upload ' . $typeLabel) ?></a></li>
-      <?php endif ?>
-      <?php if ($embedAllowed): ?>
-        <li><a href="<?php echo url_for("aMedia/embed") ?>" class="a-btn icon big a-add"><?php echo a_('Embed ' . $typeLabel) ?></a></li>
-      <?php endif ?>
-   </ul>
-  <?php endif ?>
-        
- <?php for ($n = 0; ($n < count($results)); $n += 2): ?>
-   <div class="a-media-row">
-        <?php for ($i = $n; ($i < min(count($results), $n + 2)); $i++): ?>
-     <?php $mediaItem = $results[$i] ?>
-      <ul id="a-media-item-<?php echo $mediaItem->getId() ?>" class="a-media-item <?php echo ($i % 2) ? "odd" : "even" ?>">
-        <?php include_partial('aMedia/mediaItem', array('mediaItem' => $mediaItem)) ?>
-      </ul>
-        <?php endfor ?>
-   </div>
- <?php endfor ?>
+        <div class="a-media-items">
+         <?php for ($n = 0; ($n < count($results)); $n += 2): ?>
+           <div class="a-media-row">
+                <?php for ($i = $n; ($i < min(count($results), $n + 2)); $i++): ?>
+             <?php $mediaItem = $results[$i] ?>
+              <ul id="a-media-item-<?php echo $mediaItem->getId() ?>" class="a-media-item <?php echo ($i % 2) ? "odd" : "even" ?>">
+                <?php include_partial('aMedia/mediaItem', array('mediaItem' => $mediaItem)) ?>
+              </ul>
+                <?php endfor ?>
+           </div>
+         <?php endfor ?>
+        </div>
 </div>
 

plugins/apostrophePlugin/trunk/web/css/a-engines.css

@@ -213 +213 @@
 }
 
+.a-media-toolbar,
+.a-media-library
+{
+width: 720px;
+float: right;
+margin-bottom: 30px;
+/*overflow: hidden;*/
+}
+
+.a-ui.a-media-upload-controls
+{
+        margin-top: 5px;
+}
+
+.logged-in .a-media-items
+/* pushes a-controls away from media rows when authenticated */
+{
+        float: left;
+        width: 100%;
+        margin-top: 20px;
+}
+
 .a-media-row
 {
@@ -219 +241 @@
 margin-bottom: 60px;
 width: 100%;
-}
-
-.a-media-toolbar,
-.a-media-library
-{
-width: 720px;
-float: right;
-margin-bottom: 20px;
-/*overflow: hidden;*/
-}
-
-.a-media-toolbar
-{
-padding-bottom: 20px;
-border-bottom: 1px solid #ddd;
 }
 
@@ -286 +293 @@
 margin-bottom: 20px;
 padding: 0;
+list-style: none;
 }
 
@@ -343 +351 @@
 {
 padding: 10px;
-margin: 0 0 20px -1px;
+margin: 0 0 0 -1px;
 background-color: #efefef;
 -moz-border-radius: 4px;