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

Merge pull request #74 from alberanid/master

Browse source 
header and footer
This commit is contained in:
Davide Alberani 2015-05-10 10:39:35 +02:00
commit f72eee465f
4 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
angular_app/event-info.html
View file

@ -111,9 +111,9 @@
</div>
</div>
<div class="panel panel-info table-striped top5">
<div class="panel panel-info top5">
<div class="panel-heading">{{'Unregistered persons' | translate}}</div>
<div class="panel-body" class="small-table">
<div class="panel-body small-table">
<table class="table table-striped table-condensed">
<thead>
<tr>

13
angular_app/index.html
View file

@ -43,13 +43,16 @@
-->
<body>
<nav class="navbar navbar-default navbar-fixed-top" ng-controller="NavigationCtrl as n">
<nav class="navbar navbar-default navbar-fixed-top" ng-controller="NavigationCtrl">
<div class="container">
<div class="collapse navbar-collapse">
<div class="navbar-header">
<div ng-if="logo.imgURL" class="navbar-brand"><a ng-if="logo.link" href="{{logo.link}}" target="_blank"><img src="{{logo.imgURL}}" /></a></div>
<ul class="nav navbar-nav">
<li ng-class="{active: n.isActive('/events') || n.isActive('/event')}"><a ui-sref="events">{{'Events' | translate}}</a></li>
<li ng-class="{active: n.isActive('/persons') || n.isActive('/person') || n.isActive('/import/persons')}"><a ui-sref="persons">{{'Persons' | translate}}</a></li>
<li ng-class="{active: isActive('/events') || isActive('/event')}"><a ui-sref="events">{{'Events' | translate}}</a></li>
<li ng-class="{active: isActive('/persons') || isActive('/person') || isActive('/import/persons')}"><a ui-sref="persons">{{'Persons' | translate}}</a></li>
</ul>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<button class="btn btn-link">
@ -70,7 +73,7 @@
<div ui-view></div>
<div class="main-footer">
<a href="https://github.com/raspibo/eventman/" target="_blank">Event Man(ager)</a> by RaspiBO: <a href="http://raspibo.org">wiki</a> | <a href="http://social.raspibo.org">social network</a> | <a href="http://liste.raspibo.org/wws/">mailing lists</a> | <a href="mailto:info@raspibo.org">contact</a>
</div>
</body>
</html>

16
angular_app/js/controllers.js vendored
View file

@ -7,13 +7,21 @@ var eventManControllers = angular.module('eventManControllers', []);
/* A controller that can be used to navigate. */
eventManControllers.controller('NavigationCtrl', ['$location',
function ($location) {
this.go = function(url) {
eventManControllers.controller('NavigationCtrl', ['$scope', '$location', 'Setting',
function ($scope, $location, Setting) {
$scope.logo = {};
$scope.go = function(url) {
$location.url(url);
};
this.isActive = function (view) {
Setting.query({setting: 'logo'}, function(data) {
if (data && data.length) {
$scope.logo = data[0];
}
});
$scope.isActive = function(view) {
if (view === $location.path()) {
return true;
}

21
static/css/eventman.css
View file

@ -2,9 +2,24 @@
/* nav-bar padding */
body { padding-top: 70px; }
/* logo padding */
.navbar-brand {
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
}
/* fix styling for empty href */
.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
/* Footer links */
.main-footer {
background-color: lightgray;
text-align: center;
padding: 4px;
font-size: x-small;
}
/* margins for lists */
.top5 { margin-top: 5px; }
.top10 { margin-top: 10px; }
@ -50,8 +65,8 @@ body { padding-top: 70px; }
/* a small table with a fixed height */
.small-table {
height:200px;
overflow-x:hidden;
overflow-y:scroll;
height: 200px !important;
overflow-x: hidden !important;
overflow-y: scroll !important;
}