diff --git a/company_site/financial/templates/financial/contract_detail.html b/company_site/financial/templates/financial/contract_detail.html index 2952377..d403277 100644 --- a/company_site/financial/templates/financial/contract_detail.html +++ b/company_site/financial/templates/financial/contract_detail.html @@ -5,51 +5,52 @@ Contract Detail - - - - + + + + +
- - {% if is_new %} -

New Contract

-
- {% csrf_token %} - {{ form }} - -
- {% else %} -

{{ contract.name }}

-
- {% csrf_token %} - {{ form }} - -
- {% endif %} - + {% if is_new %} +

New Contract

+
+ {% csrf_token %} + {{ form }} + +
+ + {% else %} +

{{ contract.name }}

+
+ {% csrf_token %} + {{ form }} + +
+ {% endif %} - - - - - {% if is_new %} - {% else %} -

Charge Numbers

- {% if charge_numbes %} -

put charge number table here

-

Create a new charge number

- {{ charge_number_form }} - {% else %} -

There are no charge numbers for this contract

-
- {% csrf_token %} + + + + + + {% if is_new %} + {% else %} +

Charge Numbers

+ {% if charge_numbes %} +

put charge number table here

+

Create a new charge number

{{ charge_number_form }} - -
- {% endif %} - {% endif %} - + {% else %} +

There are no charge numbers for this contract

+
+ {% csrf_token %} + {{ charge_number_form }} + +
+ {% endif %} + {% endif %} - + + \ No newline at end of file diff --git a/company_site/financial/templates/financial/contracts.html b/company_site/financial/templates/financial/contracts.html index bed7ad4..d4fcfa7 100644 --- a/company_site/financial/templates/financial/contracts.html +++ b/company_site/financial/templates/financial/contracts.html @@ -5,45 +5,46 @@ Profile - - - - + + + + +
- - -

Contracts

- {% if contracts %} - - - - - - - - - - - - - {% for contract in contracts %} - - - - - - - - - - - {% endfor %} -
NameIdentifierTypeStart DateEnd DateProposed AmountBaseline AmountFunded Amount
{{ contract.name }} {{ contract.slug }} {{ contract.contract_type }} {{ contract.baseline_start }} {{ contract.baseline_end }} {{ contract.proposed_amount }} {{ contract.baseline_amount }} {{ contract.funded_amount }}
-
-

Create new contract.

- {% else %} -

There are no contracts. Please make one

- {% endif %} - +

Contracts

+ {% if contracts %} + + + + + + + + + + + + + {% for contract in contracts %} + + + + + + + + + + + + {% endfor %} +
NameIdentifierTypeStart DateEnd DateProposed AmountBaseline AmountFunded Amount
{{ contract.name }} {{ contract.slug }} {{ contract.contract_type }} {{ contract.baseline_start }} {{ contract.baseline_end }} {{ contract.proposed_amount }} {{ contract.baseline_amount }} {{ contract.funded_amount }}
+
+

Create new contract.

+ {% else %} +

There are no contracts. Please make one

+ + {% endif %} + \ No newline at end of file diff --git a/company_site/financial/templates/financial/index.html b/company_site/financial/templates/financial/index.html index 243fe10..39fbef7 100644 --- a/company_site/financial/templates/financial/index.html +++ b/company_site/financial/templates/financial/index.html @@ -3,9 +3,10 @@ Accounting - - - + + + +
-

Accouting

\ No newline at end of file diff --git a/company_site/financial/templates/financial/profile.html b/company_site/financial/templates/financial/profile.html index 5e2e2de..3960525 100644 --- a/company_site/financial/templates/financial/profile.html +++ b/company_site/financial/templates/financial/profile.html @@ -5,13 +5,14 @@ Profile - - - - + + + + +
- - -

Profile

- {{ form }} + + +

Profile

+ {{ form }} \ No newline at end of file diff --git a/company_site/public/static/public/img/favicon.jpg b/company_site/public/static/public/img/favicon.jpg new file mode 100644 index 0000000..bb90219 Binary files /dev/null and b/company_site/public/static/public/img/favicon.jpg differ diff --git a/company_site/public/static/public/img/logo.png b/company_site/public/static/public/img/logo.png deleted file mode 100644 index 8e77402..0000000 Binary files a/company_site/public/static/public/img/logo.png and /dev/null differ diff --git a/company_site/public/templates/base.html b/company_site/public/templates/base.html index f2a3469..4c87c10 100644 --- a/company_site/public/templates/base.html +++ b/company_site/public/templates/base.html @@ -16,7 +16,7 @@ + content="{% block og_image %}{{ request.scheme }}://{{ request.get_host }}{% static 'public/img/favicon.jpg' %}{% endblock %}"> @@ -25,7 +25,7 @@ + content="{% block twitter_image %}{{ request.scheme }}://{{ request.get_host }}{% static 'public/img/favicon.jpg' %}{% endblock %}"> @@ -34,7 +34,7 @@ - + {% if not debug %}