Show the custom title in all modes

author: Micah Lee <micah@micahflee.com> 2021-04-12 18:15:51 -0400
committer: Micah Lee <micah@micahflee.com> 2021-04-12 18:15:51 -0400
commit: 1543bb38d236248f0e3676dbe57dde7256621bee (patch)
tree: 179b12c0141ed3dd42737bcef7d5a46ed248e15b /cli
parent: b5c68fa5ca63b6a592ac2cfb75179a83222d55ac (diff)
download: onionshare-1543bb38d236248f0e3676dbe57dde7256621bee.tar.gz
onionshare-1543bb38d236248f0e3676dbe57dde7256621bee.zip
7 files changed, 67 insertions, 57 deletions
diff --git a/cli/onionshare_cli/resources/templates/listing.html b/cli/onionshare_cli/resources/templates/listing.html
index 8458bb87..8e0dedf7 100644
--- a/cli/onionshare_cli/resources/templates/listing.html
+++ b/cli/onionshare_cli/resources/templates/listing.html
@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title>OnionShare</title>
+  <title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" />
@@ -14,7 +14,7 @@
   <header class="d-flex">
     <div class="logo-container">
       <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
-      <h1>OnionShare</h1>
+      <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
     </div>
   </header>
 
@@ -57,4 +57,4 @@
   </div>
 </body>
 
-</html>
+</html>
+\ No newline at end of file
diff --git a/cli/onionshare_cli/resources/templates/receive.html b/cli/onionshare_cli/resources/templates/receive.html
index 20f4bb7e..08b9623c 100644
--- a/cli/onionshare_cli/resources/templates/receive.html
+++ b/cli/onionshare_cli/resources/templates/receive.html
@@ -1,46 +1,49 @@
 <!DOCTYPE html>
 <html>
- <head>
-    <title>OnionShare</title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1"> 
-    <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
-    <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
-  </head>
-  <body>
-
-    <header class="clearfix">
-        <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
-        <h1>OnionShare</h1>
-    </header>
-
-    <div class="upload-wrapper">
-      <p><img class="logo" src="{{ static_url_path }}/img/logo_large.png" title="OnionShare"></p>
-
-      <p class="upload-header">Send Files</p>
-      <p class="upload-description">Select the files you want to send, then click "Send Files"...</p>
-
-      <div id="uploads"></div>
-
-      <div>
-        <ul id="flashes" class="flashes">
-          {% with messages = get_flashed_messages(with_categories=true) %}
-            {% if messages %}
-              {% for category, message in messages %}
-                <li class="{{ category }}">{{ message }}</li>
-              {% endfor %}
-            {% endif %}
-          {% endwith %}
-        </ul>
-      </div>
-
-      <form id="send" method="post" enctype="multipart/form-data" action="/upload">
-         <p><input type="file" id="file-select" name="file[]" multiple /></p>
-         <p><button type="submit" id="send-button" class="button">Send Files</button></p>
-      </form>
 
+<head>
+  <title>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</title>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
+  <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
+</head>
+
+<body>
+
+  <header class="clearfix">
+    <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
+    <h1>{% if title %}{{ title }}{% else %}OnionShare Dropbox{% endif %}</h1>
+  </header>
+
+  <div class="upload-wrapper">
+    <p><img class="logo" src="{{ static_url_path }}/img/logo_large.png" title="OnionShare"></p>
+
+    <p class="upload-header">Send Files</p>
+    <p class="upload-description">Select the files you want to send, then click "Send Files"...</p>
+
+    <div id="uploads"></div>
+
+    <div>
+      <ul id="flashes" class="flashes">
+        {% with messages = get_flashed_messages(with_categories=true) %}
+        {% if messages %}
+        {% for category, message in messages %}
+        <li class="{{ category }}">{{ message }}</li>
+        {% endfor %}
+        {% endif %}
+        {% endwith %}
+      </ul>
     </div>
-    <script src="{{ static_url_path }}/js/jquery-3.5.1.min.js"></script>
-    <script async src="{{ static_url_path }}/js/receive.js" id="receive-script"></script>
-  </body>
-</html>
+
+    <form id="send" method="post" enctype="multipart/form-data" action="/upload">
+      <p><input type="file" id="file-select" name="file[]" multiple /></p>
+      <p><button type="submit" id="send-button" class="button">Send Files</button></p>
+    </form>
+
+  </div>
+  <script src="{{ static_url_path }}/js/jquery-3.5.1.min.js"></script>
+  <script async src="{{ static_url_path }}/js/receive.js" id="receive-script"></script>
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/cli/onionshare_cli/resources/templates/send.html b/cli/onionshare_cli/resources/templates/send.html
index dd30bfdd..bd9bd631 100644
--- a/cli/onionshare_cli/resources/templates/send.html
+++ b/cli/onionshare_cli/resources/templates/send.html
@@ -2,9 +2,9 @@
 <html>
 
 <head>
-  <title>OnionShare</title>
+  <title>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
   <meta name="onionshare-filename" content="{{ filename }}">
@@ -16,7 +16,7 @@
   <header class="d-flex">
     <div class="logo-container">
       <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
