From 789b20a61e597c3effdffbb977463d182bb300c7 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 17 Jun 2022 14:17:55 +0200
Subject: [PATCH 1/2] Redesign - responsive popravki statusa, objave

---
 admin/survey/SurveyAdminSettings.php          |  55 ++++++---
 .../survey/classes/class.SurveyStatistic.php  |   9 +-
 public/css/admin_new.css                      | 105 +++++++++++-------
 .../sass/admin_new/mobile/pages/archive.scss  |   1 -
 .../sass/admin_new/mobile/pages/data.scss     |   3 +-
 .../sass/admin_new/mobile/pages/publish.scss  |  31 ++++--
 .../sass/admin_new/mobile/pages/status.scss   |  16 +++
 .../pages/survey_objava/pregled.scss          |  73 ++++++++----
 8 files changed, 196 insertions(+), 97 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 405e604b3..178020a09 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -2717,35 +2717,56 @@ class SurveyAdminSettings {
 
 		echo '<p class="bottom16">'.$lang['srv_publication_survey_links_note'].'</p>';
 
-		echo '<div class="button_holder">';
-		echo '<div class="input_box">';
-		echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
-		echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
-		echo '</div>';
-		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
 		
 		//Lep URL - dodajanje
-
 		// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
         $userAccess = UserAccess::getInstance($global_user_id);
         if(!$userAccess->checkUserAccess($what='nice_url')){
-            echo '<button type="button" class="medium yellow">'.$lang['srv_nice_url_add'].'</button>';
-			echo '</div>'; // div.button_holder
 
+            echo '<div class="button_holder">';
+
+            echo '  <div class="copy_survey_url_holder">';
+            echo '      <div class="input_box">';
+            echo '          <span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
+            echo '          <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
+            echo '      </div>';
+            echo '      <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+            echo '  </div>';
+            
+            echo '  <button type="button" class="medium yellow">'.$lang['srv_nice_url_add'].'</button>';
+			
+            echo '</div>';
         }
         else{
+
+            echo '<div class="button_holder">';
+
+            echo '  <div class="copy_survey_url_holder">';
+            echo '      <div class="input_box">';
+            echo '          <span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
+            echo '          <input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'" readonly/>';
+            echo '      </div>';
+            echo '      <button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+            echo '  </div>';
+    
             // Gumb za dodajanje lepega linka
-            echo '<button id="nice_url_button" type="button" class="medium white-black" onclick="toggleNiceURL(\'show\');">'.$lang['srv_nice_url_add'].'</button>';
+            echo '  <button id="nice_url_button" type="button" class="medium white-black" onclick="toggleNiceURL(\'show\');">'.$lang['srv_nice_url_add'].'</button>';
+
+			echo '  <div id="nice_url_holder" class="displayNone">';
+
+            echo '      <div class="url">';
+			echo            $site_url;
+			echo '          <input type="text" class="text large" name="nice_url" id="nice_url" value=""/>';
+            echo '      </div>';
+            
+            echo '      <div class="buttons">';
+			echo '          <button type="button" class="medium blue" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;">'.$lang['add'].'</button>';
+			echo '          <button type="button" class="medium white-blue" onclick="toggleNiceURL(\'hide\')">'.$lang['edit1338'].'</button>';
+            echo '      </div>';
+			echo '  </div>';
 
-			echo '<div id="nice_url_holder" class="displayNone">';
-			echo $site_url;
-			echo '<input type="text" class="text large" name="nice_url" id="nice_url" value=""/>';
-			echo '<button type="button" class="medium blue" onclick="$.redirect(\'ajax.php?a=nice_url\', {anketa: '.$this->anketa.', nice_url: $(\'#nice_url\').val()}); return false;">'.$lang['add'].'</button>';
-			echo '<button type="button" class="medium white-blue" onclick="toggleNiceURL(\'hide\')">'.$lang['edit1338'].'</button>';
 			echo '</div>';
 
-			echo '</div>'; // div.button_holder
-
 
 			if (isset($_GET['error'])) {
 
diff --git a/admin/survey/classes/class.SurveyStatistic.php b/admin/survey/classes/class.SurveyStatistic.php
index 10e846046..00c3cb9a5 100644
--- a/admin/survey/classes/class.SurveyStatistic.php
+++ b/admin/survey/classes/class.SurveyStatistic.php
@@ -897,11 +897,12 @@ class SurveyStatistic {
     // Prikazemo filtre na vrhu dashboarda
     function DisplayTopFilters(){
         global $lang;
-
         
-        echo '<div id="dashboardEmailInvitationFilter" class="filter_setting">';
-        echo $this->emailInvitationFilter($this->emailInvitation);
-        echo '</div>';
+        if($this->emailInvitation == 1 || $this->emailInvitation == 2){
+            echo '<div id="dashboardEmailInvitationFilter" class="filter_setting">';
+            $this->emailInvitationFilter($this->emailInvitation);
+            echo '</div>';
+        }
 
         # če imamo vabila - filter za emaile
         $row = SurveyInfo::getSurveyRow();
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index c0894891e..a59c18d71 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -24391,32 +24391,50 @@ div#vabila div.button_holder {
   align-items: center;
   margin-bottom: 16px;
 }
-div#vabila div.button_holder button {
-  margin: 0 32px 0 8px;
-  min-width: 114px;
+div#vabila div.button_holder .copy_survey_url_holder {
+  display: flex;
+  flex-direction: row;
 }
-div#vabila div.button_holder div.input_box {
+div#vabila div.button_holder .copy_survey_url_holder .input_box {
+  display: flex;
+  align-items: center;
   border: 1px solid #C4C4C4;
   width: 300px;
   padding: 10px 0 10px 8px;
 }
-div#vabila div.button_holder div.input_box input {
+div#vabila div.button_holder .copy_survey_url_holder .input_box input {
   border: none;
   margin: 0;
   padding: 0;
   font-size: 16px;
-  width: 90%;
+  width: 100%;
 }
-div#vabila div.button_holder div#nice_url_holder {
+div#vabila div.button_holder .copy_survey_url_holder button {
+  min-width: 114px;
+  margin: 0 0 0 8px;
+}
+div#vabila div.button_holder #nice_url_button {
+  margin: 0 0 0 32px;
+}
+div#vabila div.button_holder #nice_url_holder {
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin: 0 0 0 32px;
 }
