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

[Redizajn 1KA] Popupi: Status > Neodgovor premenljivke - Filtri > Spremenljivke

Browse Source
This commit is contained in:
tejagerjovic 2022-05-05 11:55:31 +02:00
parent 0418b479b3
commit 18c14ebbfe
5 changed files with 110 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
admin/survey/classes/class.SurveyVariablesProfiles.php
View File

@ -297,7 +297,7 @@ class SurveyVariablesProfiles
$svp_av = self::$SDF->getSurveyVariables();
if ( self::$currentId != SVP_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting" class="popup_note">';
echo '<div id="not_default_setting" class="popup_note red">';
echo $lang['srv_not_default_setting'];
echo '</div>';
}
@ -373,43 +373,77 @@ class SurveyVariablesProfiles
echo '<div id="variableProfileCoverDiv"></div>';
// div za shranjevanje novega profila
echo '<div id="newProfile">'.$lang['srv_missing_profile_name'].': ';
echo '<input id="newProfileName" name="newProfileName" type="text" size="45" />';
echo '<div id="newProfile">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" />';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
$button = new PopUpButton($lang['srv_save_profile']);
echo $button -> setFloat('right')
->setButtonColor('orange')
-> addAction('onClick','variableProfileAction(\'newSave\'); return false;');
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'newCancel\'); return false;');
echo '</div>';
echo '</div>';
// div za preimenovanje
echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': ';
echo '<input id="renameProfileName" name="renameProfileName" type="text" value="'.$svp_ap[$cvp]['name'].'" size="45" />';
echo '<div id="renameProfileDiv">';
echo '<div class="setting_holder">';
echo '<div class="setting_item">';
echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
echo '<input id="renameProfileName" name="renameProfileName" type="text" value="'.$svp_ap[$cvp]['name'].'" class="text large" />';
echo '<input id="renameProfileId" type="hidden" value="'.$pid.'" />';
echo '</div>';
echo '</div>';
echo '<div class="button_holder">';
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
$button = new PopUpButton($lang['srv_rename_profile_yes']);
echo $button -> setFloat('right')
->setButtonColor('orange')
-> addAction('onClick','variableProfileAction(\'renameProfile\'); return false;');
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'renameCancel\'); return false;');
echo '</div>';
echo '</div>';
// div za brisanje
echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>'.$svp_ap[$cvp]['name'].'</b>?';
echo '<div id="deleteProfileDiv">';
echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">'.$svp_ap[$cvp]['name'].'</span>?';
echo '<input id="deleteProfileId" type="hidden" value="'.$pid.'" />';
echo '<div class="button_holder">';
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'deleteCancel\'); return false;');
$button = new PopUpButton($lang['srv_delete_profile_yes']);
echo $button -> setFloat('right')
->setButtonColor('orange')
-> addAction('onClick','variableProfileAction(\'deleteConfirm\'); return false;');
$button = new PopUpButton($lang['srv_cancel']);
echo $button -> setFloat('right')
-> addAction('onClick','variableProfileAction(\'deleteCancel\'); return false;');
echo '</div>';
echo '</div>';
$content = ob_get_clean();

2
lang/1.php
View File

@ -5534,7 +5534,7 @@ $lang = array (
"reg_donthave_uname" => 'Nimate uporabni&#154;kega imena',
"reg_can_social" => 'Prijavite ali registrirate se lahko tudi z uporabni&#154;kim imenom va&#154;ega socialnega omre&#382;ja.',
"login_or_register" => 'Prijava ali registracija',
"srv_not_default_setting" => '»Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev«',
"srv_not_default_setting" => 'Izbrane imate lastne nastavitve, ki se razlikujejo od privzetih (default) 1KA nastavitev.',
"srv_dataIcons_write" => 'Izvoz posamezne ankete',
"srv_dataIcons_labels" => 'Labele',
"srv_dataIcons_note" => 'Ikone:',

2
lang/2.php
View File

@ -5494,7 +5494,7 @@ $lang = array (
"reg_donthave_uname" => 'Don\'t have username',
"reg_can_social" => 'You can also register or login using your social network username.',
"login_or_register" => 'Login or register',
"srv_not_default_setting" => '»You have selected your own settings that differ from the default 1KA settings«',
"srv_not_default_setting" => 'You have selected your own settings that differ from the default 1KA settings.',
"srv_dataIcons_write" => 'Export survey',
"srv_dataIcons_labels" => 'Labels',
"srv_dataIcons_note" => 'Icons',

26
public/css/admin_new.css
View File

@ -5467,7 +5467,7 @@ span.faicon.export::before {
}
span.faicon.file-import::before {
content: "";
content: "\f56f";
transform: scaleX(-1);
}
@ -8157,6 +8157,30 @@ div#div_time_profiles div#renameProfileDiv .setting_holder .setting_item input.t
width: 469px;
}
div#div_variable_profiles div#newProfile .setting_holder,
div#div_variable_profiles div#renameProfileDiv .setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
}
div#div_variable_profiles div#newProfile .setting_holder:first-of-type,
div#div_variable_profiles div#renameProfileDiv .setting_holder:first-of-type {
margin-top: 0;
}
div#div_variable_profiles div#newProfile .setting_holder .setting_item,
div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item {
margin-top: 8px;
}
div#div_variable_profiles div#newProfile .setting_holder .setting_item label,
div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item label {
margin-right: 0;
}
div#div_variable_profiles div#newProfile .setting_holder .setting_item input.text,
div#div_variable_profiles div#renameProfileDiv .setting_holder .setting_item input.text {
margin-left: 4px;
width: 469px;
}
/*
Header scss - top line, menu...
*/

31
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -1,4 +1,4 @@
//STATUS
/////// STATUS //////////
// Povzetek > Nastavitev obdobja
div#div_time_profiles {
@ -64,8 +64,37 @@ div#div_time_profiles {
width: 469px;
}
}
}
}
}
//Neodgovor spremenljivke >Filtri zgoraj desno
div#div_variable_profiles {
div#newProfile,
div#renameProfileDiv {
.setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
&:first-of-type{
margin-top: 0;
}
.setting_item {
margin-top: 8px;
label {
margin-right: 0;
}
input.text {
margin-left: 4px;
width: 469px;
}
}
}
}
}