From 4d9d27e9da5d2b892af6362742f39fc3653f9cd9 Mon Sep 17 00:00:00 2001
From: Luca <lucas@openstamanager.com>
Date: Tue, 30 Jul 2019 16:51:33 +0200
Subject: [PATCH] Fix minori

---
 assets/src/css/style.css                   |  4 ++
 include/top.php                            | 16 ++++----
 modules/utenti/components/photo.php        |  6 +++
 modules/utenti/info.php                    |  5 +--
 modules/utenti/user.php                    |  7 +++-
 src/HTMLBuilder/Handler/DefaultHandler.php | 10 ++++-
 src/HTMLBuilder/Wrapper/HTMLWrapper.php    | 45 +++++++++++++---------
 7 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/assets/src/css/style.css b/assets/src/css/style.css
index 32d46fc87..2439cc7d0 100644
--- a/assets/src/css/style.css
+++ b/assets/src/css/style.css
@@ -871,3 +871,7 @@ input.small-width {
     list-style: none;
     margin-left: 11px;
 }
+
+.progress .progress-bar span{
+    color:#000;
+}
\ No newline at end of file
diff --git a/include/top.php b/include/top.php
index 13102de78..2b9f52438 100644
--- a/include/top.php
+++ b/include/top.php
@@ -97,15 +97,15 @@ if (Auth::check()) {
     }
     echo '
             password: {
-                    "wordMinLength": "'.tr('La tua password è troppo corta').'",
-                    "wordMaxLength": "'.tr('La tua password è troppo lunga').'",
-                    "wordInvalidChar": "'.tr('La tua password contiene un carattere non valido').'",
+                    "wordMinLength": "'.tr('La password è troppo corta').'",
+                    "wordMaxLength": "'.tr('La password è troppo lunga').'",
+                    "wordInvalidChar": "'.tr('La password contiene un carattere non valido').'",
                     "wordNotEmail": "'.tr('Non usare la tua e-mail come password').'",
-                    "wordSimilarToUsername": "'.tr('La tua password non può contenere il tuo nome').'",
+                    "wordSimilarToUsername": "'.tr('La password non può contenere il tuo nome').'",
                     "wordTwoCharacterClasses": "'.tr('Usa classi di caratteri diversi').'",
-                    "wordRepetitions": "'.tr('Troppe ripetizioni').'",
-                    "wordSequences": "'.tr('La tua password contiene sequenze').'",
-                    "errorList": "'.tr('Errori').':",
+                    "wordRepetitions": "'.tr('La password contiene ripetizioni').'",
+                    "wordSequences": "'.tr('La password contiene sequenze').'",
+                    "errorList": "'.tr('Attenzione').':",
                     "veryWeak": "'.tr('Molto debole').'",
                     "weak": "'.tr('Debole').'",
                     "normal": "'.tr('Normale').'",
@@ -338,7 +338,7 @@ if (Auth::check()) {
     $user_photo = $user->photo;
     if ($user_photo) {
         echo '
-                            <img src="'.$user_photo.'" class="img-responsive" alt="'.$user['username'].'" />';
+                            <img src="'.$user_photo.'" class="img-circle pull-left" alt="'.$user['username'].'" />';
     } else {
         echo '
                             <i class="fa fa-user-circle-o fa-3x pull-left" alt="'.tr('OpenSTAManager').'"></i>';
diff --git a/modules/utenti/components/photo.php b/modules/utenti/components/photo.php
index a17e789f3..2ecfc2c7f 100644
--- a/modules/utenti/components/photo.php
+++ b/modules/utenti/components/photo.php
@@ -2,6 +2,12 @@
 
 include_once __DIR__.'/../../core.php';
 
+$user_photo = $user->photo;
+if ($user_photo) {
+    echo '
+        <center><img src="'.$user_photo.'" class="img-responsive" alt="'.$user['username'].'" /></center>';
+} 
+
 echo '
     <div class="row">
 		 <div class="col-md-12">
diff --git a/modules/utenti/info.php b/modules/utenti/info.php
index ec7747415..4aebd58e3 100644
--- a/modules/utenti/info.php
+++ b/modules/utenti/info.php
@@ -25,7 +25,7 @@ $module = Modules::get('Utenti e permessi');
 
 echo '
 <div class="box box-widget widget-user">
-    <div class="widget-user-header bg-yellow">
+    <div class="widget-user-header bg-'.(($theme!='default') ? $theme : 'primary').'">
       <h3 class="widget-user-username">'.$user['username'].'</h3>
       <h5 class="widget-user-desc">'.$user['gruppo'].'</h5>
     </div>
@@ -35,7 +35,7 @@ echo '
 $user_photo = $user->photo;
 if ($user_photo) {
     echo '
-        <img src="'.$user_photo.'" class="img-responsive" alt="'.$user['username'].'" />';
+        <img src="'.$user_photo.'" class="img-circle" alt="'.$user['username'].'" />';
 } else {
     echo '
         <i class="fa fa-user-circle-o fa-4x pull-left" alt="'.tr('OpenSTAManager').'"></i>';
@@ -43,7 +43,6 @@ if ($user_photo) {
 
 echo '
     </div>
-    
     <div class="box-footer">
         <div class="row">
             <div class="col-sm-4 border-right">
diff --git a/modules/utenti/user.php b/modules/utenti/user.php
index f9cb8d33b..64bec8195 100644
--- a/modules/utenti/user.php
+++ b/modules/utenti/user.php
@@ -42,11 +42,16 @@ if (!empty($user)) {
     echo '
 	<div class="row">
 		<div class="col-md-12">
-		    {[ "type": "checkbox", "label": "'.tr('Cambia password').'", "name": "change_password", "value": "1" ]}
+		    {[ "type": "checkbox", "label": "'.tr('Cambia password').'", "name": "change_password", "value": "0" ]}
 		</div>
     </div>
     
     <script>
+        $(function() {
+            $("#password").attr("disabled", true);
+            $("#submit-button").attr("disabled", false).removeClass("disabled");
+        });
+
         $("#change_password").change(function() {
             if (this.checked) {
                 $("#password").attr("disabled", false);
diff --git a/src/HTMLBuilder/Handler/DefaultHandler.php b/src/HTMLBuilder/Handler/DefaultHandler.php
index b8bbaf0c7..0528b7d30 100644
--- a/src/HTMLBuilder/Handler/DefaultHandler.php
+++ b/src/HTMLBuilder/Handler/DefaultHandler.php
@@ -82,7 +82,7 @@ class DefaultHandler implements HandlerInterface
      */
     protected function password(&$values, &$extras)
     {
-        $values['icon-after'] = '<i onclick="togglePassword_'.$values['id'].'()" class="fa clickable" id="'.$values['id'].'_toggle"></i>';
+        $values['icon-after'] = '<i onclick="togglePassword_'.$values['id'].'()" class="clickable fa" id="'.$values['id'].'_toggle"></i>';
 
         $result = '
     <script>
@@ -122,7 +122,15 @@ class DefaultHandler implements HandlerInterface
                     },
                     progressBarExtraCssClasses: "progress-bar-striped active",
                     showPopover: true,
+                    showProgressBar: false,
+                    popoverPlacement: "top",
+                    showStatus: true,
                     showErrors: true,
+                    showVerdicts: true,
+                    useVerdictCssClass: false,
+                    showScore: false,
+                    progressBarMinWidth: 50,
+                    colorClasses: ["danger", "danger", "warning", "warning", "success", "success"],
                 },
                 i18n: {
                     t: function (key) {
diff --git a/src/HTMLBuilder/Wrapper/HTMLWrapper.php b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
index d1ff2faf7..4e26e2d37 100644
--- a/src/HTMLBuilder/Wrapper/HTMLWrapper.php
+++ b/src/HTMLBuilder/Wrapper/HTMLWrapper.php
@@ -26,7 +26,7 @@ class HTMLWrapper implements WrapperInterface
 
         if (!empty($values['icon-before']) || !empty($values['icon-after']) || !empty($values['validation'])) {
             $result .= '
-    <div class="input-group">';
+    <div class="input-group has-feedback">';
 
             if (!empty($values['icon-before'])) {
                 $result .= '
@@ -52,7 +52,7 @@ class HTMLWrapper implements WrapperInterface
 
             if (!empty($values['validation'])) {
                 $result .= '
-                <span class="input-group-addon" id="'.$pseudo_id.'_validation">
+                <span class="input-group-addon after" id="'.$pseudo_id.'_validation">
                     <span class="tip" title="'.tr('Validazione').'"><i class="fa fa-question-circle "></i></span>
                 </span>';
             }
@@ -119,24 +119,33 @@ class HTMLWrapper implements WrapperInterface
                 },
                 success: function(data) {
                     data = JSON.parse(data);
-            
-                    if(data.result) {
-                        icon.attr("class", "fa fa-check");
-                        parent.addClass("has-success").removeClass("has-error");
-                    } else {
-                        icon.attr("class", "fa fa-close");
-                        parent.addClass("has-error").removeClass("has-success");
+                    
+                    if (value == ""){
+                        parent.removeClass("has-success").removeClass("has-error");
+                        icon.attr("class", "fa fa-question-circle");
+                        message.tooltipster("content", "'.tr('Validazione').'");
                     }
+                    else{
+
+                        if(data.result) {
+                            icon.attr("class", "fa fa-check");
+                            parent.addClass("has-success").removeClass("has-error");
+                        } else {
+                            icon.attr("class", "fa fa-close");
+                            parent.addClass("has-error").removeClass("has-success");
+                        }
+                        
+                        message.tooltipster("content", data.message);
+                        input.attr("valid", +(data.result));
                     
-                    message.tooltipster("content", data.message);
-                    input.attr("valid", +(data.result));
-                    
-                    if (data.fields) {
-                        fields = data.fields;
-            
-                        Object.keys(fields).forEach(function(element) {
-                            $("[name=" + element + "]").val(fields[element]);
-                        });
+                        if (data.fields) {
+                            fields = data.fields;
+                
+                            Object.keys(fields).forEach(function(element) {
+                                $("[name=" + element + "]").val(fields[element]);
+                            });
+                        }
+
                     }
                 }
             });