diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index a833e00e0..a197bb9ed 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -408,7 +408,7 @@ class SurveyAdmin echo ''; // fullscreen urejanje spremenljivke - echo '
'; + echo '
'; // fullscreen urejanje vprasanja echo '
'; diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php index e49ba5f3c..a4f4509f0 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php @@ -322,98 +322,124 @@ class SurveyAnalysisArchive { static function DisplayDoArchive() { global $lang, $site_url; - echo '
'."\n"; + echo '
'; echo ''; - echo '

'.$lang['srv_analiza_arhiv'].'

'; - - echo $lang['srv_analiza_arhiviraj_ime']; - echo ': '."\n"; + echo '

'.$lang['srv_analiza_archive_generate_quick_button'].'

'; - echo '
'; - - echo '
'; - echo $lang['srv_analiza_archive_note'].':'; - echo ''; + echo '
'; + echo ''.$lang['srv_analiza_arhiviraj_ime'].':'; + echo ''; echo '
'; - echo '
'; - echo '
'; + + echo '
'; + echo ''.$lang['srv_analiza_archive_note'].':'; + echo ''; + echo '
'; + + echo '
'; // dostop - echo '
'; - echo $lang['srv_analiza_archive_access'].':'; - echo '
 '.$lang['srv_analiza_archive_access_all']; - echo '
 '.$lang['srv_analiza_archive_access_admins']; - echo '
 '.$lang['srv_analiza_archive_access_password']; - echo '
'; - echo '
 
'; - + echo '
'; + + echo '
'; + echo ''.$lang['srv_analiza_archive_access'].':'; + + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo $lang['srv_analiza_archive_access_password_label'].':'; + echo ''; + echo '
'; + + echo '
'; + echo '
'; //left + // trajanje - echo '
'; - echo $lang['srv_analiza_archive_duration'].':'; - echo '
'; + echo '
'; + + echo '
'; + echo ''.$lang['srv_analiza_archive_duration'].':'; + $date = date("Y-m-d");// current date $duration = strtotime(date("Y-m-d", strtotime($date)) . " +3 month"); $duration = date("d.m.Y",$duration); - echo ''; - printf ($lang['srv_analiza_archive_duration_default'], $duration); - echo '
'; - echo ''.$lang['srv_analiza_archive_duration_custom'].'  - - - '; - echo '
'; - echo ''.$lang['srv_permanent_archive']; - echo '
'; - - echo '
'; - echo '
'; - - echo '
'."\n"; - echo $lang['srv_analiza_current_archives']; - if (true) { - self :: ListArchive(array('create_new'=>false, 'delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false)); - #self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>false, 'access'=>false, 'name_link'=>true, 'duration'=>false, 'insert'=>false, 'edit'=>false)); - } else { - echo $lang['srv_analiza_no_current_archives']; - } - - echo '
'."\n"; // end: div_curent_archives + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo ''; + echo ' + + '; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; + + + echo '
'; //right + + echo '
'; //wrap + + echo '
'; + echo ''; + + $action = ''; if ($_GET['podstran'] == M_ANALYSIS_CROSSTAB || $_POST['podstran'] == M_ANALYSIS_CROSSTAB) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveCrosstabs();'; } else if ($_GET['podstran'] == M_ANALYSIS_MEANS || $_POST['podstran'] == M_ANALYSIS_MEANS) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveMeans();'; } else if ($_GET['podstran'] == M_ANALYSIS_TTEST || $_POST['podstran'] == M_ANALYSIS_TTEST) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveTTest();'; } else if ($_GET['podstran'] == M_ANALYSIS_BREAK || $_POST['podstran'] == M_ANALYSIS_BREAK) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveBreak();'; } else if ($_GET['podstran'] == M_ANALYSIS_CHARTS || $_POST['podstran'] == M_ANALYSIS_CHARTS) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveChart();'; } else if ($_GET['podstran'] == M_ANALYSIS_CREPORT || $_POST['podstran'] == M_ANALYSIS_CREPORT) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveCReport();'; } else { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveAnaliza();'; } - echo ''.$lang['srv_analiza_arhiviraj_cancle'].''."\n"; - - echo '
'."\n"; // end div_analiza_archive_name + echo ''; + + echo '
'; + + echo '
'; // end div_analiza_archive_name } static function DisplayCreatedArchive($aid=null, $name) { global $lang, $site_url; - echo '
'."\n"; + echo '
'; echo ''; @@ -421,39 +447,29 @@ class SurveyAnalysisArchive { $CAE = self::CheckArchiveExistance($aid); if ( $CAE > 0) { - echo '
'; + echo '

