Commit e68a35c51d0b55c21ca29555c3e8769a5f3fe2ba
1 parent
755aeab5
Exists in
master
and in
5 other branches
bug fixing on course's and subject's list frotend
Showing
2 changed files
with
6 additions
and
7 deletions
Show diff stats
courses/templates/course/index.html
@@ -62,14 +62,14 @@ | @@ -62,14 +62,14 @@ | ||
62 | <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false"> | 62 | <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false"> |
63 | <div class="group"> | 63 | <div class="group"> |
64 | <div class="panel panel-info"> | 64 | <div class="panel panel-info"> |
65 | - <div class="panel-heading headingOne ui-sortable-handle" role="tab"> | 65 | + <div class="panel-heading" role="tab"> |
66 | <div class="row"> | 66 | <div class="row"> |
67 | - <div class="col-xs-9 col-md-10 titleTopic"> | 67 | + <div class="col-xs-9 col-md-9 titleTopic"> |
68 | <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed"> | 68 | <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed"> |
69 | - <h4>{{course.name}}</h4> | 69 | + <h4 style="color:white">{{course.name}}</h4> |
70 | </a> | 70 | </a> |
71 | </div> | 71 | </div> |
72 | - <div class="col-xs-4 col-md-2" id="divMoreActions"> | 72 | + <div class="col-xs-4 col-md-3" id="divMoreActions"> |
73 | <div class="btn-group"> | 73 | <div class="btn-group"> |
74 | <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible"> | 74 | <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible"> |
75 | <i class="fa fa-eye fa-2x" aria-hidden="true"></i> | 75 | <i class="fa fa-eye fa-2x" aria-hidden="true"></i> |
@@ -81,7 +81,6 @@ | @@ -81,7 +81,6 @@ | ||
81 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | 81 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> |
82 | </button> | 82 | </button> |
83 | <ul class="dropdown-menu" aria-labelledby="moreActions"> | 83 | <ul class="dropdown-menu" aria-labelledby="moreActions"> |
84 | - <li><a href="{% url 'course:view' course.slug %}"><i class="fa fa-angle-double-right fa-fw" aria-hidden="true"></i> Access</a></li> | ||
85 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> Replicate</a></li> | 84 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> Replicate</a></li> |
86 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> Remove</a></li> | 85 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> Remove</a></li> |
87 | </ul> | 86 | </ul> |
@@ -100,7 +99,7 @@ | @@ -100,7 +99,7 @@ | ||
100 | {{course.description}} | 99 | {{course.description}} |
101 | </i> | 100 | </i> |
102 | </p> | 101 | </p> |
103 | - | 102 | + <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a> |
104 | </div> | 103 | </div> |
105 | </div> | 104 | </div> |
106 | </div> | 105 | </div> |
courses/templates/course/view.html
@@ -206,7 +206,6 @@ | @@ -206,7 +206,6 @@ | ||
206 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> | 206 | <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i> |
207 | </button> | 207 | </button> |
208 | <ul class="dropdown-menu" aria-labelledby="moreActions"> | 208 | <ul class="dropdown-menu" aria-labelledby="moreActions"> |
209 | - <li><a href="{% url 'course:view_subject' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> Access</a></li> | ||
210 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> Replicate</a></li> | 209 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal3"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> Replicate</a></li> |
211 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> Remove</a></li> | 210 | <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeSubject2"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> Remove</a></li> |
212 | </ul> | 211 | </ul> |
@@ -231,6 +230,7 @@ | @@ -231,6 +230,7 @@ | ||
231 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> | 230 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> |
232 | </div> | 231 | </div> |
233 | </div> | 232 | </div> |
233 | + <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Subject' %}<div class="ripple-container"></div></a> | ||
234 | </div> | 234 | </div> |
235 | </div> | 235 | </div> |
236 | {% endfor %} | 236 | {% endfor %} |