Преглед изворни кода

working framework. not happy with groove. Can't set mailbox

Henry Oswald пре 10 година
родитељ
комит
882297c353

+ 31 - 0
services/web/app/views/contact-us-modal.jade

@@ -0,0 +1,31 @@
+script(type='text/ng-template', id='supportModalTemplate')
+	.modal-header
+		button.close(
+			type="button"
+			data-dismiss="modal"
+			ng-click="close()"
+		) ×
+		h3 Contact Us
+	.modal-body
+		span(ng-show="sent == false")
+			.form-group
+			label
+				| Subject
+			.form-group
+				input.field.text.medium.span8.form-control(ng-model="form.subject", maxlength='255', tabindex='1', onkeyup='')
+			label.desc
+				| Email
+			.form-group
+				input.field.text.medium.span8.form-control(ng-model="form.email", type='email', spellcheck='false', value='', maxlength='255', tabindex='2')
+			label#title12.desc
+				| Project URL (optional)
+			.form-group
+				input.field.text.medium.span8.form-control(ng-model="form.project_url", tabindex='3', onkeyup='')
+			label.desc
+				| Message
+			.form-group
+				textarea.field.text.medium.span8.form-control(ng-model="form.message",type='text', value='', maxlength='255', tabindex='4', onkeyup='')
+			.form-group.text-center
+				input.btn-success.btn.btn-lg(type='submit', ng-disabled="sending", ng-click="contactUs()" value='Get in Touch')
+		span(ng-show="sent")
+			p Request Sent, Thank you.

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

@@ -65,10 +65,6 @@ html(itemscope, itemtype='http://schema.org/Product')
 			window.ab = {};
 			window.ab = {};
 			window.user_id = '#{getLoggedInUserId()}';
 			window.user_id = '#{getLoggedInUserId()}';
 
 
-		//- script.
-		//- 	(function() {var s=document.createElement('script'); s.type='text/javascript';s.async=true; s.src=('https:'==document.location.protocol?'https':'http') + '://sharelatex-accounts.groovehq.com/widgets/f5ad3b09-7d99-431b-8af5-c5725e3760ce/ticket.js'; var q = document.getElementsByTagName('script')[0];q.parentNode.insertBefore(s, q);})();
-
-
 		- if (typeof(settings.algolia) != "undefined")
 		- if (typeof(settings.algolia) != "undefined")
 			script.
 			script.
 				window.sharelatex.algolia = {
 				window.sharelatex.algolia = {
@@ -86,6 +82,9 @@ html(itemscope, itemtype='http://schema.org/Product')
 				}
 				}
 				
 				
 	body
 	body
+		div(ng-controller="ContactModal")
+			a(ng-click="contactUsModal()") contact us
+
 		- if(typeof(suppressSystemMessages) == "undefined")
 		- if(typeof(suppressSystemMessages) == "undefined")
 			.system-messages(
 			.system-messages(
 				ng-cloak
 				ng-cloak
@@ -131,5 +130,12 @@ html(itemscope, itemtype='http://schema.org/Product')
 				src=jsPath+'libs/require.js?fingerprint='+fingerprint(jsPath + 'libs/require.js')
 				src=jsPath+'libs/require.js?fingerprint='+fingerprint(jsPath + 'libs/require.js')
 			)
 			)
 
 
+			script(type='text/javascript').
+				(function() {var s=document.createElement('script'); s.type='text/javascript';s.async=true; 
+				s.src=('https:'==document.location.protocol?'https':'http') + '://sharelatex-accounts.groovehq.com/widgets/f5ad3b09-7d99-431b-8af5-c5725e3760ce/ticket/api.js'; 
+				var q = document.getElementsByTagName('script')[0];q.parentNode.insertBefore(s, q);})(); 
+
+		include contact-us-modal
+
 
 
 
 

+ 1 - 1
services/web/app/views/layout/navbar.jade

@@ -27,7 +27,7 @@ nav.navbar.navbar-default
 								a.dropdown-toggle(href, dropdown-toggle)
 								a.dropdown-toggle(href, dropdown-toggle)
 									| !{translate(item.text)}
 									| !{translate(item.text)}
 									b.caret
 									b.caret
