Changeset 2166

Timestamp:

09/09/10 14:04:51 (17 months ago)

Author:

rickybanister

Message:

touched engines.css and the slideshow selection tools / cropping. Removed the dark box around selected images, restored the crop work area, wrapped the crop button url_for in a json_encode to fix a bug

Location:

plugins/apostrophePlugin/trunk

Files:

• modules/aMedia/templates/_multipleList.php (modified) (1 diff)
• modules/aMedia/templates/_selectMultiple.php (modified) (2 diffs)
• web/css/a-engines.css (modified) (11 diffs)

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

@@ -58 +58 @@
                 });
                 
-                $('#a-media-selection-list-caption').hide();
+                $('.a-media-selection-help').hide();
                 if (!ids.length) {
-      $('#a-media-selection-list-caption').show();
+      $('.a-media-selection-help').show();
                 }
 

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

@@ -21 +21 @@
   <div class="a-ui">
 
-        <div id="a-media-selection-list-caption">
-          <h4><?php echo __("Preview your selected image%plural% here.", array('%plural%' => aMediaTools::isMultiple() ? 's':' '), 'apostrophe') ?></h4>
-        </div>
+        <div id="a-media-selection-wrapper">
 
-        <div id="a-media-selection-wrapper">
-                <ul id="a-media-selection-list" style="min-height:<?php echo ($thumbHeight = aMediaTools::getSelectedThumbnailHeight()) ? $thumbHeight + 10 : 0 ?>px;">
-                        <?php if($items): ?>
-                                <?php include_partial("aMedia/multipleList", array("items" => $items)) ?>
-                        <?php else: ?>
-                          <?php if (aMediaTools::isMultiple()): ?>
-                                <li class="a-media-selection-placeholder"><?php echo __('Add images to your slideshow', null, 'apostrophe') ?></li>
-                        <?php else: ?>
-                          <li class="a-media-selection-placeholder"><?php echo __('Select an image', null, 'apostrophe') ?></li>
-                        <?php endif ?>
-                        <?php endif ?>
-                </ul>
+                        <div class="a-media-selection-help">
+                          <?php if (aMediaTools::isMultiple()): ?>
+                                <h4><?php echo __('Add images to your slideshow', null, 'apostrophe') ?></h4>
+                        <?php else: ?>
+                          <h4><?php echo __('Select an image', null, 'apostrophe') ?></h4>
+                        <?php endif ?>          
+                        </div>
+
+                        <ul id="a-media-selection-list" style="min-height:<?php echo ($thumbHeight = aMediaTools::getSelectedThumbnailHeight()) ? $thumbHeight + 10 : 0 ?>px;">
+                                        <?php if($items): ?>
+                                        <?php include_partial("aMedia/multipleList", array("items" => $items)) ?>
+                                        <?php endif ?>
+                        </ul>
 
                 <?php echo jq_sortable_element("#a-media-selection-list", array("url" => "aMedia/multipleOrder" )) ?>
@@ -43 +42 @@
                         <?php include_partial("aMedia/multiplePreview", array("items" => $items)) ?>
                   </ul>
-                  <ul class="a-controls a-media-crop-controls" style="display:none;">
-                                <li><?php echo jq_link_to_function('<span class="icon"></span>'.__('Crop', null, 'apostrophe'), 'aCrop.setCrop('.url_for('aMedia/crop').')', array('class'=>'a-btn save', 'id' => 'a-save-crop', )) ?></li>
+                  <ul class="a-ui a-controls a-media-crop-controls" style="display:none;">
+                                <li><?php echo jq_link_to_function('<span class="icon"></span>'.__('Crop', null, 'apostrophe'), 'aCrop.setCrop('.json_encode(url_for('aMedia/crop')).')', array('class'=>'a-btn save', 'id' => 'a-save-crop', )) ?></li>
                           <li><?php echo jq_link_to_function('<span class="icon"></span>'.__('Cancel', null, 'apostrophe'), 'aCrop.resetCrop()', array('class'=>'a-btn icon a-cancel')) ?></li>
                   </ul>

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

@@ -373 +373 @@
 background-color: #000;
 z-index: 199;
+-moz-border-radius: 2px;
+-webkit-border-radius: 2px;
+border-radius: 2px;
+
 }
 
@@ -806 +810 @@
         position: relative;
         float: left;
-        width:680px;
-        padding:10px;
+        width:700px;
         margin-bottom: 20px;
+/*padding:10px;
         background-color: #555;
         -moz-border-radius: 4px;
@@ -815 +819 @@
         box-shadow:inset 0 0 10px #000000;
   -moz-box-shadow:inset 0 0 10px #000000;
-  -webkit-box-shadow:inset 0 0 10px #000000;
+  -webkit-box-shadow:inset 0 0 10px #000000;*/
 }
 
@@ -825 +829 @@
 width:690px;
 margin-left: -10px;
--moz-border-radius: 4px;
--webkit-border-radius: 4px;
-border-radius: 4px;
-}
-
-.a-media-selection-placeholder
+}
+
+.a-ui .a-media-selection-placeholder
 {
         margin-left: 10px;
@@ -836 +837 @@
         width: 80px;
         height: 50px;
-        border: 2px dashed #ddd;
+        border: 2px dashed #222;
         padding: 10px;
-        color: #fff;
+        color: #222;
 }
 
@@ -891 +892 @@
 }
 
-#a-media-selection-list-caption {
-  display: none;
-  position: absolute;
-  padding: 45px;
-  z-index: 1;
-}
-#a-media-selection-list-caption h4 {
-  font-size: 1.2em;
-  color: #999;
-}
-
 #a-media-selection-preview
 {
@@ -907 +897 @@
         float:left;
         width:100%;
-        margin:10px 0 0;
 }
 
@@ -924 +913 @@
 }
 
-ul.a-media-crop-controls
+.a-ui ul.a-media-crop-controls
 {
         position: absolute;
@@ -931 +920 @@
 }
 
-.a-crop-workspace
+.a-ui .a-crop-workspace
 {
         overflow: hidden;
         display: none;
-/*margin: 0 0 10px;
+        margin: 10px 0;
         padding: 10px;
         background-color: #222;
@@ -943 +932 @@
         box-shadow:inset 0 0 10px #000000;
   -moz-box-shadow:inset 0 0 10px #000000;
-  -webkit-box-shadow:inset 0 0 10px #000000;*/
-}
-
+  -webkit-box-shadow:inset 0 0 10px #000000;
+}
 
 .a-crop-workspace h4
@@ -959 +947 @@
 }
 
-.a-crop-workspace h4 a:hover
-{
-        color: ;
-}