From 2e3a38db9d641fbd58eb02ade5cffeea33ce438e Mon Sep 17 00:00:00 2001 From: Tait Hoyem Date: Fri, 13 Nov 2020 10:38:21 -0700 Subject: [PATCH] Add basic styling --- core/static/core/css/logged-in.css | 8 ++++ core/static/core/css/style.css | 41 ++++++++++++++++++ core/templates/core/links.html | 33 +++++++++++--- download/__pycache__/forms.cpython-38.pyc | Bin 498 -> 605 bytes download/forms.py | 10 ++++- download/templates/common/master.html | 20 ++++----- download/templates/download/code-form.html | 1 + .../templates/download/download-page.html | 4 +- quote_pdf/__pycache__/urls.cpython-38.pyc | Bin 1272 -> 1272 bytes .../templates/viewrequests/requests.html | 10 ----- 10 files changed, 98 insertions(+), 29 deletions(-) create mode 100644 core/static/core/css/logged-in.css create mode 100644 core/static/core/css/style.css diff --git a/core/static/core/css/logged-in.css b/core/static/core/css/logged-in.css new file mode 100644 index 0000000..cda90ae --- /dev/null +++ b/core/static/core/css/logged-in.css @@ -0,0 +1,8 @@ +table { + border-collapse: collapse; +} +td, th { + padding: 20px; + border: 1px solid black; + margin: 0px; +} diff --git a/core/static/core/css/style.css b/core/static/core/css/style.css new file mode 100644 index 0000000..fe6db91 --- /dev/null +++ b/core/static/core/css/style.css @@ -0,0 +1,41 @@ +body { + background-color: #f2f2f2; +} +h1, h2, h3, h4, h5, h6 { + text-transform: capitalize; + line-height: initial; +} +#wrapper { + width: 80%; + margin: auto; + color: #333; + font-size: 1.1em; + line-height: 1.5em; +} +.two-col-grid { + display: grid; + width: 100%; + grid-template-columns: 50% 50%; +} +.two-col-grid > * { + text-align: center; +} + +nav { + background-color: lightgrey; +} +a { + color: #47a; + padding: 12px; + display: block; +} +a:visited { + color: #941452; +} +nav > a { + display: inline-block; +} + +input { + font-size: 32px; +} \ No newline at end of file diff --git a/core/templates/core/links.html b/core/templates/core/links.html index 834569f..02adcdb 100644 --- a/core/templates/core/links.html +++ b/core/templates/core/links.html @@ -1,8 +1,31 @@ {% extends 'common/master.html' %} {% block body %} - {% if user.is_authenticated %} - Upload - View Downloads - {% endif %} - Download +
+
+

Download a quote

+

Download a quote from {{ company }}. Have it sent right to your inbox.

+ Download a quote +
+ {% if user.is_authenticated %} +
+

Upload quotes

+

Upload quotes for {{ company }}.

+ Upload +
+
+

View Download Attempts

+

View all download attempts, what IP the request originated from, what quote was requested, if the email was sent correctly and more!

+ View Downloads +
+ {% endif %} +
+ {% if user.is_authenticated %} +

Logout

+ Logout + {% else %} +

Login

+ Login + {% endif %} +
+
{% endblock %} diff --git a/download/__pycache__/forms.cpython-38.pyc b/download/__pycache__/forms.cpython-38.pyc index 15f259eda69a6e4cc4c46e19a6a5bcba81e1dee9..d8278ac52002b119d9a9b523f84972313ad2489d 100644 GIT binary patch delta 353 zcmYjK%Syvg5Y0_)(wp?Lvf@&A21HP)E0KyAbR&Xw6Bi|BhBo1*skf;XH-14ErC-sF z8~^5lAJCon19ehS9GJtInRCv3Ss%P{SFd{pmHYnIePXjl{92)@O+C6KKqF*egeF=k z2L>is#BAVTCk&h^gUXbL4(%!+!2P>=|E>b6w}xNS;yecoa+QU=WJ^Ku9bFyDD8_y+ z0afT693I`AwT^wJ?Wic!$miOY(F02DWznQ7anLLJS}1%RCkjD3&k6Lf(Dp?ZC33k< zkuSA08elukaX-$pYu}xHw)Wf(PKv9+a9n5}({t^u4MBnuw2h^CVW=kARdXJ&`>hS4 nf_aQHXT?_z|7G(9+u8lmt;Hp55@>OfTqQdm>ipnUce_Fx80j$0hg`6;Px`9--=EFjiP4xkYsn#>db$?>te<|bz5 zyi@>+_-S%Xc3?D}+`uT!CJ5vg2~J+f7|p=~WO6VHFisX>Qq+KmgC#+P5RkaVVUwGm RQks)$#|Y#VGXV)6CIB77C!7EP diff --git a/download/forms.py b/download/forms.py index 35785d8..9cc2b69 100644 --- a/download/forms.py +++ b/download/forms.py @@ -1,5 +1,11 @@ from django import forms class CodeForm(forms.Form): - code = forms.CharField(label='Code', max_length=8, required=True) - email = forms.EmailField(label='Email', max_length=32, required=True) + code = forms.CharField(label='Code', max_length=8, required=True, + widget=forms.TextInput( + attrs={'placeholder': '123A56'} + )) + email = forms.EmailField(label='Email', max_length=32, required=True, + widget=forms.TextInput( + attrs={'placeholder': 'jane@joe.com'} + )) \ No newline at end of file diff --git a/download/templates/common/master.html b/download/templates/common/master.html index cbc928b..7fbea36 100644 --- a/download/templates/common/master.html +++ b/download/templates/common/master.html @@ -1,19 +1,19 @@ +{% load static %} {% block title %}{% endblock %} - + + {% if user.is_authenticated %} + + {% endif %} - {% include 'common/navbar.html' %} - {% block body %} - {% endblock %} +
+ {% include 'common/navbar.html' %} + {% block body %} + {% endblock %} +
diff --git a/download/templates/download/code-form.html b/download/templates/download/code-form.html index b95b2cc..f80aab6 100644 --- a/download/templates/download/code-form.html +++ b/download/templates/download/code-form.html @@ -1,3 +1,4 @@ +{% extends 'common/master.html' %} {% block body %}

Type In Your Code

diff --git a/download/templates/download/download-page.html b/download/templates/download/download-page.html index bbc50f5..7297b98 100644 --- a/download/templates/download/download-page.html +++ b/download/templates/download/download-page.html @@ -1,8 +1,8 @@ {% extends 'common/master.html' %} {% block body %}

Download Your Quote

- - + +