From 67cba0dfd2c9e1ccee94496b7078e68911d603db Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 12:14:32 +0100 Subject: [PATCH] killed info controller and setup features.less for dropbox and feature pages also moved dropbox to external pages --- .../StaticPages/InfoController.coffee | 6 -- .../StaticPages/StaticPagesRouter.coffee | 3 +- services/web/app/views/info/dropbox.jade | 94 ------------------- .../web/public/stylesheets/app/features.less | 27 ++++++ .../web/public/stylesheets/app/homepage.less | 21 ----- services/web/public/stylesheets/style.less | 2 +- 6 files changed, 29 insertions(+), 124 deletions(-) delete mode 100755 services/web/app/coffee/Features/StaticPages/InfoController.coffee delete mode 100644 services/web/app/views/info/dropbox.jade create mode 100644 services/web/public/stylesheets/app/features.less diff --git a/services/web/app/coffee/Features/StaticPages/InfoController.coffee b/services/web/app/coffee/Features/StaticPages/InfoController.coffee deleted file mode 100755 index 48078949c2..0000000000 --- a/services/web/app/coffee/Features/StaticPages/InfoController.coffee +++ /dev/null @@ -1,6 +0,0 @@ -module.exports= - - dropbox: (req, res)-> - res.render "info/dropbox", - title: 'Dropbox with LaTeX' - diff --git a/services/web/app/coffee/Features/StaticPages/StaticPagesRouter.coffee b/services/web/app/coffee/Features/StaticPages/StaticPagesRouter.coffee index 89b1438033..70e82320b8 100644 --- a/services/web/app/coffee/Features/StaticPages/StaticPagesRouter.coffee +++ b/services/web/app/coffee/Features/StaticPages/StaticPagesRouter.coffee @@ -1,5 +1,4 @@ HomeController = require('./HomeController') -InfoController = require('./InfoController') module.exports = apply: (app) -> @@ -12,4 +11,4 @@ module.exports = app.get '/planned_maintenance', HomeController.externalPage("planned_maintenance", "Planned Maintenance") app.get '/style', HomeController.externalPage("style_guide", "Style Guide") - app.get '/dropbox', InfoController.dropbox \ No newline at end of file + app.get '/dropbox', HomeController.externalPage("dropbox", "Dropbox and ShareLaTeX") \ No newline at end of file diff --git a/services/web/app/views/info/dropbox.jade b/services/web/app/views/info/dropbox.jade deleted file mode 100644 index 020ee06241..0000000000 --- a/services/web/app/views/info/dropbox.jade +++ /dev/null @@ -1,94 +0,0 @@ -extends ../layout - -block content - .container - .row - .span10.offset1.span-box - .page-header - h1 Dropbox and LaTeX - .long-form-features - .row - .span5 - h2 ShareLaTeX Dropbox Sync - p LaTeX and Dropbox has never been easier - p.subdued ShareLaTeX allows you to link your account - | to Dropbox, keeping your LaTeX work synced at all - | times. Using LaTeX in a team is made easier with - | dropbox allowing your team members to use their own - | tools, and work offline if required. With all of - | your LaTeX synced to dropbox you never have to worry - | about keeping backups of your ShareLaTeX work again. - ul - li Work Offline - li Collaborate with more people - li Worry free backups - li Use different LaTeX Editors - li Easy to add new files into your ShareLaTeX project - li Automated backup snapshots - .span5 - img(src="/img/dropbox/dropbox_banner_tall.png", alt="Sync your ShareLaTeX LaTeX using Dropbox").noborder - - center - a.btn.btn-large.btn-success(href='/user/subscription/plans') Sign Up Now for Dropbox Sync - hr - - .long-form-features - .row - .span6 - h2 Work Offline - p.subdued Dropbox Sync allows you to work on your - | LaTeX offline using Dropbox, then come back to the - | updated project in ShareLaTeX, just like you never - | left. Being on the move with no internet connection - | no longer means you can not work on your LaTeX - | project, and Dropbox's great offline capabilities - | allows you to use local editors then let Dropbox and - | ShareLaTeX take care of the rest. - .span4 - img(src="/img/dropbox/dropbox_progress_bar.png", alt="Dropbox changes are checked for every 15 minutes").short_image - - - .row - .span4 - img(src="/img/dropbox/share_dropbox_folder.png", alt="share latex folder with other dropbox users").short_image - .span6 - h2 Collaborate with Anyone - p.subdued Not everyone wants to use ShareLaTeX, and - | sharing your LaTeX files via Dropbox allows you to - | collaborate with people who like to use a different - | editor. Many people have been using LaTeX for - | decades and do not want to move away from the tools - | they know so well, but this no longer has to be a reason - | to stop you working on a paper with them - - .row - .span6 - h2 LaTeX Backups in Dropbox - p.subdued All of your LaTeX files will be safely - | stored in Dropbox so you no longer have to worry - | about having another backup of your paper. - .span4 - img(src="/img/dropbox/dropbox_logo.png", alt="Sync your ShareLaTeX LaTeX using Dropbox") - - .row - .span4 - img(src="/img/dropbox/document_updated_modal.png", alt="Dropbox changes are checked for every 15 minutes") - .span6 - h2 Easy to Insert Files and Folders into your ShareLaTeX Project - p.subdued You can easily add new files into your - | LaTeX project by just moving them into your Dropbox; - | after a sync they will apear in ShareLaTeX. - - .row - .span6 - h2 Automated Snapshots After Each Update - p.subdued Each time a change is detected in Dropbox - | ShareLaTeX takes a project snapshot meaning there is - | no chance of your changes being lost. - .span4 - img(src="/img/dropbox/history_diff.png", alt="snapshots are taken before changes from Dropbox are applied") - - center - a.btn.btn-large.btn-success(href='/user/subscription/plans') Sign Up Now for Dropbox Sync - - include ../general/small-footer diff --git a/services/web/public/stylesheets/app/features.less b/services/web/public/stylesheets/app/features.less new file mode 100644 index 0000000000..6c3b1cbb9c --- /dev/null +++ b/services/web/public/stylesheets/app/features.less @@ -0,0 +1,27 @@ +.long-form-features { + h2 { + margin-top: 0; + margin-bottom: @line-height-computed; + } + img { + border-radius: 3px; + -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1); + box-shadow: 0 2px 4px rgba(0,0,0,0.1); + max-width: 100%; + height: auto; + } + h3 { + margin: 0; + } + p { + color: @gray + } + i { + color: lighten(@blue, 15%); + } + + .row { + padding-top: 10px; + padding-bottom: 40px; + } +} \ No newline at end of file diff --git a/services/web/public/stylesheets/app/homepage.less b/services/web/public/stylesheets/app/homepage.less index e386dc152d..120d283cf3 100644 --- a/services/web/public/stylesheets/app/homepage.less +++ b/services/web/public/stylesheets/app/homepage.less @@ -96,24 +96,3 @@ background: url('/img/pattern-home.png') repeat #f1f1f1; border-top: 1px solid @gray-lightest; } - -.long-form-features { - h2 { - margin-top: 0; - margin-bottom: @line-height-computed; - } - img { - border-radius: 3px; - -webkit-box-shadow: 0 2px 4px rgba(0,0,0,0.1); - box-shadow: 0 2px 4px rgba(0,0,0,0.1); - } - h3 { - margin: 0; - } - p { - color: @gray - } - i { - color: lighten(@blue, 15%); - } -} \ No newline at end of file diff --git a/services/web/public/stylesheets/style.less b/services/web/public/stylesheets/style.less index 4539f910c8..be44cc249c 100755 --- a/services/web/public/stylesheets/style.less +++ b/services/web/public/stylesheets/style.less @@ -63,4 +63,4 @@ @import "app/bonus.less"; @import "app/register.less"; @import "app/blog.less"; -@import "app/templates.less"; +@import "app/features.less";