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

This commit is contained in:
James Allen 2014-07-24 13:24:20 +01:00
commit 06ca7c904e
5 changed files with 0 additions and 184 deletions

View file

@ -1,12 +1,6 @@
module.exports=
themes : (req, res)=>
res.render "info/themes",
title: 'Themes'
dropbox: (req, res)->
res.render "info/dropbox",
title: 'Dropbox with LaTeX'
advisor: (req, res)->
res.render "info/advisor",
title: 'Advisor Program'

View file

@ -12,6 +12,4 @@ module.exports =
app.get '/planned_maintenance', HomeController.externalPage("planned_maintenance", "Planned Maintenance")
app.get '/style', HomeController.externalPage("style_guide", "Style Guide")
app.get '/themes', InfoController.themes
app.get '/advisor', InfoController.advisor
app.get '/dropbox', InfoController.dropbox

View file

@ -1,69 +0,0 @@
extends ../layout
block content
.container
.row
.span8.offset2.span-box
.page-header
h1 Become a ShareLaTeX Advisor
.long-form-features
div Want to help us change collaboration in academia? We are currently recruiting members to join our advisor program. If you love LaTeX like we do and want to help represent us at your Institution then please get in touch.
hr
div
h2 Selected Advisors will:
ul
li Teach LaTeX sessions in your Institution
li Help us refine our the learning resources for the sessions
li Invite your colleges to work on ShareLaTeX
li Give us feedback and new ideas
li Let us know what the needs of your Institution are
hr
div
h2 You will get:
ul
li A premium ShareLaTeX account for free
li Be the first to try out new Beta features
li Get coffee and cake paid by us for your sessions
li Get to connect with other ShareLaTeX Advisors around the world
hr
div
h2 Apply
div To apply to be a ShareLaTeX advisor please fill in this form telling us about yourself. Let us know about what you have done using ShareLaTeX and LaTeX in the past, any opinions you have on LaTeX or collaboration in academia.
div  
form(name='form2', autocomplete='off', enctype='multipart/form-data', method='post', novalidate='novalidate', action='https://sharelatex.wufoo.com/forms/m7x3z9/#public')
.clearfix
label#title1.desc(for='Field1') Email address
.input
input.span4#Field1.field.text.medium(name='Field1', type='email', value='', maxlength='255', tabindex='1', onkeyup='', required='required')
.clearfix
label#title2.desc(for='Field2') Full name
.input
input.span4#Field2.field.text.medium(name='Field2', type='text', value='', maxlength='255', tabindex='2', onkeyup='')
.clearfix
label#title3.desc(for='Field3') Institution
.input
div
input.span4#Field3.field.text.medium(name='Field3', type='text', value='', maxlength='255', tabindex='3', onkeyup='')
.clearfix
label#title4.desc(for='Field4') Position
div
.input
input.span4#Field4.field.text.medium(name='Field4', type='text', value='', maxlength='255', tabindex='4', onkeyup='')
.clearfix
label#title5.desc(for='Field5') About you
.input
textarea.span4#Field5.field.textarea.medium(name='Field5', spellcheck='true', rows='10', cols='50', tabindex='5', onkeyup='')
div
input#saveForm.btn.btn-success.submit(name='saveForm', type='submit', value='Submit')
.hide
label(for='comment') Do Not Fill This Out
textarea#comment(name='comment', rows='1', cols='1')
input#idstamp(type='hidden', name='idstamp', value='UtmlhAnuOejSWtH/UuhT7YWdvNi99jxEEveIrxKyVtc=')
include ../general/small-footer

View file

@ -1,92 +0,0 @@
extends ../layout
block content
.container
.row
.box
.page-header
h1 Available Themes
div
h3 Chrome
img(src='/img/themes/origonal/Chrome.jpg')
hr
h3 Monokai
img(src='/img/themes/origonal/Monokai.jpg')
hr
h3 Clouds
img(src='/img/themes/origonal/clouds.jpg')
hr
h3 clouds_midnight
img(src='/img/themes/origonal/clouds_midnight.jpg')
hr
h3 cobalt
img(src='/img/themes/origonal/cobalt.jpg')
hr
h3 crimson_editor
img(src='/img/themes/origonal/crimson_editor.jpg')
hr
h3 dawn
img(src='/img/themes/origonal/dawn.jpg')
hr
h3 dreamweaver
img(src='/img/themes/origonal/dreamweaver.jpg')
hr
h3 eclipse
img(src='/img/themes/origonal/eclipse.jpg')
hr
h3 ide_fingers
img(src='/img/themes/origonal/ide_fingers.jpg')
hr
h3 kr_theme
img(src='/img/themes/origonal/kr_theme.jpg')
hr
h3 merbivore_soft
img(src='/img/themes/origonal/merbivore.jpg')
hr
h3 merbivore_soft
img(src='/img/themes/origonal/merbivore_soft.jpg')
hr
h3 mono_industrial
img(src='/img/themes/origonal/mono_industrial.jpg')
hr
h3 pastles_on_dark
img(src='/img/themes/origonal/pastles_on_dark.jpg')
hr
h3 solarized_dark
img(src='/img/themes/origonal/solarized_dark.jpg')
hr
h3 solarized_light
img(src='/img/themes/origonal/solarized_light.jpg')
hr
h3 tomorrow
img(src='/img/themes/origonal/tomorrow.jpg')
hr
h3 tomorrow_night
img(src='/img/themes/origonal/tomorrow_night.jpg')
hr
h3 tomorrow_night_blue
img(src='/img/themes/origonal/tomorrow_night_blue.jpg')
hr
h3 tomorrow_night_bright
img(src='/img/themes/origonal/tomorrow_night_bright.jpg')
hr
h3 tomorrow_night_eightys
img(src='/img/themes/origonal/tomorrow_night_eightys.jpg')
hr
h3 twilight
img(src='/img/themes/origonal/twilight.jpg')
hr
h3 vibrant_ink
img(src='/img/themes/origonal/vibrant_ink.jpg')
// li.span3
// a(href='#').thumbnail
// img(src='http://placehold.it/260x180', alt='')
// li.span3
// a(href='#').thumbnail
// img(src='http://placehold.it/260x180', alt='')
// li.span3
// a(href='#').thumbnail
// img(src='http://placehold.it/260x180', alt='')
// li.span3
// a(href='#').thumbnail
// img(src='http://placehold.it/260x180', alt='')

View file

@ -1,15 +0,0 @@
script(type='text/template')#userNotLinkedToDropboxTemplate
.alert.alert-warning.userDropboxStatus
span Your account is not linked to dropbox
|    
a(href='/user/settings#dropboxSettings').btn.btn-warning Update Dropbox Settings
script(type='text/template')#userLinkedToDropboxTemplate
row
div
strong {{minsTillNextPoll}} minutes
| until dropbox is next checked for changes
div  
.progress.progress-striped.active
.bar(style='width: {{percentageLeftTillNextPoll}}%;')