Merge branch 'master' of https://bitbucket.org/1ka/1ka

admin/survey/classes/class.Vprasanje.php

@@ -1876,10 +1876,7 @@ class Vprasanje {
 		$row = Cache::srv_spremenljivka($this->spremenljivka);
 		#'email','ime','priimek','telefon','naziv','drugo'
 		
-		echo '<p><span class="title">'.$lang['srv_label'].':</span><span class="content"><input type="text" name="label" value="'.$row['label'].'" maxlength="50" /></span></p>';
+		echo '<p><span class="title">'.$lang['srv_label'].':</span><span class="content"><input type="text" name="label" value="'.$row['label'].'" maxlength="80" /></span></p>';		
-		
-		//echo '<p><span class="title">'.$lang['srv_datapiping'].': '.Help::display('DataPiping').'</span> '.$lang['srv_datapiping_txt'].'</p>';
-		
 	}
 	
 	/**

admin/survey/modules/mod_NIJZ/class.SurveyNIJZ.php

@@ -99,7 +99,7 @@ class SurveyNIJZ{
 
         echo '<div class="spremenljivka nijz_radar_holder">';
 
-        echo '<h1 class="nijz_title radar_title">Naslov grafa</h1>';
+        echo '<h1 class="nijz_title radar_title">Bivalno okolje</h1>';
 
         echo '<img src="'.$site_url.RESULTS_FOLDER.'/radar_'.$this->usr_id.'.png">';
 
@@ -155,7 +155,7 @@ class SurveyNIJZ{
 
         echo '<div class="spremenljivka nijz_table_holder">';
 
-        echo '<h1 class="nijz_title table_title">Naslov tabele</h1>';
+        //echo '<h1 class="nijz_title table_title">Naslov tabele</h1>';
 
         $half = round(count($this->vprasanja_radar) / 2);
 
@@ -181,7 +181,7 @@ class SurveyNIJZ{
 
 
 	// Zgeneriramo pdf analizo
-	private function createRadar(){
+	public function createRadar(){
 		global $site_path;
 		global $admin_type;
 
@@ -197,7 +197,7 @@ class SurveyNIJZ{
             $out = exec('Rscript '.$script.' '.$this->usr_id.' 2>&1', $output, $return_var);
         }
         catch(Exception $e){
-            echo $e->getMessage();
+            return $e->getMessage();
         }
 		
 		// Testiranje - izpis errorjev

public/css/admin.css

@@ -28444,12 +28444,107 @@ a.addIfIcon {
 }
 
 @media (max-width: 600px) {
-  table#surveyList_new td {
+  #srv_footer {
+    display: flex;
+    flex-direction: column;
+  }
+  #srv_footer .footer_left {
+    margin-bottom: 10px;
+  }
+
+  #main #moje_ankete_edit {
+    padding: 20px !important;
+  }
+  #main #moje_ankete_edit #survey_list {
+    display: flex;
+    flex-direction: column;
+  }
+  #main #moje_ankete_edit #survey_list > div {
+    margin: 15px 0 20px 0;
+  }
+  #main #moje_ankete_edit #survey_list #anketa_new_float {
+    display: flex;
+    justify-content: center;
+  }
+  #main #moje_ankete_edit #survey_list #pagination {
+    margin-left: auto;
+    margin-right: auto;
+    transform: none;
     display: none;
   }
-  table#surveyList_new td:nth-child(3), table#surveyList_new td:nth-child(6), table#surveyList_new td:nth-child(7) {
+  #main #moje_ankete_edit #survey_list #pagination.bottom {
+    display: block;
+  }
+  #main #moje_ankete_edit #survey_list #sortButton,
+#main #moje_ankete_edit #survey_list #filterButton,
+#main #moje_ankete_edit #survey_list #folderSwitch {
+    display: none;
+  }
+  #main #moje_ankete_edit #survey_list #searchMySurveys {
+    padding: 0;
+  }
+  #main #moje_ankete_edit #survey_list #searchMySurveys form {
+    display: flex;
+    justify-content: center;
+  }
+  #main #moje_ankete_edit #survey_list #searchMySurveys form input[type=text] {
+    width: 100%;
+    padding: 5px 0 5px 7px;
+  }
+  #main #moje_ankete_edit #survey_list .div_sl_new {
+    padding: 20px 0;
+  }
+  #main #moje_ankete_edit #survey_list table#surveyList_new td {
+    display: none;
+  }
+  #main #moje_ankete_edit #survey_list table#surveyList_new td:nth-child(3), #main #moje_ankete_edit #survey_list table#surveyList_new td:nth-child(6), #main #moje_ankete_edit #survey_list table#surveyList_new td:nth-child(7) {
     display: table-cell;
   }
+
+  #branching {
+    width: 100%;
+  }
+  #branching li {
+    margin: 0 10px 0 20px !important;
+  }
+  #branching .spr_edit {
+    display: none !important;
+  }
+  #branching #bottom_icons_holder {
+    display: flex;
+    flex-direction: column;
+  }
+  #branching #bottom_icons_holder .forma_bottom {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    height: auto;
+    padding: 30px 10px 20px 20px;
+  }
+  #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner {
+    display: flex;
+    flex-direction: row;
+    padding: 0 0 10px 0;
+    margin: 0;
+  }
+  #branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a {
+    margin: 0 8px;
+    padding: 0;
+  }
+
+  #vprasanje_float_editing {
+    position: fixed;
+    width: 90%;
+    max-height: 90%;
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin: 5% !important;
+    top: 0;
+    right: 0;
+    left: 0;
+    box-shadow: 0px 0px 100px 100px #333;
+  }
 }
 
 /*# sourceMappingURL=admin.css.map */

