Skip to content

Commit

Permalink
Added some nice operation linking
Browse files Browse the repository at this point in the history
  • Loading branch information
Ace Nassri authored and Ace Nassri committed Mar 8, 2013
1 parent 1812528 commit 3333a9b
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 4 deletions.
10 changes: 8 additions & 2 deletions treasureapp/templates/accounts/form.html
@@ -1,17 +1,23 @@
{% extends "base.html" %}
{% load bootstrap %}
{% block title %}Treasure Chest | Add account{% endblock %}

{% block title %}{{Treasure Chest | Add/Update account"}{% endblock %}

{% block content %}

<h1>Add new account</h1>
{% if mode == 'create' %}
<h1>Add new account</h1>
{% elif mode == 'update' %}
<h1>Update existing account</h1>
{% endif %}

<form class="well" method="post">
{% csrf_token %}
{{ form|bootstrap }}
<div class="control-group">
<div class="controls">
<button type="submit" class="btn btn-primary">Save</button>
<a {% if mode == 'create' %} href="{% url account_list %}" {% else %} href="{% url account_detail account.pk %}" {% endif %} class="btn btn-primary">Cancel</a>
</div>
</div>
</form>
Expand Down
1 change: 1 addition & 0 deletions treasureapp/templates/registration/registration_form.html
Expand Up @@ -11,6 +11,7 @@
<div class="control-group">
<div class="controls">
<button type="submit" class="btn btn-primary">Sign Up</button>
<a class="btn btn-primary" href="{% url index %}">Cancel</a>
</div>
</div>
</form>
Expand Down
1 change: 1 addition & 0 deletions treasureapp/templates/transactions/form.html
Expand Up @@ -12,6 +12,7 @@ <h1>Transaction out of {{ account.name }}</h1>
<div class="control-group">
<div class="controls">
<button type="submit" class="btn btn-primary">Save</button>
<a {% if mode == 'update' %} href="{% url transaction_detail transaction.pk %}" {% else %} href="{% url account_detail account.pk %}" {% endif %} class="btn btn-primary">Cancel</a>
</div>
</div>
</form>
Expand Down
4 changes: 2 additions & 2 deletions treasureapp/view/account.py
Expand Up @@ -81,7 +81,7 @@ def account_create(request, *args, **kargs):

# Update the CSRF token
kargs.update(csrf(request))
context = RequestContext(request, dict(section="accounts",
context = RequestContext(request, dict(section="accounts", mode = "create",
form=account_form, **kargs))
return render_to_response("accounts/form.html", context)

Expand Down Expand Up @@ -113,5 +113,5 @@ def account_update(request, account_id, *args, **kargs):
# Pass back the form we have, after updating CSRF
kargs.update(csrf(request))
context = RequestContext(request, dict(section="accounts",
form=account_form, **kargs))
form=account_form, mode="update", account=account, **kargs))
return render_to_response("accounts/form.html", context)
3 changes: 3 additions & 0 deletions treasureapp/view/transaction.py
Expand Up @@ -60,6 +60,7 @@ def transaction_create(request, account_id, *args, **kargs):
context = RequestContext(request, dict(section="accounts",
account=from_acct,
form=transaction_form,
mode='create',
**kargs))
return render_to_response("transactions/form.html", context)

Expand Down Expand Up @@ -93,5 +94,7 @@ def transaction_update(request, transaction_id, *args, **kargs):
context = RequestContext(request, dict(section="accounts",
account=transaction.from_acct,
form=transaction_form,
transaction=transaction,
mode='update',
**kargs))
return render_to_response("transactions/form.html", context)

0 comments on commit 3333a9b

Please sign in to comment.