[Redizajn 1KA] - Testiranje --> Komentarji - v0

admin/survey/SurveyAdminSettings.php

@@ -7049,13 +7049,7 @@ class SurveyAdminSettings {
 		
 		$rowa = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="placeholder" class="komentarji">';
+		echo '<div id="comment_question_note">';
-		
-		
-		echo '<div id="branching" class="branching_new expanded komentarji">';
-		
-		
-		echo '<span id="comment_question_note">';
 				
 		echo $lang['srv_komentarji_imate'].' ';
 		if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo '<span class="red">';
@@ -7064,9 +7058,10 @@ class SurveyAdminSettings {
 		
 		echo ' '.$lang['srv_komentarji_odskupno'].' ';
 		echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od');
-		echo '</span>';
+		echo '</div>';
 		
 		
+		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TG
 		echo '&nbsp;<span class="tooltip clr spaceLeft">';
 		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
 		echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
@@ -7075,7 +7070,7 @@ class SurveyAdminSettings {
 		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
 		echo '<span class="arrow"></span>';
 		echo '</span>';	// expanded-tooltip bottom
-		echo '</span>'; // tooltip
+		echo '</span>'; // tooltip */
 		
 		
 		# VV: privzeto naj bodo samo nerešeni komentarji
@@ -7273,7 +7268,6 @@ class SurveyAdminSettings {
 		echo '</div>';
 	
 			
-		echo '</div>';
 		echo '</div>';
 	}
 	
@@ -7520,11 +7514,6 @@ class SurveyAdminSettings {
 		
 		$rowi = SurveyInfo::getInstance()->getSurveyRow();
 		
-		echo '<div id="placeholder" class="komentarji">';
-		
-		
-        echo '<div id="branching" class="branching_new expanded komentarji">';
-        
 		SurveySetting::getInstance()->Init($this->anketa);
 		$question_resp_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_viewadminonly');
 		$question_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment_viewadminonly');
@@ -7541,7 +7530,7 @@ class SurveyAdminSettings {
 		$comment_count = $this->testiranje_komentarji_count();
 		
 		
-		echo '<span id="comment_question_note">';
+		echo '<div id="comment_question_note">';
 				
 		echo $lang['srv_komentarji_imate'].' ';
 		if($comment_count['question']['unresolved'] > 0) echo '<span class="red">';
@@ -7551,10 +7540,10 @@ class SurveyAdminSettings {
 		echo ' '.$lang['srv_komentarji_odskupno'].' ';
 		echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od');
 		
-		echo '</span>';
+		echo '</div>';
 		
 		
-		echo '&nbsp;<span class="tooltip clr spaceLeft">';
+		/* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho '&nbsp;<span class="tooltip clr spaceLeft">';
 		echo '<a href="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" target="_blank" style="font-size:15px"><span class="faicon edit_square"></span> '.$lang['srv_survey_testdata'].'</a>';
 		echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') ';
 		echo '<span class="expanded-tooltip bottom light" style="left: -20px;">';
@@ -7562,7 +7551,7 @@ class SurveyAdminSettings {
 		echo '<p>'.$lang['srv_preview_testdata_longtext'].'</p>';
 		echo '<span class="arrow"></span>';
 		echo '</span>';	// expanded-tooltip bottom
-		echo '</span>'; // tooltip
+		echo '</span>'; // tooltip */
 		
 		
 		# VV: privzeto naj bodo samo nerešeni komentarji

admin/survey/classes/tracking/CrossRoad.php

@@ -126,8 +126,8 @@ class CrossRoad {
                     $first_action = NAVI_TESTIRANJE;
                     $second_action = NAVI_TESTIRANJE_KOMENTARJI;
 
-                    $layout_width = 'wide';
+                    $layout_width = 'narrow';
-                    $layout_menu = 'menu_left';
+                    $layout_menu = '';
 
                     $status = 0;
 

public/css/admin_new.css

@@ -10329,78 +10329,6 @@ table.variableView {
   width: 100%;
 }
 
-div#srv_diagnostic h2 {
-  font-size: 24px;
-  margin-top: 32px;
-  margin-bottom: 16px;
-  font-weight: 300;
-}
-div#srv_diagnostic h2:first-of-type {
-  margin-top: 0;
-}
-div#srv_diagnostic table {
-  width: 100%;
-}
-div#srv_diagnostic table td a.ok {
-  color: #D3D3D3 !important;
-}
-div#srv_diagnostic table td div.status_wrapper {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-div#srv_diagnostic table td div.status_wrapper div.status {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 24px;
-  min-width: 88px;
-  border-radius: 2px;
-  font-size: 14px;
-}
-div#srv_diagnostic table td div.status_wrapper div.status.notok {
-  background-color: #FFE3E3;
-}
-div#srv_diagnostic table td div.status_wrapper div.status.ok {
-  background-color: #E3F6DE;
-}
-div#srv_diagnostic table td div.status_wrapper div.status.rec {
-  background-color: #EAF9FE;
-}
-div#srv_diagnostic table td div.status_wrapper div.status a {
-  color: inherit;
-  text-decoration: none;
-}
-div#srv_diagnostic div.lastnosti_wrapper {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  gap: 32px;
-}
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
-div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
-  width: 50%;
-}
-div#srv_diagnostic div.input_box {
-  border: 1px solid #C4C4C4;
-  width: 300px;
-  padding: 10px 0 10px 8px;
-}
-div#srv_diagnostic div.input_box input {
-  border: none;
-  margin: 0;
-  padding: 0;
-  font-size: 16px;
-  width: 90%;
-}
-div#srv_diagnostic div.button_holder {
-  align-items: center;
-  margin-bottom: 0;
-}
-div#srv_diagnostic div.button_holder button {
-  margin: 0 0 0 8px;
-}
-
 div.subpage_predvidenicas table,
 div.subpage_cas table {
   width: 100%;
@@ -10493,6 +10421,150 @@ div.subpage_cas div.tabela_trajanje_legenda span.legend {
   margin-right: 32px;
 }
 
+div#srv_diagnostic h2 {
+  font-size: 24px;
+  margin-top: 32px;
+  margin-bottom: 16px;
+  font-weight: 300;
+}
+div#srv_diagnostic h2:first-of-type {
+  margin-top: 0;
+}
+div#srv_diagnostic table {
+  width: 100%;
+}
+div#srv_diagnostic table td a.ok {
+  color: #D3D3D3 !important;
+}
+div#srv_diagnostic table td div.status_wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+div#srv_diagnostic table td div.status_wrapper div.status {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 24px;
+  min-width: 88px;
+  border-radius: 2px;
+  font-size: 14px;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.notok {
+  background-color: #FFE3E3;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.ok {
+  background-color: #E3F6DE;
+}
+div#srv_diagnostic table td div.status_wrapper div.status.rec {
+  background-color: #EAF9FE;
+}
+div#srv_diagnostic table td div.status_wrapper div.status a {
+  color: inherit;
+  text-decoration: none;
+}
+div#srv_diagnostic div.lastnosti_wrapper {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+  gap: 32px;
+}
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_left,
+div#srv_diagnostic div.lastnosti_wrapper div.lastnosti_right {
+  width: 50%;
+}
+div#srv_diagnostic div.input_box {
+  border: 1px solid #C4C4C4;
+  width: 300px;
+  padding: 10px 0 10px 8px;
+}
+div#srv_diagnostic div.input_box input {
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 16px;
+  width: 90%;
+}
+div#srv_diagnostic div.button_holder {
+  align-items: center;
+  margin-bottom: 0;
+}
+div#srv_diagnostic div.button_holder button {
+  margin: 0 0 0 8px;
+}
+
+#placeholder.komentarji {
+  margin: 0px;
+}
+
+.comment {
+  font-style: italic;
+  color: #FF0000;
+  width: auto;
+  padding-right: 10px;
+  padding-top: 3px;
+  display: block;
+  float: left;
+}
+
+.if_comment {
+  font-style: italic;
+  color: #E5E5E5;
+  width: auto;
+  margin: 0px 3px;
+}
+
+.spr_comment {
+  font-style: italic;
+  color: #E5E5E5;
+  width: auto;
+  margin: 0px 3px;
+}
+
+#quick_comments_link {
+  margin-bottom: 1px !important;
+  margin-left: 3px !important;
+  padding-bottom: 3px !important;
+}
+#quick_comments_link a span.link {
+  display: inline-block;
+  padding: 3px !important;
+  padding-bottom: 5px !important;
+  font-size: 11px;
+  vertical-align: top;
+}
+
+#quick_comments_link.newCss {
+  height: 20px !important;
+  line-height: 20px !important;
+  text-align: center;
+  margin-top: 8px !important;
+}
+#quick_comments_link.newCss img {
+  vertical-align: middle;
+}
+
+.comments_on_alert {
+  margin-bottom: 10px;
+}
+.comments_on_alert a {
+  font-weight: 500;
+}
+.comments_on_alert a:hover {
+  color: #1E88E5;
+}
+
+.comment_qtip_title_secondLine {
+  color: #E5E5E5;
+  font-weight: normal !important;
+  padding-top: 5px;
+}
+
+#topSettingsHolder.komentarji #additional_navigation a span,
+#topSettingsHolder.komentarji_anketa #additional_navigation a span {
+  padding: 2px 0px 2px 0;
+}
+
 div.page_tema h2 {
   font-size: 24px;
   margin-top: 32px;

resources/sass/admin_new/pages/my_surveys/my_surveys.scss

@@ -8,8 +8,8 @@
 @import "missing_values";
 @import "standardne_besede";
 @import "podatki";
-@import "testiranje";
+@import "testiranje/testiranje";
 @import "oblika_teme";
 @import "objava";
-@import "komentarji";
+@import "nastavitve_komentarji";
 

resources/sass/admin_new/pages/my_surveys/testiranje.scss

@@ -1,194 +0,0 @@
-// DIAGNOSTIKA
-div#srv_diagnostic {
-    h2 {
-        font-size: 24px;
-        margin-top: 32px;
-        margin-bottom: 16px;
-
-        font-weight: $light;
-        
-        &:first-of-type {
-            margin-top: 0;
-        }
-
-    }
-
-    table {
-        width: 100%;
-
-        td {
-
-            a.ok {
-                color: $dark-gray2 !important;
-            }
-
-            div.status_wrapper {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                
-                div.status {
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    height: 24px;
-                    min-width: 88px;
-                    border-radius: 2px;
-    
-                    font-size: 14px;
-    
-                    &.notok {
-                        background-color: $status-red;
-                    }
-    
-                    &.ok {
-                        background-color: $status-green;
-                    }
-
-                    &.rec {
-                        background-color: $status-blue;
-                    }
-
-                    a {
-                        color: inherit;
-                        text-decoration: none;
-                    }
-                }
-            }
-        }
-    }
-
-    div.lastnosti_wrapper {
-        display: flex;
-        flex-direction: row;
-        align-items: flex-start;
-        gap: 32px;
-
-        div.lastnosti_left,
-        div.lastnosti_right {
-            width: 50%;
-        }
-        
-    }
-    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%
-        }
-    }
-
-    div.button_holder {
-        align-items: center;
-        margin-bottom: 0;
-        button {
-            margin: 0 0 0 8px;
-        }
-    }
-}
-
-//OCENJEVANJE TRAJANJA, DEJANSKI ČASI
-div.subpage_predvidenicas,
-div.subpage_cas {
-
-    table {
-        width: 100%;
-        white-space: nowrap;
-
-        td.graph_cell {
-            width: 100%;
-
-            div.graph_cell {
-                
-                display:flex;
-                flex-direction: row;
-            }
-        }
-
-        td.time {
-            padding-right: 0;
-        }
-
-        td.predvideni {
-            color: $dark-gray;
-        }
-
-        &#casi_histogram {
-            padding: 0;
-            margin: 0;
-
-            td.histogram {
-                vertical-align: bottom;
-                margin: 0;
-                padding: 0;
-                border: none;
-
-                div.histogram {
-                    background-color: $gray;
-                    border: 1px solid transparent;
-                    text-align: right;
-                    width: 100%;
-                    margin: 0;
-                    padding: 0;
-                    min-height: 1px;
-                }
-            }
-
-            td.histogram_time {
-                padding: 0;
-                text-align: left;
-                vertical-align: top;
-                color: $very-dark-gray;
-
-                border: none;
-            }
-        }
-    }
-
-    div.graph_full {
-        background-color: $blue;
-        height: 24px;
-        text-align: right;
-    }
-    
-    div.graph_empty {
-        background-color: $gray;
-        height: 24px;
-    }
-
-    div.graph_red {
-        background-color: $status-red;
-        height: 24px;
-    }
-
-    div.tabela_trajanje_legenda {
-        display: flex;
-        flex-direction: row;
-        justify-content: start;
-        align-items: center;
-
-        margin-top: 16px;
-
-        span.legend {
-            font-size: 14px;
-        }
-
-        div.legend {
-            width: 14px;
-            height: 14px;
-            margin-right: 8px;
-            border-radius: 2px;
-        }
-
-        span.legend {
-            margin-right: 32px;
-        }
-    }
-}

