Skip to content

Commit

Permalink
Bootstrap calendar: move bootstrap classes from html to css file and …
Browse files Browse the repository at this point in the history 
…UI improvements.
  • Loading branch information
@ntsagkas
ntsagkas committed Sep 11, 2024
1 parent 80101ea commit 06beae6
Show file tree
Hide file tree
Showing 8 changed files with 127 additions and 60 deletions.
25 changes: 11 additions & 14 deletions include/baseTheme.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3703,12 +3703,13 @@ className: 'submitAdminBtnDefault'
$styles_str .= "
.cal-row-fluid.cal-row-head .cal-cell1,
.number-day-cal {
.cal-month-day .pull-right,
.cal-day-weekend span[data-cal-date] {
color: $theme_options_styles[clColorBodyAgenda];
}
.myPersonalCalendar .cal-row-fluid.cal-row-head .cal-cell1,
.myPersonalCalendar .number-day-cal,
.myPersonalCalendar .cal-month-day .pull-right,
.myPersonalCalendar .cal-day-hour div,
#cal-day-box div,
.cal-year-box div,
Expand Down Expand Up @@ -4065,11 +4066,8 @@ className: 'submitAdminBtnDefault'
border-color: $theme_options_styles[bgColorActiveDateTime] !important;
}
.active-calendar-day{
background-color:$theme_options_styles[bgColorActiveDateTime] !important;
}
.cal-day-today .number-day-cal {
.cal-day-today span[data-cal-date],
.cal-day-holiday span[data-cal-date]{
background-color:$theme_options_styles[bgColorActiveDateTime] !important;
}
Expand Down Expand Up @@ -4150,13 +4148,12 @@ className: 'submitAdminBtnDefault'
color: $theme_options_styles[TextColorActiveDateTime] !important;
}
.active-calendar-day{
color: $theme_options_styles[TextColorActiveDateTime] !important;;
}
.cal-day-today .number-day-cal,
.cal-day-today .number-day-cal:hover,
.cal-day-today .number-day-cal:focus{
.cal-day-today span[data-cal-date],
.cal-day-today span[data-cal-date]:hover,
.cal-day-today span[data-cal-date]:focus,
.cal-day-holiday span[data-cal-date],
.cal-day-holiday span[data-cal-date]:hover,
.cal-day-holiday span[data-cal-date]:focus{
color: $theme_options_styles[TextColorActiveDateTime] !important;
}
Expand Down
5 changes: 3 additions & 2 deletions modules/offline/offline_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3207,12 +3207,13 @@ function get_theme_options() {
$styles_str .= "
.cal-row-fluid.cal-row-head .cal-cell1,
.number-day-cal {
.cal-month-day .pull-right,
.cal-day-weekend span[data-cal-date] {
color: $theme_options_styles[clColorBodyAgenda];
}
.myPersonalCalendar .cal-row-fluid.cal-row-head .cal-cell1,
.myPersonalCalendar .number-day-cal,
.myPersonalCalendar .cal-month-day .pull-right,
.myPersonalCalendar .cal-day-hour div,
#cal-day-box div,
.cal-year-box div,
Expand Down
2 changes: 2 additions & 0 deletions resources/views/modern/layouts/default.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@
$(".table-default thead tr th:last-child:not(:has(.fa-cogs))").attr("aria-label","{{ trans('langCommands') }} / {{ trans('langResults') }}");
$(".sp-input-container .sp-input").attr("aria-label","{{ trans('langOptForColor') }}");
$("ul").find(".select2-search__field").attr("aria-label","{{ trans('langSearch') }}");
$("#cal-slide-content ul li .event-item").attr("aria-label","{{ trans('langEvent') }}");
$("#cal-day-box .event-item").attr("aria-label","{{ trans('langEvent') }}");
});
</script>
@stack('bottom_scripts')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/modern/modules/auth/altnewuser.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<div class='row'>
<div class='col-12 px-3'>
<div class='form-group mt-4'>
<label for='UserName' class='col-sm-12 control-label-notes'>{{ trans('langUsername') }}</label>
<label for='UserName' class='col-sm-12 control-label-notes'>{{ trans('langUsername') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id='UserName' class='form-control' type='text' size='30' maxlength='30' placeholder="{{ trans('langUserNotice') }}" name='uname' autocomplete='off' {{ $set_uname }}>
</div>
Expand All @@ -38,7 +38,7 @@
<div class='row'>
<div class='col-12 px-3'>
<div class='form-group mt-4'>
<label for='Pass' class='col-sm-12 control-label-notes'>{{ trans('langPass') }}</label>
<label for='Pass' class='col-sm-12 control-label-notes'>{{ trans('langPass') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id='Pass' class='form-control' type='password' size='30' maxlength='30' name='passwd' autocomplete='off' placeholder='{{ trans('langPass') }}'>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/modern/modules/auth/formuser.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

<div class='col-12'>
<div class='form-group mt-4'>
<label for='dialog-set-value' class='col-sm-12 control-label-notes'>{{ trans('langFaculty') }}</label>
<label for='dialog-set-value' class='col-sm-12 control-label-notes'>{{ trans('langFaculty') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
{!! $buildusernode !!}
</div>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/modern/modules/auth/lostpass.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
<input type='hidden' name='u' value='{{ $userUID }}'>
<input type='hidden' name='h' value='{{ q($_REQUEST['h']) }}'>
<div class="form-group">
<label for='password' class='col-sm-12 control-label-notes'>{!! trans('langNewPass1') !!}</label>
<label for='password' class='col-sm-12 control-label-notes'>{!! trans('langNewPass1') !!} <span class='Accent-200-cl'>(*)</span></label>
<div class="col-sm-12">
<input type='password' placeholder="{!! trans('langNewPass1') !!}" class='form-control' size='40' name='newpass' value='' id='password' autocomplete='off'>&nbsp;<span id='result'></span>
</div>
</div>
<div class="form-group mt-3">
<label for='new_pass_word' class="col-sm-12 control-label-notes">{!! trans('langNewPass2') !!}</label>
<label for='new_pass_word' class="col-sm-12 control-label-notes">{!! trans('langNewPass2') !!} <span class='Accent-200-cl'>(*)</span></label>
<div class="col-sm-12">
<input type='password' placeholder="{!! trans('langNewPass2') !!}" class='form-control' size='40' name='newpass1' value='' id='new_pass_word' autocomplete='off'>
</div>
Expand Down Expand Up @@ -87,15 +87,15 @@
<form role='form' method='post' action='{!! $_SERVER['SCRIPT_NAME'] !!}'>
<div class='form-group'>
<div class='col-12'>
<label for='userName' class='form-label'>{{ trans('lang_username') }}</label>
<label for='userName' class='form-label'>{{ trans('lang_username') }} <span class='Accent-200-cl'>(*)</span></label>
</div>
<div class='col-sm-12'>
<input class='form-control' type='text' name='userName' id='userName' autocomplete='off' placeholder='{{ trans('lang_username') }}'>
</div>
</div>
<div class='form-group mt-4'>
<div class='col-12'>
<label for='email' class='form-label'>{{ trans('lang_email') }}</label>
<label for='email' class='form-label'>{{ trans('lang_email') }} <span class='Accent-200-cl'>(*)</span></label>
</div>
<div class='col-sm-12'>
<input class='form-control' type='text' name='email' id='email' autocomplete='off' placeholder='{{ trans('lang_email') }}'>
Expand Down
10 changes: 5 additions & 5 deletions resources/views/modern/modules/auth/newuser.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@
<div class='row'>
<div class='col-lg-6 col-12 px-3'>
<div class='form-group'>
<label for='NameID' class='col-sm-12 control-label-notes'>{{ trans('langName') }}</label>
<label for='NameID' class='col-sm-12 control-label-notes'>{{ trans('langName') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id="NameID" class='form-control' type='text' name='givenname_form' size='30' maxlength='100' value = '{{ $user_data_firstname }}' placeholder='{{ trans('langName') }}...'>
</div>
</div>
</div>
<div class='col-lg-6 col-12 px-3'>
<div class='form-group mt-lg-0 mt-4'>
<label for='SurNameID' class='col-sm-12 control-label-notes'>{{ trans('langSurname') }}</label>
<label for='SurNameID' class='col-sm-12 control-label-notes'>{{ trans('langSurname') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id="SurNameID" class='form-control' type='text' name='surname_form' size='30' maxlength='100' value = '{{ $user_data_lastname }}' placeholder='{{ trans('langSurname') }}...'>
</div>
Expand All @@ -104,7 +104,7 @@
<div class='row'>
<div class='col-lg-6 col-12 px-3'>
<div class='form-group mt-4'>
<label for='UserNameID' class='col-sm-12 control-label-notes'>{{ trans('langUsername') }}</label>
<label for='UserNameID' class='col-sm-12 control-label-notes'>{{ trans('langUsername') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id="UserNameID" class='form-control' type='text' name='uname' value = '{{ $user_data_displayName }}' accept="" size='30' maxlength='100' autocomplete='off' placeholder='{{ trans('langUserNotice') }}...'>
</div>
Expand All @@ -124,7 +124,7 @@
<div class='row'>
<div class='col-lg-6 col-12 px-3'>
<div class='form-group mt-4'>
<label for='UserPassID' class='col-sm-12 control-label-notes'>{{ trans('langPass') }}</label>
<label for='UserPassID' class='col-sm-12 control-label-notes'>{{ trans('langPass') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
<input id="UserPassID" class='form-control' type='password' name='password1' size='30' maxlength='30' autocomplete='off' id='password' placeholder='{{ trans('langUserNotice') }}...'><span id='result'></span>
</div>
Expand Down Expand Up @@ -168,7 +168,7 @@

<div class='col-lg-6 col-12 px-3'>
<div class='form-group mt-4'>
<label for='dialog-set-value' class='col-sm-12 control-label-notes'>{{ trans('langFaculty') }}</label>
<label for='dialog-set-value' class='col-sm-12 control-label-notes'>{{ trans('langFaculty') }} <span class='Accent-200-cl'>(*)</span></label>
<div class='col-sm-12'>
{!! $buildusernode !!}
</div>
Expand Down
131 changes: 99 additions & 32 deletions template/modern/css/new_calendar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@
color:#ffffff;
}

.number-day-cal{
font-size: 14px;
color: #3E4965;
}

.cal-day-outmonth,
.datetimepicker table tr td.old,
.datetimepicker table tr td.new,
Expand All @@ -54,20 +49,6 @@
.datepicker table tr td.new{
color: #2B3944 !important;
}
.cal-day-outmonth > .number-day-cal {
opacity: 1;
}

/* .cal-day-today > .number-day-cal{ color:white; padding:3px 6px 2px 6px; border-radius: 50%; background-color: #005ad9;} */
.cal-day-today > .number-day-cal{
background-color: #0073E6;
padding: 4px 4px 3px 3px;
border-radius: 50% ;
color: #ffffff;
width: 32px;
height: 32px;
text-align: center;
}

.btn-calendar-prev, .btn-calendar-next{
height:25px; width:25px;
Expand All @@ -93,7 +74,7 @@
height:5px;
}

.cal-day-today.cal-day-holiday .number-day-cal {
.cal-day-today.cal-day-holiday .pull-right {
background-color: #0073E6;
padding: 4px 4px 3px 3px;
border-radius: 50% ;
Expand All @@ -103,8 +84,91 @@
text-align: center;
}

/****************************************************************************************************/
/****************************************************************************************************/

#cal-slide-content ul{
padding: 12px;
border: solid 1px #EFF2FB;
}
#cal-slide-content ul li{
margin-bottom: 12px;
}
#cal-slide-content ul li .event-item{
font-size: 13px;
font-weight: 700;
font-style: normal;
}
.cal-month-day{
display: flex;
justify-content: center;
align-items: center;
}
.cal-month-day .pull-right,
.cal-day-weekend span[data-cal-date]{
display: flex;
justify-content: center;
align-items: center;
padding: 0px;
font-size: 14px;
font-style: normal;
color: #2B3944;
margin: 0;
opacity: 1;
}
.cal-day-today span[data-cal-date],
.cal-day-holiday span[data-cal-date]{
border-radius: 50%;
background-color: #0073E6;
color: #ffffff;
font-weight: normal;
font-size: 14px;
height: 32px;
width: 32px;
}
.cal-month-day .events-list{
width: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
}
.cal-row-fluid.cal-row-head .cal-cell1{
font-size: 14px;
font-weight: 700;
font-style: normal;
color: #2B3944;
}
.cal-month-box{
border: 0px !important;
}
.cal-month-box .cal-row-fluid{
border: 0px !important;
}
.cal-month-box .cal-row-fluid .cal-cell1{
border: 0px !important;
}
.cal-day-outmonth span[data-cal-date] {
opacity: 1;
}
















/************************************rgba(255, 255, 255, 0.5)**********************************************/
/***************** this is mypersonal-calendar , courseHome-calendar *********************************/
/***************** this is mypersonal-calendar *********************************/
/****************************************************************************************************/

.fc-view, .fc-view>table {
Expand Down Expand Up @@ -161,13 +225,21 @@
.myPersonalCalendar .cal-row-fluid.cal-row-head .cal-cell1:hover{
background-color: transparent;
}
.myPersonalCalendar .number-day-cal{
color: #003e87;
.myPersonalCalendar .cal-month-day{
display: flex;
justify-content: center;
align-items: center;
}
.myPersonalCalendar .cal-month-day .pull-right{
display: flex;
justify-content: center;
align-items: center;
padding: 0px;
margin: 0;
opacity: 1;
color: #ffffff;
font-size: 17px ;
}
.myPersonalCalendar .cal-day-today .number-day-cal{
color: #ffffff ;
}
.myPersonalCalendar .cal-cell{
border: solid 0.5px #f5f4f4 ;
}
Expand Down Expand Up @@ -583,9 +655,4 @@
font-size: 15px;
font-weight: 700;
color:#212D37;
}

.active-calendar-day{
background-color: #005ad9;
color: #ffffff;
}
}

0 comments on commit 06beae6

Please sign in to comment.