benjaminramey/lunchrun.me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into edit-run

Browse Source
This commit is contained in:
Ben Ramey
2014-06-24 21:24:08 -05:00
parent 29865300ec 1668b700ea
commit 0c5b53459f
5 changed files with 86 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
assets/linker/styles/forms.less
View File

@@ -20,10 +20,6 @@ form {
top: 9px; top: 9px;
right: 5px; right: 5px;
} }
.btn-primary {
font-size: 4em;
}
} }
.create-run-form { .create-run-form {
.invitees { .invitees {
@@ -31,6 +27,10 @@ form {
margin-top: 20px; margin-top: 20px;
} }
} }
.submit button {
font-size: 4em;
}
} }
.update-order-form { .update-order-form {
textarea { textarea {

6
assets/linker/styles/run.less
View File

@@ -33,3 +33,9 @@
.run-show-actions a.back-to-run { .run-show-actions a.back-to-run {
display: none; display: none;
} }
.invitee {
.deletebtn-wrapper {
padding-left: 0;
}
}

4
assets/linker/templates/layouts/interior-page.jade
View File

@@ -4,10 +4,10 @@
| lunch run | lunch run
span.text-muted |me span.text-muted |me
.row .row
.col-xs-12.col-sm-8 .col-xs-12.col-md-8
h1.page-title h1.page-title
block pagetitle block pagetitle
.col-xs-12.col-sm-4 .col-xs-12.col-md-4
.page-actions .page-actions
block pageactions block pageactions

44
assets/linker/templates/run/create.jade
View File

@@ -6,11 +6,12 @@ block pagetitle
block interiorcontent block interiorcontent
.create-run-form(ng-controller='CreateRunCtrl') .create-run-form(ng-controller='CreateRunCtrl')
form(name='form',novalidate,role='form') form.row(name='form',novalidate,role='form')
.col-xs-12.col-sm-6
section.name.row section.name.row
.col-xs-12.col-sm-2.step-num .col-xs-12.col-lg-2.step-num
span.glyphicon.glyphicon-info-sign span.glyphicon.glyphicon-info-sign(title='Lunch Run Info')
.col-xs-12.col-sm-10 .col-xs-12.col-lg-10
.form-group(ng-class="{'has-error has-feedback': form.Name.$dirty && form.Name.$invalid, 'has-success has-feedback': form.Name.$dirty && form.Name.$valid}") .form-group(ng-class="{'has-error has-feedback': form.Name.$dirty && form.Name.$invalid, 'has-success has-feedback': form.Name.$dirty && form.Name.$valid}")
input#name.form-control.input-lg(type='text',ng-model='run.name',required,placeholder='Name your run',name='Name') input#name.form-control.input-lg(type='text',ng-model='run.name',required,placeholder='Name your run',name='Name')
div(ng-show='form.Name.$dirty && form.Name.$invalid') div(ng-show='form.Name.$dirty && form.Name.$invalid')
@@ -19,9 +20,9 @@ block interiorcontent
span.glyphicon.glyphicon-ok.form-control-feedback(ng-show="form.Name.$dirty && form.Name.$valid") span.glyphicon.glyphicon-ok.form-control-feedback(ng-show="form.Name.$dirty && form.Name.$valid")
section.row section.row
.col-xs-12.col-sm-2.step-num .col-xs-12.col-lg-2.step-num
span.glyphicon.glyphicon-user span.glyphicon.glyphicon-user(title='Your Info')
.col-xs-12.col-sm-10 .col-xs-12.col-lg-10
.form-group(ng-class="{'has-error has-feedback': form.CreatorName.$dirty && form.CreatorName.$invalid, 'has-success has-feedback': form.CreatorName.$dirty && form.CreatorName.$valid}") .form-group(ng-class="{'has-error has-feedback': form.CreatorName.$dirty && form.CreatorName.$invalid, 'has-success has-feedback': form.CreatorName.$dirty && form.CreatorName.$valid}")
input#creatorName.form-control.input-lg(type='text',ng-model='run.creatorName',required,placeholder='Your name',name='CreatorName') input#creatorName.form-control.input-lg(type='text',ng-model='run.creatorName',required,placeholder='Your name',name='CreatorName')
div(ng-show="form.CreatorName.$dirty && form.CreatorName.$invalid") div(ng-show="form.CreatorName.$dirty && form.CreatorName.$invalid")
@@ -38,9 +39,9 @@ block interiorcontent
span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='form.Email.$dirty && form.Email.$valid') span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='form.Email.$dirty && form.Email.$valid')
section.row section.row
.col-xs-12.col-sm-2.step-num .col-xs-12.col-lg-2.step-num
span.glyphicon.glyphicon-map-marker span.glyphicon.glyphicon-map-marker(title='Lunch Location')
.col-xs-12.col-sm-10 .col-xs-12.col-lg-10
.form-group(ng-class="{'has-error has-feedback': form.Restaurant.$dirty && form.Restaurant.$invalid, 'has-success has-feedback': form.Restaurant.$dirty && form.Restaurant.$valid}") .form-group(ng-class="{'has-error has-feedback': form.Restaurant.$dirty && form.Restaurant.$invalid, 'has-success has-feedback': form.Restaurant.$dirty && form.Restaurant.$valid}")
input#restaurant.form-control.input-lg(type='text',ng-model='run.restaurant',placeholder='Restaurant',name='Restaurant',required) input#restaurant.form-control.input-lg(type='text',ng-model='run.restaurant',placeholder='Restaurant',name='Restaurant',required)
div(ng-show="form.Restaurant.$dirty && form.Restaurant.$invalid") div(ng-show="form.Restaurant.$dirty && form.Restaurant.$invalid")
@@ -51,14 +52,15 @@ block interiorcontent
.form-group .form-group
input#menuUrl.form-control.input-lg(type='url',ng-model='run.menuUrl',placeholder='Menu URL') input#menuUrl.form-control.input-lg(type='url',ng-model='run.menuUrl',placeholder='Menu URL')
.col-xs-12.col-sm-6
section.invitees.row section.invitees.row
.col-xs-12.col-sm-2.step-num .col-xs-12.col-lg-2.step-num
span.glyphicon.glyphicon-list span.glyphicon.glyphicon-list(title='Lunch Invitees')
.col-xs-12.col-sm-10 .col-xs-12.col-lg-10
.invitee.clearfix(ng-repeat='i in invitees') .invitee.clearfix(ng-repeat='i in invitees')
ng-form(name='inviteeForm') ng-form(name='inviteeForm')
.row .row
.col-xs-12.col-sm-5 .col-xs-10.name-wrapper
.form-group(ng-class="{'has-error has-feedback': inviteeForm.Name.$dirty && inviteeForm.Name.$invalid, 'has-success has-feedback': inviteeForm.Name.$dirty && inviteeForm.Name.$valid}") .form-group(ng-class="{'has-error has-feedback': inviteeForm.Name.$dirty && inviteeForm.Name.$invalid, 'has-success has-feedback': inviteeForm.Name.$dirty && inviteeForm.Name.$valid}")
input.form-control.input-lg(ng-model='i.name',required,placeholder='Name',name="Name") input.form-control.input-lg(ng-model='i.name',required,placeholder='Name',name="Name")
div(ng-show='inviteeForm.Name.$dirty && inviteeForm.Name.$invalid') div(ng-show='inviteeForm.Name.$dirty && inviteeForm.Name.$invalid')
@@ -66,7 +68,11 @@ block interiorcontent
span(ng-show='inviteeForm.Name.$error.required') Give this person a name span(ng-show='inviteeForm.Name.$error.required') Give this person a name
span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='inviteeForm.Name.$dirty && inviteeForm.Name.$valid') span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='inviteeForm.Name.$dirty && inviteeForm.Name.$valid')
.col-xs-12.col-sm-5 .col-xs-2.deletebtn-wrapper
button.btn.btn-block.btn-lg.btn-warning(ng-click='removeInvitee($index)')
span.glyphicon.glyphicon-remove
.col-xs-10.email-wrapper
.form-group(ng-class="{'has-error has-feedback': inviteeForm.Email.$dirty && inviteeForm.Email.$invalid, 'has-success has-feedback': inviteeForm.Email.$dirty && inviteeForm.Email.$valid}") .form-group(ng-class="{'has-error has-feedback': inviteeForm.Email.$dirty && inviteeForm.Email.$invalid, 'has-success has-feedback': inviteeForm.Email.$dirty && inviteeForm.Email.$valid}")
input.form-control.input-lg(type='email',ng-model='i.email',required,placeholder='Email',name="Email") input.form-control.input-lg(type='email',ng-model='i.email',required,placeholder='Email',name="Email")
div(ng-show='inviteeForm.Email.$dirty && inviteeForm.Email.$invalid') div(ng-show='inviteeForm.Email.$dirty && inviteeForm.Email.$invalid')
@@ -75,16 +81,10 @@ block interiorcontent
span(ng-show='inviteeForm.Email.$error.email') That doesn't look like a valid email address. span(ng-show='inviteeForm.Email.$error.email') That doesn't look like a valid email address.
span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='inviteeForm.Email.$dirty && inviteeForm.Email.$valid') span.glyphicon.glyphicon-ok.form-control-feedback(ng-show='inviteeForm.Email.$dirty && inviteeForm.Email.$valid')
.col-xs-12.col-sm-2
button.btn.btn-block.btn-lg.btn-warning(ng-click='removeInvitee($index)')
span.glyphicon.glyphicon-remove
.row
.col-xs-12.col-sm-4.col-sm-offset-8
button.btn.btn-default.btn-lg.btn-block(ng-click='addInvitee()') button.btn.btn-default.btn-lg.btn-block(ng-click='addInvitee()')
span.glyphicon.glyphicon-plus span.glyphicon.glyphicon-plus
|  Invite another! |  Invite another!
section.submit section.submit
button.btn.btn-lg.btn-primary.btn-block(ng-click="create(run,invitees)",ng-disabled="form.$invalid") button.btn.btn-lg.btn-success.btn-block(ng-click="create(run,invitees)",ng-disabled="form.$invalid")
| Create | Create

2
assets/linker/templates/run/show.jade
View File

@@ -23,7 +23,7 @@ block interiorcontent
| {{ i.name }} | {{ i.name }}
.order.col-sm-7 {{ i.order }} .order.col-sm-7 {{ i.order }}
.fill.col-sm-2 .fill.col-sm-2
a.btn.btn-default.btn-sm.btn-block(href='#/order/{{ i.id }}') a.btn.btn-primary.btn-sm.btn-block(href='#/order/{{ i.id }}')
span.glyphicon.glyphicon-pencil span.glyphicon.glyphicon-pencil
block modals block modals