may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popupi - V DELU

Browse Source
This commit is contained in:
pero1203 2022-02-16 17:04:52 +01:00
parent 4d6715e390
commit 483f18aa82
25 changed files with 3388 additions and 2820 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
admin/survey/classes/class.SurveyDataSettingProfiles.php
View File

@ -611,42 +611,47 @@ class SurveyDataSettingProfiles {
}
$currentFilterProfile = $_all_profiles[$current_pid];
if ( self::$currentProfileId != SDS_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo '<div id="dsp_profiles_left">';
echo '<span id="dsp_profiles_holder">';
echo '<div clasS="popup_main">';
echo '<div id="dsp_profiles_left" class="popup_left">';
echo '<div id="dsp_profiles_holder">';
# zlistamo vse profile
echo '<span id="dsp_profiles" class="select">';
echo '<div id="dsp_profiles" class="list select">';
if (count($_all_profiles)) {
foreach ($_all_profiles as $id=>$profile) {
echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="dataSetting_profile_' . $id . '" value="'.$id.'">';
foreach ($_all_profiles as $id=>$profile) {
echo '<div class="list-item option '.($current_pid == $id ? 'active' : '').'" id="dataSetting_profile_' . $id . '" value="'.$id.'">';
echo $profile['name'];
if($current_pid == $id){
# sistemskega ne moremo izbrisati
# sistemskega ne moremo izbrisati
if ($current_pid != 0) {
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
}
# sistemskega in seje ne moremo preimenovati
if ($current_pid > 0) {
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
}
}
echo '</div>';
}
}
echo '</span>'; # dataSetting_profile
echo '</span>'; # dsp_profiles_holder
echo '</div>'; # dsp_profiles_left
echo '</div>'; # dataSetting_profile
echo '<div id="dsp_profiles_right">'."\n";
echo '</div>'; # dsp_profiles_holder
echo '</div>'; # dsp_profiles_left
echo '<div id="dsp_profiles_right" class="popup_right">'."\n";
if ($current_pid == 0) {
echo '<div id="dsp_note">';
echo $lang['srv_change_default_profile'];
@ -660,21 +665,27 @@ class SurveyDataSettingProfiles {
echo '</div>'; // dataSetting_profile_right
echo '</div>';
echo '<div id="dsp_button_holder">'."\n";
echo '<div id="dsp_button_holder" class="button_holder">'."\n";
if ((int)$current_pid <= 0 ) {
if ((int)$current_pid == 0) {
echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
} else {
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
if ((int)$current_pid == 0) {
echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
}
else {
echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
}
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
} else {
echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
}
else {
echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
}
echo '</div>'."\n"; // dsp_button_holder

5693
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

67
resources/sass/admin_new/components/popup/basic.scss
View File

@ -107,6 +107,73 @@
line-height: 20px;
}
.popup_main{
display: flex;
border-bottom: 1px $dark-gray solid;
.popup_left{
box-sizing: border-box;
width: 232px;
padding-right: 16px;
margin-right: 16px;
border-right: 1px $dark-gray solid;
.list{
display: flex;
flex-direction: column;
.list-item{
cursor: pointer;
box-sizing: border-box;
padding: 8px;
margin-bottom: 8px;
font-size: 14px;
border: 1px $gray solid;
border-radius: 2px;
transition: 0.2s;
&.active,
&:hover{
background-color: $light-gray;
border-color: $blue;
}
}
}
}
.popup_right{
overflow-y: auto;
max-height: 70vh;
fieldset{
display: flex;
flex-direction: column;
padding: 16px 0 0 0;
margin-bottom: 16px;
border: 0;
border-top: 1px $gray solid;
legend{
padding: 0 8px 0 0;
font-size: 14px;
}
.setting_line{
margin-bottom: 16px;
}
}
}
}
.button_holder{
justify-content: end !important;

116
resources/sass/admin_new/components/popup/page_specific/data_setting.scss
View File

@ -1,116 +0,0 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 23-Aug-2018, 10:31:31
Author : podkrizniku
*/
#dsp_div {
display: none;
position: relative;
z-index: 90;
}
#dsp_cover_div {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
width: 100%;
height: 100%;
background: $blue;
opacity: .40;
z-index: 10;
display: none;
}
#dsp_profiles_left {
width: 192px;
float: left;
}
#dsp_profiles_right {
float: right;
width: 490px;
padding: 0 0 10px 10px;
margin-bottom: 40px;
background-color: $blue;
}
#dsp_profiles_holder {
width: 190px;
height: 150px;
display: inline-block;
}
#dsp_profiles {
height: 150px;
overflow: auto;
cursor: pointer;
width: 190px;
display: inline-block;
.option {
padding: 2px 5px;
margin-bottom: 5px;
}
.active {
padding: 2px 5px;
background-color: $blue;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
}
}
#dsp_note {
width: 450px;
padding: 3px;
color: black;
font-size: 11px;
border: 1px solid $blue;
background-color: $blue;
}
#dsp_content {
width: auto;
min-height: 80px;
padding: 0;
fieldset {
margin: 0px 0px 5px 0px;
border: 0;
border-top: 1px solid $blue;
}
legend {
background-color: white;
}
}
#dsp_left_link_holder {
width: auto;
max-width: 180px;
}
#dsp_button_holder {
position: absolute;
bottom: 20px;
right: 20px;
}
.dsp_sett_label {
display: inline-block;
width: auto;
line-height: 20px;
}
/*popup data export settings*/
#div_export_setting_show {
@include popup_general();
display: none;
position: fixed;
z-index: 90;
left: calc(50% - 200px);
top: 30vh;
min-width: 250px;
min-height: 80px;
height: auto;
width: auto;
margin: 10px;
}

