Redesign - popravki napak - status, alternativni mail

admin/survey/SurveyAdminSettings.php

@@ -10445,7 +10445,7 @@ class SurveyAdminSettings {
 			echo '<div class="setting_holder">';
 			echo '<label>'.$lang['email'].':</label>';
 			echo '<div class="icon_holder">';
-			echo '<input class="large disabled" value="'.$row['email'].'" type="text">';
+			echo '<input class="large disabled" value="'.$row['email'].'" type="text" name="email_main">';
 			if(!empty($alternativni_emaili))
 				echo '<input name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'><label for="active-master">'.$lang['login_email_subscription'].'</label>';
 			echo '</div>';
@@ -10457,8 +10457,8 @@ class SurveyAdminSettings {
                     echo '<div class="setting_holder">';
                     echo '<label>'.$lang['altemail'].':</label>';
                     echo '<div class="icon_holder">';
-                    echo '<input class="large disabled" value="'.$email->email.'" type="text">';
+                    echo '<input class="large disabled" value="'.$email->email.'" name="email_alter'.($email->id).'" type="text">';
-                    echo '<div class="blue pointer altmail" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><span class="faicon trash empty"></span></div>';
+                    echo '<div class="blue pointer altmail" onclick="izbrisiAlternativniEmail(\''.$email->id.'\', \''.$email->email.'\')"><span class="faicon trash empty"></span></div>';
                     echo '<input value="'.($email->id).'" id="altemail'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="altemail'.($email->id).'">'.$lang['login_email_subscription'].'</label>';
                     echo '</div>';
                     echo '</div>';						

admin/survey/classes/class.SurveyStatistic.php

@@ -1117,7 +1117,6 @@ class SurveyStatistic {
 				
 				echo $prefix.$_starts[2].'.'.$_starts[1].'.'.$_starts[0].'-'.$_expire[2].'.'.$_expire[1].'.'.$_expire[0];
 				
-				# echo $prefix . $this->dateFormat($active['starts'],DATE_FORMAT_SHORT).'-'.$this->dateFormat($active['expire'],DATE_FORMAT_SHORT);
 				$prefix = '; ';
 			}
 			echo '</td></tr>';
@@ -1133,7 +1132,7 @@ class SurveyStatistic {
 		echo '<tr><td>';
 		echo $lang['srv_info_duration']. ':';
 		echo '</td><td colspan="3">';
-		echo ($skupni_cas!=''?'<a href="index.php?anketa='.$this->surveyId.'&a='.A_REPORTI . '&m='.M_TESTIRANJE_CAS.'">':'').$skupni_cas.($skupni_cas!=''?'</a>, ':'');
+		echo ($skupni_cas!=''?'<a href="index.php?anketa='.$this->surveyId.'&a=testiranje&m=cas">':'').$skupni_cas.($skupni_cas!=''?'</a>, ':'');
 		
 		echo ''.$lang['srv_predvideno'].': ';
 		if ($d->checkDostopSub('test'))
@@ -1929,9 +1928,7 @@ class SurveyStatistic {
 	 			$email_filter_string = ' AND inv_res_id is NULL ';
 	 		}
 	 	}
-	 	
+	 			
-		echo '<div class="box_title">'.$lang['srv_statistic_referals_list'].' '.Help :: display('srv_statistic_referals_list').'</div>';
-		
 		// še podatke o uporabniku
 		$sql_userInfo = sisplet_query("SELECT referer, COUNT(*) as cnt FROM srv_user WHERE ank_id = '".$this->getSurveyId()."' AND preview = '0' AND deleted='0' AND time_insert BETWEEN '".$this->startDate."' AND '".$this->endDate."' + INTERVAL 1 ".$email_filter_string ." DAY GROUP BY referer");
 		if (mysqli_num_rows($sql_userInfo) > 0) {
@@ -1969,9 +1966,7 @@ class SurveyStatistic {
 		# IP-je lovimo preko ajaxa
 		$string_sql = "SELECT COUNT(id) AS count, ip FROM srv_user WHERE ank_id='".$this->getSurveyId()."' AND preview = '0' AND deleted='0' AND (time_insert BETWEEN '".$this->startDate."' AND '".$this->endDate."' + INTERVAL 1 DAY) ".$email_filter_string." GROUP BY ip ORDER BY count DESC, ip ASC";
 		$sql = sisplet_query($string_sql);
-		
+				
-		echo '<div class="box_title">'.$lang['srv_statistic_IP_list'].' '.Help :: display('srv_statistic_IP_list').'</div>';
-		
         if (mysqli_num_rows($sql) > 0) {
 			echo '<table>';
 			

admin/survey/css/print.css

@@ -396,6 +396,105 @@ div.dashboard_cell table td{
 	padding: 2px 0px;
 }
 
+.dashboard_boxes{
+    display: flex;
+    flex-wrap: wrap;
+    box-sizing: border-box;
+
+    margin-top: 32px;
+}
+
+.dashboard_box{
+    position: relative;
+    box-sizing: border-box;
+    width: 430px;
+    max-width: 100%;
+
+    padding: 32px 16px;
+    margin: 0 32px 32px 0;
+
+    font-size: 14px;
+
+    border: 1px #e5e5e5 solid;
+}
+.dashboard_box .box_title{
+    position: absolute;
+    top: -10px;
+    left: 16px;
+
+    padding: 0 16px;
+
+    font-size: 14px;
+    font-weight: bold;
+    color: #1E88E5;
+    text-transform: uppercase;
+    line-height: 18px;
+
+    background-color: white;
+}
+
+.dashboard_box .box_top_settings{
+    display: flex;
+    align-items: center;
+
+    margin-bottom: 8px;
+}
+.dashboard_box .box_top_settings span,
+.dashboard_box .box_top_settings label{
+    font-size: 14px;
+}
+
+.dashboard_box .box_top_settings select.dropdown{
+    width: auto;
+    margin: 0 0 0 8px;
+}
+
+.dashboard_box table{
+    width: 100%;
+    margin: 0 0 16px 0;
+
+    
+}
+.dashboard_box table tr{
+    height: auto;
+}
+.dashboard_box table tr.row1 td{
+    padding: 8px 16px 8px 8px;
+    font-weight: 600;
+    background-color: #F8F8F8;
+}
+
+.dashboard_box table tr.row_sum td{
+    font-weight: 600;
+}
+
+.dashboard_box table tr td{
+    padding: 4px 16px 4px 8px;
+
+    font-size: 14px;
+
+    border-top: 1px #E5E5E5 solid;
+    border-bottom: 1px #E5E5E5 solid;
+}
+.dashboard_box table tr td strong{
+    font-weight: 600;
+}
+
+.dashboard_box table tr td span{
+    font-size: 14px;
+}
+.dashboard_box table tr td .graph_db {
+    float: left; 
+    height: 16px;
+    margin-top: 1px;
+
+    background-color: #1E88E5;
+}
+.dashboard_box table tr td .graph_text {
+    margin-left: 8px;
+    font-size: 14px;
+}
+
 #div_statistic_info { }
 #div_statistic_answer_state { }
 #div_statistic_status {}

admin/survey/script/js-lang.php

@@ -199,6 +199,7 @@ lang('srv_comments_new');
 lang('srv_comment_comment');
 lang('edit1338');
 lang('for');
+lang('alternative_email_delete');
 
 
 //LOKACIJA

admin/survey/script/script.js

@@ -3622,6 +3622,7 @@ function voteCountToggle(status) {
 }
 
 function survey_statistic_referal(what) {
+    
 	if ($(what).attr('value') == '0') { // nalozimo vsebino samo prvi klik
 		var type = $("#type").val();
 		var period = $("#period").val();
@@ -3632,15 +3633,19 @@ function survey_statistic_referal(what) {
 			$("#survey_referals").slideDown();
 			$(what).attr('value','1');
 		});
-	} else if ($(what).attr('value') == '1') { // skrijemo
+	} 
+    else if ($(what).attr('value') == '1') { // skrijemo
 		$("#survey_referals").slideUp();
 		$(what).attr('value','2');
-	} else { // prikazemo
+	} 
+    else { // prikazemo
 		$("#survey_referals").slideDown();
 		$(what).attr('value','1');
 	}
 }
+
 function ip_list_podrobno (what) {
+
 	if ($(what).attr('value') == '0') { // nalozimo vsebino samo prvi klik
 		var type = $("#type").val();
 		var period = $("#period").val();
@@ -3651,20 +3656,15 @@ function ip_list_podrobno (what) {
 			$("#ip_list_podrobno").slideDown();
 			$(what).attr('value','1');
 		});
-	} else if ($(what).attr('value') == '1') { // skrijemo
+	} 
+    else if ($(what).attr('value') == '1') { // skrijemo
 		$("#ip_list_podrobno").slideUp();
 		$(what).attr('value','2');
-	} else { // prikazemo
+	} 
+    else { // prikazemo
 		$("#ip_list_podrobno").slideDown();
 		$(what).attr('value','1');
 	}
-/*
-	if ($('#ip_list_podrobno').css('display') == 'none') {
-		$('#ip_list_podrobno').slideDown();
-	} else {
-		$('#ip_list_podrobno').slideUp();
-	}
-	*/
 }
 function survey_statistic_status(status) {
 	$('#fullscreen').html('').fadeIn('slow').draggable({delay:100, cancel: 'input, textarea, select, .buttonwrapper'});
@@ -5253,14 +5253,17 @@ function stringContains(password, allowedChars){
  *
  * @param id
  */
-function izbrisiAlternativniEmail(id){
+function izbrisiAlternativniEmail(id, email){
-  if (confirm(lang['delete_alternative_email'])) {
+
+  if (confirm(lang['alternative_email_delete'] + ' ' + email + '?')) {
+
     $.post('ajax.php?a=editanketasettings&m=global_user_myProfile', {
     	izbrisiAlternativniEmail: 1,
-      alternativniEmailId: id
+        alternativniEmailId: id
     }).success(function(response){
       window.location.reload();
     });
+
   }
 }
 

lang/1.php

@@ -3445,11 +3445,12 @@ $lang = array (
     "add_alternative_email_subject"   		=> "Potrditev dodatnega elektronskega naslova na spletnem mestu #PAGENAME#",
 	"add_alternative_email"					=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali poleg primarnega elektronskega naslova #PRIMARNIEMAIL#,  dodali še dodatni elektronski naslov <strong>#ALTERNATIVNIEMAIL#</strong>. Geslo za prijavo je enako kot za primarni elektronski naslov.<br/><br/>
  															 Omenjeni elektronski naslov aktivirate s klikom na to #CODESTART# povezavo#CODEEND#.<br /><br />Lep pozdrav,",
-    "add_alternative_primary_email_subject"   => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
+    "add_alternative_primary_email_subject" => "Dodan nov elektronski dostop do vašega računa na spletnem mestu #PAGENAME#",
-    "add_alternative_primary_email"			=>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
+    "add_alternative_primary_email"         =>	"Spo&#353;tovani, #NAME#!<br /><br />Na spletnem mestu <strong>#PAGENAME#</strong> ste dodali nov elektronsk naslov <strong>#ALTERNATIVNIEMAIL#</strong>.<br/>
  															 				V kolikor tega niste storili, nas o tem obvestite ali izbrišite elektronski naslov iz vašega profila.<br /><br />Lep pozdrav,",
-    "alternative_email_confirm_error"			=>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
+    "alternative_email_confirm_error"       =>	"Pri aktivaciji dodatnega elektronskega naslova je pri&#353;lo do napake.<br />Prosimo, kontaktirajte urednika spletnega mesta za pomo&#269;",
     "alternative_email_confirm_success"		=>	"Poslali smo vam elektronsko sporočilo s kodo za aktivacijo omenjenega elektronskega naslova.",
+    "alternative_email_delete"		        =>	"Ste prepričani, da želite odstraniti alternativni email",
 	"confirm_user_in_db"      				=> "Potrdi",
 	"delete_user_in_db"      				=> "Izbriši",
 	"user_confirm_h"						=>	"Potrditev veljavnosti e-naslova",

lang/2.php

@@ -3419,6 +3419,7 @@ $lang = array (
  															 				If you have not done this, please inform us or delete the email address from your profile.<br /><br />Sincerely,",
   	"alternative_email_confirm_error"		=>	"When activating additional e-mail address, an error has occurred.<br /> Please contact the support to help you.",
   	"alternative_email_confirm_success"		=>	"An email with a code to activate this email address has been sent.",
+    "alternative_email_delete"		        =>	"Are you sure you want to remvoe alternative email",
   	"confirm_user_in_db"      => "Confirm",
 	"delete_user_in_db"      => "Delete",
 	"user_confirm_h"				=>	"E-mail confirmation",

public/css/admin_new.css

@@ -12412,6 +12412,10 @@ input[type=radio] + span.enka-checkbox-radio {
   width: 100px;
   font-weight: 600;
 }
+.dashboard_boxes .dashboard_box#div_statistic_info table tr td:nth-child(2) {
+  max-width: 290px;
+  overflow: hidden;
+}
 .dashboard_boxes .dashboard_box#div_statistic_info table tr td:nth-child(3) {
   font-weight: 600;
 }
@@ -12431,6 +12435,10 @@ input[type=radio] + span.enka-checkbox-radio {
 .dashboard_boxes .dashboard_box#div_statistic_referals table tr td:first-child {
   width: 140px;
 }
+.dashboard_boxes .dashboard_box#div_statistic_referals table tr td:nth-child(2) {
+  max-width: 290px;
+  overflow: hidden;
+}
 .dashboard_boxes .dashboard_box#div_statistic_referals #referal_detail {
   display: flex;
   flex-direction: column;

resources/sass/admin_new/pages/survey_status/summary.scss

@@ -181,6 +181,11 @@
                     font-weight: 600;
                 }
 
+                &:nth-child(2){
+                    max-width: 290px;
+                    overflow: hidden;
+                }
+
                 &:nth-child(3){
                     font-weight: 600;
                 }
@@ -234,6 +239,11 @@
                 &:first-child{
                     width: 140px;
                 }
+
+                &:nth-child(2){
+                    max-width: 290px;
+                    overflow: hidden;
+                }
             }
 
             #referal_detail{