-								ul.dropdown-menu(ng-controller="NavController")
+								ul.dropdown-menu
 									each child in item.dropdown
 									each child in item.dropdown
 										if child.divider
 										if child.divider
 											li.divider
 											li.divider

+ 0 - 9
services/web/public/coffee/base.coffee

@@ -24,13 +24,4 @@ define [
 			client_id: window.user_id
 			client_id: window.user_id
 		})
 		})
 
 
-	App.controller "NavController", ($scope) ->
-
-		$scope.toggleGroove = ->
-			$scope['is-open'] = false
-			$scope['isOpen'] = false
-			GrooveWidget.toggle()
-
-
-
 	return App
 	return App

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

@@ -15,7 +15,7 @@ define [
 	"main/annual-upgrade"
 	"main/annual-upgrade"
 	"main/register-users"
 	"main/register-users"
 	"main/subscription/group-subscription-invite-controller"
 	"main/subscription/group-subscription-invite-controller"
-	"main/universties-site"
+	"main/contact-us"
 	"analytics/AbTestingManager"
 	"analytics/AbTestingManager"
 	"directives/asyncForm"
 	"directives/asyncForm"
 	"directives/stopPropagation"
 	"directives/stopPropagation"

+ 63 - 0
services/web/public/coffee/main/contact-us.coffee

@@ -0,0 +1,63 @@
+define [
+	"base"
+], (App) ->
+
+
+	App.controller 'ContactModal', ($scope, $modal) ->
+		$scope.contactUsModal = () ->
+			modalInstance = $modal.open(
+				templateUrl: "supportModalTemplate"
+				controller: "SupportModalController"
+			)
+
+	App.controller 'SupportModalController', ($scope, $modal) ->
+
+		$scope.form = {}
+		$scope.sent = false
+		$scope.sending = false
+		$scope.contactUs = ->
+			if !$scope.form.email?
+				console.log "email not set"
+				return
+			$scope.sending = true
+			ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
+			params =
+				email: $scope.form.email
+				message: $scope.form.message
+				subject: $scope.form.subject + " - [#{ticketNumber}]"
+				about : $scope.form.project_url
+
+			Groove.createTicket params, (err, json)->
+				$scope.sent = true
+				$scope.$apply()
+
+
+		$scope.close = () ->
+			$modalInstance.close()
+
+
+
+
+	App.controller 'UniverstiesContactController', ($scope, $modal) ->
+
+		$scope.form = {}
+		$scope.sent = false
+		$scope.sending = false
+		$scope.contactUs = ->
+			if !$scope.form.email?
+				console.log "email not set"
+				return
+			$scope.sending = true
+			ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
+			params =
+				name: $scope.form.name || $scope.form.email
+				email: $scope.form.email
+				labels: $scope.form.source
+				message: "Please contact me with more details"
+				subject: $scope.form.subject + " - [#{ticketNumber}]"
+				about : "#{$scope.form.position || ''} #{$scope.form.university || ''}"
+				to: "support@sharelatex.com"
+
+			Groove.createTicket params, (err, json)->
+				$scope.sent = true
+				$scope.$apply()

+ 0 - 26
services/web/public/coffee/main/universties-site.coffee

@@ -1,26 +0,0 @@
-define [
-	"base"
-], (App) ->
-
-	App.controller 'UniverstiesContactController', ($scope, $modal) ->
-
-		$scope.form = {}
-		$scope.sent = false
-		$scope.sending = false
-		$scope.contactUs = ->
-			if !$scope.form.email?
-				console.log "email not set"
-				return
-			$scope.sending = true
-			ticketNumber = Math.floor((1 + Math.random()) * 0x10000).toString(32)
-			params = 
-				name: $scope.form.name || $scope.form.email
-				email: $scope.form.email
-				labels: $scope.form.source
-				message: "Please contact me with more details"
-				subject: $scope.form.subject + " - [#{ticketNumber}]"
-				about : "#{$scope.form.position || ''} #{$scope.form.university || ''}"
-
-			Groove.createTicket params, (err, json)->
-				$scope.sent = true
-				$scope.$apply()