htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #56 from openHPI/collapsing-change

Browse Source 
Collapsing change + sorted alphabetically
This commit is contained in:
rteusner
2016-06-14 16:48:45 +02:00
committed by GitHub
parent 74b33492cb f5aa3cef3c
commit fef14d836c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/exercises/_file_form.html.slim
View File

@ -4,7 +4,7 @@ li.panel.panel-default
div.clearfix role="button" div.clearfix role="button"
span = f.object.name span = f.object.name
a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{id}" collapse a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{id}" collapse
.panel-collapse.collapse.in id="collapse#{id}" role="tabpanel" .panel-collapse.collapse id="collapse#{id}" role="tabpanel"
.panel-body .panel-body
.clearfix = link_to(t('shared.destroy'), '#', class:'btn btn-warning btn-sm discard-file pull-right') .clearfix = link_to(t('shared.destroy'), '#', class:'btn btn-warning btn-sm discard-file pull-right')
.form-group .form-group

4
app/views/exercises/show.html.slim
View File

@ -23,13 +23,13 @@ h1
h2 = t('activerecord.attributes.exercise.files') h2 = t('activerecord.attributes.exercise.files')
ul.list-unstyled.panel-group#files ul.list-unstyled.panel-group#files
- @exercise.files.each do |file| - @exercise.files.order('name').each do |file|
li.panel.panel-default li.panel.panel-default
.panel-heading role="tab" id="heading" .panel-heading role="tab" id="heading"
div.clearfix role="button" div.clearfix role="button"
span.panel-title = file.name_with_extension span.panel-title = file.name_with_extension
a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{file.id}" collapse a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{file.id}" collapse
.panel-collapse.collapse.in id="collapse#{file.id}" role="tabpanel" .panel-collapse.collapse id="collapse#{file.id}" role="tabpanel"
.panel-body .panel-body
- if policy(file).destroy? - if policy(file).destroy?
.clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm pull-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete) .clearfix = link_to(t('shared.destroy'), file, class:'btn btn-warning btn-sm pull-right', data: {confirm: t('shared.confirm_destroy')}, method: :delete)