Commit d9c4ec246e9d8754c5af79acd035e16981be5f0f
1 parent
c430a211bd
Exists in
master
fixed the maui setup :)
Showing
3 changed files
with
18 additions
and
13 deletions
Show diff stats
maui/demo.html
| @@ -20,11 +20,11 @@ | @@ -20,11 +20,11 @@ | ||
| 20 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/dist/css/mobile-angular-ui-base.min.css" /> | 20 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/dist/css/mobile-angular-ui-base.min.css" /> |
| 21 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/dist/css/mobile-angular-ui-desktop.min.css" /> | 21 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/dist/css/mobile-angular-ui-desktop.min.css" /> |
| 22 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/demo/demo.css" /> | 22 | <link rel="stylesheet" href="/static/bower_components/mobile-angular-ui/demo/demo.css" /> |
| 23 | - <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular.min.js"></script> | ||
| 24 | - <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-route.min.js"></script> | ||
| 25 | - <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.15/angular-touch.min.js"></script> | 23 | + <script src="/static/bower_components/angular/angular.min.js"></script> |
| 24 | + <script src="/static/bower_components/angular-route/angular-route.min.js"></script> | ||
| 25 | + <script src="/static/bower_components/angular-touch/angular-touch.min.js"></script> | ||
| 26 | <script src="/static/bower_components/mobile-angular-ui/dist/js/mobile-angular-ui.min.js"></script> | 26 | <script src="/static/bower_components/mobile-angular-ui/dist/js/mobile-angular-ui.min.js"></script> |
| 27 | - <script src="/static/bower_components/mobile-angular-ui/demo/demo.js"></script> | 27 | + <script src="demo.js"></script> |
| 28 | </head> | 28 | </head> |
| 29 | <body ng-app="MobileAngularUiExamples" ng-controller="MainController"> | 29 | <body ng-app="MobileAngularUiExamples" ng-controller="MainController"> |
| 30 | 30 |
maui/demo.js
| @@ -5,14 +5,14 @@ var app = angular.module('MobileAngularUiExamples', [ | @@ -5,14 +5,14 @@ var app = angular.module('MobileAngularUiExamples', [ | ||
| 5 | ]); | 5 | ]); |
| 6 | 6 | ||
| 7 | app.config(function($routeProvider, $locationProvider) { | 7 | app.config(function($routeProvider, $locationProvider) { |
| 8 | - $routeProvider.when('/', {templateUrl: "home.html"}); | ||
| 9 | - $routeProvider.when('/scroll', {templateUrl: "scroll.html"}); | ||
| 10 | - $routeProvider.when('/toggle', {templateUrl: "toggle.html"}); | ||
| 11 | - $routeProvider.when('/tabs', {templateUrl: "tabs.html"}); | ||
| 12 | - $routeProvider.when('/accordion', {templateUrl: "accordion.html"}); | ||
| 13 | - $routeProvider.when('/overlay', {templateUrl: "overlay.html"}); | ||
| 14 | - $routeProvider.when('/forms', {templateUrl: "forms.html"}); | ||
| 15 | - $routeProvider.when('/carousel', {templateUrl: "carousel.html"}); | 8 | + $routeProvider.when('/', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/home.html"}); |
| 9 | + $routeProvider.when('/scroll', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/scroll.html"}); | ||
| 10 | + $routeProvider.when('/toggle', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/toggle.html"}); | ||
| 11 | + $routeProvider.when('/tabs', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/tabs.html"}); | ||
| 12 | + $routeProvider.when('/accordion', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/accordion.html"}); | ||
| 13 | + $routeProvider.when('/overlay', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/overlay.html"}); | ||
| 14 | + $routeProvider.when('/forms', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/forms.html"}); | ||
| 15 | + $routeProvider.when('/carousel', {templateUrl: "/static/bower_components/mobile-angular-ui/demo/carousel.html"}); | ||
| 16 | }); | 16 | }); |
| 17 | 17 | ||
| 18 | app.service('analytics', [ | 18 | app.service('analytics', [ |
| @@ -127,4 +127,4 @@ app.controller('MainController', function($rootScope, $scope, analytics){ | @@ -127,4 +127,4 @@ app.controller('MainController', function($rootScope, $scope, analytics){ | ||
| 127 | { name: "Ebony Rice", online: false } | 127 | { name: "Ebony Rice", online: false } |
| 128 | ]; | 128 | ]; |
| 129 | 129 | ||
| 130 | -}); | ||
| 131 | \ No newline at end of file | 130 | \ No newline at end of file |
| 131 | +}); |
salt/roots/playground/nginx.conf
| @@ -15,6 +15,11 @@ server { | @@ -15,6 +15,11 @@ server { | ||
| 15 | alias /vagrant/static/; | 15 | alias /vagrant/static/; |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | + location /maui/ { | ||
| 19 | + expires off; | ||
| 20 | + alias /vagrant/maui/; | ||
| 21 | + } | ||
| 22 | + | ||
| 18 | location /media/ { | 23 | location /media/ { |
| 19 | expires off; | 24 | expires off; |
| 20 | alias /vagrant/media/; | 25 | alias /vagrant/media/; |