28
resources/sass/admin_new/components/popup/page_specific/survey_edit.scss
View File

@ -1,28 +0,0 @@
/*
Urejanje vprasalnika - popupi
*/
// Urejanje posamezne vrednosti v urejanju vprasalnika
#vrednost_edit {
@include popup_general();
display: none;
z-index: 89;
min-height: 130px;
width: 600px;
p {
padding: 1px 3px;
}
div {
padding: -10px;
}
textarea[name=naslov] {
width: 99%;
height: 60px;
}
}

3
resources/sass/admin_new/components/popup/popup.scss
View File

@ -9,8 +9,5 @@
@import "other";
@import "loader";
@import "settings";
@import "alert";
@import "error";
@import "page_specific/page_specific";

74
resources/sass/admin_new/components/popup/settings.scss → resources/sass/admin_new/pages/survey_analysis/popups/chart.scss
View File

@ -1,22 +1,8 @@
/*
Popupi z nastavitvami
Popupi z nastavitvami grafov
*/
/* Survey title edit */
#quick_title_edit {
position: relative;
width: 720px;
height: 265px;
.quick_title_edit_label {
width: 145px;
font-weight: 600;
}
}
/* Nastavitve grafov */
#div_chart_settings_profiles {
display: none;
@ -174,61 +160,3 @@
}
}
#div_variable_profiles {
z-index: 90;
}
#divConditionProfiles {
width: 1035px;
}
/* Calculation edit */
#calculation {
display: none;
position: relative;
z-index: 91;
margin-left: auto;
margin-right: auto;
height: auto;
width: 600px;
#calculation_editing_inner {
top: 0;
bottom: 0;
left: 0;
right: 0;
margin-bottom: 40px;
overflow: auto;
}
.calculation_editing_body{
max-height: 40vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
border: 1px $blue solid;
.tbl_condition_editing{
margin-bottom: 5px;
}
}
#condition_editing_close {
float: right;
margin: 20px 20px 20px 0;
}
#bottom_space {
bottom: 0;
left: 0;
position: absolute;
right: 0;
padding: 0;
}
}

0
resources/sass/admin_new/components/popup/page_specific/custom_report.scss → resources/sass/admin_new/pages/survey_analysis/popups/custom_report.scss
View File

0
resources/sass/admin_new/components/popup/page_specific/analysis_multicrosstabs.scss → resources/sass/admin_new/pages/survey_analysis/popups/multicrosstab.scss
View File

7
resources/sass/admin_new/pages/survey_analysis/popups/popups.scss Normal file
View File

@ -0,0 +1,7 @@
@import "profiles";
@import "multicrosstab";
@import "chart";
@import "custom_report";

0
resources/sass/admin_new/components/popup/page_specific/profiles.scss → resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
View File

9
resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss
View File

@ -1,7 +1,10 @@
// Osnova analiz
@import "basic";
@import "preview";
@import "icons";
// Specificne strani
@import "page_sums";
@import "page_freq";
@import "page_desc";
@ -12,4 +15,8 @@
@import "page_break";
@import "page_charts";
@import "page_custom_report";
@import "page_custom_report";
// Popupi analiz
@import "popups/popups";

