Download as
Browse Code »

Commit 7da17356790e4ea35437cc0a4358a80db9add95b

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

CSS adjusting

Showing 5 changed files with 108 additions and 119 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @7da1735
@@ -60,31 +60,51 @@ @@ -60,31 +60,51 @@
60 /* category app starts */ 60 /* category app starts */
61 61
62 .panel-invisible{ 62 .panel-invisible{
63 - background-color: #BDBDBD; 63 + background-color: #BDBDBD;
  64 +}
  65 +
  66 +.category-panel {
  67 + background: #0277BD;
  68 +}
  69 +.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading {
  70 + padding: 2px 0px;
  71 +}
  72 +
  73 +.subject-panel {
  74 + background: #039BE5;
  75 +}
  76 +
  77 +.subject-group {
  78 + margin-left: 20px;
64 } 79 }
65 80
66 .category-header > h4{ 81 .category-header > h4{
67 - float:left;  
68 - margin-top: 0.5%; 82 + float:left;
  83 + margin-top: 5px;
  84 + margin-bottom: 2px;
69 } 85 }
70 86
  87 +.category-header > h4 > a:focus {
  88 + text-decoration: none;
  89 +}
71 90
  91 +.category-card-items {
  92 + padding-right: 0px;
  93 +}
72 .category-card-items i{ 94 .category-card-items i{
73 font-size: 25px !important; 95 font-size: 25px !important;
74 - margin-right: 5%;  
75 - margin-top: 1%; 96 + margin-right: 10px;
  97 + margin-top: 6px;
76 } 98 }
  99 +
77 .category-header i{ 100 .category-header i{
78 color: white; 101 color: white;
79 -  
80 font-size: 20px; 102 font-size: 20px;
81 float: right; 103 float: right;
82 -  
83 -  
84 } 104 }
85 105
86 .category-header i:hover{ 106 .category-header i:hover{
87 - color: #90CAF9; 107 + color: #90CAF9;
88 } 108 }
89 109
90 110
@@ -94,6 +114,7 @@ @@ -94,6 +114,7 @@
94 114
95 .cat-selector { 115 .cat-selector {
96 margin: 0; 116 margin: 0;
  117 + top: -2px;
97 } 118 }
98 119
99 #create-category{ 120 #create-category{
@@ -118,8 +139,8 @@ @@ -118,8 +139,8 @@
118 139
119 #core-subjects-options-div{ 140 #core-subjects-options-div{
120 width: 100%; 141 width: 100%;
121 - margin-bottom: 2%;  
122 - height: 30px; 142 + margin-bottom: 10px;
  143 + height: 50px;
123 } 144 }
124 145
125 .core-subjects-options li{ 146 .core-subjects-options li{
amadeus/templates/base.html
  Diff comments   View file @7da1735
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <span class="icon-bar"></span> 70 <span class="icon-bar"></span>
71 <span class="icon-bar"></span> 71 <span class="icon-bar"></span>
72 </button> 72 </button>
73 - <a class="navbar-brand" href="{% url 'categories:index' %}"> 73 + <a class="navbar-brand" href="{% url 'subjects:home' %}">
74 <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo" /> 74 <img class="logo pull-left" src="{% static 'img/topo-amadeus-white.png' %}" alt="Logo" />
75 <span class="pull-right project_name">Projeto Amadeus</span> 75 <span class="pull-right project_name">Projeto Amadeus</span>
76 </a> 76 </a>
categories/templates/categories/list.html
  Diff comments   View file @7da1735
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> 39 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
40 {% for category in categories %} 40 {% for category in categories %}
41 {% if category.visible %} 41 {% if category.visible %}
42 - <div class="panel panel-info"> 42 + <div class="panel panel-info category-panel">
43 <div class="panel-heading"> 43 <div class="panel-heading">
44 <div class="row"> 44 <div class="row">
45 <div class="col-md-12 category-header"> 45 <div class="col-md-12 category-header">
@@ -48,27 +48,20 @@ @@ -48,27 +48,20 @@
48 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}} 48 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}}
49 </a> 49 </a>
50 </h4> 50 </h4>
51 - {% if user.is_staff or user in category.coordinators.all %}  
52 - <div class=" divMoreActions">  
53 - <div class="btn-group">  
54 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
55 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
56 - </button>  
57 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
58 - {% if user.is_staff %}  
59 - <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 - {% endif %}  
61 - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>  
62 - <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>  
63 - </ul>  
64 - </div>  
65 - </div>  
66 - {% else %}  
67 - <div class=" divMoreActions">  
68 - </div>  
69 - {% endif %}  
70 51
71 <div class="col-md-5 pull-right category-card-items"> 52 <div class="col-md-5 pull-right category-card-items">
  53 + {% if user.is_staff or user in category.coordinators.all %}
  54 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  55 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  56 + </a>
  57 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  58 + {% if user.is_staff %}
  59 + <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 + {% endif %}
  61 + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
  62 + <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>
  63 + </ul>
  64 + {% endif %}
