Download as
Browse Code »

Commit b7641548d22183599c6587d3907bc031396ddd42

Authored by Ailson da Cruz
1 parent f3c42107
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Fixing template error #52

Showing 3 changed files with 78 additions and 48 deletions   Show diff stats
users/templates/list_users.html
  Diff comments   View file @b764154
... ... @@ -48,7 +48,7 @@
48 48 <p>{% trans 'Email' %}: {{ acc.email }}</p>
49 49 <p>{% trans 'Contact' %}: {{ acc.phone }}</p>
50 50 <div align="right">
51   - <a href="javascript:void(0)" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
  51 + <a href="{% url 'users:update' acc.username %}" class="btn btn-raised btn-success">{% trans 'Edit' %}</a>
52 52 <a href="javascript:void(0)" class="btn btn-raised btn-primary">{% trans 'Delete' %}</a>
53 53 </div>
54 54 </div>
... ...
users/templates/users/create.html
  Diff comments   View file @b764154
... ... @@ -71,7 +71,12 @@
71 71 {% endif %}
72 72 </div>
73 73 {% endfor %}
74   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
  74 + <div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
  75 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
  76 + </div>
  77 + <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
  78 + <a href="{% url 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>
  79 + </div>
75 80 </form>
76 81 </div>
77 82 </div>
... ...
users/templates/users/update.html
  Diff comments   View file @b764154
1   -{% extends 'app/base.html' %}
  1 +{% extends 'list_users.html' %}
2 2  
3 3 {% load static i18n %}
4 4 {% load widget_tweaks %}
5 5  
  6 +{% load django_bootstrap_breadcrumbs %}
  7 +
6 8 {% block breadcrumbs %}
7   - <ol class="breadcrumb">
8   - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
9   - <li class="active">{% trans 'Edit user' %}</li>
10   - </ol>
11   -{% endblock %}
12 9  
13   -{% block sidebar %}
14   - <div class="list-group">
15   - <a href="{% url 'users:manage' %}" class="list-group-item">
16   - {% trans 'System Users' %}
17   - </a>
18   - <a href="{% url 'users:create' %}" class="list-group-item">
19   - {% trans 'New Account' %}
20   - </a>
21   - <a href="#" class="list-group-item">
22   - {% trans 'Send Mail' %}
23   - </a>
24   - </div>
  10 + {{ block.super }}
  11 + {% breadcrumb 'Update User' 'users:update' %}
  12 +
25 13 {% endblock %}
26 14  
  15 +
27 16 {% block content %}
28   - <div class="alert alert-info alert-dismissible" role="alert">
29   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
30   - <span aria-hidden="true">&times;</span>
31   - </button>
32   - <p>{% trans 'All fields are required' %}</p>
33   - </div>
  17 + {% if messages %}
  18 + {% for message in messages %}
  19 + <div class="alert alert-success alert-dismissible" role="alert">
  20 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  21 + <span aria-hidden="true">&times;</span>
  22 + </button>
  23 + <p>{{ message }}</p>
  24 + </div>
  25 + {% endfor %}
  26 + {% endif %}
34 27  
35   - <form method="post" action="" enctype="multipart/form-data">
36   - {% csrf_token %}
37   - {% for field in form %}
38   - <div class="form-group{% if form.has_error %} has-error {% endif %}">
39   - <label for="{{ field.auto_id }}">{{ field.label }}</label>
40   - {% render_field field class='form-control input-sm' %}
41   - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
42   - {% if field.errors.length > 0 %}
43   - <div class="alert alert-danger alert-dismissible" role="alert">
44   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
45   - <span aria-hidden="true">&times;</span>
46   - </button>
47   - <ul>
48   - {% for error in field.errors %}
49   - <li>{{ error }}</li>
50   - {% endfor %}
51   - </ul>
  28 + <div class="card">
  29 + <div class="card-content">
  30 + <div class="card-body">
  31 + <form method="post" action="" enctype="multipart/form-data">
  32 + {% csrf_token %}
  33 + {% for field in form %}
  34 + <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
  35 + <label for="{{ field.auto_id }}">{{ field.label }}</label>
  36 + {% if field.auto_id == 'id_birth_date' %}
  37 + {% render_field field class='form-control input-sm' type='date' %}
  38 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  39 + {% elif field.auto_id == 'id_image' %}
  40 + {% render_field field class='form-control input-sm' %}
  41 + <div class="input-group">
  42 + <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
  43 + <span class="input-group-btn input-group-sm">
  44 + <button type="button" class="btn btn-fab btn-fab-mini">
  45 + <i class="material-icons">attach_file</i>
  46 + </button>
  47 + </span>
  48 + </div>
  49 + {% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
  50 + <div class="checkbox">
  51 + <label>
  52 + {% render_field field type='checkbox' %}
  53 + </label>
  54 + </div>
  55 + {% else %}
  56 + {% render_field field class='form-control input-sm' %}
  57 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  58 + {% endif %}
  59 + {% if field.errors.length > 0 %}
  60 + <div class="alert alert-danger alert-dismissible" role="alert">
  61 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  62 + <span aria-hidden="true">&times;</span>
  63 + </button>
  64 + <ul>
  65 + {% for error in field.errors %}
  66 + <li>{{ error }}</li>
  67 + {% endfor %}
  68 + </ul>
  69 + </div>
  70 + </div>
  71 + {% endif %}
  72 + </div>
  73 + {% endfor %}
  74 + <div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
  75 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
  76 + </div>
  77 + <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
  78 + <a href="{% url 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>
52 79 </div>
53   - </div>
54   - {% endif %}
  80 + </form>
55 81 </div>
56   - {% endfor %}
57   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
58   - </form>
  82 + </div>
  83 + </div>
59 84 <br clear="all" />
60 85 {% endblock %}
... ...