Просмотр исходного кода

slighly change layout of notifications & insert html via angular

Henry Oswald 10 лет назад
Родитель
Сommit
9d61a58710

+ 2 - 2
services/web/app/views/project/list.jade

@@ -21,14 +21,14 @@ block content
 
 	.content.content-alt(ng-controller="ProjectPageController")
 		.container
-			.row(ng-cloak)
-				include ./list/notifications
+				
 			.row(ng-cloak)
 				span(ng-show="first_sign_up == 'default' || projects.length > 0")
 					aside.col-md-2.col-xs-3
 						include ./list/side-bar
 
 					.col-md-10.col-xs-9
+						include ./list/notifications
 						include ./list/project-list
 				
 				span(ng-if="first_sign_up == 'minimial' && projects.length == 0")

+ 14 - 16
services/web/app/views/project/list/notifications.jade

@@ -1,19 +1,17 @@
 span(ng-controller="NotificationsController")
-	aside.col-md-2.col-xs-3
-	.col-md-10.col-xs-9
+	.col-md-12
 		.row
-			.col-xs-12(ng-cloak)
-				ul.list-unstyled.notifications-list(
-					ng-if="notifications.length > 0",
-					ng-cloak
+			ul.list-unstyled.notifications-list(
+				ng-if="notifications.length > 0",
+				ng-cloak
+			)
+				li.notification_entry(
+					ng-repeat="unreadNotification in notifications",
 				)
-					li.notification_entry(
-						ng-repeat="unreadNotification in notifications",
-					)
-						.row(ng-hide="unreadNotification.hide")
-							.col-xs-12
-								.alert.alert-info
-									span {{unreadNotification.html}}
-									button(ng-click="dismiss(unreadNotification)").close.pull-right
-										span(aria-hidden="true") ×
-										span.sr-only #{translate("close")}
+					.row(ng-hide="unreadNotification.hide")
+						.col-xs-12
+							.alert.alert-warning
+								span(ng-bind-html="unreadNotification.html")
+								button(ng-click="dismiss(unreadNotification)").close.pull-right
+									span(aria-hidden="true") ×
+									span.sr-only #{translate("close")}