resources/sass/admin_new/pages/my_surveys/testiranje/diagnostika.scss

@@ -0,0 +1,95 @@
+// DIAGNOSTIKA
+div#srv_diagnostic {
+    h2 {
+        font-size: 24px;
+        margin-top: 32px;
+        margin-bottom: 16px;
+
+        font-weight: $light;
+        
+        &:first-of-type {
+            margin-top: 0;
+        }
+
+    }
+
+    table {
+        width: 100%;
+
+        td {
+
+            a.ok {
+                color: $dark-gray2 !important;
+            }
+
+            div.status_wrapper {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                
+                div.status {
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    height: 24px;
+                    min-width: 88px;
+                    border-radius: 2px;
+    
+                    font-size: 14px;
+    
+                    &.notok {
+                        background-color: $status-red;
+                    }
+    
+                    &.ok {
+                        background-color: $status-green;
+                    }
+
+                    &.rec {
+                        background-color: $status-blue;
+                    }
+
+                    a {
+                        color: inherit;
+                        text-decoration: none;
+                    }
+                }
+            }
+        }
+    }
+
+    div.lastnosti_wrapper {
+        display: flex;
+        flex-direction: row;
+        align-items: flex-start;
+        gap: 32px;
+
+        div.lastnosti_left,
+        div.lastnosti_right {
+            width: 50%;
+        }
+        
+    }
+    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%
+        }
+    }
+
+    div.button_holder {
+        align-items: center;
+        margin-bottom: 0;
+        button {
+            margin: 0 0 0 8px;
+        }
+    }
+}

resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss

@@ -0,0 +1,88 @@
+div.page_komentarji {
+
+    div#comment_question_note {
+
+    }
+}
+
+
+#placeholder.komentarji{
+    margin: 0px;
+}
+
+.comment {
+	font-style: italic;
+	color: $red;
+	width: auto;
+	padding-right: 10px;
+	padding-top: 3px;
+	display: block;
+	float: left;
+}
+.if_comment {
+	font-style: italic;
+	color: $gray;
+	width: auto;
+	margin: 0px 3px;
+}
+.spr_comment {
+	font-style: italic;
+	color: $gray;
+	width: auto;
+	margin: 0px 3px;
+}
+#quick_comments_link {
+	margin-bottom: 1px !important;
+	margin-left: 3px !important;
+	padding-bottom: 3px !important;
+	a {
+		span.link {
+			display: inline-block;
+			padding: 3px !important;
+			padding-bottom: 5px !important;
+			font-size: 11px;
+			vertical-align: top;
+		}
+	}
+}
+#quick_comments_link.newCss {
+	height: 20px !important;
+	line-height: 20px !important;
+	text-align: center;
+	margin-top: 8px !important;
+	img {
+		vertical-align: middle;
+	}
+}
+.comments_on_alert {
+	margin-bottom: 10px;
+
+    a{
+        //color: white;
+        font-weight: 500;
+
+        &:hover{
+            color: $blue;
+        }
+    }
+}
+.comment_qtip_title_secondLine {
+	color: $gray;
+	font-weight: normal !important;
+	padding-top: 5px;
+}
+@mixin sub_settings_comments(){
+
+    
+}
+#topSettingsHolder.komentarji,
+#topSettingsHolder.komentarji_anketa {
+    
+    #additional_navigation {
+		a {
+			span {
+				padding: 2px 0px 2px 0;
+			}
+		}
+	}
+}