'; printf( $lang['srv_analiza_arhiviraj_success'],$name); - echo '

'; - echo '
'; + echo '

'; - echo '
'; + $archive_link = $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid; + + echo '

'; echo $lang['srv_analiza_arhiviraj_success_note']; - echo '
'; - echo ''; - echo ''; - echo $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid; + echo ': '; + echo $archive_link; echo ''; - echo ''; + echo ''; + echo '

'; + + echo '
'; + echo ''; + //echo ''; echo '
'; - - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo ' '.$lang['srv_analiza_arhiviraj_send_mail'].''."\n"; } else { self::DisplayError($CAE); } - - # seznam arhivov - echo '
'; - echo '
'."\n"; - echo $lang['srv_analiza_current_archives']; - if (true) { - self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false)); - } else { - echo $lang['srv_analiza_no_current_archives']; - } - echo '
'."\n"; // end: div_curent_archives - echo '
'."\n"; // end div_analiza_archive_name + echo '
'; // end div_analiza_archive_name } static function EmailArchive($aid) { diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js index 69d592aa2..6e4f0ad21 100644 --- a/admin/survey/script/script_analiza.js +++ b/admin/survey/script/script_analiza.js @@ -919,7 +919,7 @@ function saveArchiveAnaliza(aid) { function toggleAnalysisArchiveAccessPassword() { var value = $("input[name=newAnalysisArchiveAccess]:checked").val(); var pass_div = document.getElementById("newAnalysisArchiveAccessPasswordDiv"); - value == 2 ? pass_div.style.visibility='visible' : pass_div.style.visibility='hidden'; + value == 2 ? pass_div.style.display='block' : pass_div.style.display='none'; } function AnalysisArchiveDelete(aid) { diff --git a/lang/1.php b/lang/1.php index 43580f74f..0ccbaadc4 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4083,7 +4083,7 @@ $lang = array ( "srv_testni_nakonec" => "Statistično analizo testnih podatkov v zavihku 'ANALIZE' naredite tako, da v Statusih izberete Vse statuse oziroma status null.", "srv_analiza_arhiv" => "Arhiv", "srv_analiza_arhiviraj" => "Arhiviraj", - "srv_analiza_arhiviraj_ttl" => "Ustvari arhiv analize", + "srv_analiza_arhiviraj_ttl" => "Izdelaj arhiv analize", "srv_analiza_arhiviraj_email" => "Pošlji", "srv_analiza_arhiviraj_email_ttl" => "Pošlji arhiv analize prijatelju", "srv_analiza_arhiviraj_ime" => "Ime arhiva", @@ -4099,14 +4099,14 @@ $lang = array ( "srv_analiza_archive_access_wrong_pass" => "Napačno geslo", "srv_analiza_archive_duration" => "Trajanje", "srv_analiza_archive_duration_default" => "Privzeto 3 mesece (do: %s)", - "srv_analiza_archive_duration_custom" => "Poljubno. Izberi datum:", - "srv_analiza_arhiviraj_create" => "Ustvari arhivski naslov", + "srv_analiza_archive_duration_custom" => "Poljubno:", + "srv_analiza_arhiviraj_create" => "Ustvari arhiv", "srv_analiza_arhiviraj_save" => "Shrani", "srv_analiza_arhiviraj_delete" => "Izbriši", "srv_analiza_arhiviraj_cancle" => "Prekliči", "srv_analiza_arhiviraj_close" => "Zapri", - "srv_analiza_arhiviraj_success" => "Arhiv analize z imenom: %s je bil uspešno ustvarjen!", - "srv_analiza_arhiviraj_success_note" => "Dostopen je na naslovu:", + "srv_analiza_arhiviraj_success" => "Arhiv analize z imenom: %s je bil uspešno ustvarjen!", + "srv_analiza_arhiviraj_success_note" => "Dostopen je na naslovu", "srv_analiza_arhiviraj_error_note" => "Pri ustvarjanju arhiva analize je prišlo do napake!", "srv_analiza_arhiviraj_access_0" => "Vsi", "srv_analiza_arhiviraj_access_1" => "Administratorji ankete", diff --git a/lang/2.php b/lang/2.php index 9d8fe17de..663276248 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4080,14 +4080,14 @@ $lang = array ( "srv_analiza_archive_access_wrong_pass" => "Wrong password", "srv_analiza_archive_duration" => "Duration", "srv_analiza_archive_duration_default" => "Default. 3 months(to date: %s)", - "srv_analiza_archive_duration_custom" => "Custom. Choose date:", - "srv_analiza_arhiviraj_create" => "Create archive link", + "srv_analiza_archive_duration_custom" => "Custom:", + "srv_analiza_arhiviraj_create" => "Create archive", "srv_analiza_arhiviraj_save" => "Save", "srv_analiza_arhiviraj_delete" => "Delete", "srv_analiza_arhiviraj_cancle" => "Cancel", "srv_analiza_arhiviraj_close" => "Close", "srv_analiza_arhiviraj_success" => "Archive with name: %s was successfully created!", - "srv_analiza_arhiviraj_success_note" => "Accessible on url:", + "srv_analiza_arhiviraj_success_note" => "Accessible on URL", "srv_analiza_arhiviraj_error_note" => "There was an error creating the analysis archive!", "srv_analiza_arhiviraj_access_0" => "All", "srv_analiza_arhiviraj_access_1" => "Only survey administrators", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index f024d87f1..d87790538 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8240,6 +8240,48 @@ div#telephone_popup .setting_holder .setting_item span.faicon { margin-right: 16px; } +div#div_analiza_archive_name .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; +} +div#div_analiza_archive_name .setting_holder:first-of-type { + margin-top: 0; +} +div#div_analiza_archive_name .setting_holder .setting_item { + margin-top: 8px; +} +div#div_analiza_archive_name .setting_holder .setting_item label { + cursor: pointer; + margin-right: 0; +} +div#div_analiza_archive_name .setting_holder .setting_item.indent { + margin-left: 25px; + margin-top: 0; + display: none; +} +div#div_analiza_archive_name .setting_holder .setting_item.indent input.text { + margin-left: 4px; +} +div#div_analiza_archive_name .setting_holder .setting_item input.text.medium { + width: 40% !important; + margin-left: 4px; + margin-right: 4px; +} +div#div_analiza_archive_name .setting_holder input.text, +div#div_analiza_archive_name .setting_holder textarea { + width: 100% !important; +} +div#div_analiza_archive_name .alaysis_archive_wrap { + display: flex; + flex-direction: row; + gap: 32px; +} +div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_right, +div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left { + width: 50%; +} + /* Header scss - top line, menu... */ @@ -21207,13 +21249,6 @@ and open the template in the editor. Created on : 14-Aug-2018, 11:40:15 Author : podkrizniku */ -/* Arhiv */ -#div_analiza_archive_name { - min-width: 900px; - width: auto; - padding-bottom: 50px !important; -} - .div_curent_archives { margin-top: 10px; padding: 20px 5px 20px 5px; diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index de8415932..8972af635 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -159,4 +159,62 @@ div#telephone_popup { } } +} + +////// ANALIZE ////// + +//Ustvari arhiv analize + +div#div_analiza_archive_name { + + .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; + + &:first-of-type{ + margin-top: 0; + } + + .setting_item { + margin-top: 8px; + + label { + cursor: pointer; + margin-right: 0; + } + + &.indent { + margin-left: 25px; + margin-top: 0; + display: none; + + input.text { + margin-left: 4px; + } + } + + input.text.medium { + width: 40% !important; + margin-left: 4px; + margin-right: 4px; + } + } + + input.text, + textarea { + width: 100% !important; + } + } + + .alaysis_archive_wrap { + display: flex; + flex-direction: row; + gap: 32px; + + .alaysis_archive_right, + .alaysis_archive_left { + width: 50%; + } + } } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/popups/archive.scss b/resources/sass/admin_new/pages/survey_edit/popups/archive.scss index 123ec770f..e5db163e8 100644 --- a/resources/sass/admin_new/pages/survey_edit/popups/archive.scss +++ b/resources/sass/admin_new/pages/survey_edit/popups/archive.scss @@ -9,14 +9,6 @@ and open the template in the editor. */ -/* Arhiv */ -#div_analiza_archive_name { - min-width: 900px; - width: auto; - - padding-bottom: 50px !important; -} - .div_curent_archives { margin-top: 10px; padding: 20px 5px 20px 5px;