-div#vabila div.button_holder div#nice_url_holder input {
+div#vabila div.button_holder #nice_url_holder .url {
+  display: flex;
+  align-items: center;
+}
+div#vabila div.button_holder #nice_url_holder .url input {
   margin: 0 8px;
   width: 200px;
 }
-div#vabila div.button_holder div#nice_url_holder button {
+div#vabila div.button_holder #nice_url_holder .buttons {
+  display: flex;
+}
+div#vabila div.button_holder #nice_url_holder .buttons button {
+  min-width: 114px;
   margin-right: 8px;
   margin-left: 0;
 }
@@ -32923,6 +32941,19 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     border-radius: 1px;
   }
 
+  .dashboard_top_settings {
+    flex-direction: column;
+  }
+  .dashboard_top_settings .dashboard_top_filters {
+    align-items: flex-start;
+    width: 100%;
+    margin-top: 16px;
+  }
+  .dashboard_top_settings .dashboard_top_filters .filter_setting {
+    margin-left: 0;
+    margin-right: 16px;
+  }
+
   .dashboard_boxes {
     flex-direction: column;
   }
@@ -33307,20 +33338,28 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
     width: 100% !important;
   }
 
-  .page_vabila.subpage_settings #vabila .button_holder {
-    flex-wrap: wrap;
+  .page_vabila #vabila .button_holder {
+    flex-direction: column;
+    align-items: flex-start;
   }
-  .page_vabila.subpage_settings #vabila .button_holder .input_box {
-    display: flex;
-    width: auto !important;
+  .page_vabila #vabila .button_holder .copy_survey_url_holder {
+    width: 100%;
   }
-  .page_vabila.subpage_settings #vabila .button_holder button {
-    margin: 0 0 0 8px;
+  .page_vabila #vabila .button_holder .copy_survey_url_holder .input_box {
+    width: auto;
   }
-  .page_vabila.subpage_settings #vabila .button_holder button#nice_url_button {
+  .page_vabila #vabila .button_holder #nice_url_button {
     margin: 16px 0 0 0;
   }
-  .page_vabila.subpage_settings #vabila .more_block {
+  .page_vabila #vabila .button_holder #nice_url_holder {
+    flex-direction: column;
+    align-items: flex-start;
+    margin: 16px 0 0 0;
+  }
+  .page_vabila #vabila .button_holder #nice_url_holder .buttons {
+    margin: 16px 0 0 0;
+  }
+  .page_vabila #vabila .more_block {
     width: 100%;
   }
 