resources/sass/admin_new/pages/my_surveys/testiranje/testiranje.scss

@@ -0,0 +1,3 @@
+@import "trajanje";
+@import "diagnostika";
+@import "komentarji";

resources/sass/admin_new/pages/my_surveys/testiranje/trajanje.scss

@@ -0,0 +1,98 @@
+//OCENJEVANJE TRAJANJA, DEJANSKI ČASI
+div.subpage_predvidenicas,
+div.subpage_cas {
+
+    table {
+        width: 100%;
+        white-space: nowrap;
+
+        td.graph_cell {
+            width: 100%;
+
+            div.graph_cell {
+                
+                display:flex;
+                flex-direction: row;
+            }
+        }
+
+        td.time {
+            padding-right: 0;
+        }
+
+        td.predvideni {
+            color: $dark-gray;
+        }
+
+        &#casi_histogram {
+            padding: 0;
+            margin: 0;
+
+            td.histogram {
+                vertical-align: bottom;
+                margin: 0;
+                padding: 0;
+                border: none;
+
+                div.histogram {
+                    background-color: $gray;
+                    border: 1px solid transparent;
+                    text-align: right;
+                    width: 100%;
+                    margin: 0;
+                    padding: 0;
+                    min-height: 1px;
+                }
+            }
+
+            td.histogram_time {
+                padding: 0;
+                text-align: left;
+                vertical-align: top;
+                color: $very-dark-gray;
+
+                border: none;
+            }
+        }
+    }
+
+    div.graph_full {
+        background-color: $blue;
+        height: 24px;
+        text-align: right;
+    }
+    
+    div.graph_empty {
+        background-color: $gray;
+        height: 24px;
+    }
+
+    div.graph_red {
+        background-color: $status-red;
+        height: 24px;
+    }
+
+    div.tabela_trajanje_legenda {
+        display: flex;
+        flex-direction: row;
+        justify-content: start;
+        align-items: center;
+
+        margin-top: 16px;
+
+        span.legend {
+            font-size: 14px;
+        }
+
+        div.legend {
+            width: 14px;
+            height: 14px;
+            margin-right: 8px;
+            border-radius: 2px;
+        }
+
+        span.legend {
+            margin-right: 32px;
+        }
+    }
+}