72 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> 65 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
73 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> 66 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
74 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> 67 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
@@ -95,7 +88,7 @@ @@ -95,7 +88,7 @@
95 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 88 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
96 {% endif %} 89 {% endif %}
97 90
98 - <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 91 + <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
99 {% for subject in category.subject_category.all %} 92 {% for subject in category.subject_category.all %}
100 {% include "subjects/subject_card.html" %} 93 {% include "subjects/subject_card.html" %}
101 {% endfor %} 94 {% endfor %}
@@ -103,7 +96,7 @@ @@ -103,7 +96,7 @@
103 </div> 96 </div>
104 </div> 97 </div>
105 {% elif request.user in category.coordinators.all or request.user.is_staff %} 98 {% elif request.user in category.coordinators.all or request.user.is_staff %}
106 - <div class="panel panel-invisible"> 99 + <div class="panel panel-invisible special-panel">
107 <div class="panel-heading"> 100 <div class="panel-heading">
108 <div class="row"> 101 <div class="row">
109 <div class="col-md-12 category-header"> 102 <div class="col-md-12 category-header">
@@ -112,33 +105,25 @@ @@ -112,33 +105,25 @@
112 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}} 105 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}}
113 </a> 106 </a>
114 </h4> 107 </h4>
115 - {% if user.is_staff or user in category.coordinators.all %}  
116 - <div class=" divMoreActions">  
117 - <div class="btn-group">  
118 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
119 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
120 - </button>  
121 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
122 - {% if user.is_staff %}  
123 - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>  
124 - {% endif %}  
125 - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>  
126 - <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>  
127 - </ul>  
128 - </div>  
129 - </div>  
130 - {% else %}  
131 - <div class=" divMoreActions">  
132 - </div>  
133 - {% endif %}  
134 -  
135 - <div class="col-md-5 pull-right category-card-items">  
136 - <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>  
137 - <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>  
138 - <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>  
139 - <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>  
140 - </div>  
141 - 108 +
  109 + <div class="col-md-5 pull-right category-card-items">
  110 + {% if user.is_staff or user in category.coordinators.all %}
  111 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  112 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  113 + </a>
  114 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  115 + {% if user.is_staff %}
  116 + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  117 + {% endif %}
  118 + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
  119 + <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>
  120 + </ul>
  121 + {% endif %}
  122 + <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
  123 + <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
  124 + <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
  125 + <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
  126 + </div>
142 </div> 127 </div>
143 </div> 128 </div>
144 </div> 129 </div>
@@ -160,7 +145,7 @@ @@ -160,7 +145,7 @@
160 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 145 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
161 {% endif %} 146 {% endif %}
162 147
163 - <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 148 + <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
164 {% for subject in category.subject_category.all %} 149 {% for subject in category.subject_category.all %}
165 {% include "subjects/subject_card.html" %} 150 {% include "subjects/subject_card.html" %}
166 {% endfor %} 151 {% endfor %}
subjects/templates/subjects/list.html
  Diff comments   View file @7da1735
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> 42 <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
43 {% for category in categories %} 43 {% for category in categories %}
44 {% if category.visible %} 44 {% if category.visible %}
45 - <div class="panel panel-info"> 45 + <div class="panel panel-info category-panel">
46 <div class="panel-heading"> 46 <div class="panel-heading">
47 <div class="row"> 47 <div class="row">
48 <div class="col-md-12 category-header"> 48 <div class="col-md-12 category-header">
@@ -51,27 +51,20 @@ @@ -51,27 +51,20 @@
51 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}} 51 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}}
52 </a> 52 </a>
53 </h4> 53 </h4>
54 - {% if user.is_staff or user in category.coordinators.all %}  
55 - <div class=" divMoreActions">  
56 - <div class="btn-group">  
57 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
58 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
59 - </button>  
60 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
61 - {% if user.is_staff %}  
62 - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>  
63 - {% endif %}  
64 - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>  
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>  
66 - </ul>  
67 - </div>  
68 - </div>  
69 - {% else %}  
70 - <div class=" divMoreActions">  
71 - </div>  
72 - {% endif %}  
73 54
74 <div class="col-md-5 pull-right category-card-items"> 55 <div class="col-md-5 pull-right category-card-items">
  56 + {% if user.is_staff or user in category.coordinators.all %}
  57 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  58 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  59 + </a>
  60 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  61 + {% if user.is_staff %}
  62 + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  63 + {% endif %}
  64 + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
  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>
  66 + </ul>
  67 + {% endif %}
