Skip to content

Commit

Permalink
[course_admin/templates] Improve responsiveness (#786)
Browse files Browse the repository at this point in the history 
* Responsive tables

* Update less file with new rule
  • Loading branch information
@Drumor
Drumor committed Mar 18, 2022
1 parent 1c34146 commit 59f51db
Show file tree
Hide file tree
Showing 8 changed files with 353 additions and 331 deletions.
5 changes: 5 additions & 0 deletions inginious/frontend/static/css/INGInious.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@ body {
transform: rotate(90deg);
}
}
@media (max-width: 700px){
h2{
font-size:20px;
}
}
@media (max-width: 991.98px) and (min-width: 600px) {
body.sidebar-state-0 #inginious-sidebar-toggle i {
transform: rotate(0deg);
Expand Down
5 changes: 5 additions & 0 deletions inginious/frontend/static/css/common.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,11 @@ body {
.inginious-sidebar-open()
}
}
@media (max-width: 700px){
h2{
font-size:20px;
}
}

#inginious-logo {
display: block;
Expand Down
102 changes: 52 additions & 50 deletions inginious/frontend/templates/course_admin/edit_tabs/files.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,59 @@
{% endif %}

<input type="file" name="file" id="file" style="display: none;">
<table class="table table-bordered table-sm">
<thead class="table-borderless">
<th class="col-sm-8">{{_("Path")}}</th>
<th class="col-sm-1">{{_("Download")}}</th>
<th class="col-sm-1">{{_("Edit")}}</th>
<th class="col-sm-1">{{_("Move")}}</th>
<th class="col-sm-1">{{_("Delete")}}</th>
</thead>
<tr>
<td><i class="fa fa-folder-open"></i>&nbsp;/</td>
<td><a href="{{get_homepath()}}/admin/{{course.get_id()}}/edit/task/{{taskid}}/files?action=download&path=/"
onclick="studio_task_edit_downloadfile('/'); return false;" class="btn btn-sm btn-primary btn-block" title="{{ _('Download') }}"><i
class="fa fa-cloud-download"></i></a></td>
<td></td>
<td></td>
<td></td>
</tr>
{% for level, is_directory, name, complete_name in file_list %}
<tr data-x-path="{{ complete_name }}">
<td>
{% for i in range(level+1) %}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{% endfor %}
{% if is_directory %}<i class="fa fa-folder-open"></i>&nbsp;{%endif %}
{{ name }}
</td>
<td>
<a href="{{ get_homepath() }}/admin/{{ course.get_id() }}/edit/task/{{ taskid }}/files?action=download&path={{ complete_name }}"
class="btn btn-sm btn-primary btn-block" title="{{ _('Download') }}"><i class="fa fa-cloud-download"></i></a>
</td>
<td>
{% if not is_directory %}
<a href="#" onclick="studio_task_file_open_tab('{{complete_name}}'); return false;" class="btn btn-sm btn-warning btn-block"
title="{{ _('Edit') }}"><i class="fa fa-edit"></i></a>
{% endif %}
</td>
<td>
<a href="#" onclick="studio_task_file_rename('{{complete_name}}'); return false;" class="btn btn-sm btn-info btn-block"
title="{{ _('Move/Rename') }}"><i class="fa fa-exchange"></i></a>
</td>
<td>
<a href="#" onclick="studio_task_file_delete('{{complete_name}}'); return false;" class="btn btn-sm btn-danger btn-block"
title="{{ _('Delete') }}"><i class="fa fa-trash"></i></a>
</td>
<div style="overflow-x:auto;">
<table class="table table-bordered table-sm">
<thead class="table-borderless">
<th class="col-sm-8">{{_("Path")}}</th>
<th class="col-sm-1">{{_("Download")}}</th>
<th class="col-sm-1">{{_("Edit")}}</th>
<th class="col-sm-1">{{_("Move")}}</th>
<th class="col-sm-1">{{_("Delete")}}</th>
</thead>
<tr>
<td><i class="fa fa-folder-open"></i>&nbsp;/</td>
<td><a href="{{get_homepath()}}/admin/{{course.get_id()}}/edit/task/{{taskid}}/files?action=download&path=/"
onclick="studio_task_edit_downloadfile('/'); return false;" class="btn btn-sm btn-primary btn-block" title="{{ _('Download') }}"><i
class="fa fa-cloud-download"></i></a></td>
<td></td>
<td></td>
<td></td>
</tr>
{% endfor %}
<tr>
<th colspan="5" style="text-align:right">
<a href="#" onclick="studio_task_file_create(); return false;" class="btn btn-sm btn-info">{{ _("Create a new file") }}</a>
<a href="#" onclick="$('#modal_file_upload').modal('show'); return false;" class="btn btn-sm btn-info">{{ _("Upload a file") }}</a>
</th>
</tr>
</table>
{% for level, is_directory, name, complete_name in file_list %}
<tr data-x-path="{{ complete_name }}">
<td>
{% for i in range(level+1) %}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{% endfor %}
{% if is_directory %}<i class="fa fa-folder-open"></i>&nbsp;{%endif %}
{{ name }}
</td>
<td>
<a href="{{ get_homepath() }}/admin/{{ course.get_id() }}/edit/task/{{ taskid }}/files?action=download&path={{ complete_name }}"
class="btn btn-sm btn-primary btn-block" title="{{ _('Download') }}"><i class="fa fa-cloud-download"></i></a>
</td>
<td>
{% if not is_directory %}
<a href="#" onclick="studio_task_file_open_tab('{{complete_name}}'); return false;" class="btn btn-sm btn-warning btn-block"
title="{{ _('Edit') }}"><i class="fa fa-edit"></i></a>
{% endif %}
</td>
<td>
<a href="#" onclick="studio_task_file_rename('{{complete_name}}'); return false;" class="btn btn-sm btn-info btn-block"
title="{{ _('Move/Rename') }}"><i class="fa fa-exchange"></i></a>
</td>
<td>
<a href="#" onclick="studio_task_file_delete('{{complete_name}}'); return false;" class="btn btn-sm btn-danger btn-block"
title="{{ _('Delete') }}"><i class="fa fa-trash"></i></a>
</td>
</tr>
{% endfor %}
<tr>
<th colspan="5" style="text-align:right">
<a href="#" onclick="studio_task_file_create(); return false;" class="btn btn-sm btn-info">{{ _("Create a new file") }}</a>
<a href="#" onclick="$('#modal_file_upload').modal('show'); return false;" class="btn btn-sm btn-info">{{ _("Upload a file") }}</a>
</th>
</tr>
</table>
</div>
<script>
drag_drop_handler();
</script>
Expand Down
71 changes: 37 additions & 34 deletions inginious/frontend/templates/course_admin/stats.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,42 +47,45 @@ <h2>{{_("Statistics")}}</h2>
<div class="tab-content">
<div role="tabpanel" class="card-body tab-pane active" id="tab_progress">
<h3>{{ _("Tasks") }}</h3>
<table class="table">
<tr>
<th>{{_("task name")}}</th>
<th>{{_("# student viewed")}}</th>
<th>{{_("# student attempted")}}</th>
<th>{{_("# student succeeded")}}</th>
<th>{{_("# attempts")}}</th>
<th>
<div class="btn-group btn-group-sm" role="group">
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/stats?progress_csv" class="btn btn-info"
title="{{_('Download CSV') }}" data-toggle="tooltip" data-placement="bottom"><i
class="fa fa-table"></i></a>
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/submissions"
class="btn btn-secondary" title="{{ _('View all submissions') }}" data-toggle="tooltip"
data-placement="bottom"><i class="fa fa-files-o"></i></a>
</div>
</th>
</tr>
{% for taskid in stats_progress %}
<tr>
<td>
{{ stats_progress[taskid]["name"] }}
<input type="hidden" name="task" value="{{taskid}}">
</td>
<td>{{stats_progress[taskid]["viewed"]}}</td>
<td>{{stats_progress[taskid]["attempted"]}}</td>
<td>{{stats_progress[taskid]["succeeded"]}}</td>
<td>{{stats_progress[taskid]["attempts"]}}</td>
<td style="min-width:120px">
<div style="overflow-x:auto;">
<table class="table">
<tr>
<th>{{_("task name")}}</th>
<th>{{_("# student viewed")}}</th>
<th>{{_("# student attempted")}}</th>
<th>{{_("# student succeeded")}}</th>
<th>{{_("# attempts")}}</th>
<th>
<div class="btn-group btn-group-sm" role="group">
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/submissions{{stats_progress[taskid]['url']}}" class="btn btn-secondary" title="{{_('View submissions') }}" data-toggle="tooltip"
data-placement="bottom"><i class="fa fa-file-code-o fa-fw"></i></a>
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/stats?progress_csv" class="btn btn-info"
title="{{_('Download CSV') }}" data-toggle="tooltip" data-placement="bottom"><i
class="fa fa-table"></i></a>
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/submissions"
class="btn btn-secondary" title="{{ _('View all submissions') }}" data-toggle="tooltip"
data-placement="bottom"><i class="fa fa-files-o"></i></a>
</div>
</th>
</tr>
{% for taskid in stats_progress %}
<tr>
<td>
{{ stats_progress[taskid]["name"] }}
<input type="hidden" name="task" value="{{taskid}}">
</td>
</tr>
{% endfor %}
</table>
<td>{{stats_progress[taskid]["viewed"]}}</td>
<td>{{stats_progress[taskid]["attempted"]}}</td>
<td>{{stats_progress[taskid]["succeeded"]}}</td>
<td>{{stats_progress[taskid]["attempts"]}}</td>
<td style="min-width:120px">
<div class="btn-group btn-group-sm" role="group">
<a href="{{get_homepath()}}/admin/{{course.get_id()}}/submissions{{stats_progress[taskid]['url']}}" class="btn btn-secondary" title="{{_('View submissions') }}" data-toggle="tooltip"
data-placement="bottom"><i class="fa fa-file-code-o fa-fw"></i></a>
</div>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<div role="tabpanel" class="tab-pane card-body" id="tab_submissions">
{% with target="stats#alerts", is_stats=True %}
Expand Down

0 comments on commit 59f51db

Please sign in to comment.