maket/MaketRandevu
1
1
Fork 0
Code Issues 15 Pull requests Projects Releases 4 Packages Wiki Activity

Updated backend/calendar page with bootstrap 3

Browse source
This commit is contained in:
Alex Tselegidis 2015-07-20 23:39:50 +02:00
parent ed3f2c1176
commit 8a9a21d9eb
2 changed files with 92 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/application/views/backend/calendar.php
View file

@ -51,21 +51,21 @@
&& $this->config->item('ea_google_sync_feature') == TRUE) { ?>
<button id="google-sync" class="btn btn-primary"
title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
<i class="icon-refresh icon-white"></i>
<span><?php echo $this->lang->line('synchronize'); ?></span>
<span class="glyphicon glyphicon-refresh"></span>
<?php echo $this->lang->line('synchronize'); ?>
</button>
<button id="enable-sync" class="btn" data-toggle="button"
title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
<i class="icon-calendar"></i>
<span><?php echo $this->lang->line('enable_sync'); ?></span>
<span class="glyphicon glyphicon-calendar"></span>
<?php echo $this->lang->line('enable_sync'); ?>
</button>
<?php } ?>
<button id="reload-appointments" class="btn"
title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
<i class="icon-repeat"></i>
<span><?php echo $this->lang->line('reload'); ?></span>
<span class="glyphicon glyphicon-repeat"></span>
<?php echo $this->lang->line('reload'); ?>
</button>
</div>
@ -73,14 +73,14 @@
<div class="btn-group">
<button id="insert-appointment" class="btn btn-info"
title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
<i class="icon-plus icon-white"></i>
<span><?php echo $this->lang->line('appointment'); ?></span>
<span class="glyphicon glyphicon-plus"></span>
<?php echo $this->lang->line('appointment'); ?>
</button>
<button id="insert-unavailable" class="btn"
title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
<i class="icon-plus"></i>
<span><?php echo $this->lang->line('unavailable'); ?></span>
<span class="glyphicon glyphicon-plus"></i>
<?php echo $this->lang->line('unavailable'); ?>
</button>
</div>
<?php } ?>
@ -97,7 +97,7 @@
//
// --------------------------------------------------------------------
?>
<div id="manage-appointment" class="modal hide fade" data-keyboard="true" tabindex="-1">
<div id="manage-appointment" class="modal hidden fade" data-keyboard="true" tabindex="-1">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
@ -311,7 +311,10 @@
//
// --------------------------------------------------------------------
?>
<div id="manage-unavailable" class="modal hide fade" data-keyboard="true" tabindex="-1">
<div id="manage-unavailable" class="modal hidden fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
@ -364,6 +367,8 @@
</button>
</div>
</div>
</div>
</div>
<?php
// --------------------------------------------------------------------
@ -372,7 +377,9 @@
//
// --------------------------------------------------------------------
?>
<div id="select-google-calendar" class="modal hide fade" data-keyboard="true" tabindex="-1">
<div id="select-google-calendar" class="modal hidden fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
@ -395,3 +402,5 @@
</button>
</div>
</div>
</div>
</div>

10
src/assets/css/backend.css
View file

@ -145,14 +145,12 @@ body .jspTrack {
#calendar-page #calendar-toolbar {
border-bottom: 1px solid #D6D6D6;
background: #3A3A3A;
/*background: #FAFAFA;*/
padding: 10px;
height: 39px;
overflow: auto;
color: white;
}
#calendar-page #calendar-filter {
display: inline-block;
float: left;
}
@ -163,19 +161,13 @@ body .jspTrack {
font-size: 18px;
}
#calendar-page #calendar-filter select {
margin-top: 5px;
}
#calendar-page #calendar-filter select:disabled {
background: white;
cursor: auto;
}
#calendar-page #calendar-actions {
display: inline-block;
float: right;
margin-top: 4px;
}
#calendar-page #calendar {