rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

improved calendar legend

Browse Source
This commit is contained in:
Sylvain 2019-11-27 11:52:37 +01:00
parent 48b811d2b5
commit 91008b3df1
9 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/app.js
View File

@ -88,6 +88,8 @@ angular.module('application', ['ngCookies', 'ngResource', 'ngSanitize', 'ui.rout
$rootScope.fablabWithoutInvoices = Fablab.withoutInvoices;
// Global config: if true, the phone number is required to create an account
$rootScope.phoneRequired = Fablab.phoneRequired;
// Global config: if true, the events are shown in the admin calendar
$rootScope.eventsInCalendar = Fablab.eventsInCalendar;
// Global function to allow the user to navigate to the previous screen (ie. $state).
// If no previous $state were recorded, navigate to the home page

27
app/assets/stylesheets/app.components.scss
View File

@ -651,11 +651,24 @@ padding: 10px;
text-transform: uppercase;
}
}
.calendar-legend-block {
text-align: right;
padding-right: 2em;
.calendar-legend {
border: 1px solid;
border-left: 3px solid;
border-radius: 3px;
font-size: 10px;
padding: 2px;
}
h4 {
font-size: 12px;
font-style: italic;
}
.legends {
display: flex;
flex-direction: row-reverse;
}
.calendar-legend {
border: 1px solid;
border-left: 3px solid;
border-radius: 3px;
font-size: 10px;
padding: 2px;
margin-left: 10px;
}
}

18
app/assets/stylesheets/app.layout.scss
View File

@ -101,22 +101,6 @@
}
}
.display-h {
display: flex;
flex-direction: row;
justify-content: space-evenly;
padding: 0;
}
.display-v {
display: flex;
flex-direction: column;
justify-content: space-around;
align-self: baseline;
height: inherit;
}
body.container{
padding: 0;
}
@ -651,4 +635,4 @@ body.container{
position: absolute;
left: -4px;
}
}
}

22
app/assets/templates/admin/calendar/calendar.html.erb
View File

@ -12,15 +12,8 @@
</div>
<div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
<section class="heading-actions wrapper display-h" ng-class="{'p-s': !fablabWithoutSpaces}">
<div class="display-v">
<span class="calendar-legend text-sm border-formation" ng-class="{'m-t-sm': fablabWithoutSpaces}" translate>{{ 'admin_calendar.trainings' }}</span><br>
<span class="calendar-legend text-sm border-machine" translate>{{ 'admin_calendar.machines' }}</span><br>
</div>
<div class="display-v">
<span class="calendar-legend text-sm border-space" ng-hide="fablabWithoutSpaces" translate>{{ 'admin_calendar.spaces' }}</span>
<span class="calendar-legend text-sm border-event" ng-hide="fablabWithoutSpaces" translate>{{ 'admin_calendar.events' }}</span>
</div>
<section class="heading-actions wrapper" ng-class="{'p-s': !fablabWithoutSpaces}">
</section>
</div>
@ -32,6 +25,15 @@
<div class="col-sm-12 col-md-12 col-lg-9">
<div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg"></div>
<div class="calendar-legend-block">
<h4 translate>{{ 'admin_calendar.legend' }}</h4>
<div class="legends">
<span class="calendar-legend text-sm border-formation" ng-class="{'m-t-sm': fablabWithoutSpaces}" translate>{{ 'admin_calendar.trainings' }}</span><br>
<span class="calendar-legend text-sm border-machine" translate>{{ 'admin_calendar.machines' }}</span><br>
<span class="calendar-legend text-sm border-space" ng-hide="fablabWithoutSpaces" translate>{{ 'admin_calendar.spaces' }}</span>
<span class="calendar-legend text-sm border-event" ng-show="eventsInCalendar" translate>{{ 'admin_calendar.events' }}</span>
</div>
</div>
</div>
<div class="col-sm-12 col-md-12 col-lg-3">
@ -119,4 +121,4 @@
</div>
</div>
</section>
</section>

1
app/views/application/index.html.erb
View File

@ -21,6 +21,7 @@
Fablab.withoutOnlinePayment = ('<%= Rails.application.secrets.fablab_without_online_payments %>' === 'true');
Fablab.withoutInvoices = ('<%= Rails.application.secrets.fablab_without_invoices %>' === 'true');
Fablab.phoneRequired = ('<%= Rails.application.secrets.phone_required %>' === 'true');
Fablab.eventsInCalendar = ('<%= Rails.application.secrets.events_in_calendar %>' === 'true');
Fablab.slotDuration = parseInt("<%= ApplicationHelper::SLOT_DURATION %>", 10);
Fablab.disqusShortname = "<%= Rails.application.secrets.disqus_shortname %>";
Fablab.defaultHost = "<%= Rails.application.secrets.default_host %>";

1
config/locales/app.admin.en.yml
View File

@ -86,6 +86,7 @@ en:
event_in_the_past: "Unable to create a slot in the past."
edit_event: "Edit the event"
view_reservations: "View reservations"
legend: "legend"
project_elements:
# management of the projects' components

1
config/locales/app.admin.es.yml
View File

@ -86,6 +86,7 @@ es:
event_in_the_past: "Unable to create a slot in the past." # translation_missing
edit_event: "Edit the event" # translation_missing
view_reservations: "Ver reservas" # translation_missing
legend: "leyenda"
project_elements:
# management of the projects' components

1
config/locales/app.admin.fr.yml
View File

@ -86,6 +86,7 @@ fr:
event_in_the_past: "Impossible de créer un créneau dans le passé."
edit_event: "Modifier l'évènement"
view_reservations: "Voir les réservations"
legend: "Légende"
project_elements:
# gestion des éléments constituant les projets

1
config/locales/app.admin.pt.yml
View File

@ -86,6 +86,7 @@ pt:
event_in_the_past: "Unable to create a slot in the past." # translation_missing
edit_event: "Edit the event" # translation_missing
view_reservations: "Ver reservas" # translation_missing
legend: "legenda"
project_elements:
# management of the projects' components