From 20b11886af851e70b4ebe365a87c0be4d8ef9ec4 Mon Sep 17 00:00:00 2001
From: Davide Alberani <d.alberani@endian.com>
Date: Sat, 9 Jul 2016 15:09:28 +0200
Subject: [PATCH] improve cuteness

---
 angular_app/event-edit.html   |  5 +++--
 angular_app/events-list.html  | 15 ++++++++-------
 angular_app/js/controllers.js |  2 +-
 angular_app/login.html        |  4 ++--
 angular_app/ticket-edit.html  | 27 ++++++++++++++++++---------
 angular_app/tickets-list.html | 20 ++++++--------------
 angular_app/user-edit.html    | 26 +++++++++++++++++++++-----
 angular_app/users-list.html   | 16 +++++++++-------
 8 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/angular_app/event-edit.html b/angular_app/event-edit.html
index 946f50c..b7b7ec0 100644
--- a/angular_app/event-edit.html
+++ b/angular_app/event-edit.html
@@ -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>
+                &nbsp;<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>
-                &nbsp;<span ng-if="hasPermission('event|create') && !event.title">{{'New event' | translate}}</span>{{event.title}}
             </h1>
         </div>
         <div class="panel-body">
diff --git a/angular_app/events-list.html b/angular_app/events-list.html
index cbc2ad0..e60e469 100644
--- a/angular_app/events-list.html
+++ b/angular_app/events-list.html
@@ -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">
diff --git a/angular_app/js/controllers.js b/angular_app/js/controllers.js
index 9764b4a..8c62db8 100644
--- a/angular_app/js/controllers.js
+++ b/angular_app/js/controllers.js
@@ -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');
                     });
                 }
             });
diff --git a/angular_app/login.html b/angular_app/login.html
index 49e6107..8f2b40e 100644
--- a/angular_app/login.html
+++ b/angular_app/login.html
@@ -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">
diff --git a/angular_app/ticket-edit.html b/angular_app/ticket-edit.html
index 7bb7a55..e323296 100644
--- a/angular_app/ticket-edit.html
+++ b/angular_app/ticket-edit.html
@@ -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>
+                                &nbsp;<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>
+                                &nbsp;<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>
+                                &nbsp;<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}}
diff --git a/angular_app/tickets-list.html b/angular_app/tickets-list.html
index b7416bf..27f72a5 100644
--- a/angular_app/tickets-list.html
+++ b/angular_app/tickets-list.html
@@ -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">
diff --git a/angular_app/user-edit.html b/angular_app/user-edit.html
index 845fe7b..8cc8f69 100644
--- a/angular_app/user-edit.html
+++ b/angular_app/user-edit.html
@@ -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">&nbsp;&lt;{{user.email}}&gt;</span>
+                &nbsp;-&nbsp;{{'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">&nbsp;&lt;{{ticket.email}}&gt;</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>
diff --git a/angular_app/users-list.html b/angular_app/users-list.html
index cebe5c4..47dce72 100644
--- a/angular_app/users-list.html
+++ b/angular_app/users-list.html
@@ -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">