Updated backend/calendar page with bootstrap 3

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

View file

@ -51,21 +51,21 @@
&& $this->config->item('ea_google_sync_feature') == TRUE) { ?> && $this->config->item('ea_google_sync_feature') == TRUE) { ?>
<button id="google-sync" class="btn btn-primary" <button id="google-sync" class="btn btn-primary"
title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>"> title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
<i class="icon-refresh icon-white"></i> <span class="glyphicon glyphicon-refresh"></span>
<span><?php echo $this->lang->line('synchronize'); ?></span> <?php echo $this->lang->line('synchronize'); ?>
</button> </button>
<button id="enable-sync" class="btn" data-toggle="button" <button id="enable-sync" class="btn" data-toggle="button"
title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>"> title="<?php echo $this->lang->line('enable_appointment_sync_hint'); ?>">
<i class="icon-calendar"></i> <span class="glyphicon glyphicon-calendar"></span>
<span><?php echo $this->lang->line('enable_sync'); ?></span> <?php echo $this->lang->line('enable_sync'); ?>
</button> </button>
<?php } ?> <?php } ?>
<button id="reload-appointments" class="btn" <button id="reload-appointments" class="btn"
title="<?php echo $this->lang->line('reload_appointments_hint'); ?>"> title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
<i class="icon-repeat"></i> <span class="glyphicon glyphicon-repeat"></span>
<span><?php echo $this->lang->line('reload'); ?></span> <?php echo $this->lang->line('reload'); ?>
</button> </button>
</div> </div>
@ -73,14 +73,14 @@
<div class="btn-group"> <div class="btn-group">
<button id="insert-appointment" class="btn btn-info" <button id="insert-appointment" class="btn btn-info"
title="<?php echo $this->lang->line('new_appointment_hint'); ?>"> title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
<i class="icon-plus icon-white"></i> <span class="glyphicon glyphicon-plus"></span>
<span><?php echo $this->lang->line('appointment'); ?></span> <?php echo $this->lang->line('appointment'); ?>
</button> </button>
<button id="insert-unavailable" class="btn" <button id="insert-unavailable" class="btn"
title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>"> title="<?php echo $this->lang->line('unavailable_periods_hint'); ?>">
<i class="icon-plus"></i> <span class="glyphicon glyphicon-plus"></i>
<span><?php echo $this->lang->line('unavailable'); ?></span> <?php echo $this->lang->line('unavailable'); ?>
</button> </button>
</div> </div>
<?php } ?> <?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"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button> aria-hidden="true">&times;</button>
@ -311,57 +311,62 @@
// //
// -------------------------------------------------------------------- // --------------------------------------------------------------------
?> ?>
<div id="manage-unavailable" class="modal hide fade" data-keyboard="true" tabindex="-1"> <div id="manage-unavailable" class="modal hidden fade">
<div class="modal-header"> <div class="modal-dialog">
<button type="button" class="close" data-dismiss="modal" <div class="modal-content">
aria-hidden="true">&times;</button>
<h3><?php echo $this->lang->line('new_unavailable_title'); ?></h3> <div class="modal-header">
</div> <button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
<h3><?php echo $this->lang->line('new_unavailable_title'); ?></h3>
</div>
<div class="modal-body"> <div class="modal-body">
<div class="modal-message alert" style="display: none;"></div> <div class="modal-message alert" style="display: none;"></div>
<form class="form-horizontal">
<fieldset>
<input id="unavailable-id" type="hidden" />
<div class="control-group"> <form class="form-horizontal">
<label for="unavailable-start" class="control-label"> <fieldset>
<?php echo $this->lang->line('start'); ?> <input id="unavailable-id" type="hidden" />
</label>
<div class="controls"> <div class="control-group">
<input type="text" id="unavailable-start" /> <label for="unavailable-start" class="control-label">
</div> <?php echo $this->lang->line('start'); ?>
</div> </label>
<div class="controls">
<div class="control-group"> <input type="text" id="unavailable-start" />
<label for="unavailable-end" class="control-label"> </div>
<?php echo $this->lang->line('end'); ?> </div>
</label>
<div class="controls"> <div class="control-group">
<input type="text" id="unavailable-end" /> <label for="unavailable-end" class="control-label">
</div> <?php echo $this->lang->line('end'); ?>
</div> </label>
<div class="controls">
<div class="control-group"> <input type="text" id="unavailable-end" />
<label for="unavailable-notes" class="control-label"> </div>
<?php echo $this->lang->line('notes'); ?> </div>
</label>
<div class="controls"> <div class="control-group">
<textarea id="unavailable-notes" rows="3" class="span3"></textarea> <label for="unavailable-notes" class="control-label">
</div> <?php echo $this->lang->line('notes'); ?>
</div> </label>
</fieldset> <div class="controls">
</form> <textarea id="unavailable-notes" rows="3" class="span3"></textarea>
</div> </div>
</div>
</fieldset>
</form>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button id="save-unavailable" class="btn btn-primary"> <button id="save-unavailable" class="btn btn-primary">
<?php echo $this->lang->line('save'); ?> <?php echo $this->lang->line('save'); ?>
</button> </button>
<button id="cancel-unavailable" class="btn"> <button id="cancel-unavailable" class="btn">
<?php echo $this->lang->line('cancel'); ?> <?php echo $this->lang->line('cancel'); ?>
</button> </button>
</div>
</div>
</div> </div>
</div> </div>
@ -372,26 +377,30 @@
// //
// -------------------------------------------------------------------- // --------------------------------------------------------------------
?> ?>
<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-header"> <div class="modal-dialog">
<button type="button" class="close" data-dismiss="modal" <div class="modal-content">
aria-hidden="true">&times;</button> <div class="modal-header">
<h3><?php echo $this->lang->line('select_google_calendar'); ?></h3> <button type="button" class="close" data-dismiss="modal"
</div> aria-hidden="true">&times;</button>
<h3><?php echo $this->lang->line('select_google_calendar'); ?></h3>
<div class="modal-body"> </div>
<p>
<?php echo $this->lang->line('select_google_calendar_prompt'); ?> <div class="modal-body">
</p> <p>
<select id="google-calendar"></select> <?php echo $this->lang->line('select_google_calendar_prompt'); ?>
</div> </p>
<select id="google-calendar"></select>
<div class="modal-footer"> </div>
<button id="select-calendar" class="btn btn-primary">
<?php echo $this->lang->line('select'); ?> <div class="modal-footer">
</button> <button id="select-calendar" class="btn btn-primary">
<button id="close-calendar" class="btn"> <?php echo $this->lang->line('select'); ?>
<?php echo $this->lang->line('close'); ?> </button>
</button> <button id="close-calendar" class="btn">
</div> <?php echo $this->lang->line('close'); ?>
</div> </button>
</div>
</div>
</div>
</div>

View file

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