From e6ea69b9c23ab04046779e07b86e3c8987728e0a Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Tue, 8 Apr 2014 21:02:26 -0500 Subject: [PATCH] Fix templates --- .../templates/layouts/interior-page.jade | 2 +- assets/linker/templates/run/create.jade | 87 ++++++++++--------- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/assets/linker/templates/layouts/interior-page.jade b/assets/linker/templates/layouts/interior-page.jade index 6545639..ab8df6e 100644 --- a/assets/linker/templates/layouts/interior-page.jade +++ b/assets/linker/templates/layouts/interior-page.jade @@ -1,5 +1,5 @@ .interior - include includes/nav + include ../includes/nav h1 block pagetitle diff --git a/assets/linker/templates/run/create.jade b/assets/linker/templates/run/create.jade index f80cd84..7f1694e 100644 --- a/assets/linker/templates/run/create.jade +++ b/assets/linker/templates/run/create.jade @@ -1,45 +1,48 @@ -div.interior.create-run-form(ng-controller='CreateRunCtrl') - include nav - h1 - span.glyphicon.glyphicon-chevron-right - | start a new lunch run - form.interior-content(name='form',novalidate,role='form') - section.name - .row - .col-xs-2.step-num - span.glyphicon.glyphicon-info-sign - .col-xs-10 - input#name.form-control(type='text',ng-model='run.name',required,placeholder='Name your run') - section - .row - .col-xs-2.step-num - span.glyphicon.glyphicon-user - .col-xs-10 - input#creatorName.form-control(type='text',ng-model='run.creatorName',required,placeholder='Your name') - input#creatorEmail.form-control(type='email',ng-model='run.creatorEmail',required,placeholder='Your email') - section - .row - .col-xs-2.step-num - span.glyphicon.glyphicon-map-marker - .col-xs-10 - input#restaurant.form-control(type='text',ng-model='run.restaurant',placeholder='Restaurant') - input#menuUrl.form-control(type='url',ng-model='run.menuUrl',placeholder='Menu URL') +extends ../layouts/interior-page - section.invitees - .row - .col-xs-2.step-num - span.glyphicon.glyphicon-list - .col-xs-10 - .invitee.clearfix(ng-repeat='i in run.invitees') - input.form-control(ng-model='i.name',required,placeholder='Name') - input.form-control(ng-model='i.email',required,placeholder='Email') - button.btn.btn-warning(ng-click='removeInvitee($index)') - span.glyphicon.glyphicon-remove +block pagetitle + span.glyphicon.glyphicon-chevron-right + | start a new lunch run + +block interiorcontent + .create-run-form(ng-controller='CreateRunCtrl') + form(name='form',novalidate,role='form') + section.name + .row + .col-xs-2.step-num + span.glyphicon.glyphicon-info-sign + .col-xs-10 + input#name.form-control(type='text',ng-model='run.name',required,placeholder='Name your run') + section + .row + .col-xs-2.step-num + span.glyphicon.glyphicon-user + .col-xs-10 + input#creatorName.form-control(type='text',ng-model='run.creatorName',required,placeholder='Your name') + input#creatorEmail.form-control(type='email',ng-model='run.creatorEmail',required,placeholder='Your email') + section + .row + .col-xs-2.step-num + span.glyphicon.glyphicon-map-marker + .col-xs-10 + input#restaurant.form-control(type='text',ng-model='run.restaurant',placeholder='Restaurant') + input#menuUrl.form-control(type='url',ng-model='run.menuUrl',placeholder='Menu URL') - button.btn.btn-default(ng-click='addInvitee()') - span.glyphicon.glyphicon-plus - | Invite another! + section.invitees + .row + .col-xs-2.step-num + span.glyphicon.glyphicon-list + .col-xs-10 + .invitee.clearfix(ng-repeat='i in run.invitees') + input.form-control(ng-model='i.name',required,placeholder='Name') + input.form-control(ng-model='i.email',required,placeholder='Email') + button.btn.btn-warning(ng-click='removeInvitee($index)') + span.glyphicon.glyphicon-remove - section.submit - button.btn.btn-lg.btn-primary.btn-block(ng-click="create(run)",ng-disabled="form.$invalid") - | Create + button.btn.btn-default(ng-click='addInvitee()') + span.glyphicon.glyphicon-plus + | Invite another! + + section.submit + button.btn.btn-lg.btn-primary.btn-block(ng-click="create(run)",ng-disabled="form.$invalid") + | Create