github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 09:55:20 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign

Browse source
This commit is contained in:
Henry Oswald 2014-07-25 13:14:22 +01:00
commit c0f5894edb
3 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
services/web/app/views/subscriptions/plans.jade
View file

@ -7,7 +7,7 @@ block content
.row
.col-md-12
.page-header.centered.plans-header.text-centered
h1 Start Your 30-Day Free Trial Today
h1 Start Your 30-Day Free Trial Today!
.row
.col-md-8.col-md-offset-2
@ -137,6 +137,42 @@ block content
.row(ng-cloak)
p.text-centered Choose the plan that works for you with our 30-day free trial. Cancel at any time.
.row(ng-cloak)
.col-md-8.col-md-offset-2
.alert.alert-info.text-centered
| Interested in using ShareLaTeX with a group, team or department wide account?
br
a(href, ng-click="openGroupPlanModal()") Get in touch for details!
script(type="text/ng-template", id="groupPlanModalTemplate")
.modal-header
h3 Group Plan Enquiry
.modal-body
form(name='form1', autocomplete='off', enctype='multipart/form-data', method='post', novalidate='', action='https://sharelatex.wufoo.com/forms/z7x3p3/#public', _lpchecked='1')
.form-group
label(for='Field9') Name
input.form-control(name='Field9', type='text', value='', maxlength='255', tabindex='1', onkeyup='')
.form-group
label(for='Field11') Email
input.form-control(name='Field11', type='email', spellcheck='false', value='', maxlength='255', tabindex='2')
.form-group
label(for='Field12') University
input.form-control(name='Field12', type='text', value='', maxlength='255', tabindex='3', onkeyup='')
.form-group
label(for='Field13') Position
input.form-control(name='Field13', type='text', value='', maxlength='255', tabindex='4', onkeyup='')
.form-group
input.btn.btn-primary.btn-large(name='saveForm', type='submit', value='Send')
div(style='display: none;')
label(for='comment') Do Not Fill This Out
textarea#comment(name='comment', rows='1', cols='1')
input#idstamp(type='hidden', name='idstamp', value='xkgLkZnS/AQW71jCS1d0XrrFjq26lJryIPVk2rx0YkU=')
.row
.col-md-12
.page-header.plans-header.plans-subheader.text-centered

7
services/web/public/coffee/main/plans.coffee
View file

@ -1,7 +1,7 @@
define [
"base"
], (App) ->
App.controller "PlansController", ($scope, event_tracking) ->
App.controller "PlansController", ($scope, $modal, event_tracking) ->
$scope.ui =
view: "monthly"
@ -22,3 +22,8 @@ define [
$scope.switchToAnnual = ->
$scope.ui.view = "annual"
event_tracking.send 'subscription-funnel', 'plans-page', 'student-prices'
$scope.openGroupPlanModal = () ->
$modal.open {
templateUrl: "groupPlanModalTemplate"
}

4
services/web/public/stylesheets/app/homepage.less
View file

@ -137,11 +137,11 @@
.track-changes-example {
.removed, .added {
color: #333;
margin: 0 -3px;
margin: 0 -1px;
padding: 0 3px;
}
.added {
background-color: hsl(200, 70%, 70%);
background-color: hsl(200, 70%, 80%);
}
.removed {