From 67cba0dfd2c9e1ccee94496b7078e68911d603db Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 12:14:32 +0100 Subject: [PATCH 1/5] 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"; From 9ec2c3260555dd29be6f6f9a691ea916a06251e7 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 13:48:10 +0100 Subject: [PATCH 2/5] added text-rendering: optimizelegibility; to css --- services/web/public/stylesheets/core/type.less | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/stylesheets/core/type.less b/services/web/public/stylesheets/core/type.less index 738afd6865..c1cc4a6bc8 100755 --- a/services/web/public/stylesheets/core/type.less +++ b/services/web/public/stylesheets/core/type.less @@ -4,6 +4,7 @@ * { -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; } // Headings From 2ffe0939522cbb74357d73391e4af8e824b25e4c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 13:58:02 +0100 Subject: [PATCH 3/5] removed unused bonus jade files --- .../web/app/views/referal/facebookLike.jade | 9 ------- .../app/views/referal/facebookWallPost.jade | 25 ------------------- .../web/app/views/referal/googleplus.jade | 10 -------- services/web/app/views/referal/tweet.jade | 2 -- .../web/app/views/referal/tweetShare.jade | 2 -- 5 files changed, 48 deletions(-) delete mode 100644 services/web/app/views/referal/facebookLike.jade delete mode 100644 services/web/app/views/referal/facebookWallPost.jade delete mode 100644 services/web/app/views/referal/googleplus.jade delete mode 100644 services/web/app/views/referal/tweet.jade delete mode 100644 services/web/app/views/referal/tweetShare.jade diff --git a/services/web/app/views/referal/facebookLike.jade b/services/web/app/views/referal/facebookLike.jade deleted file mode 100644 index 73fe385228..0000000000 --- a/services/web/app/views/referal/facebookLike.jade +++ /dev/null @@ -1,9 +0,0 @@ -div.fb-like(data-href='https://www.sharelatex.com', ref='#{getReferalId()}', data-send='false', data-layout='box_count', data-width='450', data-show-faces='true', data-font='lucida grande') -script(type='text/javascript') - (function(d, s, id) { - var js, fjs = d.getElementsByTagName(s)[0]; - if (d.getElementById(id)) {return;} - js = d.createElement(s); js.id = id; - js.src = '//connect.facebook.net/en_GB/all.js#xfbml=1'; - fjs.parentNode.insertBefore(js, fjs); - }(document, 'script', 'facebook-jssdk')); \ No newline at end of file diff --git a/services/web/app/views/referal/facebookWallPost.jade b/services/web/app/views/referal/facebookWallPost.jade deleted file mode 100644 index d6a0856525..0000000000 --- a/services/web/app/views/referal/facebookWallPost.jade +++ /dev/null @@ -1,25 +0,0 @@ -a(onclick='postToFeed(); return false;').facebook Post on Facebook - -script(src='http://connect.facebook.net/en_US/all.js') -script(type='text/javascript') - FB.init({appId: "148710621956179", status: true, cookie: true}); - - function postToFeed() { - - // calling the API ... - var obj = { - method: 'feed', - redirect_uri: 'https://www.sharelatex.com', - link: '#{buildReferalUrl()}', - picture: 'https://www.sharelatex.com/brand/logo/logosmall.png', - name: 'ShareLaTeX - Online LaTeX Editor', - caption: 'Free Unlimited Projects and Compiles', - description: 'ShareLaTeX is a free Online LaTeX Editor. Real time collaboration like Google Docs, with Dropbox, history and Auto Complete' - }; - - //function callback(response) { - // document.getElementById('msg').innerHTML = "Post ID: " + response['post_id']; - //} - - FB.ui(obj, callback); - } diff --git a/services/web/app/views/referal/googleplus.jade b/services/web/app/views/referal/googleplus.jade deleted file mode 100644 index c7ee30ff37..0000000000 --- a/services/web/app/views/referal/googleplus.jade +++ /dev/null @@ -1,10 +0,0 @@ - - -script(type='text/javascript') - window.___gcfg = {lang: 'en-GB'}; - - (function() { - var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; - po.src = 'https://apis.google.com/js/plusone.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); - })(); \ No newline at end of file diff --git a/services/web/app/views/referal/tweet.jade b/services/web/app/views/referal/tweet.jade deleted file mode 100644 index fb6cc4e15e..0000000000 --- a/services/web/app/views/referal/tweet.jade +++ /dev/null @@ -1,2 +0,0 @@ -a(href='https://twitter.com/share', counturl='https://www.sharelatex.com', data-text="is trying out online latex editor ShareLaTeX #{buildReferalUrl()}", data-count='vertical').twitter-share-button Tweet -script(type='text/javascript', src='//platform.twitter.com/widgets.js') diff --git a/services/web/app/views/referal/tweetShare.jade b/services/web/app/views/referal/tweetShare.jade deleted file mode 100644 index 6dc95d0bf3..0000000000 --- a/services/web/app/views/referal/tweetShare.jade +++ /dev/null @@ -1,2 +0,0 @@ -a(href='https://twitter.com/share', counturl='https://www.sharelatex.com', data-text="is trying out online latex editor ShareLaTeX #{buildReferalUrl()}", data-count='none').twitter Tweet about us -script(type='text/javascript', src='//platform.twitter.com/widgets.js') From 787a3adad3e87e097816ba6d4d7d4ba8deda2b10 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 14:05:20 +0100 Subject: [PATCH 4/5] killed changelog --- services/web/app/views/changelog.jade | 138 -------------------------- 1 file changed, 138 deletions(-) delete mode 100644 services/web/app/views/changelog.jade diff --git a/services/web/app/views/changelog.jade b/services/web/app/views/changelog.jade deleted file mode 100644 index 92fb1d6cab..0000000000 --- a/services/web/app/views/changelog.jade +++ /dev/null @@ -1,138 +0,0 @@ -extends layout - -block content - .container - .row - .span12.span-box - .page-header - h1 Change Log - small Some of the things that have changed on the site - #changeLogContent - h5 April - ul - li Added Templates - h5 March - ul - li Improved search and replace - li Improved Zip uploads - li Improved Zip downloads - li Added user bonus page - li Added new help pages and knowledge base - li Started Dropbox beta - li Added 'About Us' page - h5 February - ul - li Built in spell checker - li Auto completion of commands - li Saved message in bottom left doesn't flicker anymore - li Files and folders are order alphabetically in the left hand pane - li The root document can now be nested inside a folder - li Duplicate project can now be done from inside the project settings - h5 January - ul - li Split view and adjustable size panels added. - h5 December - ul - li Site can now compile with LaTeX, XeLaTeX and pdfLaTeX - li Made history/version control functionality - li When returning to document the editor scrolls to where you previously where - li Added recompile button - h5 November - ul - li Added premium accounts - li Updated backend collaberation system to allow multiple instances of the website to be run at the same time for more robustness - h5 May - October - ul - li Lots of work on increasing stability so we can serve our growing user base (thank you!) - li Background work to make it possible to record a complete history of changes to your documents - h5 18th May - ul - li changed compiler to be more robust - li updated ace editor code with new vim binding - li added things to the resources page - h5 13th May - ul - li Added site to chrome web store - li cleaned up home page - li added mailchimp sign up - li added comments page - li added link to public projects - h5 11th May - ul - li Added flat view of public projects - h5 9th May - ul - li Fixed bug with deleting projects - h5 5th May - ul - li Lost of changes behind the scenes to improve robustness - h5 21st April - ul - li Increased logging length to 48 hours - li Trying to access a project while not logged in redirects to login page rather than restricted - h5 20th April - ul - li Stability update to the compiling - h5 16th April - ul - li When a compile fails user is shown the logs by default - h5 11th April - ul - li Fixed lost connection bug - li Fixed bug so large projects will compile (25,000+ words) - h5 31st March - ul - li Added public and read only projects - li Added blog post of LNUG talk - li Added project upload - li Improved safety of site removing edge case of when site crashes data could be potentially lost - li Added blank project option when creating new project - h5 26th March - ul - li Update to faq - li All js files are now minified including editor - h5 21st March - ul - li Fixed bug with double encoding of PDFs in headers - li improved reliability of site - h5 17th March - ul - li Minified JavaScript everywhere but editor - h4 16th March - ul - li Added themes preview - li Added Detexify to resources page - h4 14th March - ul - li Added Resources list - li Improved application monitoring - h4 13th March 2012 - ul - li Improved resilience reducing number of restarts required. - li added UTF-8 to default project template - li Fixed projects not always deleting - h4 11th March 2012 - ul - li Fixed deeply nested documents not being fount - h4 8th March 2012 - ul - li improved error handling on projects that don't compile - li added more FAQ answers. - h4 5th March 2012 - ul - li fixed bug where error logs were not shown, infinite spinning compile - li allow users to see raw logs - li add change log - li added quantcast - h4 4th March 2012 - ul - li fixed google plus button - h4 3th March 2012 - ul - li fixed dropping connections - li fixed problem with missing data in zipped projects - h4 2nd March 2012 - ul - li updated 404 page with correct css - - From 726719ce3f7b847c42cab256c058da3329a6d734 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 24 Jul 2014 14:57:53 +0100 Subject: [PATCH 5/5] changed html autofocus to an angular directive autofocus is html5y and worked on chrome but not firefox for me. --- services/web/app/views/user/login.jade | 2 +- services/web/app/views/user/register.jade | 2 +- services/web/public/coffee/directives/focus.coffee | 11 +++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade index af77e3a739..132aa4fbf9 100644 --- a/services/web/app/views/user/login.jade +++ b/services/web/app/views/user/login.jade @@ -20,7 +20,7 @@ block content placeholder='email@example.com', ng-model="email", ng-model-options="{ updateOn: 'blur' }", - autofocus + focus="true" ) span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") | Must be an email address diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade index 91d6dcd9ba..a2faf4fe25 100644 --- a/services/web/app/views/user/register.jade +++ b/services/web/app/views/user/register.jade @@ -32,7 +32,7 @@ block content ng-model="email", ng-init="email = #{JSON.stringify(new_email)}", ng-model-options="{ updateOn: 'blur' }", - autofocus + focus="true" ) span.small.text-primary(ng-show="registerForm.email.$invalid && registerForm.email.$dirty") | Must be an email address diff --git a/services/web/public/coffee/directives/focus.coffee b/services/web/public/coffee/directives/focus.coffee index db742f155f..eb1098b869 100644 --- a/services/web/public/coffee/directives/focus.coffee +++ b/services/web/public/coffee/directives/focus.coffee @@ -55,6 +55,17 @@ define [ selectName(element) } + + App.directive "focus", ($timeout) -> + scope: + trigger: "@focus" + + link: (scope, element) -> + scope.$watch "trigger", (value) -> + if value is "true" + $timeout -> + element[0].focus() + selectName = (element) -> # Select up to last '.'. I.e. everything # except the file extension