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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Aktivnost/kvote - v7

Browse Source 
Spremenjen styling za koledar, skrito polje za št. vnosov, če nimamo kvote.
This commit is contained in:
tejagerjovic 2021-12-15 13:27:11 +01:00
parent 3eac34c48e
commit 1a7bd15d95
5 changed files with 1392 additions and 1374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/survey/SurveyAdminSettings.php
View File

@ -8651,7 +8651,7 @@ class SurveyAdminSettings {
datepicker("#expireManual1");'; datepicker("#expireManual1");';
if($row['expire'] == PERMANENT_DATE) if($row['expire'] == PERMANENT_DATE)
echo '$("#expire").find(".ui-datepicker-trigger").addClass("displayNone");'; echo '$("#expire").find(".ui-datepicker-trigger").addClass("disabled");';
echo ' }); echo ' });
</script>'; </script>';
@ -8671,7 +8671,7 @@ class SurveyAdminSettings {
echo '<fieldset>'; echo '<fieldset>';
echo '<legend>'.$lang['srv_vote_quotas'].' '.Help::display('srv_activity_quotas').'</legend>'; echo '<legend>'.$lang['srv_vote_quotas'].' '.Help::display('srv_activity_quotas').'</legend>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder '.($row['vote_limit'] == 0 ? 'bottom0' : '').'" id="vote_limit">';
echo '<span class="setting_title">' . $lang['srv_vote_quotas_2'] . ':</span>'; echo '<span class="setting_title">' . $lang['srv_vote_quotas_2'] . ':</span>';
echo '<div class="setting_item">'; echo '<div class="setting_item">';
@ -8689,20 +8689,19 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
// Opozorilo, da je limit odgovorov presezen
echo '<div id="vote_limit_warning" class="'.($row['vote_limit'] == 0 ? 'displayNone' : '').'">';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
echo '<span class="setting_title"><label for="anketa' . $row['id'] . '" >'.$lang['srv_vote_count'].':</label></span>'; echo '<span class="setting_title"><label for="anketa' . $row['id'] . '" >'.$lang['srv_vote_count'].':</label></span>';
echo '<input type="text" class="large" id="vote_count" name="vote_count" ' . ($row['vote_limit'] == 0 ? ' disabled="disabled"' : '') . ' value="' . $row['vote_count'] . '"/></label>'; echo '<input type="text" class="large" id="vote_count" name="vote_count" ' . ($row['vote_limit'] == 0 ? ' disabled="disabled"' : '') . ' value="' . $row['vote_count'] . '"/></label>';
echo '</div>'; echo '</div>';
// Opozorilo, da je limit odgovorov presezen echo '<p class="top16">'.$lang['srv_survey_voteLimit_warning'].':</p>';
echo '<div id="vote_limit_warning" class="setting_holder '.($row['vote_limit'] == 0 ? 'displayNone' : '').'">';
echo $lang['srv_survey_voteLimit_warning'].':';
$srv_survey_non_active_voteLimit = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_survey_non_active_voteLimit'); $srv_survey_non_active_voteLimit = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_survey_non_active_voteLimit');
if ($srv_survey_non_active_voteLimit == '') $srv_survey_non_active_voteLimit = $lang['srv_survey_non_active_voteLimit']; if ($srv_survey_non_active_voteLimit == '') $srv_survey_non_active_voteLimit = $lang['srv_survey_non_active_voteLimit'];
echo '<p><span class="italic">'.$srv_survey_non_active_voteLimit.' </span><a href="'.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=jezik">'.$lang['edit3'].'</a><p>'; echo '<p><span class="italic">'.$srv_survey_non_active_voteLimit.' </span><a href="'.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'&a=jezik"><span class="faicon edit"></span></a><p>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
} }

8
admin/survey/script/script.js
View File

@ -3680,11 +3680,11 @@ function recalc_alert_expire(days) {
// enablamo in disablamo vnos max stevila glasov (trajanje) // enablamo in disablamo vnos max stevila glasov (trajanje)
function voteCountStatus(status) { function voteCountStatus(status) {
if (status == 1 || status == 2) { if (status == 1 || status == 2) {
$('#vote_count').removeAttr('disabled');
$('#vote_limit_warning').removeClass('displayNone'); $('#vote_limit_warning').removeClass('displayNone');
$('#vote_limit').removeClass('bottom0');
} else { } else {
$('#vote_count').attr('disabled', true);
$('#vote_limit_warning').addClass('displayNone'); $('#vote_limit_warning').addClass('displayNone');
$('#vote_limit').addClass('bottom0');
} }
} }
function voteCountToggle(status) { function voteCountToggle(status) {
@ -4422,12 +4422,12 @@ function setExpirePermanent() {
if (data.permanent == '0') { if (data.permanent == '0') {
// enablamo polje // enablamo polje
$("#expireManual1").removeClass("disabled"); $("#expireManual1").removeClass("disabled");
$("#expire").find(".ui-datepicker-trigger").removeClass("displayNone"); $("#expire").find(".ui-datepicker-trigger").removeClass("disabled");
} else { } else {
// disablamo polje // disablamo polje
$("#expireManual1").addClass("disabled"); $("#expireManual1").addClass("disabled");
$("#expire").find(".ui-datepicker-trigger").addClass("displayNone"); $("#expire").find(".ui-datepicker-trigger").addClass("disabled");
} }
$("#expireManual1").val(data.expire); $("#expireManual1").val(data.expire);

2723
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

5
resources/sass/admin_new/components/form/button.scss
View File

@ -125,4 +125,9 @@ button.ui-datepicker-trigger {
border: none; border: none;
background: none; background: none;
padding: 0; padding: 0;
&.disabled {
color: $very-dark-gray;
pointer-events: none;
}
} }

13
resources/sass/admin_new/components/form/fieldset.scss
View File

@ -17,10 +17,16 @@ fieldset{
text-transform: uppercase; text-transform: uppercase;
} }
p.setting_text { p{
&.bottom16 {
margin-bottom: 16px; margin-bottom: 16px;
} }
&.top16 {
margin-top: 16px;
}
}
.setting_horizontal_wrapper { .setting_horizontal_wrapper {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@ -35,12 +41,13 @@ fieldset{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
&:first-of-type{ &:first-of-type,
&.top0{
margin-top: 0; margin-top: 0;
} }
&:last-of-type, &:last-of-type,
&.no_margin{ &.bottom0{
margin-bottom: 0; margin-bottom: 0;
} }