From fc02f996599124af81e9c19b0012a0c499c0331c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 17 Jul 2014 15:26:31 +0100 Subject: [PATCH] made restricted page like 404, also got dropbox progress bar going the other way --- services/web/app/views/user/restricted.jade | 17 ++++++++++------- .../controllers/DropboxController.coffee | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/user/restricted.jade b/services/web/app/views/user/restricted.jade index 3ce1b5a0ff..4c4ebcd52a 100644 --- a/services/web/app/views/user/restricted.jade +++ b/services/web/app/views/user/restricted.jade @@ -1,10 +1,13 @@ extends ../layout block content - - .container#loginBox - .row - .box.span3.offset4 - .page-header - h1 Restricted - + .content + .container + .row + .col-md-8.col-md-offset-2.text-center + .page-header + h2 Restricted, sorry you don't have permission to load this page. + p + a(href="/") + i.fa.fa-arrow-circle-o-left + | Take me home! \ No newline at end of file diff --git a/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee b/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee index e3f3d5aa47..671206d77b 100644 --- a/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee +++ b/services/web/public/coffee/ide/dropbox/controllers/DropboxController.coffee @@ -34,7 +34,7 @@ define [ roundedMinsSinceLastPoll = Math.round(milisecondsSinceLastPoll / ONE_MIN_MILI) $scope.dbState.minsTillNextPoll = POLLING_INTERVAL - roundedMinsSinceLastPoll - $scope.dbState.percentageLeftTillNextPoll = 100 - ((roundedMinsSinceLastPoll / POLLING_INTERVAL) * 100) + $scope.dbState.percentageLeftTillNextPoll = ((roundedMinsSinceLastPoll / POLLING_INTERVAL) * 100) console.log $scope.dbState.percentageLeftTillNextPoll $timeout calculatePollTime, 60 * 1000