27
resources/sass/admin_new/pages/survey_data/popups/data_setting.scss Normal file
View File

@ -0,0 +1,27 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 23-Aug-2018, 10:31:31
Author : podkrizniku
*/
/*popup data export settings*/
#div_export_setting_show {
@include popup_general();
display: none;
position: fixed;
z-index: 90;
left: calc(50% - 200px);
top: 30vh;
min-width: 250px;
min-height: 80px;
height: auto;
width: auto;
margin: 10px;
}

2
resources/sass/admin_new/pages/survey_data/popups/popups.scss Normal file
View File

@ -0,0 +1,2 @@
@import "data_setting";

2
resources/sass/admin_new/pages/survey_data/survey_data.scss
View File

@ -4,3 +4,5 @@
@import "data_layout";
@import "data_table_settings";
@import "data_table";
@import "popups/popups";

0
resources/sass/admin_new/components/popup/page_specific/archive.scss → resources/sass/admin_new/pages/survey_edit/popups/archive.scss
View File

0
resources/sass/admin_new/components/popup/page_specific/consulting.scss → resources/sass/admin_new/pages/survey_edit/popups/consulting.scss
View File

0
resources/sass/admin_new/components/popup/page_specific/dodeljeni_uporabniki.scss → resources/sass/admin_new/pages/survey_edit/popups/dodeljeni_uporabniki.scss
View File

0
resources/sass/admin_new/components/popup/page_specific/import_from_text.scss → resources/sass/admin_new/pages/survey_edit/popups/import_from_text.scss
View File

17
resources/sass/admin_new/components/popup/page_specific/page_specific.scss → resources/sass/admin_new/pages/survey_edit/popups/popups.scss
View File

@ -1,14 +1,11 @@
@import "data_setting";
@import "profiles";
@import "import_from_text";
@import "archive";
@import "preview_question";
@import "consulting";
@import "dodeljeni_uporabniki";
@import "analysis_multicrosstabs";
@import "custom_report";
@import "survey_edit";
@import "title_edit";
@import "preview_question";
@import "import_from_text";
@import "archive";
@import "dodeljeni_uporabniki";
@import "standardne_besede";
@import "consulting";

0
resources/sass/admin_new/components/popup/page_specific/preview_question.scss → resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
View File

0
resources/sass/admin_new/components/popup/page_specific/standardne_besede.scss → resources/sass/admin_new/pages/survey_edit/popups/standardne_besede.scss
View File

79
resources/sass/admin_new/pages/survey_edit/popups/survey_edit.scss Normal file
View File

@ -0,0 +1,79 @@
/*
Urejanje vprasalnika - popupi
*/
// Urejanje posamezne vrednosti v urejanju vprasalnika
#vrednost_edit {
@include popup_general();
display: none;
z-index: 89;
min-height: 130px;
width: 600px;
p {
padding: 1px 3px;
}
div {
padding: -10px;
}
textarea[name=naslov] {
width: 99%;
height: 60px;
}
}
/* Calculation edit */
#calculation {
@include popup_general();
display: none;
position: relative;
z-index: 91;
margin-left: auto;
margin-right: auto;
height: auto;
width: 600px;
#calculation_editing_inner {
top: 0;
bottom: 0;
left: 0;
right: 0;
margin-bottom: 40px;
overflow: auto;
}
.calculation_editing_body{
max-height: 40vh;
overflow-y: auto;
margin: 20px 0;
padding: 10px 5px 5px 5px;
border: 1px $blue solid;
.tbl_condition_editing{
margin-bottom: 5px;
}
}
#condition_editing_close {
float: right;
margin: 20px 20px 20px 0;
}
#bottom_space {
bottom: 0;
left: 0;
position: absolute;
right: 0;
padding: 0;
}
}

14
resources/sass/admin_new/pages/survey_edit/popups/title_edit.scss Normal file
View File

@ -0,0 +1,14 @@
/* Survey title edit */
#quick_title_edit {
position: relative;
width: 720px;
height: 265px;
.quick_title_edit_label {
width: 145px;
font-weight: 600;
}
}

3
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -14,3 +14,6 @@
// Urejanje -> Nastavitve
@import "survey_settings/survey_settings";
// Popupi
@import "popups/popups";