From a5f92beb958125db96b519405fff66bc974c90c3 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sun, 25 Jun 2017 22:43:43 +0100
Subject: [PATCH] move templates to separate file

Former-commit-id: b466ad616c836dc08206cf0b5f706c343fc923f0
---
 _assets/templates/base.tmpl      | 86 +------------------------------
 _assets/templates/templates.tmpl | 87 ++++++++++++++++++++++++++++++++
 page.go                          |  2 +
 3 files changed, 90 insertions(+), 85 deletions(-)
 create mode 100644 _assets/templates/templates.tmpl

diff --git a/_assets/templates/base.tmpl b/_assets/templates/base.tmpl
index e72a29f6..e56cbae6 100644
--- a/_assets/templates/base.tmpl
+++ b/_assets/templates/base.tmpl
@@ -198,91 +198,7 @@
     </div>
     {{- end }}
 
-    <template id="question-template">
-        <form class="prompt">
-            <h3></h3>
-            <p></p>
-            <input autofocus type="text">
-            <div>
-                <button type="submit" autofocus class="ok">OK</button>
-                <button class="cancel" onclick="closePrompt(event);">Cancel</button>
-            </div>
-        </form>
-    </template>
-
-    <template id="info-template">
-        <div class="prompt">
-            <h3>File Information</h3>
-            <p><strong>Display Name:</strong> <span id="display_name"></span></p>
-            <p><strong>Content Length:</strong> <span id="content_length"></span> Bytes</p>
-            <p><strong>Last Modified:</strong> <span id="last_modified"></span></p>
-
-            <section class="file-only">
-                <p><strong>MD5:</strong> <code id="md5"><a href="#" onclick="getHash(event, 'md5')">show</a></code></p>
-                <p><strong>SHA1:</strong> <code id="sha1"><a href="#" onclick="getHash(event, 'sha1')">show</a></code></p>
-                <p><strong>SHA256:</strong> <code id="sha256"><a href="#" onclick="getHash(event, 'sha256')">show</a></code></p>
-                <p><strong>SHA512:</strong> <code id="sha512"><a href="#" onclick="getHash(event, 'sha512')">show</a></code></p>
-            </section>
-
-            <div>
-                <button type="submit" onclick="closePrompt(event);" class="ok">OK</button>
-            </div>
-        </div>
-    </template>
-
-    <template id="message-template">
-        <div class="prompt">
-            <h3></h3>
-            <p></p>
-            <div>
-                <button type="submit" onclick="closePrompt(event);" class="ok">OK</button>
-            </div>
-        </div>
-    </template>
-
-    <template id="move-template">
-        <form class="prompt">
-            <h3>Move</h3>
-            <p>Choose new house for your file(s)/folder(s):</p>
-
-            <div class="file-list">
-                <ul>
-                </ul>
-            </div>
-
-            <p>Currently navigating on: <code></code>.</p>
-
-            <div>
-                <button type="submit" autofocus class="ok">Move</button>
-                <button class="cancel" onclick="closePrompt(event);">Cancel</button>
-            </div>
-        </form>
-    </template>
-
-    <div class="help">
-        <h3>Help</h3>
-
-        <ul>
-            <li><strong>F1</strong> - this information</li>
-            <li><strong>F2</strong> - rename file</li>
-            <li><strong>DEL</strong> - delete selected items</li>
-            <li><strong>ESC</strong> - clear selection and/or close the prompt</li>
-            <li><strong>CTRL + S</strong> - save a file or download the directory where you are</li>
-            <li><strong>CTRL + Click</strong> - select multiple files or directories</li>
-            <li><strong>Double click</strong> - open a file or directory</li>
-            <li><strong>Click</strong> - select file or directory</li>
-        </ul>
-
-        <p>Not available yet</p>
-
-        <ul>
-            <li><strong>Alt + Click</strong> - select a group of files</li>
-        </ul>
-
-        <div>
-            <button type="submit" onclick="closeHelp(event);" class="ok">OK</button>
-        </div>
-    </div>
+    {{ template "templates" . }}
 
     <footer>Served with <a rel="noopener noreferrer" href="https://caddyserver.com">Caddy</a> and <a rel="noopener noreferrer" href="https://github.com/hacdias/caddy-filemanager">File Manager</a>.</footer>
 </body>