-      <h1>OnionShare</h1>
+      <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
     </div>
     <div class="information d-flex">
       <div>Total size: <strong>{{ filesize_human }}</strong> {% if is_zipped %} (compressed){% endif %}</div>
@@ -25,10 +25,11 @@
   </header>
 
   {% if breadcrumbs %}
-      <ul class="breadcrumbs">
-        {% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li>
-      </ul>
-    {% endif %}
+  <ul class="breadcrumbs">
+    {% for breadcrumb in breadcrumbs %}<li><a href="{{ breadcrumb[1] }}">{{ breadcrumb[0] }}</a> <span
+        class="sep">&#8227;</span></li>{% endfor %}<li>{{ breadcrumbs_leaf }}</li>
+  </ul>
+  {% endif %}
 
   <div class="file-list" id="file-list">
     <div class="d-flex">
@@ -66,4 +67,4 @@
   <script async src="{{ static_url_path }}/js/send.js" charset="utf-8"></script>
 </body>
 
-</html>
+</html>
+\ No newline at end of file
diff --git a/cli/onionshare_cli/resources/templates/thankyou.html b/cli/onionshare_cli/resources/templates/thankyou.html
index aa0bc553..8e92386d 100644
--- a/cli/onionshare_cli/resources/templates/thankyou.html
+++ b/cli/onionshare_cli/resources/templates/thankyou.html
@@ -4,7 +4,7 @@
 <head>
   <title>OnionShare is closed</title>
   <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1"> 
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon">
   <link rel="stylesheet" rel="subresource" type="text/css" href="{{ static_url_path }}/css/style.css" media="all">
 </head>
@@ -12,7 +12,7 @@
 <body>
   <header class="clearfix">
     <img class="logo" src="{{ static_url_path }}/img/logo.png" title="OnionShare">
-    <h1>OnionShare</h1>
+    <h1>{% if title %}{{ title }}{% else %}OnionShare{% endif %}</h1>
   </header>
 
   <div class="info-wrapper">
@@ -24,4 +24,4 @@
   </div>
 </body>
 
-</html>
+</html>
+\ No newline at end of file
diff --git a/cli/onionshare_cli/web/receive_mode.py b/cli/onionshare_cli/web/receive_mode.py
index 46f471a8..21e83f58 100644
--- a/cli/onionshare_cli/web/receive_mode.py
+++ b/cli/onionshare_cli/web/receive_mode.py
@@ -64,7 +64,9 @@ class ReceiveModeWeb:
             self.web.add_request(self.web.REQUEST_LOAD, request.path)
             r = make_response(
                 render_template(
-                    "receive.html", static_url_path=self.web.static_url_path
+                    "receive.html",
+                    static_url_path=self.web.static_url_path,
+                    title=self.web.settings.get("general", "title"),
                 )
             )
             return self.web.add_security_headers(r)
@@ -168,6 +170,7 @@ class ReceiveModeWeb:
                             "new_body": render_template(
                                 "thankyou.html",
                                 static_url_path=self.web.static_url_path,
+                                title=self.web.settings.get("general", "title"),
                             )
                         }
                     )
@@ -176,6 +179,7 @@ class ReceiveModeWeb:
                     r = make_response(
                         render_template("thankyou.html"),
                         static_url_path=self.web.static_url_path,
+                        title=self.web.settings.get("general", "title"),
                     )
                     return self.web.add_security_headers(r)
 
diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py
index 72ba8c64..87ec5185 100644
--- a/cli/onionshare_cli/web/share_mode.py
+++ b/cli/onionshare_cli/web/share_mode.py
@@ -230,6 +230,7 @@ class ShareModeWeb(SendBaseModeWeb):
                 is_zipped=self.is_zipped,
                 static_url_path=self.web.static_url_path,
                 download_individual_files=self.download_individual_files,
+                title=self.web.settings.get("general", "title"),
             )
         )
 
diff --git a/cli/onionshare_cli/web/website_mode.py b/cli/onionshare_cli/web/website_mode.py
index 5718c9a9..6badd399 100644
--- a/cli/onionshare_cli/web/website_mode.py
+++ b/cli/onionshare_cli/web/website_mode.py
@@ -60,6 +60,7 @@ class WebsiteModeWeb(SendBaseModeWeb):
                 breadcrumbs=breadcrumbs,
                 breadcrumbs_leaf=breadcrumbs_leaf,
                 static_url_path=self.web.static_url_path,
+                title=self.web.settings.get("general", "title"),
             )
         )
author	Micah Lee <micah@micahflee.com>	2021-04-12 18:15:51 -0400
committer	Micah Lee <micah@micahflee.com>	2021-04-12 18:15:51 -0400
commit	1543bb38d236248f0e3676dbe57dde7256621bee (patch)
tree	179b12c0141ed3dd42737bcef7d5a46ed248e15b /cli
parent	b5c68fa5ca63b6a592ac2cfb75179a83222d55ac (diff)
download	onionshare-1543bb38d236248f0e3676dbe57dde7256621bee.tar.gz onionshare-1543bb38d236248f0e3676dbe57dde7256621bee.zip