improve cuteness
This commit is contained in:
Davide Alberani
parent
eeadf5759d
commit
20b11886af
8 changed files with 68 additions and 47 deletions
|
|
@ -3,7 +3,9 @@
|
|||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
<button ng-if="event._id && hasPermission('tickets-all|read')" ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-success">
|
||||
{{event.title}}
|
||||
<span ng-if="hasPermission('event|create') && !event._id">{{'New event' | translate}}</span>
|
||||
<button ng-if="event._id && hasPermission('tickets-all|read')" ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-success">
|
||||
<span class="fa fa-ticket vcenter"></span>
|
||||
{{'Tickets' | translate}}
|
||||
</button>
|
||||
|
|
@ -11,7 +13,6 @@
|
|||
<span class="fa fa-user-plus vcenter"></span>
|
||||
{{'Join this event' | translate}}
|
||||
</button>
|
||||
<span ng-if="hasPermission('event|create') && !event.title">{{'New event' | translate}}</span>{{event.title}}
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
<!-- show the list of Events -->
|
||||
<div class="container">
|
||||
<h1>{{'Events' | translate}}
|
||||
<button ng-click="$state.go('event.new')" class="btn btn-success">
|
||||
<span class="fa fa-plus-circle vcenter"></span>
|
||||
{{'Add event' | translate}}
|
||||
</button>
|
||||
</h1>
|
||||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">{{'Events' | translate}}</div>
|
||||
<div class="panel-heading">
|
||||
<h1>{{'Events' | translate}}
|
||||
<button ng-click="$state.go('event.new')" class="btn btn-success" ng-if="hasPermission('event|create')">
|
||||
<span class="fa fa-plus-circle vcenter"></span>
|
||||
{{'Add event' | translate}}
|
||||
</button>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-inline">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
2
angular_app/js/controllers.js
vendored
2
angular_app/js/controllers.js
vendored
|
|
@ -596,7 +596,7 @@ eventManControllers.controller('UsersCtrl', ['$scope', '$rootScope', '$state', '
|
|||
if (!data.error) {
|
||||
$rootScope.readInfo(function() {
|
||||
$log.debug('logged out user');
|
||||
$state.go('events');
|
||||
$state.go('login');
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div class="row">
|
||||
<div class="col-md-7 col-xs-7">
|
||||
<div class="panel panel-primary table-striped">
|
||||
<div class="panel-heading">{{'Login' | translate}}</div>
|
||||
<div class="panel-heading"><h1>{{'Login' | translate}}</h1></div>
|
||||
<div class="panel-body">
|
||||
<form method="POST">
|
||||
<div class="input-group input-group-lg">
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
</div>
|
||||
<div class="col-md-4 col-xs-4">
|
||||
<div class="panel panel-success table-striped">
|
||||
<div class="panel-heading">{{'Register a new user' | translate}}</div>
|
||||
<div class="panel-heading"><h1>{{'Register a new user' | translate}}</h1></div>
|
||||
<div class="panel-body">
|
||||
<form method="POST">
|
||||
<div class="input-group input-group-lg">
|
||||
|
|
|
|||
|
|
@ -1,13 +1,6 @@
|
|||
<!-- show details of an Event -->
|
||||
<div class="container">
|
||||
<div eventman-message="eventman-message" control="message"></div>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-7 col-xs-7 vcenter">
|
||||
<h1><a ui-sref="event.view({id: event._id})" ng-if="event._id">{{event.title}}</a><span ng-if="!ticket._id"> - {{'join this event' | translate}}</span><span ng-if="ticket._id"> - {{'your ticket' | translate}}</span></h1>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- FIXME: ideally, here we would have put a ng-if="!ticket.cancelled" directive, but for some
|
||||
odd reason, any kind ng-if directive will prevent the form being populated with the formData model.
|
||||
|
|
@ -15,8 +8,24 @@
|
|||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="panel panel-info table-striped top5">
|
||||
<div class="panel-heading">{{'Join this event' | translate}}</div>
|
||||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
{{event.title}}<span ng-if="!ticket._id"> - {{'join this event' | translate}}</span><span ng-if="ticket._id"> - {{'your ticket' | translate}}</span>
|
||||
<button ng-click="$state.go('event.view', {id: event._id})" class="btn btn-success" ng-if="event._id && !hasPermission('event|update')">
|
||||
<span class="fa fa-calendar vcenter"></span>
|
||||
{{'Event details' | translate}}
|
||||
</button>
|
||||
<button ng-click="$state.go('event.edit', {id: event._id})" class="btn btn-success" ng-if="event._id && hasPermission('event|update')">
|
||||
<span class="fa fa-calendar vcenter"></span>
|
||||
{{'Edit event' | translate}}
|
||||
</button>
|
||||
<button ng-click="$state.go('event.tickets', {id: event._id})" class="btn btn-success" ng-if="event._id && hasPermission('tickets-all|read')">
|
||||
<span class="fa fa-ticket vcenter"></span>
|
||||
{{'Tickets' | translate}}
|
||||
</button>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div ng-if="ticket.cancelled" class="clearfix alert alert-danger">
|
||||
{{'Your ticket has been cancelled; you can join again this event using the commands below' | translate}}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,12 @@
|
|||
<!-- show the list of Tickets -->
|
||||
<div class="container">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-7 col-xs-7 vcenter">
|
||||
<h1>{{'All tickets' | translate}}</h1>
|
||||
</div><!--
|
||||
--><div class="col-md-5 col-xs-5 vcenter">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h2><div class="label label-info vcenter">{{'Tickets:' | translate}} {{tickets.length || 0}}</div></h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">{{'Tickets' | translate}}</div>
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
{{'All Tickets' | translate}}
|
||||
<div class="label label-info vcenter">{{'Tickets:' | translate}} {{tickets.length || 0}}</div>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-inline">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -1,8 +1,13 @@
|
|||
<!-- show details of a User -->
|
||||
<div class="container">
|
||||
<h1>{{user.username}}</h1>
|
||||
<div class="panel panel-success table-striped">
|
||||
<div class="panel-heading">{{'Update user information' | translate}}</div>
|
||||
<div class="panel panel-primary table-striped">
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
{{user.username}}
|
||||
<span ng-if="user.email"> <{{user.email}}></span>
|
||||
- {{'update user information' | translate}}
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form method="POST">
|
||||
<div class="input-group input-group-lg top10">
|
||||
|
|
@ -20,7 +25,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">{{'Tickets' | translate}}</div>
|
||||
<div class="panel-heading"><h1>{{'Tickets' | translate}}</h1></div>
|
||||
<div class="panel-body">
|
||||
|
||||
<form class="form-inline">
|
||||
|
|
@ -39,13 +44,24 @@
|
|||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{'Ticket' | translate}}</th>
|
||||
<th>{{'Event' | translate}}</th>
|
||||
<th class="text-center">{{'Attended' | translate}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="ticket in (user.tickets || []) | splittedFilter:query | orderBy:ticketsOrderProp">
|
||||
<td><strong><a ui-sref="event.ticket.edit({id: ticket.event_id, ticket_id: ticket._id})">{{ticket.event_title}}</a></strong></td>
|
||||
<td>
|
||||
<strong>
|
||||
<a ui-sref="event.ticket.edit({id: ticket.event_id, ticket_id: ticket._id})">
|
||||
<span ng-if="ticket.name || ticket.surname || ticket.email">
|
||||
{{ticket.name}} {{ticket.surname}}<span ng-if="ticket.email"> <{{ticket.email}}></span>
|
||||
</span>
|
||||
<span ng-if="!(ticket.name || ticket.surname || ticket.email)">{{ticket.event_title}}</span>
|
||||
</a>
|
||||
</strong>
|
||||
</td>
|
||||
<td><strong>{{ticket.event_title}}</strong></td>
|
||||
<td class="text-center">
|
||||
<span class="fa fa-lg {{(ticket.attended) && 'fa-check-circle text-success' || 'fa-times-circle text-danger'}}"></span>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
<!-- show the list of Users -->
|
||||
<div class="container">
|
||||
<h1>{{'Users' | translate}}
|
||||
<button ng-click="$state.go('login')" class="btn btn-success">
|
||||
<span class="fa fa-plus-circle vcenter"></span>
|
||||
{{'Add user' | translate}}
|
||||
</button>
|
||||
</h1>
|
||||
<div class="panel panel-primary table-striped top5">
|
||||
<div class="panel-heading">{{'Users' | translate}}</div>
|
||||
<div class="panel-heading">
|
||||
<h1>
|
||||
{{'Users' | translate}}
|
||||
<button ng-click="$state.go('login')" class="btn btn-success">
|
||||
<span class="fa fa-plus-circle vcenter"></span>
|
||||
{{'Add user' | translate}}
|
||||
</button>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<form class="form-inline">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
Loading…
Reference in a new issue