@@ -33662,15 +33701,6 @@ table.invitations_settings p label input[type=password],
     top: 68px;
   }
 
-  .subpage_append,
-.subpage_merge,
-.subpage_calculation,
-.subpage_coding_auto,
-.subpage_recoding,
-.subpage_coding,
-.page_export {
-    flex-direction: column !important;
-  }
   .subpage_append .anketa_edit_main,
 .subpage_merge .anketa_edit_main,
 .subpage_calculation .anketa_edit_main,
@@ -33682,13 +33712,13 @@ table.invitations_settings p label input[type=password],
     box-sizing: border-box;
     margin: 0 !important;
   }
-  .subpage_append .anketa_edit_left,
-.subpage_merge .anketa_edit_left,
-.subpage_calculation .anketa_edit_left,
-.subpage_coding_auto .anketa_edit_left,
-.subpage_recoding .anketa_edit_left,
-.subpage_coding .anketa_edit_left,
-.page_export .anketa_edit_left {
+  .subpage_append .layout_left_item,
+.subpage_merge .layout_left_item,
+.subpage_calculation .layout_left_item,
+.subpage_coding_auto .layout_left_item,
+.subpage_recoding .layout_left_item,
+.subpage_coding .layout_left_item,
+.page_export .layout_left_item {
     display: none !important;
   }
   .subpage_append textarea,
@@ -33837,13 +33867,6 @@ table.analysis_reports > tbody > tr > td {
     white-space: nowrap;
   }
 
-  .page_arhivi,
-.page_tracking,
-.subpage_anal_arch,
-.subpage_view_archive,
-.subpage_anal_arch {
-    flex-direction: column !important;
-  }
   .page_arhivi .anketa_edit_left,
 .page_tracking .anketa_edit_left,
 .subpage_anal_arch .anketa_edit_left,
diff --git a/resources/sass/admin_new/mobile/pages/archive.scss b/resources/sass/admin_new/mobile/pages/archive.scss
index 64ecd1522..c97b455df 100644
--- a/resources/sass/admin_new/mobile/pages/archive.scss
+++ b/resources/sass/admin_new/mobile/pages/archive.scss
@@ -4,7 +4,6 @@
 .subpage_anal_arch,
 .subpage_view_archive,
 .subpage_anal_arch{
-    flex-direction: column !important;
 
     .anketa_edit_left{
         display: none !important;
diff --git a/resources/sass/admin_new/mobile/pages/data.scss b/resources/sass/admin_new/mobile/pages/data.scss
index 3e378dcfe..a44cbb486 100644
--- a/resources/sass/admin_new/mobile/pages/data.scss
+++ b/resources/sass/admin_new/mobile/pages/data.scss
@@ -133,7 +133,6 @@ body.data_fullscreen{
 .subpage_recoding,
 .subpage_coding,
 .page_export{
-    flex-direction: column !important;
 
     .anketa_edit_main{
         width: 100% !important;
@@ -142,7 +141,7 @@ body.data_fullscreen{
         margin: 0 !important;
     }
 
-    .anketa_edit_left{
+    .layout_left_item{
         display: none !important;
     }
 
diff --git a/resources/sass/admin_new/mobile/pages/publish.scss b/resources/sass/admin_new/mobile/pages/publish.scss
index 5cabe9837..be52f7d43 100644
--- a/resources/sass/admin_new/mobile/pages/publish.scss
+++ b/resources/sass/admin_new/mobile/pages/publish.scss
@@ -1,22 +1,35 @@
 
-.page_vabila.subpage_settings #vabila{
+.page_vabila #vabila{
 
     .button_holder{
-        flex-wrap: wrap;
+        flex-direction: column;
+        align-items: flex-start;
 
-        .input_box{
-            display: flex;
-            width: auto !important;
+        .copy_survey_url_holder{
+            width: 100%;
+
+            // Url ankete in kopiranje url-ja
+            .input_box {
+                width: auto;
+            }  
+        }   
+        
+        // Nice URL - gumb
+        #nice_url_button{
+            margin: 16px 0 0 0;
         }
 
-        button{
-            margin: 0 0 0 8px;
+        // Nice URL - dodajanje
+        #nice_url_holder {
+            flex-direction: column;
+            align-items: flex-start;
 
-            &#nice_url_button{
+            margin: 16px 0 0 0;
+
+            .buttons{
                 margin: 16px 0 0 0;
             }
         }
-
     }
 
     .more_block{
diff --git a/resources/sass/admin_new/mobile/pages/status.scss b/resources/sass/admin_new/mobile/pages/status.scss
index feef8843b..3f769e0a5 100644
--- a/resources/sass/admin_new/mobile/pages/status.scss
+++ b/resources/sass/admin_new/mobile/pages/status.scss
@@ -1,3 +1,19 @@
+.dashboard_top_settings{
+    flex-direction: column;
+
+    .dashboard_top_filters{
+        align-items: flex-start;
+        width: 100%;
+
+        margin-top: 16px;
+
+        .filter_setting{
+            margin-left: 0;
+            margin-right: 16px;
+        }
+    }
+}
+
 .dashboard_boxes{
     flex-direction: column;
 
diff --git a/resources/sass/admin_new/pages/survey_objava/pregled.scss b/resources/sass/admin_new/pages/survey_objava/pregled.scss
index 58c0fee3f..efc83965c 100644
--- a/resources/sass/admin_new/pages/survey_objava/pregled.scss
+++ b/resources/sass/admin_new/pages/survey_objava/pregled.scss
@@ -161,39 +161,66 @@ div#vabila {
         align-items: center;
         margin-bottom: 16px;
         
-        button {
-            margin: 0 32px 0 8px;
-            min-width: 114px;
-        }
+        .copy_survey_url_holder{
+            display: flex;
+            flex-direction: row;
 
-        div.input_box {
-            border: 1px solid $dark-gray;
-            width: 300px;
-            padding: 10px 0 10px 8px;
-    
-            input {
-                border: none;
-                margin: 0;
-                padding: 0;
-                font-size: 16px;
-                width: 90%
+            // Url ankete in kopiranje url-ja
+            .input_box {
+                display: flex;
+                align-items: center;
+
+                border: 1px solid $dark-gray;
+                width: 300px;
+                padding: 10px 0 10px 8px;
+        
+                input {
+                    border: none;
+                    margin: 0;
+                    padding: 0;
+                    font-size: 16px;
+                    width: 100%
+                }
+            }  
+
+            button{
+                min-width: 114px;  
+                margin: 0 0 0 8px;
             }
+        }   
+        
+        // Nice URL - gumb
+        #nice_url_button{
+            margin: 0 0 0 32px;
         }
 
-        //Nice URL
-        div#nice_url_holder {
+        // Nice URL - dodajanje
+        #nice_url_holder {
             display: flex;
             flex-direction: row;
             align-items: center;
 
-            input {
-                margin: 0 8px;
-                width: 200px;
+            margin: 0 0 0 32px;
+
+            .url{
+                display: flex;
+                align-items: center;
+
+                input {
+                    margin: 0 8px;
+                    width: 200px;
+                }
             }
 
-            button {
-                margin-right: 8px;
-                margin-left: 0;
+            .buttons{
+                display: flex;
+
+                button {
+                    min-width: 114px;
+
+                    margin-right: 8px;
+                    margin-left: 0;
+                }
             }
         }
     }

From d19e7c7c758ac63e8c7ea2f082c96e81c46c9df1 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Fri, 17 Jun 2022 14:24:01 +0200
Subject: [PATCH 2/2] Redesign - popravek - nastavitev glede polja drugo se na
 desni prikaze samo ce je polje drugo prisotno v vprasanju

---
 admin/survey/classes/class.Vprasanje.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 970568252..f1a8a2a08 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -4932,13 +4932,15 @@ class Vprasanje {
         
         $otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1);
         $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
-    
+        
 
-        if(mysqli_num_rows($sql) > 0){	//ce je prisotna moznost Drugo,
-            echo '<fieldset id = fieldset'.$row['id'].'><legend>'.$lang['srv_other_size'].'</legend>';	//pokazi fieldset
+        // ce je prisotna moznost Drugo,
+        if(mysqli_num_rows($sql) > 0){	
+            echo '<fieldset id="fieldset'.$row['id'].'"><legend>'.$lang['srv_other_size'].'</legend>';
         }
-        else{							//drugace
-            echo '<fieldset id = fieldset'.$row['id'].' hidden><legend>'.$lang['srv_other_size'].'</legend>';	//skrij fieldset
+        // drugace je to skrito
+        else{							
+            echo '<fieldset id="fieldset'.$row['id'].'" style="display:none;"><legend>'.$lang['srv_other_size'].'</legend>';
         }