resources/sass/admin/mobile/footer.scss

@@ -1 +1,8 @@
+#srv_footer{
+    display: flex;
+    flex-direction: column;
 
+    .footer_left{
+        margin-bottom: 10px;
+    }
+}

resources/sass/admin/mobile/pages/branching.scss

@@ -1 +1,56 @@
 
+#branching{
+    width: 100%;
+
+    li{
+        margin: 0 10px 0 20px !important;        
+    }
+
+    .spr_edit{
+        display: none !important;
+    }
+
+    #bottom_icons_holder{
+        display: flex;
+        flex-direction: column;
+
+        .forma_bottom{
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+
+            width: 100%;
+            height: auto;
+            padding: 30px 10px 20px 20px;
+
+            .forma_bottom_inner{
+                display: flex;
+                flex-direction: row;
+
+                padding: 0 0 10px 0;
+                margin: 0;
+
+                a{
+                    margin: 0 8px;
+                    padding: 0;
+                }
+            }
+        }
+        
+    }
+}
+
+#vprasanje_float_editing{
+    position: fixed;
+    width: 90%;
+    max-height: 90%;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    margin: 5% !important;
+    top: 0;
+    right: 0;
+    left: 0;
+
+    box-shadow: 0px 0px 100px 100px #333;
+}

resources/sass/admin/mobile/pages/my_surveys.scss

@@ -1,4 +1,56 @@
 
+#main #moje_ankete_edit{
+    padding: 20px !important;
+
+    #survey_list{
+        display: flex;
+        flex-direction: column;
+
+        > div{
+            margin: 15px 0 20px 0;
+        }
+
+        #anketa_new_float{
+            display: flex;
+            justify-content: center;
+        }
+
+        #pagination{
+            margin-left: auto;
+            margin-right: auto;
+    
+            transform: none;
+
+            display: none;
+
+            &.bottom{
+                display: block;
+            }
+        }
+    
+        #sortButton,
+        #filterButton,
+        #folderSwitch{
+            display: none;
+        }
+
+        #searchMySurveys{
+            padding: 0;
+
+            form{
+                display: flex;
+                justify-content: center;
+
+                input[type="text"]{
+                    width: 100%;
+                    padding: 5px 0 5px 7px;
+                }
+            }
+        }
+
+        .div_sl_new {
+            padding: 20px 0;
+        }
 
         // Tabela z mojimi anketami
         table#surveyList_new{
@@ -12,8 +64,7 @@ table#surveyList_new{
                     display: table-cell;
                 }
             }
-
-    
-
-
         }
+    }
+}
+