diff --git a/airtime_mvc/application/forms/BillingClient.php b/airtime_mvc/application/forms/BillingClient.php index 891cd4a95..87835d1de 100644 --- a/airtime_mvc/application/forms/BillingClient.php +++ b/airtime_mvc/application/forms/BillingClient.php @@ -162,7 +162,7 @@ class Application_Form_BillingClient extends Zend_Form $subscribe->setLabel(_('Subscribe to Sourcefabric newsletter')) ->setValue($subscribevalue) ->setBelongsTo('customfields') - ->setAttrib('class', 'input_text') + ->setAttrib('class', 'billing-details-checkbox') ->setRequired(true) ->addValidator($notEmptyValidator) ->addFilter('StringTrim'); diff --git a/airtime_mvc/application/views/scripts/billing/client.phtml b/airtime_mvc/application/views/scripts/billing/client.phtml index 44a3c8d72..8ab4cef31 100644 --- a/airtime_mvc/application/views/scripts/billing/client.phtml +++ b/airtime_mvc/application/views/scripts/billing/client.phtml @@ -1,9 +1,9 @@ form->getElement("submit")->setAttrib("class", "right-align"); +$this->form->getElement("submit")->setAttrib("class", "btn right-floated"); $this->form->getElement("country")->setAttrib("class", "right-align"); $this->form->getElement("securityqid")->setAttrib("class", "right-align"); ?> -
+

Billing Account Details

errorMessage)) {?>
errorMessage ?>
diff --git a/airtime_mvc/application/views/scripts/billing/invoices.phtml b/airtime_mvc/application/views/scripts/billing/invoices.phtml index 2e6f3ad79..ea4cb3401 100644 --- a/airtime_mvc/application/views/scripts/billing/invoices.phtml +++ b/airtime_mvc/application/views/scripts/billing/invoices.phtml @@ -1,4 +1,4 @@ -
+

Invoices

and look for the \"Checkout\" button."); + $topText = _pro("Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."); } ?> -

+

diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml index 5d583f245..eb7e93c0c 100644 --- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml +++ b/airtime_mvc/application/views/scripts/billing/upgrade.phtml @@ -193,7 +193,7 @@ $(document).ready(function() { }); -
+

@@ -215,7 +215,7 @@ $(document).ready(function() {
- @@ -225,7 +225,7 @@ $(document).ready(function() { - @@ -241,7 +241,7 @@ $(document).ready(function() { 100 Listeners per stream
200 Listeners per stream
- @@ -259,7 +259,7 @@ $(document).ready(function() { 30GB Storage
60GB Storage
- @@ -271,7 +271,7 @@ $(document).ready(function() { - @@ -281,17 +281,17 @@ $(document).ready(function() { - - + -
Date Issued2 Streams 3 Streams + 3 Streams
64kbps and 196kbps Stream Quality 64kbps, 128kbps, and 196kbps Stream Quality + 64kbps, 128kbps, and 196kbps Stream Quality
+ 500 Listeners per stream
1000 Listeners per stream
 + 150GB Storage
300GB Storage
 Live Chat, Ticket, Email, Forum Support Live Chat, Ticket, Email, Forum Support + Live Chat, Ticket, Email, Forum Support
Save 15% if paid annually Save 15% if paid annually + Save 15% if paid annually
+
@@ -416,7 +416,7 @@ echo($currentProduct["name"]); Total:
- +
\ No newline at end of file diff --git a/airtime_mvc/public/css/billing.css b/airtime_mvc/public/css/billing.css index 33cbe006c..38ad43582 100644 --- a/airtime_mvc/public/css/billing.css +++ b/airtime_mvc/public/css/billing.css @@ -2,21 +2,20 @@ .billing-panel { - width: 400px; - margin: 0 auto; + width: 500px; margin-bottom: 30px; } .billing-panel h3 { - color: #222; + /*color: #222;*/ } .billing-panel h4 { font-size: 1.25em; margin: 0px; - color: #333; + /*color: #333;*/ font-weight: normal; } @@ -24,16 +23,16 @@ { border: 0px solid #000; margin: 0 auto; - color: #000; + /*color: #000;*/ } #upgrade-downgrade label { - color: rgb(28,28,28); + /*color: rgb(28,28,28);*/ } #upgrade-downgrade label.disabled { - color: rgb(108,108,108); + /*color: rgb(108,108,108);*/ } #upgrade-downgrade dl @@ -55,14 +54,14 @@ { border-spacing: 0px; border-collapse: separate; - border: 1px solid #777; width: 680px; - margin-left: -140px; + /*border: 1px solid #777;*/ /*background-color: #555;*/ table-layout: fixed; margin-top: 20px; margin-bottom: 20px; box-shadow: 0px 5px 5px rgba(0,0,0,0.5); + color: #000; } .pricing-grid .august-promo div { @@ -80,17 +79,33 @@ .pricing-grid td, .pricing-grid th { - border-bottom: 1px solid #999; - border-right: 1px solid #bbb; - background-color: #ccc; + border-bottom: 1px solid #5b5b5b; + border-right: 1px solid #5b5b5b; padding: 10px; } +.pricing-grid td { + background: #2f2f2f; + color: #cdcdcd; +} + +.pricing-grid .last-column { + border-right: none; +} + +.pricing-grid .last-row td { + border-bottom: none; +} + .pricing-grid th { border-top-left-radius: 5px; border-top-right-radius: 5px; border: 0px; + color: #CDCDCD; + background-color:#ff5d1a; + background: -moz-linear-gradient(top, #dd4202 0, #ff5d1a 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dd4202), color-stop(100%, #ff5d1a)); } @@ -99,11 +114,8 @@ text-align: right; background-color: #ddd; font-weight: bold; -} - -#current_plan -{ - text-align: center; + background-color: #2f2f2f; + color: #cdcdcd; } #plantype @@ -146,6 +158,7 @@ border: 1px solid #777; background: #ccc; padding: 5px; + color: #000; } #total_box { @@ -189,7 +202,6 @@ #invoices_table { - margin: 0 auto; border-spacing: 0px; border-collapse: separate; border: 1px solid #777; @@ -197,12 +209,17 @@ table-layout: fixed; margin-top: 20px; margin-bottom: 35px; - background: #ccc; + width: 500px; } #invoices_table tbody tr th { border: 0px; + color: #efefef; + background: #5E5E5E; + background-color: #5E5E5E; + border-top: 1px solid #9d9d9d; + } #invoices_table .header @@ -210,6 +227,7 @@ box-shadow: 0px 2px 2px rgba(0,0,0,0.5); } + #invoices_table tr { border: 1px solid #555; @@ -221,11 +239,15 @@ } /** This form is the separate one on the Billing Account Details page (BillingClient.php) */ +#clientdetails_form { + width: 500px; +} + #clientdetails_form dt { float: left; clear: both; width: 50%; - margin-bottom: 10px; + /*margin-bottom: 10px;*/ } #clientdetails_form dd { float: left; @@ -251,3 +273,7 @@ margin-top:10px; background: url('images/august_aweomse_promo_banner.png') no-repeat; } + +.billing-details-checkbox { + width: auto; +} diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index cb021b838..059de489b 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1203,7 +1203,7 @@ input[type="checkbox"] { } #pref_form dt, #pref_form dd, -#pref_form textarea { +#pref_form textarea, #clientdetails_form dd { display:block; float:none; margin-left:0;