1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00

[bug] unable to remove training picture

also: removed some invalid href=# in the templates
This commit is contained in:
Sylvain 2019-11-19 15:18:00 +01:00
parent ad928bd4e6
commit 37d6c84cc6
9 changed files with 32 additions and 27 deletions

View File

@ -9,6 +9,7 @@
- Improved notification email to the member when a rolling subscription is taken
- Handle Ctrl^C in upgrade scripts
- Updated moment-timezone
- Fix a bug: unable to remove the picture from a training
- Fix a security issue: fixed [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57)
- [TODO DEPLOY] add the `SLOT_DURATION` environment variable (see [doc/environment.md](doc/environment.md#SLOT_DURATION) for configuration details)
- [TODO DEPLOY] add the `PHONE_REQUIRED` environment variable (see [doc/environment.md](doc/environment.md#PHONE_REQUIRED) for configuration details)

View File

@ -379,6 +379,10 @@ p, .widget p {
justify-content: center;
}
.pointer {
cursor: pointer;
}
@media screen and (min-width: $screen-lg-min) {
.b-r-lg {border-right: 1px solid $border-color; }
.hide-b-r-lg { border: none !important; }

View File

@ -2,7 +2,7 @@
<div class="row no-gutter">
<div class="col-xs-2 col-sm-2 col-md-1">
<section class="heading-btn">
<a href="#" ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left "></i></a>
<a ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left pointer"></i></a>
</section>
</div>
<div class="col-xs-7 col-sm-7 col-md-8 b-l">

View File

@ -2,7 +2,7 @@
<div class="row no-gutter">
<div class="col-xs-2 col-sm-2 col-md-1">
<section class="heading-btn">
<a href="#" ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left "></i></a>
<a ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left pointer"></i></a>
</section>
</div>
<div class="col-xs-10 col-sm-10 col-md-8 b-l">
@ -20,7 +20,7 @@
<div id="couponForm">
<form name="couponForm" novalidate="novalidate" class="col-lg-10 col-lg-offset-2 m-t-lg form-group">
<ng-include src="'<%= asset_path 'admin/coupons/_form.html' %>'"></ng-include>
<ng-include src="'<%= asset_path "admin/coupons/_form.html" %>'"></ng-include>
<div class="panel-footer no-padder">
<input type="button" value="{{ 'save' | translate }}" class="r-b btn-valid btn btn-warning btn-block p-lg btn-lg text-u-c" ng-disabled="couponForm.$invalid" ng-click="saveCoupon()"/>

View File

@ -49,7 +49,7 @@
required
bs-jasny-fileinput>
</span>
<a href="#" class="btn btn-danger fileinput-exists" data-dismiss="fileinput" translate>{{ 'delete' }}</a>
<a class="btn btn-danger fileinput-exists" data-dismiss="fileinput" translate>{{ 'delete' }}</a>
</div>
</div>
</div>

View File

@ -33,7 +33,7 @@
<button class="btn btn-valid btn-warning btn-block text-u-c r-b" ng-click="validateSlot(slot)" ng-if="!slot.isValid" translate>{{ 'cart.confirm_this_slot' }}</button>
</div>
<div class="clear"><a class="pull-right m-b-sm text-u-l ng-scope m-r-sm" href="#" ng-click="removeSlot(slot, $index, $event)" ng-if="slot.isValid" translate>{{ 'cart.remove_this_slot' }}</a></div>
<div class="clear"><a class="pull-right m-b-sm text-u-l ng-scope m-r-sm pointer" ng-click="removeSlot(slot, $index, $event)" ng-if="slot.isValid" translate>{{ 'cart.remove_this_slot' }}</a></div>
</div>
<coupon show="isSlotsValid() && (!modePlans || selectedPlan)" coupon="coupon.applied" total="totalNoCoupon" user-id="{{user.id}}"></coupon>

View File

@ -1,5 +1,5 @@
<div class="form-group m-b-lg" ng-show="show">
<a ng-click="code.input = true" ng-hide="code.input" class="b-b" translate>{{ 'i_have_a_coupon' }}</a>
<a ng-click="code.input = true" ng-hide="code.input" class="b-b pointer" translate>{{ 'i_have_a_coupon' }}</a>
<div ng-show="code.input">
<label for="coupon_code" translate>{{ 'code_' }}</label>

View File

@ -26,7 +26,7 @@
<a ui-sref="app.logged.notifications"><i class="fa fa-bell fa-2x black"></i> <span class="badge" ng-class="{'bg-red': notifications.unread > 0}">{{notifications.unread}}</span></a>
</li>
<li class="dropdown user-profile-nav" ng-if="isAuthenticated()" uib-dropdown>
<a href="#" class="dropdown-toggle" uib-dropdown-toggle>
<a class="dropdown-toggle pointer" uib-dropdown-toggle>
<span class="avatar text-center">
<fab-user-avatar ng-model="currentUser.profile.user_avatar" avatar-class="thumb-50"></fab-user-avatar>
<span class="user-name m-l-sm text-black-light font-sbold hidden-sm">{{currentUser.name}} </span>
@ -34,20 +34,20 @@
</span>
</a>
<ul class="uib-dropdown-menu animated fadeInRight">
<li><a href="#" ui-sref="app.logged.dashboard.profile" translate>{{ 'my_profile' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.invoices" ng-hide="fablabWithoutInvoices" translate>{{ 'my_invoices' }}</a></li>
<li><a href="#" ui-sref="app.logged.dashboard.wallet" translate>{{ 'my_wallet' }}</a></li>
<li><a ui-sref="app.logged.dashboard.profile" translate>{{ 'my_profile' }}</a></li>
<li><a ui-sref="app.logged.dashboard.settings" translate>{{ 'my_settings' }}</a></li>
<li><a ui-sref="app.logged.dashboard.projects" translate>{{ 'my_projects' }}</a></li>
<li><a ui-sref="app.logged.dashboard.trainings" translate>{{ 'my_trainings' }}</a></li>
<li><a ui-sref="app.logged.dashboard.events" translate>{{ 'my_events' }}</a></li>
<li><a ui-sref="app.logged.dashboard.invoices" ng-hide="fablabWithoutInvoices" translate>{{ 'my_invoices' }}</a></li>
<li><a ui-sref="app.logged.dashboard.wallet" translate>{{ 'my_wallet' }}</a></li>
<li class="divider"></li>
<li><a href="#" class="text-black" ng-click="logout($event)"><i class="fa fa-power-off"></i> {{ 'sign_out' | translate }}</a></li>
<li><a class="text-black pointer" ng-click="logout($event)"><i class="fa fa-power-off"></i> {{ 'sign_out' | translate }}</a></li>
</ul>
</li>
<li ng-if="!isAuthenticated()"><a href="#" class="font-sbold label text-md" ng-click="signup($event)"><i class="fa fa-rocket"></i> {{ 'sign_up' | translate }}</a></li>
<li ng-if="!isAuthenticated()"><a class="font-sbold label text-md pointer" ng-click="signup($event)"><i class="fa fa-rocket"></i> {{ 'sign_up' | translate }}</a></li>
<li ng-if="!isAuthenticated()">
<a href="#" class="font-sbold label text-md" ng-click="login($event)"><i class="fa fa-sign-in"></i> {{ 'sign_in' | translate }}</a>
<a class="font-sbold label text-md pointer" ng-click="login($event)"><i class="fa fa-sign-in"></i> {{ 'sign_in' | translate }}</a>
</li>
</ul>

View File

@ -8,18 +8,18 @@
<ul class="nav nav-main m-t-xs" data-ride="collapse">
<!-- Disconnected user menu for small devices -->
<li class="hidden-sm hidden-md hidden-lg" ng-if-start="!isAuthenticated()">
<a href="#" class="auto" ng-click="signup($event)">
<a class="auto pointer" ng-click="signup($event)">
<i class="fa fa-rocket"></i> <span translate>{{ 'sign_up' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg" ng-if-end>
<a href="#" class="auto" ng-click="login($event)">
<a class="auto pointer" ng-click="login($event)">
<i class="fa fa-sign-in"></i> <span translate>{{ 'sign_in' }}</span>
</a>
</li>
<!-- Connected user menu for small devices -->
<li class="notification-open hidden-sm hidden-md hidden-lg" ng-if-start="isAuthenticated()">
<a href="#" ui-sref="app.logged.notifications">
<a ui-sref="app.logged.notifications">
<i>
<i class="fa fa-bell fa-2x black"></i> <span class="menu-badge badge" ng-class="{'bg-red': notifications.length > 0}">{{notifications.length}}</span>
</i>
@ -27,37 +27,37 @@
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg">
<a href="#" ng-click="logout($event)">
<a class="pointer" ng-click="logout($event)">
<i class="fa fa-power-off"></i> <span translate>{{ 'sign_out' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg" >
<a href="#" ui-sref="app.logged.dashboard.profile">
<a ui-sref="app.logged.dashboard.profile">
<i class="fa fa-user"></i> <span translate>{{ 'my_profile' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg" >
<a href="#" ui-sref="app.logged.dashboard.settings">
<a ui-sref="app.logged.dashboard.settings">
<i class="fa fa-user"></i> <span translate>{{ 'my_settings' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg">
<a href="#" ui-sref="app.logged.dashboard.projects">
<a ui-sref="app.logged.dashboard.projects">
<i class="fa fa-puzzle-piece"></i> <span translate>{{ 'my_projects' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg">
<a href="#" ui-sref="app.logged.dashboard.trainings">
<a ui-sref="app.logged.dashboard.trainings">
<i class="fa fa-graduation-cap"></i> <span translate>{{ 'my_trainings' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg">
<a href="#" ui-sref="app.logged.dashboard.events">
<a ui-sref="app.logged.dashboard.events">
<i class="fa fa-calendar-o"></i> <span translate>{{ 'my_events' }}</span>
</a>
</li>
<li class="hidden-sm hidden-md hidden-lg" ng-hide="fablabWithoutInvoices" ng-if-end>
<a href="#" ui-sref="app.logged.dashboard.invoices">
<a ui-sref="app.logged.dashboard.invoices">
<i class="fa fa-file-pdf-o"></i> <span translate>{{ 'my_invoices' }}</span>
</a>
</li>