X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=filex%2Ftemplates%2Ffilex%2Fupload.html;h=b79d9c05b84cb7f2635c549fdc15d1c247081b78;hb=8cb1584dc8c5733aa00d3223cc2380eecac13f41;hp=bf48a9611e2f2b6715be0c2d06cdc60d40a292da;hpb=a37c1482b8b0e2d5ba549a14b94a3f8e6335d1fe;p=qcg-portal.git

diff --git a/filex/templates/filex/upload.html b/filex/templates/filex/upload.html
index bf48a96..b79d9c0 100644
--- a/filex/templates/filex/upload.html
+++ b/filex/templates/filex/upload.html
@@ -1,24 +1,53 @@
 <header class="container-fluid">
     <h3>{% block title %}Wgrywanie plików{% endblock %}</h3>
-    <p id="path"><span class="text-muted">Lokalizacja:</span> {{ host }}{{ path }}</p>
+    <p id="path"><span class="text-muted">Lokalizacja:</span> {{ host }}{{ sep }}{{ path }}</p>
 </header>
 
-<form enctype="multipart/form-data" method="post" action="{{ url }}" hidden>
-    {% csrf_token %}
-    <input id="files" type="file" name="files" multiple>
-</form>
+{% if error %}
+    <div class="container-fluid">
+        <div class="alert alert-danger">
+            <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> {{ error }}
+        </div>
+    </div>
+{% else %}
+    <form enctype="multipart/form-data" method="post" action="{{ url }}" hidden>
+        {% csrf_token %}
+        <input id="files" type="file" name="files" multiple>
+    </form>
 
-<div id="elements"></div>
+    <div id="elements"></div>
 
-<div id="drop-overlay" class="fade">Upuść pliki tutaj</div>
+    <div id="drop-overlay" class="fade">Upuść pliki tutaj</div>
 
-<footer class="navbar navbar-default navbar-fixed-bottom">
-    <div class="container-fluid">
-        <button id="btn-open" class="btn btn-default navbar-btn" onclick="$('#files').click()">Wybierz pliki</button>
-        <p class="navbar-text">lub przeciągnij je w obszar tego okna</p>
-        <div class="navbar-right">
-            <p id="status" class="navbar-text"></p>
-            <button id="btn-close" class="btn btn-default navbar-btn" onclick="window.opener.filex.reloadFiles(); window.close()">Zamknij</button>
+    <footer class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <button id="btn-open" class="btn btn-default navbar-btn" onclick="$('#files').click()">Wybierz pliki</button>
+            <p class="navbar-text">lub przeciągnij je w obszar tego okna</p>
+            <div class="navbar-right">
+                <p id="status" class="navbar-text"></p>
+                <button id="btn-close" class="btn btn-default navbar-btn" onclick="window.opener.filex.reloadFiles(); window.close()">Zamknij</button>
+            </div>
+        </div>
+    </footer>
+
+    <div id="conflict" class="modal" tabindex="-1" role="dialog" aria-labelledby="modal-label" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="modal-label">Plik już istnieje</h4>
+                </div>
+                <div class="modal-body">
+                </div>
+                <div class="modal-footer">
+                    <div class="checkbox pull-left">
+                        <label>
+                            <input id="apply-to-all" type="checkbox" autocomplete="off"> Zastosuj do wszystkich
+                        </label>
+                    </div>
+                    <button id="btn-skip" type="button" class="btn btn-default">Pomiń</button>
+                    <button id="btn-replace" type="button" class="btn btn-default">Zastąp</button>
+                </div>
+            </div>
         </div>
     </div>
-</footer>
+{% endif %}