diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php index 456205ff3..300ad8893 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php @@ -6995,85 +6995,89 @@ class SurveyAnalysis { echo '
'.$lang['srv_custom_report'].'
'; */ - echo ''; + echo '
'; // ANALIZE - echo '
'; - echo '
'; echo '
'; echo ''.$lang['srv_analiza'].''; + echo ''; echo '
'; // VPRASALNIK - echo '
'; - echo '
'; + echo '
'; echo ''.$lang['srv_analysis_links_survey'].''; + echo ''; echo '
'; // IZPIS - echo '
'; echo '
'; echo ''.$lang['srv_statistic'].''; + echo ''; + echo '
'; - echo '
'; + echo ''; } private static function printAnalizaSingleVar() { diff --git a/lang/1.php b/lang/1.php index b392db7f8..7cdf4d547 100644 --- a/lang/1.php +++ b/lang/1.php @@ -5422,7 +5422,7 @@ $lang = array ( "social_login" => 'Prijava preko socialnih omrežij', "srv_max_answers" => 'max število odgovorov', "srv_analysis_links_allAnswers" => 'Izpis odgovorov vseh ustreznih respondentov', - "srv_analysis_links_allAnswers_note" => '(pozor – ne gre za podatke, ampak za dobeseden izpis vprašalnikov in odgovorov za vsakega respondenta, kar je lahko izjemno obsežno; privzeta omejitev je zato 300 enot)', + "srv_analysis_links_allAnswers_note" => 'Opozorilo! Pri tej možnosti ne gre za izpis podatkov, ampak za dobeseden izpis vprašanj in odgovorov za vsakega respondenta. Izpis je časovno zamuden, zato je možno izpisati odgovore za največ 300 enot.', "srv_analysis_links_vpogled" => 'Vpogled v individualne ankete', "srv_means_izberi_prvo" => "Izberite prvo vprašanje", "srv_means_najprej_prvo" => "Najprej izberite prvo vprašanje", diff --git a/lang/2.php b/lang/2.php index c41bc5cfe..7eda23829 100644 --- a/lang/2.php +++ b/lang/2.php @@ -5386,7 +5386,7 @@ $lang = array ( "social_login" => 'Social network login', "srv_max_answers" => 'max number of answers', "srv_analysis_links_allAnswers" => 'Export all surveys with data (max 300 respondents)', - "srv_analysis_links_allAnswers_note" => '(Alert! – Here you do not export the data but the entire questionnaire for each respondent; the limit is set to 300).', + "srv_analysis_links_allAnswers_note" => 'Warning! This option is not a data output, but a direct output of the questions and answers for each respondent. The output is time-consuming, so it is possible to output responses for a maximum of 300 units.', "srv_analysis_links_vpogled" => 'View by individual surveys', "srv_means_izberi_prvo" => "Select the first question", "srv_means_najprej_prvo" => "First, select the first question", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 93f4180e9..03a59a1ec 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -17431,6 +17431,36 @@ ul.vrednost_sort input[type=text] { -webkit-box-shadow: 0 0 20px black; } +div.reports_holder { + display: flex; + flex: row; + justify-content: space-between; + gap: 32px; +} +div.reports_holder fieldset { + flex-basis: 100%; +} +div.reports_holder fieldset ul { + list-style-type: none; + padding: 0; + margin: 0; +} +div.reports_holder fieldset ul li { + margin-bottom: 16px; +} +div.reports_holder fieldset ul li:last-of-type { + margin-bottom: 0; +} +div.reports_holder fieldset ul li.title { + font-weight: 800; +} +div.reports_holder fieldset ul li a:not(.hasline) { + text-decoration: none; +} +div.reports_holder fieldset ul li span.faicon { + margin-right: 12px; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates diff --git a/resources/sass/admin_new/pages/survey_analysis/page_reports.scss b/resources/sass/admin_new/pages/survey_analysis/page_reports.scss new file mode 100644 index 000000000..74a2c4e3a --- /dev/null +++ b/resources/sass/admin_new/pages/survey_analysis/page_reports.scss @@ -0,0 +1,35 @@ +div.reports_holder { + display: flex; + flex: row; + justify-content: space-between; + gap: 32px; + + fieldset { + flex-basis: 100%; + + ul { + list-style-type: none; + padding: 0; + margin: 0; + + li { + margin-bottom: 16px; + &:last-of-type{ + margin-bottom: 0; + } + + &.title { + font-weight: $extra-bold; + } + + a:not(.hasline) { + text-decoration: none; + } + + span.faicon { + margin-right: 12px; + } + } + } + } +} \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss b/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss index fa1c82714..2a4d6e9d3 100644 --- a/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss +++ b/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss @@ -16,6 +16,8 @@ @import "page_charts"; @import "page_custom_report"; +@import "page_reports"; + // Popupi analiz