Merge pull request PrestaShop#2913 from jeromenadaud/feat-statuspage

[+] BO : Add status page indicator
Captain-FLAM · Apr 22, 2015 · 1fd2306 · 1fd2306
2 parents d401828 + e244f6b
commit 1fd2306
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 13 deletions.
diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
diff --git a/admin-dev/themes/default/css/admin-theme_rtl.css b/admin-dev/themes/default/css/admin-theme_rtl.css
diff --git a/admin-dev/themes/default/css/schemes/admin-theme-blue.css b/admin-dev/themes/default/css/schemes/admin-theme-blue.css
diff --git a/admin-dev/themes/default/css/schemes/admin-theme-contrast.css b/admin-dev/themes/default/css/schemes/admin-theme-contrast.css
diff --git a/admin-dev/themes/default/css/schemes/admin-theme-flex.css b/admin-dev/themes/default/css/schemes/admin-theme-flex.css
diff --git a/admin-dev/themes/default/css/schemes/admin-theme-fruit.css b/admin-dev/themes/default/css/schemes/admin-theme-fruit.css
diff --git a/admin-dev/themes/default/css/schemes/admin-theme-prune.css b/admin-dev/themes/default/css/schemes/admin-theme-prune.css
diff --git a/admin-dev/themes/default/css/schemes_rtl/admin-theme-blue_rtl.css b/admin-dev/themes/default/css/schemes_rtl/admin-theme-blue_rtl.css
diff --git a/admin-dev/themes/default/css/schemes_rtl/admin-theme-contrast_rtl.css b/admin-dev/themes/default/css/schemes_rtl/admin-theme-contrast_rtl.css
diff --git a/admin-dev/themes/default/css/schemes_rtl/admin-theme-flex_rtl.css b/admin-dev/themes/default/css/schemes_rtl/admin-theme-flex_rtl.css
diff --git a/admin-dev/themes/default/css/schemes_rtl/admin-theme-fruit_rtl.css b/admin-dev/themes/default/css/schemes_rtl/admin-theme-fruit_rtl.css
diff --git a/admin-dev/themes/default/css/schemes_rtl/admin-theme-prune_rtl.css b/admin-dev/themes/default/css/schemes_rtl/admin-theme-prune_rtl.css
diff --git a/admin-dev/themes/default/sass/partials/_footer.sass b/admin-dev/themes/default/sass/partials/_footer.sass
@@ -91,3 +91,13 @@ a.link-social
 	&:hover
 		color: #E6644E
 		background-color: white
+
+.status-page-dot
+	&.none
+		color: #2ecc71 !important
+	&.minor
+		color: #f1c40f !important
+	&.major
+		color: #e67e22 !important
+	&.critical
+		color: #e74c3c !important
diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl
@@ -76,6 +76,11 @@
 				<i class="icon-book"></i>
 				{l s='Training'}
 			</a>
+			/&nbsp;
+			<a href="http://status.prestashop.com/" class="footer_link _blank">
+				<i class="icon-circle status-page-dot"></i>
+				<span class="status-page-description"></span>
+			</a>
 			{if $iso_is_fr && !host_mode}
 			<p>Questions • Renseignements • Formations :
 				<strong>+33 (0)1.40.18.30.04</strong>

diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
@@ -2545,7 +2545,9 @@ public function setMedia()
 			$this->addJS(__PS_BASE_URI__.$this->admin_webpath.'/themes/'.$this->bo_theme.'/js/help.js');
 
 		if (!Tools::getValue('submitFormAjax'))
-			$this->addJs(_PS_JS_DIR_.'admin/notifications.js');
+			$this->addJS(_PS_JS_DIR_.'admin/notifications.js');
+
+		$this->addJS('https://cdn.statuspage.io/se-v2.js');
 
 		// Execute Hook AdminController SetMedia
 		Hook::exec('actionAdminControllerSetMedia');

diff --git a/js/admin.js b/js/admin.js
@@ -929,6 +929,15 @@ $(document).ready(function()
 
 		$('button:submit').click(bindSwapSave);
 	}
+
+    // http://status.prestashop.com/
+    var sp = new StatusPage.page({page : 'rmfc0cm3rk9y'});
+    sp.status({
+        success : function(data) {
+            $('.status-page-description').text(data.status.description);
+            $('.status-page-dot').addClass(data.status.indicator);
+        }
+    });
 });
 
 function bindSwapSave()
@@ -1552,3 +1561,5 @@ function confirm_link(head_text, display_text, confirm_text, cancel_text, confir
 			document.location = cancel_link;
 	});
 }
+
+