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

Funkcionalen datepicker
This commit is contained in:
tejagerjovic 2021-12-09 00:07:01 +01:00
parent 159aea447f
commit 747de4b769
7 changed files with 67 additions and 94 deletions

View File

@ -8627,17 +8627,15 @@ class SurveyAdminSettings {
echo '<legend>'.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').'</legend>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_from'].'</span>';
echo '<div class="mock-input-holder">';
echo '<input id="startsManual1" type="text" class="large borderless" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
echo '<a id="datepicker-trigger-starts"><span class="faicon calendar_icon normal"></span></a>';
echo '<div class="icon_holder">';
echo '<input id="startsManual1" type="text" class="large" readonly="true" name="durationStarts" value="' . $starts . '" autocomplete="off"/>';
echo '</div>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<span class="setting_title">' . $lang['srv_activate_duration_manual_to'].'</span>';
echo '<div class="mock-input-holder">';
echo '<input id="expireManual1" type="text" class="large borderless" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
echo '<a id="datepicker-trigger-expire"><span class="faicon calendar_icon normal"></span></a>';
echo '<div class="icon_holder">';
echo '<input id="expireManual1" type="text" class="large" readonly="true" name="durationExpire" value="' . $expire . '" autocomplete="off"/>';
echo '</div>';
echo '</div>';
@ -8649,18 +8647,13 @@ class SurveyAdminSettings {
echo '</fieldset>';
echo '
<script type="text/javascript">
<script type="text/javascript">
$(document).ready(function () {
$("#startsManual1").datepicker();
$("#datepicker-trigger-starts").click(function(){
$("#startsManual1").datepicker("show");
});
$("#expireManual1").datepicker();
$("#datepicker-trigger-expire").click(function(){
$("#expireManual1").datepicker("show");
});
datepicker("#startsManual1");
datepicker("#expireManual1");
});
</script>';
</script>';
}
function DisplayNastavitveMaxGlasov() {

View File

@ -17,8 +17,6 @@ function datepicker (selector, event_trigger, datetime) {
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",
buttonImageOnly: true,*/
buttonText: "",
controlType: 'select',
oneLine: true,
@ -42,9 +40,7 @@ function datepicker (selector, event_trigger, datetime) {
changeYear: true,
dateFormat: "dd.mm.yy",
showAnim: "slideDown",
showOn: "button",
/*buttonImage: srv_site_url + "admin/survey/script/calendar/calendar.gif",*/
/*buttonImageOnly: true,*/
showOn: "both",
buttonText: "",
onSelect: function(selected,evnt) {
if (event_trigger) {

View File

@ -5151,6 +5151,18 @@ a.faicon.fa-stack {
width: 1em;
}
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
}
div.icon_holder span.faicon,
div.icon_holder a.faicon,
div.icon_holder button.ui-datepicker-trigger {
margin-left: 12px;
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
@ -5857,17 +5869,6 @@ span.faicon.calendar_icon::before {
content: "\f073";
}
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
}
div.icon_holder span.faicon,
div.icon_holder a.faicon {
margin-left: 12px;
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
@ -7078,6 +7079,19 @@ div.button_holder.inline button {
margin-left: 16px;
}
button.ui-datepicker-trigger {
cursor: pointer;
transition: 0.3s;
min-width: auto;
color: #1E88E5;
border: none;
background: none;
padding: 0;
}
button.ui-datepicker-trigger:hover {
color: #1980da;
}
label {
cursor: pointer;
margin-right: 16px;
@ -7096,11 +7110,6 @@ input[type=text] {
margin-top: 4px;
font-family: Source Sans Pro, sans-serif;
}
input[type=text].borderless {
border: none;
border-radius: 0;
margin-top: 0;
}
input[type=text]#anketa_polnoIme {
width: 400px;
}
@ -7181,21 +7190,6 @@ input.disabled {
pointer-events: none;
}
div.mock-input-holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
border: 1px solid #C4C4C4;
margin-top: 4px;
border-radius: 2px;
width: 245px;
}
div.mock-input-holder span.faicon,
div.mock-input-holder a.faicon {
margin: 0 8px;
}
fieldset {
margin-bottom: 32px;
padding: 32px;

View File

@ -50,6 +50,21 @@ a.faicon{
}
}
//Wrapper (za ikone desno ob elementih)
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
span.faicon,
a.faicon,
button.ui-datepicker-trigger{
margin-left: 12px;
}
}
@import "radio";
@import "standard";

View File

@ -459,8 +459,8 @@ span.faicon.reload_large::before{
/* CALENDAR */
span.faicon.calendar_icon::before,
button.ui-datepicker-trigger::before{
font-family: $fontawesome;
font-weight: 400;
font-family: $fontawesome;
font-weight: 400;
font-size: 16px;
content: "\f073";
}
@ -596,17 +596,3 @@ span.faicon.minus_circle::before{
span.faicon.calendar_icon::before{
content: "\f073";
}
//Wrapper (za ikone desno ob elementih)
div.icon_holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
span.faicon,
a.faicon{
margin-left: 12px;
}
}

View File

@ -111,4 +111,18 @@ div.button_holder {
margin-left: 16px;
}
}
}
}
//Trigger button za koledar
button.ui-datepicker-trigger {
cursor: pointer;
transition: 0.3s;
min-width: auto;
color: $blue;
&:hover {
color: darken($blue, 3%);
}
border: none;
background: none;
padding: 0;
}

View File

@ -14,12 +14,6 @@ input {
&[type="text"] {
border: 1px solid $dark-gray;
&.borderless {
border: none;
border-radius: 0;
margin-top: 0;
}
box-sizing: border-box;
border-radius: 2px;
width: 245px;
@ -127,22 +121,3 @@ input {
pointer-events: none;
}
}
// Za prikaz ikon "v" input polju
div.mock-input-holder {
display: flex;
flex-direction: row;
box-sizing: border-box;
align-items: center;
border: 1px solid $dark-gray;
margin-top: 4px;
border-radius: 2px;
width: 245px;
span.faicon,
a.faicon{
margin: 0 8px;
}
}