Commit bfdd320f64d1ce54edf625e759c882c861c54e5d
1 parent
b88e6fc3
Exists in
master
and in
5 other branches
Adapting html to only show view button if subscribed [Issue: #195]
Showing
1 changed file
with
6 additions
and
6 deletions
Show diff stats
courses/templates/course/view.html
@@ -196,7 +196,7 @@ | @@ -196,7 +196,7 @@ | ||
196 | <div> | 196 | <div> |
197 | {% if request.GET.category == 'all' or none or request.GET.category == '' %} | 197 | {% if request.GET.category == 'all' or none or request.GET.category == '' %} |
198 | {% for subject in subjects %} | 198 | {% for subject in subjects %} |
199 | - <div class="panel panel-info"> | 199 | + <div class="panel panel-info panel_{{ subject.id }}"> |
200 | <div class="panel-heading headingTwo ui-sortable-handle" role="tab"> | 200 | <div class="panel-heading headingTwo ui-sortable-handle" role="tab"> |
201 | <div class="row"> | 201 | <div class="row"> |
202 | <div class="col-xs-9 col-md-10 titleTopic"> | 202 | <div class="col-xs-9 col-md-10 titleTopic"> |
@@ -220,7 +220,7 @@ | @@ -220,7 +220,7 @@ | ||
220 | 220 | ||
221 | {% if user|show_subject_subscribe:subject %} | 221 | {% if user|show_subject_subscribe:subject %} |
222 | <div class="col-xs-3 col-md-2"> | 222 | <div class="col-xs-3 col-md-2"> |
223 | - <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}' , '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a> | 223 | + <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}', {{ subject.id }}, '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a> |
224 | </div> | 224 | </div> |
225 | {% endif %} | 225 | {% endif %} |
226 | </div> | 226 | </div> |
@@ -242,14 +242,14 @@ | @@ -242,14 +242,14 @@ | ||
242 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> | 242 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> |
243 | </div> | 243 | </div> |
244 | </div> | 244 | </div> |
245 | - <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> | 245 | + <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a> |
246 | </div> | 246 | </div> |
247 | </div> | 247 | </div> |
248 | {% endfor %} | 248 | {% endfor %} |
249 | {% else %} | 249 | {% else %} |
250 | {% for subject in subjects_category %} | 250 | {% for subject in subjects_category %} |
251 | {% if subject.category.name == request.GET.category %} | 251 | {% if subject.category.name == request.GET.category %} |
252 | - <div class="panel panel-info"> | 252 | + <div class="panel panel-info panel_{{ subject.id }}"> |
253 | <div class="panel-heading headingTwo ui-sortable-handle" role="tab"> | 253 | <div class="panel-heading headingTwo ui-sortable-handle" role="tab"> |
254 | <div class="row"> | 254 | <div class="row"> |
255 | <div class="col-xs-9 col-md-10 titleTopic"> | 255 | <div class="col-xs-9 col-md-10 titleTopic"> |
@@ -272,7 +272,7 @@ | @@ -272,7 +272,7 @@ | ||
272 | {% endif %} | 272 | {% endif %} |
273 | {% if user|show_subject_subscribe:subject %} | 273 | {% if user|show_subject_subscribe:subject %} |
274 | <div class="col-xs-3 col-md-2"> | 274 | <div class="col-xs-3 col-md-2"> |
275 | - <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}' , '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a> | 275 | + <a onclick="subscribe($(this), '{% url 'course:subscribe_subject' subject.slug %}', {{ subject.id }}, '{% trans 'Are you sure you want to subscribe to this subject?' %}')" class="btn btn-sm btn-primary btn-raised">{% trans 'Subscribe' %}</a> |
276 | </div> | 276 | </div> |
277 | {% endif %} | 277 | {% endif %} |
278 | </div> | 278 | </div> |
@@ -294,7 +294,7 @@ | @@ -294,7 +294,7 @@ | ||
294 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> | 294 | <p><b>{% trans "End" %}: </b>{{subject.end_date}}</p> |
295 | </div> | 295 | </div> |
296 | </div> | 296 | </div> |
297 | - <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> | 297 | + <a href="{% url 'course:view_subject' subject.slug %}" class="btn btn-raised btn-default center-block view_btn" {% if user|show_subject_subscribe:subject %}style="display:none"{% endif %}>{% trans 'View Subject' %}<div class="ripple-container"></div></a> |
298 | </div> | 298 | </div> |
299 | </div> | 299 | </div> |
300 | {% endif %} | 300 | {% endif %} |