75 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> 68 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
76 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> 69 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
77 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> 70 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
@@ -97,7 +90,7 @@ @@ -97,7 +90,7 @@
97 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 90 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
98 {% endif %} 91 {% endif %}
99 92
100 - <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 93 + <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
101 {% for subject in category.subject_category.all %} 94 {% for subject in category.subject_category.all %}
102 {% include "subjects/subject_card.html" %} 95 {% include "subjects/subject_card.html" %}
103 {% endfor %} 96 {% endfor %}
@@ -105,7 +98,7 @@ @@ -105,7 +98,7 @@
105 </div> 98 </div>
106 </div> 99 </div>
107 {% elif request.user in category.coordinators.all %} 100 {% elif request.user in category.coordinators.all %}
108 - <div class="panel panel-danger"> 101 + <div class="panel panel-danger special-panel">
109 <div class="panel-heading"> 102 <div class="panel-heading">
110 <div class="row"> 103 <div class="row">
111 <div class="col-md-12 category-header"> 104 <div class="col-md-12 category-header">
@@ -114,27 +107,20 @@ @@ -114,27 +107,20 @@
114 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}} 107 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{category.name}}
115 </a> 108 </a>
116 </h4> 109 </h4>
117 - {% if user.is_staff or user in category.coordinators.all %}  
118 - <div class=" divMoreActions">  
119 - <div class="btn-group">  
120 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
121 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
122 - </button>  
123 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
124 - {% if user.is_staff %}  
125 - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>  
126 - {% endif %}  
127 - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>  
128 - <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>  
129 - </ul>  
130 - </div>  
131 - </div>  
132 - {% else %}  
133 - <div class=" divMoreActions">  
134 - </div>  
135 - {% endif %}  
136 110
137 <div class="col-md-5 pull-right category-card-items"> 111 <div class="col-md-5 pull-right category-card-items">
  112 + {% if user.is_staff or user in category.coordinators.all %}
  113 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  114 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  115 + </a>
  116 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  117 + {% if user.is_staff %}
  118 + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  119 + {% endif %}
  120 + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
  121 + <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>
  122 + </ul>
  123 + {% endif %}
138 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> 124 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
139 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> 125 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
140 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> 126 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>
@@ -160,7 +146,7 @@ @@ -160,7 +146,7 @@
160 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a> 146 <a href="{% url 'subjects:create' category.slug %}"><button class="create-subject-btn"> {% trans "Create new subject" %} </button></a>
161 {% endif %} 147 {% endif %}
162 148
163 - <div class="panel-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true"> 149 + <div class="panel-group subject-group" id="{{ category.slug }}-accordion" role="tablist" aria-multiselectable="true">
164 {% for subject in category.subject_category.all %} 150 {% for subject in category.subject_category.all %}
165 {% include "subjects/subject_card.html" %} 151 {% include "subjects/subject_card.html" %}
166 {% endfor %} 152 {% endfor %}
subjects/templates/subjects/subject_card.html
  Diff comments   View file @7da1735
1 {% load static i18n permission_tags %} 1 {% load static i18n permission_tags %}
2 2
3 -<div class="panel panel-info"> 3 +<div class="panel panel-info subject-panel">
4 <div class="panel-heading"> 4 <div class="panel-heading">
5 <div class="row"> 5 <div class="row">
6 <div class="col-md-12 category-header"> 6 <div class="col-md-12 category-header">
@@ -9,21 +9,18 @@ @@ -9,21 +9,18 @@
9 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{subject.name}} 9 <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{subject.name}}
10 </a> 10 </a>
11 </h4> 11 </h4>
12 - {% if request.user in subject.professor.all or request.user in category.coordinators.all %}  
13 - <div class="divMoreActions" >  
14 - <div class="btn-group">  
15 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
16 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
17 - </button>  
18 - <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">  
19 - <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>  
20 - <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>  
21 - <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>  
22 - </ul>  
23 - </div>  
24 - </div>  
25 - {% endif %} 12 +
26 <div class="col-md-5 pull-right category-card-items"> 13 <div class="col-md-5 pull-right category-card-items">
  14 + {% if request.user in subject.professor.all or request.user in category.coordinators.all %}
  15 + <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  16 + <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
  17 + </a>
  18 + <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
  19 + <li><a href="#"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
  20 + <li><a href="#"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
  21 + <li><a href="#"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
  22 + </ul>
  23 + {% endif %}
27 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> 24 <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a>
28 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a> 25 <a href=""><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
29 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a> 26 <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>