X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fgridftp.html;h=6e4269d2df4d126c1e9defc846a5189e475e0f97;hb=f8b36b27d943d226437ff56c6306144f82360822;hp=9eb5cee05d9e36d95afb19fc32e3d6104de071f2;hpb=1f0f07bbb4e5a5b1cc37428e8b33897fddf279aa;p=qcg-portal.git

diff --git a/qcg/templates/qcg/gridftp.html b/qcg/templates/qcg/gridftp.html
index 9eb5cee..6e4269d 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 %}
@@ -11,7 +27,8 @@
     {% include 'filex/source.js.html' %}
 
     <script>
-        var filex = filex || {};
+        var filex = filex || {},
+            hostArchiveSupport = ['moss.man.poznan.pl', 'ui.plgrid.wcss.wroc.pl'];
 
         $(function () {
             'use strict';
@@ -54,8 +71,6 @@
 
             function conflictingName(name, modal) {
                 if (filex.files.some(function(item) { return item.get('name') == name })) {
-                    modal.find('.alert').remove();
-
                     $('<div>', {
                         'class': 'alert alert-danger',
                         html: '<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> Plik o podanej już nazwie istnieje!'
@@ -68,13 +83,14 @@
             }
 
             filex.files.on('change:checked reset', function() {
-                var selected = filex.selectedFiles().length;
+                var selected = filex.selectedFiles().length,
+                    supportsArchive = hostArchiveSupport.indexOf(filex.host) != -1;
 
                 $('#btn-rename').toggleClass('disabled', selected != 1);
                 $('#btn-delete').toggleClass('disabled', selected == 0);
-                $('#btn-compress').toggleClass('disabled', selected == 0);
+                $('#btn-compress').toggleClass('disabled', !supportsArchive || selected == 0);
 
-                if (selected == 1) {
+                if (supportsArchive && selected == 1) {
                     var filename = filex.selectedFiles()[0].get('name'),
                         is_archive = _.some(['.zip', '.tar.gz', '.tgz', '.tar.bz2', 'tbz'], function(ext) {
                             return filename.endsWith(ext);
@@ -88,8 +104,10 @@
             });
 
             $('form').on('show.bs.modal', function() {
-                console.log('reset');
+                $(this).find('.alert').remove();
                 this.reset();
+            }).on('shown.bs.modal', function() {
+                $(this).find('input[type="text"]')[0].focus();
             });
 
             $('#btn-upload').on('click', function() {
@@ -355,7 +373,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">