fix: colors for counters

Signed-off-by: Thierry Bugier <[email protected]>
pluginsGLPI · Nov 23, 2021 · d172843 · d172843
1 parent ce9fb3e
commit d172843
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 63 deletions.
diff --git a/css/styles.scss b/css/styles.scss
@@ -474,23 +474,23 @@ tr[data-itemtype="PluginFormcreatorCondition"] ~ tr[data-itemtype="PluginFormcre
    }
 }
 
-// #formcreator_servicecatalogue_ticket_summary {
-//    .status_incoming, .status_incoming a {
-//       color: #c8ffc8;
-//    }
+#formcreator_servicecatalogue_ticket_summary {
+   .status_incoming, .status_incoming a {
+      color: #49bf4d;
+   }
 
-//    .status_waiting, .status_waiting a {
-//       color: #f7c976;
-//    }
+   .status_waiting, .status_waiting a {
+      color: orange;
+   }
 
-//    .status_validate, .status_validate a {
-//       color: #9B9BE9;
-//    }
+   .status_validate, .status_validate a {
+      color: #8CABDB;
+   }
 
-//    .status_solved, .status_solved a {
-//       color: #ffffff;
-//    }
-// }
+   .status_solved, .status_solved a {
+      color: black;
+   }
+}
 
 
 /* SLINKY CSS */
@@ -783,20 +783,6 @@ a.plugin_formcreator_formTile_title {
    padding: 10px 0 10px 0;
    box-sizing: border-box;
 
-   input {
-      width: 100%;
-      font-size: 1.4em;
-      padding: 10px 0 10px 10px;
-      box-sizing: border-box;
-      height: 40px;
-      border: 0;
-      border-radius: 0;
-      background-color: inherit;
-      border: 1px solid #C2C2C2;
-      box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-      background-color: #F8F8F8;
-   }
-
    input ~ label {
       position: absolute;
       float: left;
@@ -858,7 +844,7 @@ a.plugin_formcreator_formTile_title {
    display: inline-block;
    background-image: url("../pics/search.png");
    position: absolute;
-   top: 23%;
+   top: 39%;
    right: 10px;
 }
 
@@ -909,33 +895,7 @@ a.plugin_formcreator_formTile_title {
 .plugin_formcreator_heading {
    font-weight: bold;
 }
-/*
-.plugin_formcreator_sort:hover {
-   opacity: 1;
-   color: #3874BC;
-
-   .radios input[type = radio].new_radio + label:before {
-      background-color: #3874BC;
-      border: 2px solid #3874BC;
-   }
-}
-
-.plugin_formcreator_sort {
-   float: left;
-   opacity: 0.4;
-
-   input {
-      display: inline-block;
-      text-align: left;
-      margin: 0 20px;
-   }
 
-   .radios input[type = radio].new_radio + label {
-      display: inline-block;
-      margin-right: 10px;
-   }
-}
-*/
 #plugin_formcreator_serviceCatalog #header_top {
    height: 45px;
    line-height: 45px;

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -996,10 +996,10 @@ protected function showMyLastForms() : void {
       echo '<div class="card-title">'.sprintf(__('My %1$d last forms (requester)', 'formcreator'), $limit).'</div>';
       $result = PluginFormcreatorFormAnswer::getMyLastAnswersAsRequester($limit);
       if ($result->count() == 0) {
-         echo '<div class="card-body" align="center">'.__('No form posted yet', 'formcreator').'</div>';
+         echo '<div class="card-body text-center text-muted">'.__('No form posted yet', 'formcreator').'</div>';
       } else {
          echo '<div class="card-body">';
-         echo "<ul>";
+         echo '<ul class="list-group">';
          foreach ($result as $formAnswer) {
             switch ($formAnswer['status']) {
                case PluginFormcreatorFormAnswer::STATUS_WAITING:
@@ -1017,8 +1017,8 @@ protected function showMyLastForms() : void {
                echo '<span class="plugin_formcreator_date">'.Html::convDateTime($formAnswer['request_date']).'</span>';
                echo '</li>';
          }
-         echo "</ul>";
-         echo '<div class="text-center">';
+         echo '</ul>';
+         echo '<div class="text-center  card-footer">';
          $criteria = 'criteria[0][field]=4'
          . '&criteria[0][searchtype]=equals'
          . '&criteria[0][value]=' . $userId;
@@ -1044,10 +1044,10 @@ protected function showMyLastForms() : void {
       }
       $result = PluginFormcreatorFormAnswer::getMyLastAnswersAsValidator($limit);
       if ($result->count() == 0) {
-         echo '<div class="card-body" align="center">'.__('No form waiting for validation', 'formcreator').'</div>';
+         echo '<div class="card-body text-center text-muted" >'.__('No form waiting for validation', 'formcreator').'</div>';
       } else {
          echo '<div class="card-body">';
-         echo "<ul>";
+         echo '<ul>';
          foreach ($result as $formAnswer) {
             switch ($formAnswer['status']) {
                case PluginFormcreatorFormAnswer::STATUS_WAITING:
@@ -1065,8 +1065,8 @@ protected function showMyLastForms() : void {
             echo '<span class="plugin_formcreator_date">'.Html::convDateTime($formAnswer['request_date']).'</span>';
             echo '</li>';
          }
-         echo "</ul>";
-         echo '<div class="text-center">';
+         echo '</ul>';
+         echo '<div class="text-center card-footer">';
          $criteria = 'criteria[0][field]=10'
                      . '&criteria[0][searchtype]=equals'
                      . '&criteria[0][value]=' . $userId;