From: Maciej Tronowski <mtro@man.poznan.pl>
Date: Fri, 8 May 2015 12:37:33 +0000 (+0200)
Subject: gridftp: fixed height file list
X-Git-Tag: v1.0~7
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=3fcd5546c783f266eb613af084b75c97b54b9e1c;p=qcg-portal.git

gridftp: fixed height file list
---

diff --git a/filex/static/filex/filex.js b/filex/static/filex/filex.js
index a19b354..011f47c 100644
--- a/filex/static/filex/filex.js
+++ b/filex/static/filex/filex.js
@@ -329,7 +329,7 @@ $(function(){
             this.hostSelectize = this.$('#host-selector')[0].selectize;
 
             this.render();
-	        Backbone.history.start({silent: true});
+	        Backbone.history.start();
         },
 
         render: function() {
diff --git a/filex/templates/filex/source.html b/filex/templates/filex/source.html
index 551ae51..e99cb68 100644
--- a/filex/templates/filex/source.html
+++ b/filex/templates/filex/source.html
@@ -31,30 +31,32 @@
         </div>
     </nav>
 
-    <table class="table table-hover">
-        <thead>
-            <tr>
-                <th class="text-center" style="width: 40px">
-                    <label for="select-all" class="sr-only">Wybierz wszystkie pliki</label>
-                    <input id="select-all" type="checkbox" autocomplete="off">
-                </th>
-                <th style="width: 40px"></th>
-                <th>Nazwa</th>
-                <th style="width: 120px">Rozmiar</th>
-                <th style="width: 200px">Data</th>
-            </tr>
-        </thead>
-        <tbody></tbody>
-    </table>
+    <div id="list">
+        <table class="table table-hover">
+            <thead>
+                <tr>
+                    <th class="text-center" style="width: 40px">
+                        <label for="select-all" class="sr-only">Wybierz wszystkie pliki</label>
+                        <input id="select-all" type="checkbox" autocomplete="off">
+                    </th>
+                    <th style="width: 40px"></th>
+                    <th>Nazwa</th>
+                    <th style="width: 120px">Rozmiar</th>
+                    <th style="width: 200px">Data</th>
+                </tr>
+            </thead>
+            <tbody></tbody>
+        </table>
 
-    <div id="no-items" class="alert alert-info" hidden>
-        <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-        Brak elementów
-    </div>
+        <div id="no-items" class="alert alert-info" hidden>
+            <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+            Brak elementów
+        </div>
 
-    <div id="error" class="alert alert-danger" hidden>
-        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
-        <span class="msg"></span>
+        <div id="error" class="alert alert-danger" hidden>
+            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+            <span class="msg"></span>
+        </div>
     </div>
 
     <div id="spinner-overlay"></div>
diff --git a/qcg/static/qcg/main.css b/qcg/static/qcg/main.css
index 160a15c..147ed19 100644
--- a/qcg/static/qcg/main.css
+++ b/qcg/static/qcg/main.css
@@ -84,6 +84,12 @@ textarea {
 #filex {
     /* needed for positioning spinner */
     position: relative;
+    height: 100%;
+}
+
+#list {
+    height: calc(100% - 55px);
+    overflow: auto;
 }
 
 #filex input[type=checkbox] {
diff --git a/qcg/templates/qcg/gridftp.html b/qcg/templates/qcg/gridftp.html
index 6bf6a5d..5ee519f 100644
--- a/qcg/templates/qcg/gridftp.html
+++ b/qcg/templates/qcg/gridftp.html
@@ -3,6 +3,22 @@
 
 {% block extra_css %}
     <link href="{% static 'qcg/selectize/selectize.bootstrap3.css' %}" rel="stylesheet">
+
+    <style>
+        html {
+            height: 100%;
+        }
+
+        body {
+            height: 100%;
+            margin-bottom: 0;
+        }
+
+        body > .container {
+            height: calc(100% - 122px);
+            overflow-y: hidden;
+        }
+    </style>
 {% endblock %}
 
 {% block extra_js %}
@@ -355,7 +371,7 @@
 {% endblock container %}
 
 {% block footer %}
-    <footer class="navbar navbar-default navbar-fixed-bottom" style="position:fixed">
+    <footer class="navbar navbar-default navbar-fixed-bottom">
         <div class="container">
             <div class="btn-toolbar" role="toolbar" style="float: left">
                 <div class="btn-group" role="group">
diff --git a/qcg/templates/qcg/job_submit.html b/qcg/templates/qcg/job_submit.html
index 83e9025..a9ca868 100644
--- a/qcg/templates/qcg/job_submit.html
+++ b/qcg/templates/qcg/job_submit.html
@@ -126,6 +126,7 @@
 
             $('#gridftp').one('show.bs.modal', function() {
                 filex.initialLoad();
+                $(this).find('.modal-body').css('height', window.innerHeight - 200 + 'px');
             });
 
             $('#template').on('show.bs.modal', function() {
diff --git a/qcg/templates/qcg/task.html b/qcg/templates/qcg/task.html
index 584fa63..a610ea6 100644
--- a/qcg/templates/qcg/task.html
+++ b/qcg/templates/qcg/task.html
@@ -14,6 +14,10 @@
             $('.working-dir').on('click', function() {
                 filex.load($(this).data('url'));
             });
+
+            $('#gridftp').one('show.bs.modal', function() {
+                $(this).find('.modal-body').css('height', window.innerHeight - 120 + 'px');
+            });
         });
     </script>
 {% endblock extra_js %}