Merge branch 'saas-dev' into saas-showbuilder

airtime_mvc/public/css/billing.css

@@ -56,8 +56,8 @@
 	border-spacing: 0px;
     border-collapse: separate;
 	border: 1px solid #777;
-	width: 600px;
-	margin-left: -100px;
+	width: 680px;
+	margin-left: -140px;
 	/*background-color: #555;*/
 	table-layout: fixed;
 	margin-top: 20px;
@@ -65,6 +65,19 @@
 	box-shadow: 0px 5px 5px rgba(0,0,0,0.5);
 }
 
+.pricing-grid .august-promo div {
+	display: inline-block;
+	background-color: #ff611f;
+	padding: 3px 5px;
+	border-radius: 5px;
+	margin-left: -5px;
+	color: #ffffff;
+}
+
+.pricing-grid .august-promo span {
+	text-decoration: line-through;
+}
+
 .pricing-grid td, .pricing-grid th
 {
 	border-bottom: 1px solid #999;
@@ -223,4 +236,18 @@
 {
 	/*text-align: right;*/
 	width: 100%;
-}
+}
+
+#promo-plan-eligible {
+	margin-top: 10px;
+	font-size: 13px;
+	background-color: #ff611f;
+	padding: 3px 5px;
+	border-radius: 5px;
+	color: #ffffff;
+}
+
+.promo-banner {
+	margin-top:10px;
+	background: url('images/august_aweomse_promo_banner.png') no-repeat;
+}

airtime_mvc/public/js/airtime/common/common.js

@@ -231,7 +231,7 @@ function showHint(h) {
 
 function getUsabilityHint() {
     var pathname = window.location.pathname;
-    $.getJSON("/api/get-usability-hint", {"format": "json", "userPath": pathname}, function(json) {
+    $.getJSON(baseUrl + "api/get-usability-hint", {"format": "json", "userPath": pathname}, function(json) {
         var $hint_div = $('.usability_hint');
         var current_hint = $hint_div.html();
         if (json === "") {