Download as
Browse Code »

Commit 94ed516be9316dc0785e067a0fa1ba995cf0c9ee

Authored by juliotoscano
1 parent 46b8be78
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modifying menu

Showing 4 changed files with 91 additions and 110 deletions   Show diff stats
users/forms.py
  Diff comments   View file @94ed516
... ... @@ -45,7 +45,7 @@ class UpdateUserForm(forms.ModelForm):
45 45  
46 46 def validate_cpf(self, cpf):
47 47 cpf = ''.join(re.findall('\d', str(cpf)))
48   -
  48 +
49 49 if cpfcnpj.validate(cpf):
50 50 return True
51 51 return False
... ... @@ -71,4 +71,4 @@ class UpdateProfileForm(UpdateUserForm):
71 71  
72 72 class Meta:
73 73 model = User
74   - fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image']
  74 + fields = ['username', 'name', 'email', 'birth_date', 'city', 'state', 'gender', 'cpf', 'phone', 'image', 'curriculum']
... ...
users/templates/users/edit_profile.html
  Diff comments   View file @94ed516
... ... @@ -46,7 +46,7 @@
46 46 {% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
47 47 <div class="checkbox">
48 48 <label>
49   - {% render_field field type='checkbox' %}
  49 + {% render_field field type='checkbox' %}
50 50 </label>
51 51 </div>
52 52 {% elif field.auto_id == 'id_cpf' %}
... ... @@ -72,16 +72,16 @@
72 72 {% endif %}
73 73 </div>
74 74 {% endfor %}
75   - <div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
76   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
  75 + <div class="col-md-3 col-sm-2 col-xs-2">
  76 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-block btn-success" />
77 77 </div>
78   - <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
79   - <a href="{% url 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>
  78 + <div class="col-md-3 col-sm-2 col-xs-2">
  79 + <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-danger" >{% trans 'Cancel' %}</a>
80 80 </div>
81 81 </form>
82 82 </div>
83 83 </div>
84 84 </div>
85   -
  85 +
86 86 <br clear="all" />
87 87 {% endblock %}
... ...
users/templates/users/profile.html
  Diff comments   View file @94ed516
... ... @@ -14,13 +14,15 @@
14 14 {% block sidebar %}
15 15 <div class="panel panel-primary navigation">
16 16 <div class="panel-heading">
17   - <h5>Profile</h5>
  17 + <h4>Menu</h4>
18 18 </div>
19 19 <div class="panel-body">
20 20 <ul class="nav nav-pills nav-stacked">
21   - <li><a href="{% url 'app:index' %}">{% trans 'Home' %}</a></li>
22   - <li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li>
23   - <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
  21 + <li><a href="{% url 'app:index' %}">{% trans 'Home page' %}</a></li>
  22 + <li><a href="{% url 'users:profile' %}">{% trans 'View Profile' %}</a></li>
  23 + <li><a href="{% url 'users:update_profile' %}">{% trans 'Edit Profile' %}</a></li>
  24 + <li><a href="#">{% trans 'Change Password' %}</a></li>
  25 + <li><a href="#">{% trans 'Remove account' %}</a></li>
24 26 </ul>
25 27 </div>
26 28 </div>
... ... @@ -37,106 +39,85 @@
37 39 </div>
38 40 {% endfor %}
39 41 {% endif %}
40   -
41   - <div class="row">
42   - <div class="col-lg-offset-4 col-lg-2">
43   - <img src="" class="img-responsive center-block " alt="logo amadeus">
44   - </div>
45   - </div>
46 42 <div class="row">
47 43 <div class="col-lg-12">
48   - <div class="card">
49   - <div class="card-content">
50   - <div class="card-body">
51   - <div class="row">
52   - <div class="col-md-4">
53   - <img src="{{ user.image_url }}" class="img-responsive center-block img-circle" alt="foto perfil" style="max-height:174px">
54   - </div>
55   - <div class="col-md-8">
56   - <table class="table table-hover table-edited">
57   - <tbody>
58   - <tr>
59   - <td>Status:</td>
60   - <td>Offline</td>
61   - </tr>
62   - <tr>
63   - <td>Nome:</td>
64   - <td>{{user}}</td>
65   - </tr>
66   - <tr>
67   - <td>Login:</td>
68   - <td>{{user.username}}</td>
69   - </tr>
70   - <tr>
71   - <td>Email:</td>
72   - <td>{{user.email}}</td>
73   - </tr>
74   - </tbody>
75   - </table>
76   - </div>
77   - </div>
78   - <div class="row">
79   - <div class="col-md-10 col-md-offset-1">
80   - <table class="table table-hover table-edited">
81   - <tbody>
82   - <tr>
83   - <td>Tipo de usuário:</td>
84   - <td>{{use.type_profile}}</td>
85   - </tr>
86   - <tr>
87   - <td>CPF:</td>
88   - <td>{{user.cpf}}</td>
89   - </tr>
90   - <tr>
91   - <td>Número de telefone:</td>
92   - <td>{{user.phone}}</td>
93   - </tr>
94   - <tr>
95   - <td>Sexo:</td>
96   - <td>{{user.gender}}</td>
97   - </tr>
98   - <tr>
99   - <td>Data de Nascimento:</td>
100   - <td>{{user.birth_date}}</td>
101   - </tr>
102   - <tr>
103   - <td>Estado e Cidade:</td>
104   - <td>{{user.state}} - {{user.city}}</td>
105   - </tr>
106   - <tr>
107   - <td>Titulação:</td>
108   - <td>Mestrado</td>
109   - </tr>
110   - <tr>
111   - <td>Ano:</td>
112   - <td>2012</td>
113   - </tr>
114   - <tr>
115   - <td>Instituição:</td>
116   - <td>UFPE</td>
117   - </tr>
118   - <tr>
119   - <td>Currículo:</td>
120   - <td>-</td>
121   - </tr>
122   - </tbody>
123   - </table>
124   - </div>
125   - </div>
  44 + <div class="well well-lg">
  45 + <div class="row">
  46 + <div class="col-md-4">
  47 + <img src="{{ user.image_url }}" class="img-responsive center-block img-circle" alt="foto perfil" style="max-height:174px">
126 48 </div>
127   - </div>
128   - <footer class="card-footer">
129   - <div class="col-md-6">
130   - <a href="{% url 'users:update_profile' %}" class="btn btn-flat">{% trans 'Edit Profile' %}</a>
  49 + <div class="col-md-8">
  50 + <table class="table table-hover table-edited">
  51 + <tbody>
  52 + <tr>
  53 + <td>Status:</td>
  54 + <td>Offline</td>
  55 + </tr>
  56 + <tr>
  57 + <td>Nome:</td>
  58 + <td>{{user}}</td>
  59 + </tr>
  60 + <tr>
  61 + <td>Login:</td>
  62 + <td>{{user.username}}</td>
  63 + </tr>
  64 + <tr>
  65 + <td>Email:</td>
  66 + <td>{{user.email}}</td>
  67 + </tr>
  68 + </tbody>
  69 + </table>
131 70 </div>
132   - <div class="col-md-6">
133   - <button class="btn btn-flat btn-danger pull-right">{% trans 'Delete Account' %}</button>
  71 + </div>
  72 + <div class="row">
  73 + <div class="col-md-10 col-md-offset-1">
  74 + <table class="table table-hover table-edited">
  75 + <tbody>
  76 + <tr>
  77 + <td>Tipo de usuário:</td>
  78 + <td>{{use.type_profile}}</td>
  79 + </tr>
  80 + <tr>
  81 + <td>CPF:</td>
  82 + <td>{{user.cpf}}</td>
  83 + </tr>
  84 + <tr>
  85 + <td>Número de telefone:</td>
  86 + <td>{{user.phone}}</td>
  87 + </tr>
  88 + <tr>
  89 + <td>Sexo:</td>
  90 + <td>{{user.gender}}</td>
  91 + </tr>
  92 + <tr>
  93 + <td>Data de Nascimento:</td>
  94 + <td>{{user.birth_date}}</td>
  95 + </tr>
  96 + <tr>
  97 + <td>Estado e Cidade:</td>
  98 + <td>{{user.state}} - {{user.city}}</td>
  99 + </tr>
  100 + <tr>
  101 + <td>Titulação:</td>
  102 + <td>Mestrado</td>
  103 + </tr>
  104 + <tr>
  105 + <td>Ano:</td>
  106 + <td>2012</td>
  107 + </tr>
  108 + <tr>
  109 + <td>Instituição:</td>
  110 + <td>UFPE</td>
  111 + </tr>
  112 + <tr>
  113 + <td>Currículo:</td>
  114 + <td>-</td>
  115 + </tr>
  116 + </tbody>
  117 + </table>
134 118 </div>
135   - </footer>
136   -
  119 + </div>
137 120 </div>
138   -
139   -
140 121 </div>
141 122 </div>
142 123 {% endblock %}
... ...
users/templates/users/update.html
  Diff comments   View file @94ed516
... ... @@ -24,7 +24,7 @@
24 24 </div>
25 25 {% endfor %}
26 26 {% endif %}
27   -
  27 +
28 28 <div class="card">
29 29 <div class="card-content">
30 30 <div class="card-body">
... ... @@ -51,7 +51,7 @@
51 51  
52 52 {% elif field.auto_id == 'id_phone' %}
53 53 {% render_field field class='form-control' onkeypress='campoNumerico(this,event); formatarTelefone(this,event);' %}
54   -
  54 +
55 55 {% elif field.auto_id == 'id_is_staff' or field.auto_id == 'id_is_active' %}
56 56 <div class="checkbox">
57 57 <label for="{{ field.auto_id }}">
... ... @@ -77,10 +77,10 @@
77 77 </div>
78 78 {% endfor %}
79 79 <div class="col-md-offset-2 col-md-2 col-sm-2 col-xs-2">
80   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
  80 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
81 81 </div>
82 82 <div class="col-md-offset-3 col-md-2 col-sm-2 col-xs-2">
83   - <a href="{% url 'users:manage' %}" class="btn btn-sm btn-success" >{% trans 'Cancel' %}</a>
  83 + <a href="{% url 'users:manage' %}" class="btn btn-raised btn-danger" >{% trans 'Cancel' %}</a>
84 84 </div>
85 85 </form>
86 86 </div>
... ...