From cfd39be7716ff757e19db90685ae436e4b9027e0 Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Wed, 9 Apr 2014 07:31:52 -0500 Subject: [PATCH] Page layout for run and order create pages --- assets/linker/templates/run/create-order.jade | 22 +++++----- assets/linker/templates/run/show.jade | 40 ++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/assets/linker/templates/run/create-order.jade b/assets/linker/templates/run/create-order.jade index 46a4f33..873e4f7 100644 --- a/assets/linker/templates/run/create-order.jade +++ b/assets/linker/templates/run/create-order.jade @@ -1,16 +1,18 @@ -div(ng-show='show') - h2.text-center +extends ../layouts/interior-page + +block pagetitle span.text-muted Enter your order for: - br |  {{ run.name }} - p.text-center Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. - span(ng-show='showMenuUrl') Here is the - a(href='{{ run.menuUrl }}') menu. +block interiorcontent + div(ng-show='show') + p Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. + span(ng-show='showMenuUrl') Here is the + a(href='{{ run.menuUrl }}') menu. - form.form.create-order-form(role='form') - div.form-group - textarea#order.form-control(ng-model='invitee.order',placeholder='Your order') + form.form.create-order-form(role='form') + div.form-group + textarea#order.form-control(ng-model='invitee.order',placeholder='Your order') - button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Submit Order + button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Submit Order diff --git a/assets/linker/templates/run/show.jade b/assets/linker/templates/run/show.jade index 62d0376..f8f15d6 100644 --- a/assets/linker/templates/run/show.jade +++ b/assets/linker/templates/run/show.jade @@ -1,22 +1,24 @@ -.container.run-details(ng-show="show") - h1.text-center - span.text-muted Lunch run status: - br - | {{ run.name }} +extends ../layouts/interior-page - p.text-center {{ run.creatorName }}, here's your lunch run! Wait here to see real-time updates of your invitees' orders. +block pagetitle + span.text-muted Lunch run status: + |  {{ run.name }} - section - .bg   - span.glyphicon.glyphicon-user - .progress - div(class='progress-bar {{ progressClass }}',role='progressbar',aria-valuenow="{{ progress }}",aria-minvalue='0',aria-maxvalue='100',style='width:{{ progress }}%') - | {{ progress }}% complete +block interiorcontent + .run-details(ng-show="show") + p {{ run.creatorName }}, here's your lunch run! Wait here to see real-time updates of your invitees' orders. - div.row.run-order-status(ng-repeat="i in run.invitees") - .name.col-sm-3 - | {{ i.name }} - br - .order.col-sm-7 {{ i.order }} - .fill.col-sm-2 - a.btn.btn-default.btn-sm.btn-block(href='#/run/{{ run.id }}/order/{{ i.name }}') Fill in this order + section + .bg   + span.glyphicon.glyphicon-user + .progress + div(class='progress-bar {{ progressClass }}',role='progressbar',aria-valuenow="{{ progress }}",aria-minvalue='0',aria-maxvalue='100',style='width:{{ progress }}%') + | {{ progress }}% complete + + div.row.run-order-status(ng-repeat="i in run.invitees") + .name.col-sm-3 + | {{ i.name }} + br + .order.col-sm-7 {{ i.order }} + .fill.col-sm-2 + a.btn.btn-default.btn-sm.btn-block(href='#/run/{{ run.id }}/order/{{ i.name }}') Fill in this order