Do not open a new tab for file downloads

[perso/Immae/Projets/Nodejs/Surfer.git] / frontend / index.html
diff --git a/frontend/index.html b/frontend/index.html

index cbbd85e75460d62d37bbcd2023651ccb501ea200..a6d0eb007ed63d0582e5f0ba702b49b7192f98bb 100644 (file)
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -9,7 +9,7 @@
      <link href="/_admin/img/logo.png" rel="icon" type="image/png">
  
  </head>
-<body id="app">
+<body id="app" @drop="drop" @dragover="dragOver">
  
      <nav class="navbar navbar-default" v-cloak>
          <div class="container-fluid">
@@ -99,16 +99,6 @@
          </div>
      </div>
  
-    <div class="container" v-show="busy" v-cloak>
-        <div class="row">
-            <div class="col-lg-12">
-                <center>
-                    <i class="fa fa-refresh fa-4x fa-spin"></i>
-                </center>
-            </div>
-        </div>
-    </div>
-
      <div class="container" v-show="uploadStatus.busy" v-cloak>
          <div class="row">
              <div class="col-lg-12">
@@ -142,7 +132,7 @@
          </div>
      </div>
  
-    <div class="container main" v-show="session.valid && !busy" v-cloak>
+    <div class="container main" v-show="session.valid" v-cloak>
          <div class="row">
              <div class="col-lg-12">
                  <center v-show="!uploadStatus.busy">
@@ -162,7 +152,14 @@
                      <button class="btn btn-default btn-sm pull-right" v-on:click="createDirectoryAsk()">Create Folder</button>
                  </ol>
              </div>
-            <div class="col-lg-12">
+            <div class="col-lg-12" v-show="busy">
+                <br/>
+                <br/>
+                <center>
+                    <i class="fa fa-refresh fa-4x fa-spin"></i>
+                </center>
+            </div>
+            <div class="col-lg-12" v-show="!busy">
                  <table class="table table-hover table-condensed">
                      <thead>
                          <tr>
@@ -175,7 +172,7 @@
                      </thead>
                      <tbody>
                          <tr v-show="entries.length === 0">
-                            <th><i>Empty folder</i></th>
+                            <th colspan="5"><i>Empty folder</i></th>
                          </tr>
                          <tr v-for="entry in entries" v-on:click="open(entry)" class="hand">
                              <th>
@@ -186,6 +183,7 @@
                              <th><span v-my-tooltip="foobar" data-toggle="tooltip" title="{{ entry.mtime }}">{{ entry.mtime | prettyDate }}</span></th>
                              <th style="text-align: right;">
                                  <span class="entry-toolbar">
+                                    <button class="btn btn-sm btn-default" v-on:click.stop="download(entry)" title="Download" v-show="entry.isFile"><i class="fa fa-download"></i></button>
                                      <button class="btn btn-sm btn-default" v-on:click.stop="renameAsk(entry)" title="Rename"><i class="fa fa-pencil"></i></button>
                                      <button class="btn btn-sm btn-danger" v-on:click.stop="delAsk(entry)" title="Delete"><i class="fa fa-trash"></i></button>
                                  </span>