[Redizajn 1KA] Popupi: Urejanje > Nastavitve > Telefonska anketa - Preložen/Prekinjen

admin/survey/SurveyAdmin.php

@@ -503,6 +503,9 @@ class SurveyAdmin
         echo '<div id="user_narocila_popup" class="user_narocila_popup divPopUp"></div>';
         echo '<div id="user_placila_popup" class="user_placila_popup divPopUp"></div>';
 
+        //Telefonska anketa
+        echo '<div id="telephone_popup" class="divPopUp PopUpNarrow"></div>';
+        
 
         echo '</div>';
         echo '</div>';

admin/survey/classes/class.SurveyTelephone.php

@@ -3293,8 +3293,6 @@ class SurveyTelephone {
 			// Razveljavimo zadnji status (undo)
 			if($last_status == 'A')
 				echo '<p class="bottom16"><a href="#" onClick="phnUndoStatus(\''.$usr_id.'\')">'.$lang['srv_telephone_call_action_undo_status'].' (»'.$last_status.'«)</a></p>';
-
-			echo '<div id="telephone_popup" />';
 			echo '</div>';
 			
 		} else {
@@ -3560,6 +3558,11 @@ class SurveyTelephone {
 		$marker = $_POST['marker'];
 		$usr_id = (int)$_POST['usr_id'];
 
+		echo '<h2>'.$lang['srv_inv_recipients_status'].'</h2>';
+		echo '<div class="popup_close"><a href="#" onClick="$(\'#telephone_popup\').hide(); $(\'#fade\').fadeOut(\'slow\');">✕</a></div>';
+
+		$button_setting = '';
+		
 		if ($usr_id > 0 && ($marker == 'P' || $marker == 'T')) {
 			if ($marker == 'T') {
 				# zmenjen
@@ -3570,8 +3573,11 @@ class SurveyTelephone {
 			}
 			
 			echo '<p><form name="'.$marker.'">';
-			echo '<input id="'.$marker.'_datetime" type="text" name="'.$marker.'_datetime" value="'.$newDate.'" />
+
-			<span class="faicon calendar_icon icon-as_link" id="'.$marker.'_datetime_image"></span>
+			echo '<div class="setting_holder">';
+			echo '<div class="setting_item">';
+			echo '<input id="'.$marker.'_datetime" type="text" class="text large" name="'.$marker.'_datetime" value="'.$newDate.'" />
+			<span class="faicon calendar_icon blue pointer" id="'.$marker.'_datetime_image"></span>
 			<script type="text/javascript">
 			Calendar.setup({
 				inputField  : "'.$marker.'_datetime",
@@ -3579,16 +3585,23 @@ class SurveyTelephone {
 				button      : "'.$marker.'_datetime_image",
 				singleClick : true
 			});
-			</script></form>
+			</script></form>';
-			</p>';
+			echo '</div>';
+			echo '</div>';
+		}
+
+		echo '<div class="button_holder">';
+        echo '<button class="medium white-blue" onClick="$(\'#telephone_popup\').hide(); $(\'#fade\').fadeOut(\'slow\');">'.$lang['edit1338'].'</button>';              
+
+		if ($usr_id > 0 && ($marker == 'P' || $marker == 'T')){
 
 			if ($marker == 'T') {
-				echo '<span class="buttonwrapper floatRight spaceRight" ><a class="ovalbutton ovalbutton_orange"  href="#" onclick="phnAddMarker(\''.$usr_id.'\',\''.$marker.'\'); return false;"><span>'.$lang['srv_call_zmenjen'].'</span></a></span>';
+				echo '<button class="medium blue" onclick="phnAddMarker(\''.$usr_id.'\',\''.$marker.'\'); return false;">'.$lang['srv_call_zmenjen'].'</button>';
 			} else if ($marker == 'P') {
-				echo '<span class="buttonwrapper floatRight spaceRight" ><a class="ovalbutton ovalbutton_orange"  href="#" onclick="phnAddMarker(\''.$usr_id.'\',\''.$marker.'\'); return false;"><span>'.$lang['srv_call_prekinjen'].'</span></a></span>';
+				echo '<button class="medium blue" onclick="phnAddMarker(\''.$usr_id.'\',\''.$marker.'\'); return false;">'.$lang['srv_call_prekinjen'].'</button>';
 			}
 		}
-		echo '<span class="buttonwrapper floatRight spaceRight" ><a class="ovalbutton ovalbutton_gray"  href="#" onclick="$(\'#telephone_popup\').hide(); $(\'#fade\').fadeOut(\'slow\'); "><span>'.$lang['srv_cancel'].'</span></a></span>';
+        echo '</div>';
 	}
 	
 	// Nastavimo filter za pregled respondentov

lang/1.php

@@ -6476,8 +6476,8 @@ $lang = array (
 	'srv_telephone_dashboard_all_respondents'	=>	'Vseh enot s telefonsko številko:',
 	'srv_telephone_dashboard_all_contacted'		=>	'Vseh klicanih enot:',
 	'srv_telephone_dashboard_all_started'		=>	'Enot, ki so začele izpolnjevati:',
-	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min,<br/>oziroma določite nov datum in ure.',
+	'srv_telephone_call_mark_T_note'			=>	'Številka je dogovorjena čez 60min, oziroma določite nov datum in uro.',
-	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min,<br/>oziroma določite nov datum in ure.',
+	'srv_telephone_call_mark_P_note'			=>	'Številka je prekinjena za 60min, oziroma določite nov datum in uro.',
 	'srv_coding_one'							=>	'Kodiraj eno vrednost na odgovor',
 	'srv_coding_multi'							=>	'Kodiraj več vrednosti na odgovor',
 	'srv_profileManager_link'					=>	'Profili',	

public/css/admin_new.css

@@ -8222,6 +8222,24 @@ table#inv_edit_recipient {
   width: 100%;
 }
 
+div#telephone_popup .setting_holder {
+  margin-bottom: 16px;
+  display: flex;
+  flex-direction: column;
+}
+div#telephone_popup .setting_holder:first-of-type {
+  margin-top: 0;
+}
+div#telephone_popup .setting_holder .setting_item {
+  margin-top: 8px;
+}
+div#telephone_popup .setting_holder .setting_item input.text {
+  margin: 0 4px 0 4px;
+}
+div#telephone_popup .setting_holder .setting_item span.faicon {
+  margin-right: 16px;
+}
+
 /* 
     Header scss - top line, menu...
 */

resources/sass/admin_new/components/popup/page_specific.scss

@@ -130,7 +130,33 @@ div.setting_holder {
     }
 }
 
-//Nastavitve > Telefonska anketa > Izbriši respondenta
+//Nastavitve > Telefonska anketa
 table#inv_edit_recipient {
     width: 100%;
 }
+
+div#telephone_popup {
+
+    .setting_holder {
+        margin-bottom: 16px;
+        display: flex;
+        flex-direction: column;
+
+        &:first-of-type{
+            margin-top: 0;
+        }
+
+        .setting_item {
+            margin-top: 8px;
+
+            input.text {
+                margin: 0 4px 0 4px;
+            }
+
+            span.faicon {
+                margin-right: 16px;
+            }
+        }
+    }
+
+}