From e5c198b61b30cd97d7e5153fa93c2e2055478de0 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Wed, 11 Nov 2015 18:01:09 -0500
Subject: [PATCH] Some minor style changes for podcasting

---
 airtime_mvc/application/forms/EditAudioMD.php       |  4 ++--
 .../views/scripts/library/publish-dialog.phtml      |  8 ++++----
 .../views/scripts/podcast/station_podcast.phtml     | 13 +++++++------
 airtime_mvc/public/css/styles.css                   |  7 +++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index d62a66d52..3faa209bd 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -223,13 +223,13 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('button', 'publishdialog', array(
             'ignore'   => true,
             'class'    => 'btn md-publish',
-            'label'    => _('Publish track'),
+            'label'    => _('Publish...'),
             'decorators' => array(
                 'ViewHelper'
             )
         ));
 
-        $this->addDisplayGroup(array('editmdsave', 'editmdcancel', 'publishdialog'), 'submitButtons', array(
+        $this->addDisplayGroup(array('publishdialog', 'editmdsave', 'editmdcancel'), 'submitButtons', array(
             'decorators' => array(
                 'FormElements',
                 'DtDdWrapper'
diff --git a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
index 2b5b17488..9c303b301 100644
--- a/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/library/publish-dialog.phtml
@@ -3,18 +3,18 @@
         <h2>
             <?php echo _("Publishing") ?> "<span ng-bind="media.track_title" class="title_obj_name"></span>"
         </h2>
-        <button ng-click="openEditDialog()" class="btn publish-edit-md"><?php echo _("Edit Metadata") ?></button>
+        <button ng-click="openEditDialog()" class="btn publish-edit-md"><?php echo _("Edit Metadata...") ?></button>
     </div>
     <div class="inner_editor_wrapper">
         <form class="media-metadata">
             <input ng-value="media.id" class="obj_id" type="hidden"/>
-            <label class="publish-md-field"><?php echo _("Title") ?></label>
+            <label class="publish-md-field"><?php echo _("Title:") ?></label>
             <input disabled ng-model="media.track_title" type="text"/>
 
-            <label class="publish-md-field"><?php echo _("Creator") ?></label>
+            <label class="publish-md-field"><?php echo _("Creator:") ?></label>
             <input disabled ng-model="media.artist_name" type="text"/>
 
-            <label class="publish-md-field"><?php echo _("Description") ?></label>
+            <label class="publish-md-field"><?php echo _("Description:") ?></label>
             <textarea disabled ng-model="media.description"></textarea>
             <fieldset>
                 <legend><?php echo _("Publish to:"); ?></legend>
diff --git a/airtime_mvc/application/views/scripts/podcast/station_podcast.phtml b/airtime_mvc/application/views/scripts/podcast/station_podcast.phtml
index f6f5f7394..27a6af354 100644
--- a/airtime_mvc/application/views/scripts/podcast/station_podcast.phtml
+++ b/airtime_mvc/application/views/scripts/podcast/station_podcast.phtml
@@ -9,12 +9,7 @@
     </div>
     <div class="inner_editor_wrapper station_podcast_wrapper">
         <form class="podcast-metadata">
-            <p>
-                <?php echo _("Check out the ") ?><a target="_blank" href="http://cyber.law.harvard.edu/rss/rss.html#requiredChannelElements"><?php echo _("RSS specification") ?></a>
-                <?php echo _(" or the ") ?><a target="_blank" href="http://www.apple.com/ca/itunes/podcasts/specs.html"><?php echo _("Apple podcasting specification") ?></a>
-                <?php echo _(" for more information.") ?>
-            </p>
-
+            <H4>About your Podcast</H4>
             <input ng-value="podcast.id" class="obj_id" type="hidden"/>
 
             <div>
@@ -78,6 +73,12 @@
                 <label><?php echo _("Explicit") ?></label>
                 <input name="podcast_itunes_explicit" ng-model="podcast.itunes_explicit" type="checkbox"/>
             </fieldset>
+            <p>
+                <?php echo(sprintf(_("For detailed information on what these metadata fields mean, please see the %sRSS specification%s
+                or %sApple's podcasting documentation%s."),
+                    '<a href="http://cyber.law.harvard.edu/rss/rss.html#requiredChannelElements">', '</a>',
+                    '<a target="_blank" href="http://www.apple.com/ca/itunes/podcasts/specs.html">', "</a>")); ?>
+            </p>
         </form>
     </div>
 
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index cf8c85c43..cc36fb95f 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2451,8 +2451,7 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
 }
 
 .md-publish {
-    width: 100%;
-    margin-top: 4px;
+    margin-right: 4px;
 }
 
 .md-save {
@@ -4014,7 +4013,7 @@ li .ui-state-hover {
 
 .podcast-metadata p {
     text-align: center;
-    padding: 0 5%;
+    padding: 0 10px;
     margin-top: 0;
 }
 
@@ -4184,4 +4183,4 @@ li .ui-state-hover {
     display: inline-block;
     float: right;
     width: 50%;
-}
\ No newline at end of file
+}