From ab7fbe46ef92298cf999a5ae8cfea190c534a89f Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Tue, 17 Jun 2014 22:20:36 -0500 Subject: [PATCH] Menu modal sizing and title --- .../js/controllers/run-controller.coffee | 80 ++++++++++--------- assets/linker/styles/app.less | 11 +++ .../linker/templates/includes/menu-modal.jade | 2 +- 3 files changed, 53 insertions(+), 40 deletions(-) diff --git a/assets/linker/js/controllers/run-controller.coffee b/assets/linker/js/controllers/run-controller.coffee index 49de524..0419ea5 100644 --- a/assets/linker/js/controllers/run-controller.coffee +++ b/assets/linker/js/controllers/run-controller.coffee @@ -1,49 +1,51 @@ lunchControllers = angular.module 'lunchControllers' -lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', ($scope, socket, $routeParams) -> - $scope.show = false - $scope.progress = 0 - $scope.numOrders = 0 - $scope.progressClass = 'progress-bar-danger' - $scope.showMenuUrl = false +lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', '$sce', + RunController = ($scope, socket, $routeParams, $sce) -> + $scope.show = false + $scope.progress = 0 + $scope.numOrders = 0 + $scope.progressClass = 'progress-bar-danger' + $scope.showMenuUrl = false - socket.get '/run/' + $routeParams['id'], - (response) -> - if response.status is 404 - window.location = '/404' - return + socket.get '/run/' + $routeParams['id'], + (response) -> + if response.status is 404 + window.location = '/404' + return - $scope.show = true - $scope.run = response - $scope.showMenuUrl = response.menuUrl - - socket.get '/invitee', run_id: response.id, (inviteeResponse) -> - $scope.invitees = inviteeResponse - $scope.numOrders = $scope.invitees.length - $scope.setStatusClasses() + $scope.show = true + $scope.run = response + $scope.showMenuUrl = response.menuUrl + $scope.menuUrl = $sce.trustAsResourceUrl(response.menuUrl) + + socket.get '/invitee', run_id: response.id, (inviteeResponse) -> + $scope.invitees = inviteeResponse + $scope.numOrders = $scope.invitees.length + $scope.setStatusClasses() + $scope.setProgress() + $scope.$apply() + + socket.on 'message', (m) -> + if m.verb is 'update' and m.data.run_id is $routeParams.id + invitee = _.findWhere $scope.invitees, run_id: m.data.run_id + _.extend invitee, m.data $scope.setProgress() + $scope.setStatusClasses() $scope.$apply() - socket.on 'message', (m) -> - if m.verb is 'update' and m.data.run_id is $routeParams.id - invitee = _.findWhere $scope.invitees, run_id: m.data.run_id - _.extend invitee, m.data - $scope.setProgress() - $scope.setStatusClasses() - $scope.$apply() + $scope.setStatusClasses = () -> + for i in $scope.invitees + if i.order + i.statusClass = 'done' + else + i.statusClass = 'incomplete' - $scope.setStatusClasses = () -> - for i in $scope.invitees - if i.order - i.statusClass = 'done' + $scope.setProgress = () -> + numFilledOrders = _.filter($scope.invitees, (i) -> i.order).length + $scope.progress = (numFilledOrders / $scope.numOrders) * 100 + if $scope.progress >= 100 + $scope.progressClass = 'progress-bar-success' else - i.statusClass = 'incomplete' - - $scope.setProgress = () -> - numFilledOrders = _.filter($scope.invitees, (i) -> i.order).length - $scope.progress = (numFilledOrders / $scope.numOrders) * 100 - if $scope.progress >= 100 - $scope.progressClass = 'progress-bar-success' - else - $scope.progressClass = 'progress-bar-danger' + $scope.progressClass = 'progress-bar-danger' ] diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index 26b8c38..658ffed 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -24,8 +24,19 @@ body { text-align: right; padding-top: 0; padding-bottom: 0; + + .modal-title { + font-size: 2em; + padding: 15px 0 0 10px; + } } } + .modal-dialog { + width: 90vw; + height: 90vh; + max-height: 90vh; + max-width: 90vw; + } } #page { .interior { diff --git a/assets/linker/templates/includes/menu-modal.jade b/assets/linker/templates/includes/menu-modal.jade index 6d5c37a..173c604 100644 --- a/assets/linker/templates/includes/menu-modal.jade +++ b/assets/linker/templates/includes/menu-modal.jade @@ -2,7 +2,7 @@ .modal-dialog.modal-lg .modal-content .modal-header - |   + h4.modal-title.pull-left {{ run.name }} Menu button.close(type='button',data-dismiss='modal',aria-hidden='true') × .modal-body h4.hidden.modal-title#menuModalLabel Menu