Order nav on run and order pages
This commit is contained in:
@@ -5,6 +5,7 @@ lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', ($sc
|
|||||||
$scope.progress = 0
|
$scope.progress = 0
|
||||||
$scope.numOrders = 0
|
$scope.numOrders = 0
|
||||||
$scope.progressClass = 'progress-bar-danger'
|
$scope.progressClass = 'progress-bar-danger'
|
||||||
|
$scope.showMenuUrl = false
|
||||||
|
|
||||||
socket.get '/run/' + $routeParams['id'],
|
socket.get '/run/' + $routeParams['id'],
|
||||||
(response) ->
|
(response) ->
|
||||||
@@ -14,6 +15,7 @@ lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', ($sc
|
|||||||
|
|
||||||
$scope.show = true
|
$scope.show = true
|
||||||
$scope.run = response
|
$scope.run = response
|
||||||
|
$scope.showMenuUrl = response.menuUrl
|
||||||
|
|
||||||
socket.get '/invitee', run_id: response.id, (inviteeResponse) ->
|
socket.get '/invitee', run_id: response.id, (inviteeResponse) ->
|
||||||
$scope.invitees = inviteeResponse
|
$scope.invitees = inviteeResponse
|
||||||
|
|||||||
@@ -59,6 +59,15 @@ body {
|
|||||||
margin-right: 30px;
|
margin-right: 30px;
|
||||||
font-size: 1.2em;
|
font-size: 1.2em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: white;
|
||||||
|
text-decoration: none;
|
||||||
|
&:hover {
|
||||||
|
color: lightgrey;
|
||||||
|
text-decoration:none;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
|
|||||||
@@ -28,4 +28,8 @@
|
|||||||
padding-top: 9px;
|
padding-top: 9px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.back-to-run {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,3 +4,4 @@
|
|||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
9
assets/linker/templates/includes/menu-modal.jade
Normal file
9
assets/linker/templates/includes/menu-modal.jade
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
.modal.fade#menuModal(tabindex=-1,role='dialog',aria-labelledby='menuModalLabel',aria-hidden='true')
|
||||||
|
.modal-dialog.modal-lg
|
||||||
|
.modal-content
|
||||||
|
.modal-header
|
||||||
|
|
|
||||||
|
button.close(type='button',data-dismiss='modal',aria-hidden='true') ×
|
||||||
|
.modal-body
|
||||||
|
h4.hidden.modal-title#menuModalLabel Menu
|
||||||
|
iframe(ng-src='{{ menuUrl }}',width='100%',height='400px')
|
||||||
7
assets/linker/templates/includes/order-nav.jade
Normal file
7
assets/linker/templates/includes/order-nav.jade
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
div.btn-group.pull-right
|
||||||
|
a.btn.btn-default.back-to-run(href='/#/run/{{ run.id }}')
|
||||||
|
span.glyphicon.glyphicon-share-alt
|
||||||
|
| Back to Run
|
||||||
|
a.btn.btn-default(href='{{ run.menuUrl }}',target="_blank",data-toggle='modal',data-target='#menuModal',ng-show='showMenuUrl')
|
||||||
|
span.glyphicon.glyphicon-list-alt
|
||||||
|
| Show Menu
|
||||||
@@ -2,16 +2,13 @@ extends ../layouts/interior-page
|
|||||||
|
|
||||||
block pagetitle
|
block pagetitle
|
||||||
span.glyphicon.glyphicon-list
|
span.glyphicon.glyphicon-list
|
||||||
span.text-muted Enter your order for:
|
span.text-muted Enter your order for:
|
||||||
| {{ run.name }}
|
a(href='/#/run/{{ run.id }}') {{ run.name }}
|
||||||
|
|
||||||
block interiorcontent
|
block interiorcontent
|
||||||
div(ng-show='show')
|
div(ng-show='show')
|
||||||
p Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}.
|
p.pull-left Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}.
|
||||||
span.pull-right(ng-show='showMenuUrl')
|
include ../includes/order-nav
|
||||||
a.btn.btn-default(href='{{ run.menuUrl }}',target="_blank",data-toggle='modal',data-target='#menuModal')
|
|
||||||
span.glyphicon.glyphicon-list-alt
|
|
||||||
| Show Menu
|
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-xs-12.col-sm-7
|
.col-xs-12.col-sm-7
|
||||||
@@ -33,12 +30,4 @@ block interiorcontent
|
|||||||
| : {{ i.order }}
|
| : {{ i.order }}
|
||||||
|
|
||||||
block modals
|
block modals
|
||||||
.modal.fade#menuModal(tabindex=-1,role='dialog',aria-labelledby='menuModalLabel',aria-hidden='true')
|
include ../includes/menu-modal
|
||||||
.modal-dialog.modal-lg
|
|
||||||
.modal-content
|
|
||||||
.modal-header
|
|
||||||
|
|
|
||||||
button.close(type='button',data-dismiss='modal',aria-hidden='true') ×
|
|
||||||
.modal-body
|
|
||||||
h4.hidden.modal-title#menuModalLabel Menu
|
|
||||||
iframe(ng-src='{{ menuUrl }}',width='100%',height='400px')
|
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ block pagetitle
|
|||||||
|
|
||||||
block interiorcontent
|
block interiorcontent
|
||||||
.run-details(ng-show="show")
|
.run-details(ng-show="show")
|
||||||
p Wait here to see real-time updates of your invitees' orders.
|
.clearfix
|
||||||
|
p.pull-left Wait here to see real-time updates of your invitees' orders.
|
||||||
|
include ../includes/order-nav
|
||||||
|
|
||||||
.progress
|
.progress
|
||||||
div(class='progress-bar {{ progressClass }}',role='progressbar',aria-valuenow="{{ progress }}",aria-minvalue='0',aria-maxvalue='100',style='width:{{ progress }}%',ng-show='progress')
|
div(class='progress-bar {{ progressClass }}',role='progressbar',aria-valuenow="{{ progress }}",aria-minvalue='0',aria-maxvalue='100',style='width:{{ progress }}%',ng-show='progress')
|
||||||
@@ -21,3 +23,6 @@ block interiorcontent
|
|||||||
.fill.col-sm-2
|
.fill.col-sm-2
|
||||||
a.btn.btn-default.btn-sm.btn-block(href='#/order/{{ i.id }}')
|
a.btn.btn-default.btn-sm.btn-block(href='#/order/{{ i.id }}')
|
||||||
span.glyphicon.glyphicon-pencil
|
span.glyphicon.glyphicon-pencil
|
||||||
|
|
||||||
|
block modals
|
||||||
|
include ../includes/menu-modal
|
||||||
|
|||||||
Reference in New Issue
Block a user