Download as
Browse Code »

Commit ebbdc8b4cb548a30cf679b08af091563b2dd7037

Authored by Zambom
1 parent 6bdefcfe
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Padronizing buttons

Showing 16 changed files with 23 additions and 19 deletions   Show diff stats
categories/templates/categories/_form.html
  Diff comments   View file @ebbdc8b
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 {% endif %} 59 {% endif %}
60 {% endfor %} 60 {% endfor %}
61 <div class="row text-center"> 61 <div class="row text-center">
62 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-raised" /> 62 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
63 </div> 63 </div>
64 </form> 64 </form>
65 65
categories/templates/categories/delete.html
  Diff comments   View file @ebbdc8b
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div id="delete-category-footer"class="modal-footer"> 16 <div id="delete-category-footer"class="modal-footer">
17 <!-- Don't remove that!!! --> 17 <!-- Don't remove that!!! -->
18 <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button> 18 <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
19 - <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised erase-button">{% trans "Delete" %}</button> 19 + <button type="submit" id="button" form="delete_form" class="btn btn-success btn-raised erase-button">{% trans "Delete" %}</button>
20 {% if index %} 20 {% if index %}
21 <script> 21 <script>
22 $("#delete_form").submit(function(event) { 22 $("#delete_form").submit(function(event) {
categories/templates/categories/list.html
  Diff comments   View file @ebbdc8b
@@ -26,7 +26,11 @@ @@ -26,7 +26,11 @@
26 {% endif %} 26 {% endif %}
27 27
28 {% if user.is_staff %} 28 {% if user.is_staff %}
29 - <a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a> 29 + <div class='row'>
  30 + <div class="col-md-offset-3 col-md-6">
  31 + <a href="{% url 'categories:create' %}" class="btn btn-raised btn-success btn-block">{% trans "Create Category" %}</a>
  32 + </div>
  33 + </div>
30 {% endif %} 34 {% endif %}
31 35
32 {% if not user.is_staff %} 36 {% if not user.is_staff %}
mailsender/templates/mailsender/update.html
  Diff comments   View file @ebbdc8b
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 {% endfor %} 56 {% endfor %}
57 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 57 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
58 <div class="text-center"> 58 <div class="text-center">
59 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 59 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
60 </div> 60 </div>
61 </div> 61 </div>
62 </form> 62 </form>
security/templates/security/update.html
  Diff comments   View file @ebbdc8b
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 {% endfor %} 39 {% endfor %}
40 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 40 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
41 <div class="text-center"> 41 <div class="text-center">
42 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 42 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
43 </div> 43 </div>
44 </div> 44 </div>
45 </form> 45 </form>
subjects/templates/subjects/_form.html
  Diff comments   View file @ebbdc8b
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 {% endif %} 84 {% endif %}
85 {% endfor %} 85 {% endfor %}
86 <div class="row text-center"> 86 <div class="row text-center">
87 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-primary btn-raised" /> 87 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
88 </div> 88 </div>
89 </form> 89 </form>
90 90
subjects/templates/subjects/delete.html
  Diff comments   View file @ebbdc8b
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <div class="modal-footer"> 21 <div class="modal-footer">
22 <!-- Don't remove that!!! --> 22 <!-- Don't remove that!!! -->
23 <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Close" %}</button> 23 <button type="button" class="btn btn-raised btn-default" data-dismiss="modal">{% trans "Close" %}</button>
24 - <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button> 24 + <button type="submit" id="button" form="delete_form" class="btn btn-success btn-raised">{% trans "Delete" %}</button>
25 25
26 {% if index %} 26 {% if index %}
27 <script> 27 <script>
subjects/templates/subjects/list.html
  Diff comments   View file @ebbdc8b
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 {{category.description|safe}} 101 {{category.description|safe}}
102 102
103 {% if request.user in category.coordinators.all or request.user.is_staff %} 103 {% if request.user in category.coordinators.all or request.user.is_staff %}
104 - <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 104 + <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
105 {% endif %} 105 {% endif %}
106 106
107 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 107 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
@@ -164,9 +164,9 @@ @@ -164,9 +164,9 @@
164 {% endif %} 164 {% endif %}
165 165
166 {{category.description|safe}} 166 {{category.description|safe}}
167 - 167 +
168 {% if request.user in category.coordinators.all or request.user.is_staff %} 168 {% if request.user in category.coordinators.all or request.user.is_staff %}
169 - <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 169 + <a href="{% url 'subjects:create' category.slug %}" class="btn btn-raised btn-success btn-block btn-sm">{% trans "Create new subject" %}</a>
170 {% endif %} 170 {% endif %}
171 171
172 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 172 <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
subjects/templates/subjects/view.html
  Diff comments   View file @ebbdc8b
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <p>{{subject.description|safe}}</p> 79 <p>{{subject.description|safe}}</p>
80 80
81 {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %} 81 {% if request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
82 - <a href="{% url 'topics:create' subject.slug %}"><button class="btn btn-sm btn-primary btn-raised btn-block"> {% trans "Create new topic" %} </button></a> 82 + <a href="{% url 'topics:create' subject.slug %}" class="btn btn-sm btn-success btn-raised btn-block">{% trans "Create new topic" %}</a>
83 {% endif %} 83 {% endif %}
84 84
85 </div> 85 </div>
themes/templates/themes/basic_update.html
  Diff comments   View file @ebbdc8b
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 {% endfor %} 86 {% endfor %}
87 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 87 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
88 <div class="text-center"> 88 <div class="text-center">
89 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 89 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
90 </div> 90 </div>
91 </div> 91 </div>
92 </form> 92 </form>
themes/templates/themes/css_update.html
  Diff comments   View file @ebbdc8b
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 {% endfor %} 66 {% endfor %}
67 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 67 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
68 <div class="text-center"> 68 <div class="text-center">
69 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 69 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
70 </div> 70 </div>
71 </div> 71 </div>
72 </form> 72 </form>
users/templates/users/_form.html
  Diff comments   View file @ebbdc8b
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 {% endfor %} 58 {% endfor %}
59 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12"> 59 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
60 <div class="pull-left"> 60 <div class="pull-left">
61 - <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-primary" /> 61 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-raised btn-success" />
62 </div> 62 </div>
63 <div class="pull-right"> 63 <div class="pull-right">
64 <a href="{% url back_url %}" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a> 64 <a href="{% url back_url %}" class="btn btn-raised btn-default">{% trans 'Cancel' %}</a>
users/templates/users/delete.html
  Diff comments   View file @ebbdc8b
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <div class="row"> 20 <div class="row">
21 <div class="col-md-12"> 21 <div class="col-md-12">
22 <div class="pull-left"> 22 <div class="pull-left">
23 - <input type="submit" class="btn btn-raised btn-block btn-primary" value="{% trans 'Remove' %}" /> 23 + <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
24 </div> 24 </div>
25 <div class="pull-right"> 25 <div class="pull-right">
26 <a href="{% url 'users:manage' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a> 26 <a href="{% url 'users:manage' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
users/templates/users/delete_account.html
  Diff comments   View file @ebbdc8b
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <div class="row"> 20 <div class="row">
21 <div class="col-md-12"> 21 <div class="col-md-12">
22 <div class="pull-left"> 22 <div class="pull-left">
23 - <input type="submit" class="btn btn-raised btn-block btn-primary" value="{% trans 'Remove' %}" /> 23 + <input type="submit" class="btn btn-raised btn-block btn-success" value="{% trans 'Remove' %}" />
24 </div> 24 </div>
25 <div class="pull-right"> 25 <div class="pull-right">
26 <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a> 26 <a href="{% url 'users:profile' %}" class="btn btn-raised btn-block btn-default" >{% trans 'Cancel' %}</a>
users/templates/users/list.html
  Diff comments   View file @ebbdc8b
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 </form> 38 </form>
39 </div> 39 </div>
40 <div class="col-md-3"> 40 <div class="col-md-3">
41 - <a href="{% url 'users:create' %}" class="pull-right btn btn-primary btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a> 41 + <a href="{% url 'users:create' %}" class="pull-right btn btn-success btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
42 </div> 42 </div>
43 </div> 43 </div>
44 44
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 </div> 62 </div>
63 <div class="col-md-3"> 63 <div class="col-md-3">
64 <div align="right"> 64 <div align="right">
65 - <a href="{% url 'users:update' acc.email %}" class="btn btn-primary btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a> 65 + <a href="{% url 'users:update' acc.email %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
66 <a href="{% url 'users:delete' acc.email %}" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a> 66 <a href="{% url 'users:delete' acc.email %}" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
67 </div> 67 </div>
68 </div> 68 </div>
users/templates/users/register.html
  Diff comments   View file @ebbdc8b
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 <div class="row"> 87 <div class="row">
88 <div class="col-lg-12 col-md-12 col-sm-12"> 88 <div class="col-lg-12 col-md-12 col-sm-12">
89 <div class="pull-left"> 89 <div class="pull-left">
90 - <input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-primary" /> 90 + <input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-success" />
91 </div> 91 </div>
92 <div class="pull-right"> 92 <div class="pull-right">
93 <a href="{% url 'users:login' %}" class="btn btn-raised btn-default"> {% trans 'Back' %}</a> 93 <a href="{% url 'users:login' %}" class="btn btn-raised btn-default"> {% trans 'Back' %}</a>