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

change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not

Henry Oswald 12 лет назад
Родитель
Сommit
c683eab9e2

+ 4 - 10
services/web/app/views/layout.jade

@@ -43,17 +43,11 @@ html(itemscope, itemtype='http://schema.org/Product')
 		- if(typeof(suppressFooter) == "undefined")
 			include layout/footer
 
+
+
 		- if (typeof(lookingForScribtex) != "undefined" && lookingForScribtex)
-			.modal.hide#scribtexModal
-				.modal-header
-					h3 Looking for ScribTeX?
-				.modal-body
-					p ScribTeX has moved to <strong>https://scribtex.sharelatex.com</strong>. Please update your bookmarks.
-					p(style="text-align: center") You can find the page you were looking for here:
-					p(style="text-align: center")
-						a(href="https://scribtex.sharelatex.com#{scribtexPath}", style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath}
-				.modal-footer
-					button(data-dismiss="modal").btn OK
+			span(ng-controller="ScribtexPopupController")
+			include scribtex-modal
 
 
 		- if(typeof(suppressFooter) == "undefined")

+ 8 - 0
services/web/app/views/scribtex-modal.jade

@@ -0,0 +1,8 @@
+script(type='text/ng-template', id='scribtexModalTemplate')
+	.modal-header
+		h3 Looking for ScribTeX?
+	.modal-body
+		p ScribTeX has moved to <strong>https://scribtex.sharelatex.com</strong>. Please update your bookmarks.
+		p(style="text-align: center") You can find the page you were looking for here:
+		p(style="text-align: center")
+			a(href="https://scribtex.sharelatex.com#{scribtexPath}", style="font-size: 16px") https://scribtex.sharelatex.com#{scribtexPath}

+ 1 - 0
services/web/public/coffee/main.coffee

@@ -5,6 +5,7 @@ define [
 	"main/templates"
 	"main/plans"
 	"main/group-members"
+	"main/scribtex-popup"
 	"directives/asyncForm"
 	"directives/stopPropagation"
 	"directives/focus"

+ 9 - 0
services/web/public/coffee/main/scribtex-popup.coffee

@@ -0,0 +1,9 @@
+define [
+	"base"
+], (App) ->
+
+	App.controller 'ScribtexPopupController', ($scope, $modal) ->
+
+		$modal.open {
+			templateUrl: "scribtexModalTemplate"
+		}