From 7d74f1e78644082e81b449ff82a9489fa972b231 Mon Sep 17 00:00:00 2001
From: Mohit Jawanjal <mohit.jawanjal@imnica.com>
Date: Wed, 28 Mar 2018 17:08:17 +0530
Subject: [PATCH 1/2] Remove inline styles from Relation.php

Signed-off-by: Mohit Jawanjal <mohit.jawanjal@imnica.com>
---
 libraries/classes/Relation.php     | 8 ++++----
 themes/original/css/common.css.php | 7 +++++++
 themes/pmahomme/css/common.css.php | 6 ++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index 513e09e96d..c1e9b88b8a 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -101,16 +101,16 @@ class Relation
         $retval = '<br>';
 
         $messages = array();
-        $messages['error'] = '<span style="color:red"><strong>'
+        $messages['error'] = '<span class="span_color_red"><strong>'
             . __('not OK')
             . '</strong></span>';
 
-        $messages['ok'] = '<span style="color:green"><strong>'
+        $messages['ok'] = '<span class="span_color_green"><strong>'
             .  _pgettext('Correctly working', 'OK')
             . '</strong></span>';
 
-        $messages['enabled']  = '<span style="color:green">' . __('Enabled') . '</span>';
-        $messages['disabled'] = '<span style="color:red">'   . __('Disabled') . '</span>';
+        $messages['enabled']  = '<span class="span_color_green">' . __('Enabled') . '</span>';
+        $messages['disabled'] = '<span class="span_color_red">'   . __('Disabled') . '</span>';
 
         if (strlen($cfgRelation['db']) == 0) {
             $retval .= __('Configuration of pmadb…') . ' '
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 1ee7167b8e..0809a7578d 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -3435,3 +3435,10 @@ body .ui-dialog .ui-button-text-only .ui-button-text {
 #name-panel {
     overflow:hidden;
 }
+
+.span_color_green {
+    color:green;
+}
+.span_color_red {
+    color:red;
+}
\ No newline at end of file
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index f6445f6f15..9e8b4c0eb2 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -3684,3 +3684,9 @@ body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
 #name-panel {
     overflow:hidden;
 }
+.span_color_green {
+    color:green;
+}
+.span_color_red {
+    color:red;
+}
\ No newline at end of file

From c8d9471c24fad39fd20d40cadc6d2454f8bc8f0b Mon Sep 17 00:00:00 2001
From: Mohit Jawanjal <mohit.jawanjal@imnica.com>
Date: Mon, 2 Apr 2018 11:25:54 +0530
Subject: [PATCH 2/2] Inline style fix for Relation.php

Signed-off-by: Mohit Jawanjal <mohit.jawanjal@imnica.com>
---
 libraries/classes/Relation.php     |  8 ++++----
 themes/original/css/common.css.php | 10 +++-------
 themes/pmahomme/css/common.css.php |  9 +++------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index c1e9b88b8a..b565ce7173 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -101,16 +101,16 @@ class Relation
         $retval = '<br>';
 
         $messages = array();
-        $messages['error'] = '<span class="span_color_red"><strong>'
+        $messages['error'] = '<span class="caution"><strong>'
             . __('not OK')
             . '</strong></span>';
 
-        $messages['ok'] = '<span class="span_color_green"><strong>'
+        $messages['ok'] = '<span class="success"><strong>'
             .  _pgettext('Correctly working', 'OK')
             . '</strong></span>';
 
-        $messages['enabled']  = '<span class="span_color_green">' . __('Enabled') . '</span>';
-        $messages['disabled'] = '<span class="span_color_red">'   . __('Disabled') . '</span>';
+        $messages['enabled']  = '<span class="success">' . __('Enabled') . '</span>';
+        $messages['disabled'] = '<span class="caution">'   . __('Disabled') . '</span>';
 
         if (strlen($cfgRelation['db']) == 0) {
             $retval .= __('Configuration of pmadb…') . ' '
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 0809a7578d..c7add8fcdb 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -715,6 +715,9 @@ ul#topmenu2 a {
 span.caution {
     color: #FF0000;
 }
+span.success {
+    color: green;
+}
 fieldset.caution a {
     color:              #FF0000;
 }
@@ -3434,11 +3437,4 @@ body .ui-dialog .ui-button-text-only .ui-button-text {
 /* side menu */
 #name-panel {
     overflow:hidden;
-}
-
-.span_color_green {
-    color:green;
-}
-.span_color_red {
-    color:red;
 }
\ No newline at end of file
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 9e8b4c0eb2..b56f4af08f 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1026,6 +1026,9 @@ ul#topmenu2 a {
 span.caution {
     color: #FF0000;
 }
+span.success {
+    color: green; 
+}
 fieldset.caution a {
     color: #FF0000;
 }
@@ -3683,10 +3686,4 @@ body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
 /* side menu */
 #name-panel {
     overflow:hidden;
-}
-.span_color_green {
-    color:green;
-}
-.span_color_red {
-    color:red;
 }
\ No newline at end of file