diff --git a/_assets/templates/templates.tmpl b/_assets/templates/templates.tmpl
new file mode 100644
index 00000000..33bbabb5
--- /dev/null
+++ b/_assets/templates/templates.tmpl
@@ -0,0 +1,87 @@
+{{ define "templates" }}
+<template id="question-template">
+    <form class="prompt">
+        <h3></h3>
+        <p></p>
+        <input autofocus type="text">
+        <div>
+            <button type="submit" autofocus class="ok">OK</button>
+            <button class="cancel" onclick="closePrompt(event);">Cancel</button>
+        </div>
+    </form>
+</template>
+
+<template id="info-template">
+    <div class="prompt">
+        <h3>File Information</h3>
+        <p><strong>Display Name:</strong> <span id="display_name"></span></p>
+        <p><strong>Content Length:</strong> <span id="content_length"></span> Bytes</p>
+        <p><strong>Last Modified:</strong> <span id="last_modified"></span></p>
+
+        <section class="file-only">
+            <p><strong>MD5:</strong> <code id="md5"><a href="#" onclick="getHash(event, 'md5')">show</a></code></p>
+            <p><strong>SHA1:</strong> <code id="sha1"><a href="#" onclick="getHash(event, 'sha1')">show</a></code></p>
+            <p><strong>SHA256:</strong> <code id="sha256"><a href="#" onclick="getHash(event, 'sha256')">show</a></code></p>
+            <p><strong>SHA512:</strong> <code id="sha512"><a href="#" onclick="getHash(event, 'sha512')">show</a></code></p>
+        </section>
+
+        <div>
+            <button type="submit" onclick="closePrompt(event);" class="ok">OK</button>
+        </div>
+    </div>
+</template>
+
+<template id="message-template">
+    <div class="prompt">
+        <h3></h3>
+        <p></p>
+        <div>
+            <button type="submit" onclick="closePrompt(event);" class="ok">OK</button>
+        </div>
+    </div>
+</template>
+
+<template id="move-template">
+    <form class="prompt">
+        <h3>Move</h3>
+        <p>Choose new house for your file(s)/folder(s):</p>
+
+        <div class="file-list">
+            <ul>
+            </ul>
+        </div>
+
+        <p>Currently navigating on: <code></code>.</p>
+
+        <div>
+            <button type="submit" autofocus class="ok">Move</button>
+            <button class="cancel" onclick="closePrompt(event);">Cancel</button>
+        </div>
+    </form>
+</template>
+
+<div class="help">
+    <h3>Help</h3>
+
+    <ul>
+        <li><strong>F1</strong> - this information</li>
+        <li><strong>F2</strong> - rename file</li>
+        <li><strong>DEL</strong> - delete selected items</li>
+        <li><strong>ESC</strong> - clear selection and/or close the prompt</li>
+        <li><strong>CTRL + S</strong> - save a file or download the directory where you are</li>
+        <li><strong>CTRL + Click</strong> - select multiple files or directories</li>
+        <li><strong>Double click</strong> - open a file or directory</li>
+        <li><strong>Click</strong> - select file or directory</li>
+    </ul>
+
+    <p>Not available yet</p>
+
+    <ul>
+        <li><strong>Alt + Click</strong> - select a group of files</li>
+    </ul>
+
+    <div>
+        <button type="submit" onclick="closeHelp(event);" class="ok">OK</button>
+    </div>
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/page.go b/page.go
index 6a2f0fcc..dec7a0a3 100644
--- a/page.go
+++ b/page.go
@@ -103,6 +103,8 @@ func (p page) PreviousLink() string {
 
 // PrintAsHTML formats the page in HTML and executes the template
 func (p page) PrintAsHTML(w http.ResponseWriter, m *FileManager, templates ...string) (int, error) {
+	templates = append(templates, "templates")
+
 	if p.minimal {
 		templates = append(templates, "minimal")
 	} else {