Changeset 3615:b9ac15edad1c

Timestamp:

12/11/17 11:12:57 (8 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Reduce close region of message box as it prevents to copy the content, single error message are not more listed as list but paragraph.

Files:

• admin/js/common.js (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)
• admin/style/scss/partials/_messages.scss (modified) (1 diff)
• inc/core/class.dc.error.php (modified) (3 diffs)

admin/js/common.js

@@ -569 +569 @@
           e.preventDefault();
           $(this).parent().hide();
-     });
-     $('p.success,p.warning,p.error,div.error').click(function(e) {
-         e.preventDefault();
-          $(this).hide();
      });
 

admin/style/default.css

@@ -1512 +1512 @@
   display: flex;
   justify-content: space-between; }
-  .close-notice-parent ul {
+  .close-notice-parent ul, .close-notice-parent p + p {
     flex: 1; }
+  .close-notice-parent p + p {
+    padding-left: .25em; }
 
 .close-notice {

admin/style/scss/partials/_messages.scss

@@ -100 +100 @@
      display: flex;
      justify-content: space-between;
-     ul {
+     ul, p + p {
           flex: 1;
+     }
+     p + p {
+          padding-left: .25em;
      }
 }

inc/core/class.dc.error.php

@@ -30 +30 @@
      /** @var string HTML error item pattern */
      protected $html_item = "<li>%s</li>\n";
+     /** @var string HTML error single pattern */
+     protected $html_single = "<p>%s</p>\n";
 
      /**
@@ -94 +96 @@
      * @param string     $item          HTML error item pattern
      */
-     public function setHTMLFormat($list,$item)
+     public function setHTMLFormat($list,$item,$single=null)
      {
           $this->html_list = $list;
           $this->html_item = $item;
+          if ($single) {
+               $this->html_single = $single;
+          }
      }
 
@@ -111 +116 @@
           if ($this->flag)
           {
-               foreach ($this->errors as $msg)
-               {
-                    $res .= sprintf($this->html_item,$msg);
+               if (count($this->errors == 1)) {
+                    $res = sprintf($this->html_single,$this->errors[0]);
+               } else {
+                    foreach ($this->errors as $msg) {
+                         $res .= sprintf($this->html_item,$msg);
+                    }
+                    $res = sprintf($this->html_list,$res);
                }
-
-               $res = sprintf($this->html_list,$res);
           }