Download as
Browse Code »

Commit fc681d05ab523df77be0a9377471fdd358bb132b

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

fixed description html way

Showing 2 changed files with 16 additions and 7 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @fc681d0
... ... @@ -53,6 +53,10 @@
53 53 padding:10px;
54 54 }
55 55  
  56 +.core-subjects-options > li{
  57 + float:left;
  58 +}
  59 +
56 60 /* category app ends */
57 61  
58 62 .clearfix{
... ...
categories/templates/categories/list.html
  Diff comments   View file @fc681d0
... ... @@ -26,12 +26,14 @@
26 26 {% if user.is_staff %}
27 27 <a href="{% url 'categories:create' %}"><button id="create-category"> {% trans "Create Category" %}</button></a>
28 28  
29   -{% else %}
30   - <ul>
  29 +{% endif %}
  30 +
  31 +<div class="col-md-12">
  32 + <ul class="core-subjects-options">
31 33 <li>{% trans "My subjects" %}</li>
32 34 <li>{% trans "all subjects" %}</li>
33 35 </ul>
34   -{% endif %}
  36 +</div>
35 37  
36 38 <!-- Code for listing categories -->
37 39 <div class="col-md-12 cards-content">
... ... @@ -55,7 +57,10 @@
55 57 <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
56 58 </button>
57 59 <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
58   - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  60 + {% if user.is_staff %}
  61 + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  62 + {% endif %}
  63 +
59 64 <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
60 65 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
61 66 </ul>
... ... @@ -82,16 +87,16 @@
82 87 </div>
83 88  
84 89  
85   - {% if user.is_staff %}
  90 +
86 91 <div id="{{category.slug}}" class="panel-collapse collapse category-panel-content">
87 92 <h4> {% trans "Coordinator(s): " %}
88 93 {% for coordinator in category.coordinators.all %}
89 94 {{coordinator.username}}
90 95 {% endfor %}
91 96 </h4>
92   - <p> {{category.description}}</p>
  97 + {{category.description|safe}}
93 98 </div>
94   - {% endif %}
  99 +
95 100 {% comment %}
96 101  
97 102  
... ...