From 4adb9cc55a7829d53823ab18870456671c0a1c83 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Mon, 17 Aug 2015 18:34:39 -0400
Subject: [PATCH] CC-6070 - standardize editor buttons

---
 airtime_mvc/application/forms/EditAudioMD.php | 12 ++++-----
 .../views/scripts/playlist/_playlist.phtml    |  5 +++-
 .../views/scripts/playlist/_smart-block.phtml |  5 +++-
 .../views/scripts/webstream/_webstream.phtml  |  5 +++-
 airtime_mvc/public/css/_showbuilder.css       | 26 +++++++++++--------
 airtime_mvc/public/js/airtime/library/_spl.js |  5 ++++
 6 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index b58d56201..f49b55bac 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -172,7 +172,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add the submit button
         $this->addElement('button', 'editmdsave', array(
             'ignore'     => true,
-            'class'      => 'btn btn-small md-save',
+            'class'      => 'btn md-save right-floated',
             'label'      => _('Save'),
             'decorators' => array(
                 'ViewHelper'
@@ -182,7 +182,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         // Add the submit button
         $this->addElement('button', 'editmdcancel', array(
             'ignore'   => true,
-            'class'    => 'btn btn-small md-cancel',
+            'class'    => 'btn md-cancel right-floated',
             'label'    => _('Cancel'),
             'decorators' => array(
                 'ViewHelper'
@@ -190,10 +190,10 @@ class Application_Form_EditAudioMD extends Zend_Form
         ));
 
         $this->addDisplayGroup(array('editmdsave', 'editmdcancel'), 'submitButtons', array(
-                'decorators' => array(
-                    'FormElements',
-                    'DtDdWrapper'
-                    )
+            'decorators' => array(
+                'FormElements',
+                'DtDdWrapper'
+                )
         ));
     }
 
diff --git a/airtime_mvc/application/views/scripts/playlist/_playlist.phtml b/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
index ebaa94fc6..9eab3d802 100644
--- a/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/_playlist.phtml
@@ -58,8 +58,11 @@ if (isset($this->obj)) {
             echo $this->render('playlist/update.phtml') ?>
     </ul>
     <div class="btn-toolbar spl-no-margin clearfix">
+        <div class="btn-group pull-right">
+            <button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
         <div class='btn-group pull-right'>
-            <button class="btn btn-inverse" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
+            <button class="btn" title='<?php echo _("Save playlist") ?>' type="button" id="save_button"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
index 1a31f7784..017c2e656 100644
--- a/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/_smart-block.phtml
@@ -59,8 +59,11 @@ if (isset($this->obj)) {
             echo $this->render('playlist/update.phtml') ?>
     </ul>
     <div class="btn-toolbar spl-no-margin clearfix">
+        <div class="btn-group pull-right">
+            <button class="btn" type="button" id="cancel_button" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
         <div class='btn-group pull-right'>
-            <button class="btn btn-inverse" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
+            <button class="btn" title='Save smart block&#39s title, description, and criteria' type="button" id="save_button"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/application/views/scripts/webstream/_webstream.phtml b/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
index c84026040..0d4288668 100644
--- a/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
+++ b/airtime_mvc/application/views/scripts/webstream/_webstream.phtml
@@ -35,7 +35,10 @@
 
     <div class="btn-toolbar spl-no-margin clearfix">
         <div class="btn-group pull-right">
-            <button class="btn btn-inverse" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
+            <button class="btn" type="button" id="webstream_cancel" name="submit"><?php echo _("Cancel") ?></button>
+        </div>
+        <div class="btn-group pull-right">
+            <button class="btn" type="submit" id="webstream_save" name="submit"><?php echo _("Save") ?></button>
         </div>
     </div>
 
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index 6dd184227..b62688186 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -567,23 +567,27 @@ li.ui-state-default {
     padding: 4px;
 }
 
-#save_button, #webstream_save {
-    background: #ff5d1a;
-    color: #fff;
-    border-radius: 4px;
-    font-size: 16px;
-    height: 38px;
-    width: 120px;
-}
+/*#save_button, #webstream_save {*/
+    /*background: #ff5d1a;*/
+    /*color: #fff;*/
+    /*border-radius: 4px;*/
+    /*font-size: 16px;*/
+    /*height: 38px;*/
+    /*width: 120px;*/
+/*}*/
 
-#save_button:active, #webstream_save {
-    color: #fff !important;
-}
+/*#save_button:active, #webstream_save {*/
+    /*color: #fff !important;*/
+/*}*/
 
 #save_button:focus, #webstream_save {
     outline-width: 0;
 }
 
+#edit-md-dialog .zend_form dd:last-child {
+    width: 160px;
+}
+
 /* Smart Block Editor */
 
 .btn-toolbar {
diff --git a/airtime_mvc/public/js/airtime/library/_spl.js b/airtime_mvc/public/js/airtime/library/_spl.js
index 858ffd327..b39bb11a5 100644
--- a/airtime_mvc/public/js/airtime/library/_spl.js
+++ b/airtime_mvc/public/js/airtime/library/_spl.js
@@ -904,6 +904,11 @@ var AIRTIME = (function(AIRTIME){
 
         });
 
+        $pl.find("#webstream_cancel, #cancel_button").on("click", function() {
+            var tabId = $pl.attr("tab-id");
+            $("li[tab-id=" + tabId + "] .lib_pl_close").click();
+        });
+
         $lib.on("click", "#pl_edit", function() {
             openPlaylistPanel();
             $.ajax({