From 8acc8fce7661b63a91448a1466a439c7ccf4c9ba Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 27 Nov 2012 15:55:32 -0500
Subject: [PATCH] CC-1960: Internationalize Airtime / Support translations

- fixed close button on show add form
---
 .../views/scripts/schedule/add-show-form.phtml   | 16 ++++++++--------
 airtime_mvc/public/css/bootstrap.css             |  6 +++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
index 121934f4f..508adc9ba 100644
--- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
+++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
@@ -1,9 +1,9 @@
 <div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
     <div class="button-bar">
-        <a href="#" id="add-show-close" class="icon-link"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
-        <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
-            <span class="ui-icon ui-icon-plusthick"></span> 
-            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span> 
+        <a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
+        <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
+            <span class="ui-icon ui-icon-plusthick"></span>
+            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
         </button>
     </div>
     <div class="clear"></div>
@@ -20,7 +20,7 @@
     <div id="live-stream-override" class="collapsible-content">
         <?php echo $this->live; ?>
     </div>
-    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Record & Rebroadcast")?></h3>  
+    <h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Record & Rebroadcast")?></h3>
     <div id="schedule-record-rebroadcast" class="collapsible-content">
         <?php echo $this->rr; ?>
         <?php echo $this->absoluteRebroadcast; ?>
@@ -35,9 +35,9 @@
         <?php echo $this->style; ?>
     </div>
     <div class="button-bar bottom">
-        <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary"> 
-            <span class="ui-icon ui-icon-plusthick"></span> 
-            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") :  _("Update show")); ?></span> 
+        <button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
+            <span class="ui-icon ui-icon-plusthick"></span>
+            <span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") :  _("Update show")); ?></span>
         </button>
     </div>
 </div>
diff --git a/airtime_mvc/public/css/bootstrap.css b/airtime_mvc/public/css/bootstrap.css
index 58929c2a5..97fa6b159 100644
--- a/airtime_mvc/public/css/bootstrap.css
+++ b/airtime_mvc/public/css/bootstrap.css
@@ -503,7 +503,7 @@ input[type="submit"].btn.btn-mini {
 [class^="icon-"],
 [class*=" icon-"] {
   display: inline-block;
-  width: 25px;
+  width: 14px;
   height: 14px;
   *margin-right: .3em;
   line-height: 14px;
@@ -513,6 +513,10 @@ input[type="submit"].btn.btn-mini {
   background-repeat: no-repeat;
   margin-top: 1px;
 }
+
+.add-show-close {
+    width: 25px;
+}
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
 .nav > .active > a > [class^="icon-"],