Skip to content

Commit 3601c29

Browse files
committed
fix #1505
1 parent 6b3c252 commit 3601c29

File tree

9 files changed

+430
-267
lines changed

9 files changed

+430
-267
lines changed

qiita_pet/static/css/style.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
div.qiita-main {
2+
position: relative;
3+
height: 100%;
4+
width: 100%;
5+
}
6+
7+
#qiita-processing {
8+
position: absolute;
9+
height: 100%;
10+
width: 0%;
11+
right: 0;
12+
top: 0;
13+
}
14+
115
#template-content{
216
padding: 10px;
317
height: 100%;

qiita_pet/static/js/qiita.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ function show_hide(div) {
4040
$('#' + div).toggle();
4141
}
4242

43-
4443
function delete_analysis(aname, analysis_id) {
4544
if (confirm('Are you sure you want to delete analysis: ' + aname + '?')) {
4645
var form = $("<form>")
@@ -58,3 +57,15 @@ function delete_analysis(aname, analysis_id) {
5857
form.submit();
5958
}
6059
}
60+
61+
function show_hide_process_list() {
62+
if ($("#qiita-main").width() == $("#qiita-main").parent().width()) {
63+
$("#qiita-main").width("76%");
64+
$("#qiita-processing").width("24%");
65+
$("#qiita-processing").show();
66+
} else {
67+
$("#qiita-main").width("100%");
68+
$("#qiita-processing").width("0%");
69+
$("#qiita-processing").hide();
70+
}
71+
}

qiita_pet/static/vendor/js/vue.min.js

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

qiita_pet/templates/admin_approval.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{% extends sitebase.html %}
22
{% block head %}
3-
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery.dataTables.css" type="text/css">
4-
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.min.js" type="text/javascript"></script>
53

64
<script type="text/javascript">
75
$(document).ready(function() {

qiita_pet/templates/error_log.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
{% from future.utils import viewitems %}
44
{% from qiita_core.qiita_settings import qiita_config %}
55

6-
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery.dataTables.css" type="text/css">
7-
8-
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.min.js"></script>
9-
106
<script type="text/javascript">
117
$(document).ready(function() {
128
$('#error-table').dataTable({"order": [[1, "asc"]]});

qiita_pet/templates/list_studies.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
cursor: pointer;
1616
}
1717
</style>
18-
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.min.js"></script>
19-
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.plugin.natural.js"></script>
2018
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/moi.js"></script>
2119
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/select2.min.js"></script>
2220
<script src="{% raw qiita_config.portal_dir %}/static/js/sharing.js"></script>
@@ -302,6 +300,8 @@ <h3 class="gray-msg">Other Studies</h3>
302300
</tr>
303301
</thead>
304302
</table>
303+
</div>
304+
</div>
305305
<!--Abstract Modal-->
306306
<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" id="study-abstract-modal">
307307
<div class="modal-dialog modal-med">

qiita_pet/templates/portals_edit.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{% extends sitebase.html%}
22

33
{%block head%}
4-
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery.dataTables.css" type="text/css">
54
<style type="text/css">
65
.navlist li
76
{
@@ -19,7 +18,6 @@
1918
white-space: nowrap;
2019
}
2120
</style>
22-
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.min.js"></script>
2321
<script type="text/javascript">
2422
function check_submit(action) {
2523
//disable submit buttons

0 commit comments

Comments
 (0)