Download as
Browse Code »

Commit 4adb7f1089ed99b861646343a264ed77233d0e8b

Authored by Felipe Henrique de Almeida Bormann
1 parent dc999bee
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

modified delete category card

Showing 3 changed files with 15 additions and 10 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @4adb7f1
@@ -93,6 +93,14 @@ @@ -93,6 +93,14 @@
93 border-bottom-color: green; 93 border-bottom-color: green;
94 } 94 }
95 95
  96 +#delete-category-footer{
  97 + border-top:none !important;
  98 +}
  99 +
  100 +.erase-button{
  101 + float:left;
  102 +}
  103 +
96 /* category app ends */ 104 /* category app ends */
97 105
98 .clearfix{ 106 .clearfix{
categories/templates/categories/category_card.html
  Diff comments   View file @4adb7f1
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <div class="btn-group"> 13 <div class="btn-group">
14 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 14 <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
15 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> 15 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
16 - </button> 16 + </button>
17 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> 17 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
18 <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li> 18 <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
19 <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li> 19 <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
@@ -23,7 +23,9 @@ @@ -23,7 +23,9 @@
23 </div> 23 </div>
24 {% elif user|has_role:'student' %} 24 {% elif user|has_role:'student' %}
25 {% if not request.user in course.students.all %} 25 {% if not request.user in course.students.all %}
26 - <a onclick="subscribe($(this), '', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')"><button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button></a> 26 + <a onclick="subscribe($(this), '', {{ course.id}}, '{% trans 'Are you sure you want to subscribe to this course?' %}')">
  27 + <button class="btn btn-sm btn-primary btn-raised pull-right">{% trans 'Subscribe' %}</button>
  28 + </a>
27 {% endif %} 29 {% endif %}
28 {% endif %} 30 {% endif %}
29 </div> 31 </div>
categories/templates/categories/delete.html
  Diff comments   View file @4adb7f1
@@ -4,12 +4,7 @@ @@ -4,12 +4,7 @@
4 <div class="modal fade" id="category" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> 4 <div class="modal fade" id="category" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
5 <div class="modal-dialog" role="document"> 5 <div class="modal-dialog" role="document">
6 <div class="modal-content"> 6 <div class="modal-content">
7 - <!-- Modal Header -->  
8 - <div class="modal-header">  
9 -  
10 - <h4 class="modal-title" id="myModalLabel">{% trans "Delete Category" %}</h4>  
11 - </div>  
12 - <!-- Modal Body --> 7 + <!-- Modal Body -->
13 <div class="modal-body"> 8 <div class="modal-body">
14 <!-- Put ONLY your content here!!! --> 9 <!-- Put ONLY your content here!!! -->
15 <form id="delete_form" action="{% url 'categories:delete' category.slug %}" method="post"> 10 <form id="delete_form" action="{% url 'categories:delete' category.slug %}" method="post">
@@ -18,10 +13,10 @@ @@ -18,10 +13,10 @@
18 </form> 13 </form>
19 </div> 14 </div>
20 <!-- Modal Footer --> 15 <!-- Modal Footer -->
21 - <div class="modal-footer"> 16 + <div id="delete-category-footer"class="modal-footer">
22 <!-- Don't remove that!!! --> 17 <!-- Don't remove that!!! -->
23 <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>
24 - <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised">{% trans "Delete" %}</button> 19 + <button type="submit" id="button" form="delete_form" class="btn btn-primary btn-raised erase-button">{% trans "Delete" %}</button>
25 {% if index %} 20 {% if index %}
26 <script> 21 <script>
27 $("#delete_form").submit(function(event) { 22 $("#delete_form").submit(function(event) {