alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #99 from alberanid/master

Browse source 
avoid wrapping of table headers
This commit is contained in:
Davide Alberani 2016-04-17 17:14:11 +02:00
commit d20a665ee7
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
angular_app/event-info.html
View file

@ -39,13 +39,13 @@
<table class="table table-striped">
<thead>
<tr>
<th class="text-right">#</th>
<th>{{'Person' | translate}} <a ng-click="updateOrded('name')" href=""><i class="fa fa-caret-up"></i></a>{{'Name' | translate}}<a ng-click="updateOrded('-name')" href=""><i class="fa fa-caret-down"></i></a> <a ng-click="updateOrded('surname')" href=""><i class="fa fa-caret-up"></i></a>{{'Surname' | translate}}<a ng-click="updateOrded('-surname')" href=""><i class="fa fa-caret-down"></i></a></th>
<th class="text-center"><a ng-click="updateOrded('-attended')" href=""><i class="fa fa-caret-up"></i></a>{{'Attended' | translate}}<a ng-click="updateOrded('attended')" href=""><i class="fa fa-caret-down"></i></a></th>
<th class="text-center" ng-repeat="col in customFields">
<th class="text-right nowrap">#</th>
<th class="nowrap">{{'Person' | translate}} <a ng-click="updateOrded('name')" href=""><i class="fa fa-caret-up"></i></a>{{'Name' | translate}}<a ng-click="updateOrded('-name')" href=""><i class="fa fa-caret-down"></i></a> <a ng-click="updateOrded('surname')" href=""><i class="fa fa-caret-up"></i></a>{{'Surname' | translate}}<a ng-click="updateOrded('-surname')" href=""><i class="fa fa-caret-down"></i></a></th>
<th class="text-center nowrap"><a ng-click="updateOrded('-attended')" href=""><i class="fa fa-caret-up"></i></a>{{'Attended' | translate}}<a ng-click="updateOrded('attended')" href=""><i class="fa fa-caret-down"></i></a></th>
<th class="text-center nowrap" ng-repeat="col in customFields">
<a ng-click="updateOrded(col.key)" href=""><i class="fa fa-caret-up"></i></a>{{col.label | translate}}<a ng-click="updateOrded('-' + col.key)" href=""><i class="fa fa-caret-down"></i></a>
</th>
<th class="text-center">{{'Delete' | translate}}</th>
<th class="text-center nowrap">{{'Delete' | translate}}</th>
</tr>
</thead>
<tbody>

1
angular_app/js/controllers.js vendored
View file

@ -231,6 +231,7 @@ eventManControllers.controller('EventDetailsCtrl', ['$scope', '$state', 'Event',
var personObj = new Person(person);
personObj.$save(function(p) {
$scope._addAttendee(angular.copy(p));
$scope.newPerson = {};
});
} else {
$scope._addAttendee(angular.copy(person));

8
angular_app/persons-list.html
View file

@ -36,12 +36,12 @@
<table class="table table-striped">
<thead>
<tr>
<th class="text-right">#</th>
<th>{{'Person' | translate}} <a ng-click="updateOrded('name')" href=""><i class="fa fa-caret-up"></i></a>{{'Name' | translate}}<a ng-click="updateOrded('-name')" href=""><i class="fa fa-caret-down"></i></a> <a ng-click="updateOrded('surname')" href=""><i class="fa fa-caret-up"></i></a>{{'Surname' | translate}}<a ng-click="updateOrded('-surname')" href=""><i class="fa fa-caret-down"></i></a></th>
<th ng-repeat="col in customFields" class="text-center">
<th class="text-right nowrap">#</th>
<th class="nowrap">{{'Person' | translate}} <a ng-click="updateOrded('name')" href=""><i class="fa fa-caret-up"></i></a>{{'Name' | translate}}<a ng-click="updateOrded('-name')" href=""><i class="fa fa-caret-down"></i></a> <a ng-click="updateOrded('surname')" href=""><i class="fa fa-caret-up"></i></a>{{'Surname' | translate}}<a ng-click="updateOrded('-surname')" href=""><i class="fa fa-caret-down"></i></a></th>
<th ng-repeat="col in customFields" class="text-center nowrap">
<a ng-click="updateOrded(col.key)" href=""><i class="fa fa-caret-up"></i></a>{{col.label | translate}}<a ng-click="updateOrded('-' + col.key)" href=""><i class="fa fa-caret-down"></i></a>
</th>
<th class="text-center"><strong>{{'Delete' | translate}}</strong></th>
<th class="text-center nowrap"><strong>{{'Delete' | translate}}</strong></th>
</tr>
</thead>
<tbody>

4
static/css/eventman.css
View file

@ -70,3 +70,7 @@ body { padding-top: 70px; }
overflow-y: scroll !important;
}
/* do not wrap elements inside this one */
.nowrap {
white-space: nowrap;
}