Changeset 2169

Timestamp:

09/09/10 15:24:39 (17 months ago)

Author:

jake

Message:

replace image button in file edit form, starting generic file icons

Location:

plugins/apostrophePlugin/trunk

Files:

• lib/form/BaseaMediaEditForm.class.php (modified) (1 diff)
• modules/aMedia/templates/_edit.php (modified) (2 diffs)
• modules/aMedia/templates/_mediaItem.php (modified) (1 diff)
• web/css/a-buttons.css (modified) (2 diffs)
• web/css/a-components.css (modified) (1 diff)
• web/css/a-engines.css (modified) (4 diffs)
• web/css/a-forms.css (modified) (1 diff)
• web/images/a-icon-alt-replace.png (added)
• web/images/a-icon-replace.png (added)
• web/images/a-media-icon.png (added)

plugins/apostrophePlugin/trunk/lib/form/BaseaMediaEditForm.class.php

@@ -36 +36 @@
     // to try to read a button on top of
     
-    $this->getWidget('file')->setLabel('Replace File');
+    $this->getWidget('file')->setLabel('Select a new file');
     if (!$item->isNew())
     {

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

@@ -30 +30 @@
     <div class="a-form-row preview">
       <?php echo image_tag($form['file']->getWidget()->getPreviewUrl($form['file']->getValue(), aMediaTools::getOption('gallery_constraints'))) ?>
-      <?php if (!$item): ?>
-        <a class="a-media-remove-file" href="#">x</a>
-        <?php a_js_call('apostrophe.mediaEnableRemoveButton(?)', $i) ?>
-      <?php endif ?>
-    </div>
-    
-    <?php // The label says 'Replace File' now, see BaseaMediaEditForm ?>
-                <div class="a-form-row file">
-      <?php echo $form['file']->renderLabel() ?>
-      <?php echo $form['file']->renderError() ?>
-      <?php echo $form['file']->render() ?>
     </div>
 
@@ -100 +89 @@
 
                 </div>
+                
+                <div class="a-form-row replace">                
+            <?php // The label says 'Replace File' now, see BaseaMediaEditForm ?>
+                        <div class="a-options-container a-ui">          
+                                <a href="#replace-image" onclick="return false;" id="a-media-replace-image-<?php echo $i ?>" class="a-btn icon alt no-bg a-replace">Replace File</a>
+                                <div class="a-options dropshadow">
+                      <?php echo $form['file']->renderLabel() ?>
+                      <?php echo $form['file']->renderError() ?>
+                      <?php echo $form['file']->render() ?>
+                    </div>
+                        <?php a_js_call('apostrophe.menuToggle(?)', array('button' => '#a-media-replace-image-'.$i, 'classname' => '', 'overlay' => false)) ?>
+                        </div>
+                        <?php if (!$item): ?>
+              <a class="a-btn no-bg icon a-delete a-media-delete-image-btn" href="#">Delete File</a>
+              <?php a_js_call('apostrophe.mediaEnableRemoveButton(?)', $i) ?>
+            <?php endif ?>
+                </div>
 
    <?php if ($item): ?>

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

@@ -40 +40 @@
       <?php // We can't render this format on this server but we need a placeholder thumbnail ?>
       <?php $type = $mediaItem->getType() ?>
-      <img class="a-media-icon-as-thumbnail" src="/apostrophePlugin/images/a-<?php echo $type ?>-icon-tiny.png" />
+                        <span class="a-media-type"><b><?php echo $type ?></b></span>
     <?php endif ?>
   </a>

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

@@ -158 +158 @@
 .a-users > .icon { background-image: url(/apostrophePlugin/images/a-icon-users.png); }
 .a-video > .icon { background-image: url(/apostrophePlugin/images/a-icon-video.png); }
+.a-replace > .icon { background-image: url(/apostrophePlugin/images/a-icon-replace.png); }
 
 
@@ -212 +213 @@
 .alt .a-users > .icon, .a-users.alt > .icon { background-image: url(/apostrophePlugin/images/a-icon-alt-users.png); }
 .alt .a-video > .icon, .a-video.alt > .icon { background-image: url(/apostrophePlugin/images/a-icon-alt-video.png); }
+.alt .a-replace > .icon, .a-replace.alt > .icon { background-image: url(/apostrophePlugin/images/a-icon-alt-replace.png); }
 
 

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

@@ -25 +25 @@
 position: absolute;
 float: left;
-display: none;
+display: none !important;
 top: -6px;
 left: -6px;

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

@@ -434 +434 @@
 }
 
+.a-media-item-edit-form .a-form-row.help
+{
+        width:340px;
+}
+
 #a-media-plugin .a-form-row input[type="text"],
 #a-media-plugin .a-form-row select,
@@ -459 +464 @@
 }
 
-
 #a-media-plugin .a-form-row.image
 {
@@ -470 +474 @@
 top: 10px;
 left: 10px;
+}
+
+#a-media-plugin .a-form-row.replace
+{
+        width:340px;
+}
+
+.a-form-row.replace .a-replace,
+.a-form-row.replace .a-delete
+{
+        clear:none;
+        color:#000 !important;
+}
+
+.a-form-row.replace a:hover.a-replace,
+.a-form-row.replace a:hover.a-delete,
+.a-form-row.replace a:focus.a-replace,
+.a-form-row.replace a:focus.a-delete
+{
+        background-color: #fff !important;
+        color:#666 !important;
 }
 
@@ -581 +606 @@
 position: relative;
 float: left;
+}
+
+a:hover.a-media-thumb-link
+{
+        text-decoration: none;
 }
 

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

@@ -150 +150 @@
 font: 12px/normal arial, sans-serif;
 padding: 0px 4px;
-z-index: 2;
+/*z-index: 2;*/ /* TODO: Figure out why this is here */
 width: auto;
 cursor: pointer;