From c961cea514b7cff05368cb0460bd6921ba133817 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 7 Aug 2014 13:56:04 +0100 Subject: [PATCH] fixed some bits --- .../web/app/coffee/Features/Errors/ErrorController.coffee | 2 +- services/web/app/views/project/editor.jade | 5 +---- services/web/app/views/project/editor/chat.jade | 3 +-- services/web/app/views/project/list/modals.jade | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/services/web/app/coffee/Features/Errors/ErrorController.coffee b/services/web/app/coffee/Features/Errors/ErrorController.coffee index 39e2375713..d0589ba5ed 100644 --- a/services/web/app/coffee/Features/Errors/ErrorController.coffee +++ b/services/web/app/coffee/Features/Errors/ErrorController.coffee @@ -2,4 +2,4 @@ module.exports = ErrorController = notFound: (req, res)-> res.statusCode = 404 res.render 'general/404', - title: "Page Not Found" \ No newline at end of file + title: "page_not_found" \ No newline at end of file diff --git a/services/web/app/views/project/editor.jade b/services/web/app/views/project/editor.jade index 100610aa15..00e7db8654 100644 --- a/services/web/app/views/project/editor.jade +++ b/services/web/app/views/project/editor.jade @@ -28,10 +28,7 @@ block content strong #{translate("reconnecting")}... .div(ng-controller="SavingNotificationController") - .alert.alert-warning.small( - ng-repeat="(doc_id, state) in docSavingStatus" - ng-if="state.unsavedSeconds > 3" - ) #{translate("saving_notification_with_seconds", {docname:"{{ state.doc.name }}", seconds:"{{ state.unsavedSeconds }}"})} + .alert.alert-warning.small( ng-repeat="(doc_id, state) in docSavingStatus" ng-if="state.unsavedSeconds > 3") #{translate("saving_notification_with_seconds", {docname:"{{ state.doc.name }}", seconds:"{{ state.unsavedSeconds }}"})} include ./editor/left-menu diff --git a/services/web/app/views/project/editor/chat.jade b/services/web/app/views/project/editor/chat.jade index 64e6a1a132..e6f6249793 100644 --- a/services/web/app/views/project/editor/chat.jade +++ b/services/web/app/views/project/editor/chat.jade @@ -27,8 +27,7 @@ aside.chat( ng-controller="ChatMessageController" ng-class="{'self': message.user.id == user.id }" ) - div.date(ng-if="$index == 0 || (message.timestamp - chat.messages[$index - 1].timestamp) > 5 * 60 * 1000") - {{ message.timestamp | formatDate:'h:mm a' }} {{ message.timestamp | relativeDate }} + div.date(ng-if="$index == 0 || (message.timestamp - chat.messages[$index - 1].timestamp) > 5 * 60 * 1000") {{ message.timestamp | formatDate:'h:mm a' }} {{ message.timestamp | relativeDate }} span.avatar img(ng-src="{{message.user.gravatar_url}}?d=mm&s=50") div.message-wrapper diff --git a/services/web/app/views/project/list/modals.jade b/services/web/app/views/project/list/modals.jade index e4ea1e2542..ca609ae697 100644 --- a/services/web/app/views/project/list/modals.jade +++ b/services/web/app/views/project/list/modals.jade @@ -85,7 +85,7 @@ script(type='text/ng-template', id='cloneProjectModalTemplate') ng-click="clone()" ) span(ng-hide="state.inflight") #{translate("copy")} - span(ng-show="state.inflight") #{translate("coping")} ... + span(ng-show="state.inflight") #{translate("copying")} ... script(type='text/ng-template', id='newProjectModalTemplate') .modal-header