From 46027128a4f884129e83ce5f19da7133189bdfa7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 Jul 2014 15:52:55 +0100 Subject: [PATCH 1/4] change notifications email top header to the grey we use on the site --- .../Features/Email/Layouts/NotificationEmailLayout.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee b/services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee index 645285e80f..a4a2a70bc4 100644 --- a/services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee +++ b/services/web/app/coffee/Features/Email/Layouts/NotificationEmailLayout.coffee @@ -311,7 +311,7 @@ module.exports = _.template ''' -
+ From 535a3c67cdcbd6b6cf43565c54cd47d04bddb413 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 Jul 2014 16:41:22 +0100 Subject: [PATCH 2/4] added template for bonus page with html linking to us --- services/web/app/views/referal/bonus.jade | 37 ++++++++++++--- .../views/view_templates/bonus_templates.jade | 45 +++++++++++++++++++ services/web/public/coffee/main.coffee | 1 + services/web/public/coffee/main/bonus.coffee | 14 ++++++ .../web/public/stylesheets/app/bonus.less | 6 +-- 5 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 services/web/app/views/view_templates/bonus_templates.jade create mode 100644 services/web/public/coffee/main/bonus.coffee diff --git a/services/web/app/views/referal/bonus.jade b/services/web/app/views/referal/bonus.jade index 7a1ec48257..1bcc874d20 100644 --- a/services/web/app/views/referal/bonus.jade +++ b/services/web/app/views/referal/bonus.jade @@ -6,7 +6,7 @@ block content .row .col-md-8.col-md-offset-2 .card - .container-fluid + .container-fluid(ng-controller="BonusLinksController") .row .col-md-12 .page-header @@ -44,7 +44,7 @@ block content .row .col-md-8.col-md-offset-2.bonus-banner .title - a(href='#link-modal', data-toggle="modal").link Link to us from your website + a(href='#link-modal', data-toggle="modal", ng-click="openLinkToUsModal()").link Link to us from your website .row .col-md-10.col-md-offset-1.bonus-banner @@ -86,17 +86,40 @@ block content - else p.thanks You've introduced #{refered_user_count} people to ShareLaTeX. Good job! - #link-modal.modal.hide + script(type="text/ng-template", id="BonusLinkToUsModal") .modal-header + button.close( + type="button" + data-dismiss="modal" + ng-click="cancel()" + ) × h3 Link to ShareLaTeX - .modal-body + .modal-body.modal-body-share.link-modal + p You can link to ShareLaTeX with the following HTML: p - textarea(readonly=true) + textarea.col-md-12(readonly=true) Online LaTeX Editor ShareLaTeX + p Thanks! - .modal-footer - button.btn(data-dismiss="modal") Close + + + .modal-footer() + button.btn.btn-default( + ng-click="cancel()", + ) + span Close + + + + + + + + + + + script(type='text/javascript', src='//platform.twitter.com/widgets.js') script(src='https://connect.facebook.net/en_US/all.js') diff --git a/services/web/app/views/view_templates/bonus_templates.jade b/services/web/app/views/view_templates/bonus_templates.jade new file mode 100644 index 0000000000..e96f387137 --- /dev/null +++ b/services/web/app/views/view_templates/bonus_templates.jade @@ -0,0 +1,45 @@ +script(type="text/ng-template", id="BonusLinkToUsModal") + .modal-header + button.close( + type="button" + data-dismiss="modal" + ng-click="cancel()" + ) × + h3 Dropbox link + .modal-body.modal-body-share + + div(ng-show="dbState.gotLinkStatus") + div(ng-hide="dbState.userIsLinkedToDropbox || !dbState.hasDropboxFeature") + + span(ng-hide="dbState.startedLinkProcess") Your account is not linked to dropbox + |     + a(ng-click="linkToDropbox()").btn.btn-info Update Dropbox Settings + + p.small.text-center(ng-show="dbState.startedLinkProcess") + | Please refresh this page after starting your free trial. + + + div(ng-show="dbState.hasDropboxFeature && dbState.userIsLinkedToDropbox") + progressbar.progress-striped.active(value='dbState.percentageLeftTillNextPoll', type="info") + span + strong {{dbState.minsTillNextPoll}} minutes + span until dropbox is next checked for changes. + + div.text-center(ng-hide="dbState.hasDropboxFeature") + p You need to upgrade your account to link to dropbox. + p + a.btn.btn-info(ng-click="startFreeTrial('dropbox')") Start Free Trial + p.small(ng-show="startedFreeTrial") + | Please refresh this page after starting your free trial. + + div(ng-hide="dbState.gotLinkStatus") + span.small   checking dropbox status   + i.fa.fa-refresh.fa-spin + + + + .modal-footer() + button.btn.btn-default( + ng-click="cancel()", + ) + span Dismiss diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee index 121b51fcc2..26f2ab9148 100644 --- a/services/web/public/coffee/main.coffee +++ b/services/web/public/coffee/main.coffee @@ -7,6 +7,7 @@ define [ "main/group-members" "main/scribtex-popup" "main/event-tracking" + "main/bonus" "directives/asyncForm" "directives/stopPropagation" "directives/focus" diff --git a/services/web/public/coffee/main/bonus.coffee b/services/web/public/coffee/main/bonus.coffee new file mode 100644 index 0000000000..c87a0df9b4 --- /dev/null +++ b/services/web/public/coffee/main/bonus.coffee @@ -0,0 +1,14 @@ +define [ + "base" +], (App) -> + App.controller "BonusLinksController", ($scope, $modal) -> + $scope.openLinkToUsModal = -> + $modal.open { + templateUrl: "BonusLinkToUsModal" + controller: "BonusModalController" + } + + App.controller "BonusModalController", ($scope, $modalInstance)-> + + $scope.cancel = () -> + $modalInstance.dismiss() diff --git a/services/web/public/stylesheets/app/bonus.less b/services/web/public/stylesheets/app/bonus.less index 9c5f39acc1..e653275fc1 100644 --- a/services/web/public/stylesheets/app/bonus.less +++ b/services/web/public/stylesheets/app/bonus.less @@ -118,10 +118,8 @@ } -#link-modal { - .modal-body{ - text-align: center; - } +.link-modal { + text-align: center; textarea { width: 95%; margin-bottom: 0; From 8a068cf9a06234744f4269d794cda66abf244ac9 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 Jul 2014 17:29:55 +0100 Subject: [PATCH 3/4] styled the register page to show the messages for tempaltes/shared correctly i.e.: http://localhost:3000/register?zipUrl=%2Ftemplates%2F52fb89a333621a613683ec95%2Fv%2F1%2Fzip&templateName=thebibliography&compiler=pdflatex&redir=%2Fproject%2Fnew%2Ftemplate and http://localhost:3000/register?project_name=cc&user_first_name=myname&new_email=henry.oswald%2B1%40gmail.com&r=9f5572a4&rs=ci&redir=%2Fproject%2F53c8ec05ae21f58877ded489 --- services/web/public/stylesheets/app/register.less | 4 ++++ services/web/public/stylesheets/style.less | 1 + 2 files changed, 5 insertions(+) create mode 100644 services/web/public/stylesheets/app/register.less diff --git a/services/web/public/stylesheets/app/register.less b/services/web/public/stylesheets/app/register.less new file mode 100644 index 0000000000..b45cb7a8ea --- /dev/null +++ b/services/web/public/stylesheets/app/register.less @@ -0,0 +1,4 @@ +.registration_message { + text-align:center; + padding-bottom: 20px; +} \ No newline at end of file diff --git a/services/web/public/stylesheets/style.less b/services/web/public/stylesheets/style.less index 0da8677a6e..20b9b2e257 100755 --- a/services/web/public/stylesheets/style.less +++ b/services/web/public/stylesheets/style.less @@ -61,3 +61,4 @@ @import "app/plans.less"; @import "app/recurly.less"; @import "app/bonus.less"; +@import "app/register.less"; From aa3cd06d72adee6d1a2b5b7c99e74f10e48c946e Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 21 Jul 2014 17:32:16 +0100 Subject: [PATCH 4/4] add trailing space for better spacing on register message --- services/web/app/views/user/register.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade index da6f5064a7..30889eacaf 100644 --- a/services/web/app/views/user/register.jade +++ b/services/web/app/views/user/register.jade @@ -10,7 +10,7 @@ block content div Join ShareLaTeX to view this project else if newTemplateData.templateName !== undefined h1 Please register to edit the '#{newTemplateData.templateName}' template - div Already have a ShareLaTeX account? + div Already have a ShareLaTeX account? a(href="/login") Login here .row