mirrors/easyappointments
1
0
Fork 1
mirror of https://github.com/alextselegidis/easyappointments.git synced 2024-11-25 01:12:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Added updated .gitignore with storage directory.

Browse source
This commit is contained in:
Alex Tselegidis 2016-07-13 22:56:05 +02:00
parent b8b1d546fd
commit bb83b6b839
7 changed files with 102 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -3,6 +3,11 @@ composer
easyappointments.zip
node_modules
npm-debug.log
src/application/logs/*
!src/application/logs/index.html
src/storage/cache/*
!src/storage/cache/.htaccess
!src/storage/cache/index.html
src/storage/logs/*
!src/storage/logs/index.html
src/storage/uploads/*
!src/storage/uploads/index.html
src/config.php

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

@ -48,9 +48,8 @@
</div>
<div id="calendar-actions" class="col-xs-12 col-md-7">
<div class="btn-group">
<?php if (($role_slug == DB_SLUG_ADMIN || $role_slug == DB_SLUG_PROVIDER)
&& Config::GOOGLE_SYNC_FEATURE == TRUE) { ?>
&& Config::GOOGLE_SYNC_FEATURE == TRUE): ?>
<button id="google-sync" class="btn btn-primary"
title="<?php echo $this->lang->line('trigger_google_sync_hint'); ?>">
<span class="glyphicon glyphicon-refresh"></span>
@ -62,17 +61,9 @@
<span class="glyphicon glyphicon-calendar"></span>
<span><?php echo $this->lang->line('enable_sync'); ?></span>
</button>
<?php } ?>
<button id="reload-appointments" class="btn btn-default"
title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
<span class="glyphicon glyphicon-repeat"></span>
<?php echo $this->lang->line('reload'); ?>
</button>
</div>
<?php endif ?>
<?php if ($privileges[PRIV_APPOINTMENTS]['add'] == TRUE): ?>
<div class="btn-group">
<button id="insert-appointment" class="btn btn-primary"
title="<?php echo $this->lang->line('new_appointment_hint'); ?>">
<span class="glyphicon glyphicon-plus"></span>
@ -84,8 +75,13 @@
<span class="glyphicon glyphicon-plus"></span>
<?php echo $this->lang->line('unavailable'); ?>
</button>
</div>
<?php endif ?>
<button id="reload-appointments" class="btn btn-default"
title="<?php echo $this->lang->line('reload_appointments_hint'); ?>">
<span class="glyphicon glyphicon-repeat"></span>
<?php echo $this->lang->line('reload'); ?>
</button>
</div>
</div>

4
src/application/views/backend/footer.php
View file

@ -1,5 +1,5 @@
<div id="footer">
<div id="footer-content">
<div id="footer-content" class="col-xs-12 col-md-6">
Powered by
<a href="http://easyappointments.org">Easy!Appointments
<?php
@ -20,7 +20,7 @@
</a>
</div>
<div id="footer-user-display-name">
<div id="footer-user-display-name" class="col-xs-12 col-md-6">
<?php echo $this->lang->line('hello') . ', ' . $user_display_name; ?>!
</div>
</div>

10
src/application/views/backend/header.php
View file

@ -74,6 +74,11 @@
<nav id="header" class="navbar">
<div class="container-fluid">
<div class="navbar-header">
<div id="header-logo" class="navbar-brand">
<img src="<?php echo $base_url; ?>/assets/img/logo.png">
<span><?php echo $company_name; ?></span>
</div>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#header-menu"
aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
@ -81,11 +86,6 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<div id="header-logo" class="navbar-brand">
<img src="<?php echo $base_url; ?>/assets/img/logo.png">
<span><?php echo $company_name; ?></span>
</div>
</div>

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

@ -40,7 +40,7 @@ root {
#header #header-logo span {
float: left;
font-size: 20px;
font-size: 16px;
color: white;
margin-top: 14px;
font-weight: lighter;
@ -57,7 +57,7 @@ root {
#header #header-menu .menu-item {
cursor: pointer;
min-width: 100px;
min-width: 130px;
color: #FFF;
text-align: center;
text-decoration: none;
@ -85,11 +85,13 @@ root {
padding: 10px 15px;
display: inline-block;
float: left;
line-height: 2;
}
#footer #footer-user-display-name {
display: inline-block;
float: right;
text-align: right;
padding: 10px 15px;
font-weight: bold;
}
@ -147,6 +149,7 @@ body .modal-header h3 {
body .modal-header .close {
margin-top: 2px;
color: #12482a;
}
@ -255,7 +258,7 @@ body .jspTrack {
color: white;
}
#calendar-page #calendar-filter > div {
#calendar-page #calendar-filter .form-group {
margin: 5px 0;
}
@ -273,7 +276,7 @@ body .jspTrack {
background-color: #FFF;
padding: 0 10px;
background-position-x: 95%;
height: 36px;
min-width: 240px;
}
#calendar-page #calendar-filter select:disabled {
@ -281,7 +284,11 @@ body .jspTrack {
cursor: auto;
}
#calendar-page #calendar-actions > div {
#calendar-page #calendar-actions {
text-align: right;
}
#calendar-page #calendar-actions > .btn {
margin: 5px 0;
}
@ -312,6 +319,10 @@ body .jspTrack {
background-image: url('../img/custom.jpg');
}
#calendar-page .fc-header {
margin-bottom: 10px;
}
#calendar .fc-header-title h2 {
font-size: 16px;
margin: 0px;
@ -766,7 +777,50 @@ body .form-horizontal .controls {
margin-left: 12px;
}
@media(max-width: 1200px) {
#header #header-menu .menu-item {
min-width: 100px;
}
#calendar-page #calendar-actions {
text-align: left;
}
}
@media(max-width: 860px) {
#header #header-menu .menu-item {
min-width: 85px;
}
#footer #footer-user-display-name {
text-align: left;
}
#calendar-page #calendar-filter label {
margin-bottom: 5px;
}
}
@media(max-width: 468px) {
#calendar .fc-header-title
#calendar-page .fc-header td {
display: block;
width: 70vw;
float: left;
margin: 10px auto;
text-align: left;
}
#calendar-page #calendar-actions .btn {
width: 100%;
margin: 5px 0;
}
.ui-dialog {
margin: 0 12px;
}
#calendar-page #calendar-filter select {
min-width: auto;
}
}

9
src/assets/css/general.css
View file

@ -20,6 +20,10 @@ body .custom-qtip {
color: #258D53;
}
body .ui-widget {
font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif
}
body .ui-widget-overlay {
background: #000 50% 50% repeat-x;
opacity: .5;
@ -34,9 +38,10 @@ body .ui-draggable .ui-dialog-titlebar {
background: #35B66F;
color: #FFF;
font-size: 1.5em;
padding: 14px 10px;
font-weight: lighter;
padding: 12px 10px;
border: none;
border-bottom: 4px solid #1A865F;
border-bottom: 4px solid #c0f1d6;
margin-bottom: 10px;
}

4
src/assets/js/backend_calendar.js
View file

@ -797,8 +797,8 @@ window.BackendCalendar = window.BackendCalendar || {};
* @return {Number} Returns the calendar element height in pixels.
*/
function _getCalendarHeight() {
var result = window.innerHeight - $('#footer').height() - $('#header').height()
- $('#calendar-toolbar').height() - 50; // 80 for fine tuning
var result = window.innerHeight - $('#footer').outerHeight() - $('#header').outerHeight()
- $('#calendar-toolbar').outerHeight() - 60; // 60 for fine tuning
return (result > 500) ? result : 500; // Minimum height is 500px
}