Changeset 829

Timestamp:

04/01/10 16:35:47 (3 years ago)

Author:

johnnyoffline

Message:

Moved Area Delete Buttons to the top right away from the other a-controls. I turned the button into the flagging button so conserve on space. I created a really awesome placeholder div for slideshow slots. The width and the height degrade gracefully. If W and H are set in the template, it creates a placeholder that same size. If only a W is set, it creates a 16:9 box because that's a typical image size, if for some insane reason there are no W or H parameters, it sets the W to 100% (of its parent container) and the H to 100px so there is atleast SOMETHING output. I used a label for it that is already translated but the text could change to be anything really

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/a/templates/_area.php (modified) (1 diff)
• modules/aSlideshowSlot/templates/_normalView.php (modified) (1 diff)
• web/css/a.css (modified) (4 diffs)
• web/js/aUI.js (modified) (1 diff)

plugins/apostrophePlugin/trunk/modules/a/templates/_area.php

@@ -200 +200 @@
                                                         'complete' => 'aUI()'), 
               array(
-                'class' => 'a-btn icon a-delete', 
+                'class' => 'a-btn icon a-delete a-flag-btn', 
                 'title' => __('Delete Slot', null, 'apostrophe'),
                                                                 'confirm' => __('Are you sure you want to delete this slot?', null, 'apostrophe'), )) ?>

plugins/apostrophePlugin/trunk/modules/aSlideshowSlot/templates/_normalView.php

@@ -38 +38 @@
 <?php endif ?>
 
-<?php include_component('aSlideshowSlot', 'slideshow', array('items' => $items, 'id' => $id, 'options' => $options)) ?>
+<?php if (count($items)): ?>
+        <?php include_component('aSlideshowSlot', 'slideshow', array('items' => $items, 'id' => $id, 'options' => $options)) ?>
+<?php else: ?>
 
+        <?php (isset($options['width']))?  $style = 'width:' .  $options['width'] .'px;': $style = 'width:100%;'; ?>
+        <?php (isset($options['height']))? $height = $options['height'] : $height = (($options['width'])? floor($options['width']*.56):'100'); ?>               
+        <?php $style .= 'height:'.$height.'px;' ?>
+        
+        <div class="a-slideshow-placeholder" style="<?php echo $style ?>">
+                <span style="line-height:<?php echo $height ?>px;"><?php echo __("Create a Slideshow", null, 'apostrophe') ?></span>
+        </div>
+<?php endif ?>
+

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

@@ -531 +531 @@
 .a-btn.a-flag-btn.icon-only.expanded
 {
-        padding-left: 20px;
         width: auto;
+}
+
+.a-btn.a-flag-btn.icon
+{
+        padding: 0 0 0 20px;    
 }
 
@@ -1621 +1625 @@
 visibility: hidden;
 margin: 0 !important;
+width: 100%;
 }
 
@@ -1637 +1642 @@
 { /* .last option has no margin */
         margin: 0 0 2px 0 !important;
+}
+
+ul.a-controls li.last.delete
+{
+        float: right;
 }
 
@@ -2757 +2767 @@
 }
 
+.a-slot.aSlideshow .a-slideshow-placeholder
+{ /* Height and Width are defined in the template and applied inline in _normalView.php */
+}
+
+.a-slot.aSlideshow .a-slideshow-placeholder span
+{
+        display: block;
+        width: 100%;
+        height: 100%;
+        text-align: center;
+        border: 1px dashed #ccc;
+        margin: -1px 0 0 -1px;
+}
+
 .a-slot.aSlideshow ul.a-slideshow-controls
 {/* Slideshow Controls */

plugins/apostrophePlugin/trunk/web/js/aUI.js

@@ -143 +143 @@
 
 
-        // New Slot Box
+        // // New Slot Box
         // $('div.a-new-slot').remove();
         // $('div.a-slots').prepend('<div class="a-new-slot"><p>+ Add Slot</p></div>');