[Redizajn 1KA] - Testiranje --> Diagnostika - v5

2022-03-09 19:24:53 +01:00 · 2022-03-09 19:24:53 +01:00 · b43dc721a2
commit b43dc721a2
parent 21e2436a4c
9 changed files with 73 additions and 12 deletions
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@ -5731,6 +5731,10 @@ class SurveyAdmin
        echo $lang['srv_success_save'];
    }

+    function displaySuccessCopy() {
+		global $lang;
+		echo $lang['srv_diagnostika_testiranje_copied'];
+	}

    /** pravilno redirekta admin url ankete
     *  če je anketa aktivna gre na dashboard
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@ -4557,6 +4557,8 @@ class SurveyAdminAjax {
 			UserSetting::getInstance()->saveUserSetting();
 		} elseif ($_GET['a'] == 'display_success_save') {
 			$this->SurveyAdmin->displaySuccessSave();
+		} elseif ($_GET['a'] == 'display_success_copy') {
+			$this->SurveyAdmin->displaySuccessCopy();
 		} elseif ($_GET['a'] == 'vnosi_show_status_casi') {
 			SurveyStatusCasi :: Init($anketa);
 			if (isset($pid) && $pid > 0) {
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@ -5868,6 +5868,11 @@ class SurveyAdminSettings {
 		global $lang;
 		echo $lang['srv_success_save'];
 	}
+
+	function displaySuccessCopy() {
+		global $lang;
+		echo $lang['srv_diagnostika_testiranje_copied'];
+	}
 	
 	function tabTestiranje () {
        global $lang;
--- a/admin/survey/classes/class.SurveyDiagnostics.php
+++ b/admin/survey/classes/class.SurveyDiagnostics.php
@ -171,11 +171,13 @@ class SurveyDiagnostics
 		echo '<div class="button_holder inline vertical_center bottom0">';
 		echo '<div class="input_box">';
 		echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
-		echo '<input type="text" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
+		echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
 		echo '</div>';
-		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\');" return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+		echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); show_success_copy();">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
+		echo '<div id="success_copy"></div>';
 		echo '</div>';

+
 		/*Nastavitve testnega vnosa - popup	
 		echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
 		
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@ -5521,11 +5521,12 @@ function popupClose(){
    $('#fade').fadeOut('slow');
 }

-function selectInputText() {
-    var focusedElement;
-    $(document).on('focus', 'input', function () {
-        if (focusedElement == this) return;
-        focusedElement = this;
-        setTimeout(function () { focusedElement.select(); }, 100);
-    });
-}
+function show_success_copy(timeout){
+
+	if (timeout == undefined)
+		timeout = 1000;
+
+	$('#success_copy').load('ajax.php?a=display_success_copy').show();
+
+	setTimeout(function() {$('#success_copy').animate({opacity:0})}, timeout);
+}
--- a/lang/1.php
+++ b/lang/1.php
@ -3911,7 +3911,7 @@ $lang = array (
 	"srv_respondents_admin"				=>	"Admin",
 	"srv_respondents_error_create"		=>	"Napaka pri kreiranju novega profila",
 	"srv_respondents_error_data"		=>	"Manjkajo podatki!",
-	"srv_success_save"					=>	"Nastavitve so bile shranjene...",
+	"srv_success_save"					=>	"Nastavitve so bile shranjene ...",
 	"PastEventsInt"						=>	"; kot pretekli se &#154;tejejo dogodki, starej&#154;i od ",
 	"srv_statistic_choose_interval"		=>	"Izberite interval",
 	"srv_statistic_choose_dates"		=>	"Izberite datume",
@ -5524,6 +5524,7 @@ $lang = array (
 	"srv_diagnostika_testiranje_noteb"			=>	'\'TESTIRANJE\' - \'Avtomatski vnosi\'',
 	"srv_diagnostika_testiranje_notec"			=>	' lahko testne podatke vnesete tudi avtomatsko.',
 	"srv_diagnostika_testiranje_copy"			=>	'Kopiraj',
+	"srv_diagnostika_testiranje_copied"			=>	'Povezava je bila kopirana',
 	"srv_diagnostika_table_title"				=>	'Status',
 	"srv_diagnostika_table_title1"				=>	'Kriterij',
 	"srv_diagnostika_table_title2"				=>	'Podrobnosti',
--- a/lang/2.php
+++ b/lang/2.php
@ -3880,7 +3880,7 @@ $lang = array (
 	"srv_respondents_admin"				=>	"Admin",
 	"srv_respondents_error_create"		=>	"Error creating a new profile",
 	"srv_respondents_error_data"		=>	"Missing data!",
-	"srv_success_save"					=>	"The settings have been saved...",
+	"srv_success_save"					=>	"The settings have been saved ...",
 	"PastEventsInt"						=>	"; as past events are considered events older than ",
 	"srv_extra_translations"			=>	"Additional text settings",
 	"srv_extra_translations2"			=>	"- you can manage translation in Translation tab",
@ -5484,6 +5484,7 @@ $lang = array (
 	"srv_diagnostika_testiranje_noteb"			=>	'\'TEST\' - \'Test responses\'',
 	"srv_diagnostika_testiranje_notec"			=>	' tab, you can also enter the test data automatically.',
 	"srv_diagnostika_testiranje_copy"			=>	'Copy',
+	"srv_diagnostika_testiranje_copied"			=>	'The link has been copied',
 	"srv_diagnostika_table_title"				=>	'Status',
 	"srv_diagnostika_table_title1"				=>	'Criteria',
 	"srv_diagnostika_table_title2"				=>	'Details',
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@ -7840,6 +7840,21 @@ body.waitlong #loading {
 /* 
    Popupi z errorji 
 */
+div#success_save {
+  border: 1px solid #1E88E5;
+  border-radius: 2px;
+  background-color: #FFFFFF;
+  width: fit-content;
+  padding: 10px 16px 10px 16px;
+  position: fixed;
+  bottom: 32px;
+  left: 50%;
+  -moz-box-shadow: 0 0 5px #E5E5E5;
+  -webkit-box-shadow: 0 0 5px #E5E5E5;
+  box-shadow: 0 0 5px #E5E5E5;
+  display: none;
+}
+
 /* 
    Header scss - top line, menu...
 */
@ -10073,6 +10088,18 @@ div#srv_diagnostic div.input_box input {
  font-size: 16px;
  width: 90%;
 }
+div#srv_diagnostic div#success_copy {
+  border: 1px solid #1E88E5;
+  border-radius: 2px;
+  background-color: #FFFFFF;
+  width: fit-content;
+  padding: 10px 16px 10px 16px;
+  margin-left: 32px;
+  -moz-box-shadow: 0 0 5px #E5E5E5;
+  -webkit-box-shadow: 0 0 5px #E5E5E5;
+  box-shadow: 0 0 5px #E5E5E5;
+  display: none;
+}

 div.subpage_predvidenicas table,
 div.subpage_cas table {
--- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss
+++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
@ -84,6 +84,24 @@ div#srv_diagnostic {
            width: 90%
        }
    }
+
+    //Copy link popup 
+    div#success_copy {
+        border: 1px solid $blue;
+        border-radius: 2px;
+        background-color: $white;
+
+        width: fit-content;
+        padding: 10px 16px 10px 16px;
+
+        margin-left: 32px;
+
+        -moz-box-shadow: 0 0 5px $gray;
+        -webkit-box-shadow: 0 0 5px $gray;
+        box-shadow: 0 0 5px $gray;
+
+        display: none;
+    }
 }

 //OCENJEVANJE TRAJANJA, DEJANSKI ČASI