Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

pandora_console/general/news_dialog.php

@@ -39,7 +39,6 @@ if (!empty($news)) {
 
 // Prints news dialog template
 echo '<div id="news_dialog" class="invisible">';
-
     echo '<div class="parent_new_dialog_tmplt">';
         echo '<span id="new_text"></span>';
         echo '<span id="new_author"></span>';
@@ -48,14 +47,22 @@ echo '<div id="news_dialog" class="invisible">';
 
     echo '<div id="div_btn_new_dialog">';
         echo '<div class="float-right w20p">';
-        html_print_submit_button('Ok', 'hide-news-help', false, 'class="ui-button-dialog ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok w100px";"');
+        html_print_submit_button(
+            'Ok',
+            'hide-news-help',
+            false,
+            [
+                'mode' => 'ui-widget ok mini',
+                'icon' => 'wand',
+            ]
+        );
+        echo '</div>';
         echo '</div>';
-    echo '</div>';
 
-echo '</div>';
+        echo '</div>';
 
-ui_require_javascript_file('encode_decode_base64');
-?>
+        ui_require_javascript_file('encode_decode_base64');
+        ?>
 
 <script type="text/javascript" language="javascript">
 /* <![CDATA[ */
@@ -82,22 +89,22 @@ $(document).ready (function () {
                     width: 630,
                     title: news[inew].subject,
                     overlay: {
-                            opacity: 0.5,
-                            background: "black"
-                        }
+                        opacity: 0.5,
+                        background: "black"
+                    }
                 });
                     
                 $('.ui-dialog-titlebar-close').hide();
             }
         }
         
-        $("#submit-hide-news-help").click (function () {
+        $("#button-hide-news-help").click (function () {
             $("#news_dialog" ).dialog('close');
             inew++;
-            show_new ();
+            show_new();
         });
         
-        show_new ();
+        show_new();
     }
 });
 

pandora_console/godmode/setup/news.php

@@ -289,7 +289,7 @@ if ((isset($_GET['form_add'])) || (isset($_GET['form_edit']))) {
             'text',
             25,
             100,
-            $text,
+            io_safe_output($text),
             '',
             true,
             'w100p'
@@ -442,9 +442,19 @@ ui_require_javascript_file('pandora');
             dateFormat: "<?php echo DATE_FORMAT_JS; ?>",
             changeMonth: true,
             changeYear: true,
-            showAnim: "slideDown"});
+            showAnim: "slideDown"}
+        );
 
-    defineTinyMCE({"elements": "textarea_text",});
+        var added_config = {
+            "elements":"textarea_text",
+            "plugins": "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable",
+            "theme_advanced_buttons1": "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
+            "theme_advanced_buttons2": "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor",
+            "valid_children": "+body[style]",
+            "width": "90%",
+        }
+
+        defineTinyMCE(added_config);
         
         $("#checkbox-expire").click(function() {
             check_expire();

pandora_console/include/javascript/pandora_ui.js

@@ -351,11 +351,86 @@ function load_modal(settings) {
           AJAX_RUNNING = 0;
         }
       } else {
-        // No onsumbit configured. Directly close.
-        if (document.getElementById(settings.form) != undefined) {
-          document.getElementById(settings.form).submit();
+        if (Array.isArray(settings.form) === false) {
+          $("#" + settings.form + " :input").each(function() {
+            if (this.checkValidity() === false) {
+              var select2 = $(this).attr("data-select2-id");
+              if (typeof select2 !== typeof undefined && select2 !== false) {
+                $(this)
+                  .next()
+                  .attr("title", this.validationMessage);
+                $(this)
+                  .next()
+                  .tooltip({
+                    tooltipClass: "uitooltip",
+                    position: {
+                      my: "right bottom",
+                      at: "right top",
+                      using: function(position, feedback) {
+                        $(this).css(position);
+                        $("<div>")
+                          .addClass("arrow")
+                          .addClass(feedback.vertical)
+                          .addClass(feedback.horizontal)
+                          .appendTo(this);
+                      }
+                    }
+                  });
+                $(this)
+                  .next()
+                  .tooltip("open");
+
+                var element = $(this).next();
+                setTimeout(
+                  function(element) {
+                    element.tooltip("destroy");
+                    element.removeAttr("title");
+                  },
+                  3000,
+                  element
+                );
+              } else {
+                $(this).attr("title", this.validationMessage);
+                $(this).tooltip({
+                  tooltipClass: "uitooltip",
+                  position: {
+                    my: "right bottom",
+                    at: "right top",
+                    using: function(position, feedback) {
+                      $(this).css(position);
+                      $("<div>")
+                        .addClass("arrow")
+                        .addClass(feedback.vertical)
+                        .addClass(feedback.horizontal)
+                        .appendTo(this);
+                    }
+                  }
+                });
+                $(this).tooltip("open");
+
+                var element = $(this);
+                setTimeout(
+                  function(element) {
+                    element.tooltip("destroy");
+                    element.removeAttr("title");
+                  },
+                  3000,
+                  element
+                );
+              }
+
+              flagError = true;
+            }
+          });
+        }
+
+        if (!flagError) {
+          // No onsumbit configured. Directly close.
+          if (document.getElementById(settings.form) != undefined) {
+            document.getElementById(settings.form).submit();
+          }
+          d.dialog("close");
         }
-        d.dialog("close");
       }
     };
 

pandora_console/include/lib/Dashboard/Manager.php

@@ -287,7 +287,7 @@ class Manager implements PublicLogin
 
             $this->dashboardId = (int) \get_parameter('dashboardId', 0);
             if ($this->slides === 1) {
-                $this->slidesIds = (array) \get_parameter('slidesIds', [get_user_dashboards($config['id_user'])[0]['id']]);
+                $this->slidesIds = (array) \get_parameter('slidesIds');
                 $this->cellModeSlides = (int) \get_parameter(
                     'cellModeSlides',
                     0

pandora_console/views/dashboard/formSlides.php

@@ -81,6 +81,7 @@ $inputs[] = [
         'return'   => true,
         'multiple' => true,
         'sort'     => false,
+        'required' => 'required',
     ],
 ];