diff --git a/fincom/items/urls.py b/fincom/items/urls.py index db174f6..71b8345 100644 --- a/fincom/items/urls.py +++ b/fincom/items/urls.py @@ -3,4 +3,5 @@ from . import views urlpatterns = [ url(r'^$', views.list, name='list'), + url(r'^new$', views.new_form, name='new_form'), ] diff --git a/fincom/items/views.py b/fincom/items/views.py index 047e002..960e02f 100644 --- a/fincom/items/views.py +++ b/fincom/items/views.py @@ -1,6 +1,7 @@ from django.shortcuts import HttpResponse from django.template import loader from models import Item +from committee.models import Committee # Create your views here. @@ -11,3 +12,11 @@ def list(request): } return HttpResponse(template.render(context, request)) + +def new_form(request): + template = loader.get_template('items/new.html') + context = { + 'committees': Committee.objects.order_by('name'), + } + + return HttpResponse(template.render(context, request)) diff --git a/fincom/static/sass/globals.scss b/fincom/static/sass/globals.scss index feb33fb..b803f53 100644 --- a/fincom/static/sass/globals.scss +++ b/fincom/static/sass/globals.scss @@ -14,7 +14,7 @@ $pad-xl: 36; body { color: $text; - font-family: Sans-Serif; + font-family: sans-serif; background-color: $lightgray; padding-bottom: 0px; margin: 0px $pad-l; diff --git a/fincom/static/sass/include.scss b/fincom/static/sass/include.scss index 2dbeae3..bad9912 100644 --- a/fincom/static/sass/include.scss +++ b/fincom/static/sass/include.scss @@ -1,2 +1,4 @@ +@import 'globals'; @import 'items'; @import 'login'; +@import 'new'; diff --git a/fincom/static/sass/items.scss b/fincom/static/sass/items.scss index 661a663..a7d3bd5 100644 --- a/fincom/static/sass/items.scss +++ b/fincom/static/sass/items.scss @@ -1,5 +1,3 @@ -@import 'globals'; - .item { padding: $pad-m $pad-xl; margin: 0px; @@ -17,6 +15,7 @@ .details-row { margin: $pad-m 0; font-size: 16px; + font-weight: lighter; color: $text; padding: 0px; diff --git a/fincom/static/sass/login.scss b/fincom/static/sass/login.scss index 157127c..a5ab8d3 100644 --- a/fincom/static/sass/login.scss +++ b/fincom/static/sass/login.scss @@ -1,5 +1,3 @@ -@import 'globals'; - body.login { background-color: $purple; color: $gold; diff --git a/fincom/static/sass/new.scss b/fincom/static/sass/new.scss new file mode 100644 index 0000000..aa833b3 --- /dev/null +++ b/fincom/static/sass/new.scss @@ -0,0 +1,54 @@ +h1 { + font-size: 18px; + font-weight: lighter; + color: $purple; + margin: $pad-l; +} + +hr { + margin: $pad-l; + color: $midgray; +} + + +form { + div { + margin: $pad-l; + width: 376px; + + * { + display: inline-block; + } + + label { + text-align: right; + width: 180px; + color: $text; + vertical-align: top; + } + + input, select, textarea { + width: 180px; + float: right; + } + + &.clear { + margin: -$pad-l 0; + width: 180px; + } + + &.clear:after { + content: ""; + display: table; + clear: both; + } + } +} + +.rcol { + float: right; + width: 40%; + margin: $pad-l; + color: $midgray; + font-weight: lighter; +} diff --git a/fincom/templates/items/new.html b/fincom/templates/items/new.html new file mode 100644 index 0000000..3a6df15 --- /dev/null +++ b/fincom/templates/items/new.html @@ -0,0 +1,68 @@ +{% extends "../boilerplate.html" %} + +{% block title %}New Reimbursement{% endblock %} + +{% block main %} + +

Add New Reimbursements

+
+ +
+ Make sure all information is accurate, you submit and itemized receipt, and + you select the correct committee. +
+ +
+ {% csrf_token %} +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ +
+ + +
+ +
+ +
+
+ + + + + +{% endblock %}