Skip to content
Snippets Groups Projects
Commit 1bb87d28 authored by David Findlay's avatar David Findlay
Browse files

menuCtrl works, fixed layout a bit.

parent 4422ff74
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
app/views/Index.scala.html
+ 2
− 2
View file @ 1bb87d28
......@@ -10,11 +10,11 @@
<link rel="stylesheet" href="@routes.Assets.versioned("css/app.css")">
<script data-main="@routes.Assets.versioned("js/main.js")" src="@routes.Assets.versioned("lib/requirejs/require.js")"></script>
</head>
<body ng-app="eprogram2">
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle navbar-left ng-click="isShowMenu">
<button type="button" class="navbar-toggle pull-left" ng-click="isShowMenu">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......
public/css/app.css
+ 9
− 3
View file @ 1bb87d28
/* app css stylesheet */
body { padding-top: 70px; }
body { padding-top: 50px; }
#wrapper {
width: 100%;
height: 100%;
padding: 0;
}
#sidebar-wrapper {
height: 100%;
padding-right: 0px;
padding-top: 20px;
padding: 10px;
background-color: #222;
color: white;
}
#sidebar-wrapper #nav {
......@@ -22,6 +24,10 @@ body { padding-top: 70px; }
padding: 15px;
}
.navbar {
margin-bottom: 0;
}
/* Mobile narrow view */
@media screen and (max-width: 767px) {
.row-offcanvas {
......
public/js/main.js
+ 8
− 8
View file @ 1bb87d28
......@@ -27,17 +27,17 @@ require(['angular', './controllers', './directives', './filters', './services',
function(angular, controllers) {
// Declare app level module which depends on filters, and services
angular.module('eprogram2', ['eprogram2.filters', 'eprogram2.services', 'eprogram2.directives', 'ngRoute']).
//
var eprogram2 = angular.module('eprogram2', ['ui.bootstrap', 'eprogram2.filters', 'eprogram2.services', 'eprogram2.directives', 'ngRoute']).
config(['$routeProvider', function($routeProvider) {
// $routeProvider.when('/view1', {templateUrl: 'partials/partial1.html', controller: controllers.MyCtrl1});
// $routeProvider.when('/view2', {templateUrl: 'partials/partial2.html', controller: controllers.MyCtrl2});
// $routeProvider.otherwise({redirectTo: '/view1'});
$routeProvider.when('/view1', {templateUrl: 'partials/partial1.html', controller: controllers.MyCtrl1});
$routeProvider.when('/view2', {templateUrl: 'partials/partial2.html', controller: controllers.MyCtrl2});
$routeProvider.otherwise({redirectTo: '/view1'});
}]);
angular.module('eprogram2', ['ui.bootstrap']);
angular.module('eprogram2.controllers', controllers);
eprogram2.controller('menuCtrl', controllers.menuCtrl);
angular.bootstrap(document, ['eprogram2']);
});
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment