##// END OF EJS Templates
flash: re-add flash messages to top application component
ergo -
Show More
@@ -3,13 +3,6 b''
3 {% block outer_content %}
3 {% block outer_content %}
4 <!-- Begin page content -->
4 <!-- Begin page content -->
5 <div class="container">
5 <div class="container">
6 <div class="row ng-cloak" data-ng-if="flash.length" style="margin-bottom: 10px">
7 <div class="col-xs-12">
8 {% raw %}
9 <uib-alert data-ng-repeat="message in flash" type="{{ message.type}}" close="closeAlert($index)" class="animate-repeat">{{message.msg}}</uib-alert>
10 {% endraw %}
11 </div>
12 </div>
13 <div class="row">
6 <div class="row">
14 {% block content %}{% endblock %}
7 {% block content %}{% endblock %}
15 </div>
8 </div>
@@ -45,7 +45,10 b" angular.module('appenlight.components', ["
45 'appenlight.components.appenlightHeader',
45 'appenlight.components.appenlightHeader',
46 'appenlight.components.indexDashboardView',
46 'appenlight.components.indexDashboardView',
47 'appenlight.components.logsBrowserView',
47 'appenlight.components.logsBrowserView',
48 'appenlight.components.eventBrowserView'
48 'appenlight.components.eventBrowserView',
49 'appenlight.components.userProfileView',
50 'appenlight.components.userIdentitiesView',
51 'appenlight.components.settingsView'
49 ]);
52 ]);
50 angular.module('appenlight.directives', [
53 angular.module('appenlight.directives', [
51 'appenlight.directives.c3chart',
54 'appenlight.directives.c3chart',
@@ -1,5 +1,16 b''
1 <channelstream config="AeConfig"></channelstream>
1 <channelstream config="AeConfig"></channelstream>
2 <appenlight-header></appenlight-header>
2 <appenlight-header></appenlight-header>
3 <div class="container" data-ng-if="flash.length">
4 <div class="row" style="margin-bottom: 10px">
5 <div class="col-xs-12">
6 <uib-alert data-ng-repeat="message in flash"
7 type="{{ message.type }}"
8 close="closeAlert($index)" class="animate-repeat">
9 {{ message.msg }}</uib-alert>
10 </div>
11 </div>
12 </div>
13
3 <div id="outer-content">
14 <div id="outer-content">
4 <div ui-view class="container"></div>
15 <div ui-view class="container"></div>
5 </div>
16 </div>
@@ -140,25 +140,23 b" angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun"
140 });
140 });
141
141
142 $stateProvider.state('admin.configs.list', {
142 $stateProvider.state('admin.configs.list', {
143 url: '',
143 url: '/list',
144 templateUrl: 'templates/admin/configs/edit.html',
144 templateUrl: 'templates/admin/configs/edit.html',
145 controller: 'ConfigsListController as configs'
145 controller: 'ConfigsListController as configs'
146 });
146 });
147
147
148 $stateProvider.state('user', {
148 $stateProvider.state('user', {
149 url: '/ui/user',
149 url: '/ui/user',
150 templateUrl: 'templates/user/parent_view.html'
150 component: 'settingsView'
151 });
151 });
152
152
153 $stateProvider.state('user.profile', {
153 $stateProvider.state('user.profile', {
154 abstract: true,
154 abstract: true,
155 url: '/profile',
155 template: '<ui-view></ui-view>'
156 templateUrl: 'templates/user/profile.html'
157 });
156 });
158 $stateProvider.state('user.profile.edit', {
157 $stateProvider.state('user.profile.edit', {
159 url: '',
158 url: '/profile',
160 templateUrl: 'templates/user/profile_edit.html',
159 component: 'userProfileView'
161 controller: 'UserProfileController as profile'
162 });
160 });
163
161
164
162
@@ -170,8 +168,7 b" angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun"
170
168
171 $stateProvider.state('user.profile.identities', {
169 $stateProvider.state('user.profile.identities', {
172 url: '/identities',
170 url: '/identities',
173 templateUrl: 'templates/user/profile_identities.html',
171 component: 'userIdentitiesView'
174 controller: 'UserIdentitiesController as identities'
175 });
172 });
176
173
177 $stateProvider.state('user.profile.auth_tokens', {
174 $stateProvider.state('user.profile.auth_tokens', {
@@ -187,7 +184,7 b" angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun"
187 });
184 });
188
185
189 $stateProvider.state('user.alert_channels.list', {
186 $stateProvider.state('user.alert_channels.list', {
190 url: '',
187 url: '/list',
191 templateUrl: 'templates/user/alert_channels_list.html',
188 templateUrl: 'templates/user/alert_channels_list.html',
192 controller: 'AlertChannelsController as channels'
189 controller: 'AlertChannelsController as channels'
193 });
190 });
@@ -205,7 +202,7 b" angular.module('appenlight').config(['$stateProvider', '$urlRouterProvider', fun"
205 });
202 });
206
203
207 $stateProvider.state('applications.list', {
204 $stateProvider.state('applications.list', {
208 url: '',
205 url: '/list',
209 templateUrl: 'templates/applications/list.html',
206 templateUrl: 'templates/applications/list.html',
210 controller: 'ApplicationsListController as applications'
207 controller: 'ApplicationsListController as applications'
211 });
208 });
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now