add nav buttons to 'open' page too and apply colors everywhere

rest/pyapi.py

@@ -42,7 +42,7 @@ def clip():
 
         response.content_type = 'text/html; charset=utf-8'
         form = template(
-            'clip-form',
+            'form-clip',
             action='/clip',
             method='post',
             content=content,
@@ -65,7 +65,7 @@ def clip():
 
         response.content_type = 'text/html; charset=utf-8'
         form = template(
-            'clip-form',
+            'form-clip',
             action='/clip',
             method='post',
             content=content,
@@ -127,7 +127,7 @@ def upload():
         link = f'{LOCATION}/upload/{_hash}' if _hash else f'{LOCATION}/upload'
         response.content_type = 'text/html; charset=utf-8'
         disabled = True if _hash else False
-        form = template('file-form', action='/upload', method='post', disabled=disabled)
+        form = template('form-upload', action='/upload', method='post', disabled=disabled)
         
         return template(
             'upload',
@@ -191,7 +191,7 @@ def goto():
         disabled = True if content else False
         response.content_type = 'text/html; charset=utf-8'
         form = template(
-            'goto-form',
+            'form-goto',
             action='/goto',
             method='post',
             content=content,

rest/templates/button-common.tpl

@@ -0,0 +1,3 @@
+% open_disabled = setdefault('open_disabled', False) and 'disabled="true"' or ''
+<button class="button-resize pure-button" type="submit" form="open" {{!open_disabled}}> Open </button>
+<button class="button-resize pure-button" type="submit" form="new"> New </button>

rest/templates/buttongroup-clip.tpl

@@ -0,0 +1,7 @@
+% include('button-style')
+<div class="pure-button-group" role="action" style="padding: 1em 0 0;">
+  % include('button-common')
+  <button class="button-resize pure-button" type="submit" form="copy"> Edit as New </button>
+  <button class="button-resize pure-button" type="submit" form="paste" {{!disabled}}> Paste </button>
+  <button class="button-resize pure-button" type="submit" form="download" {{!download_disabled}}> Download </button>
+</div>

rest/templates/buttongroup-common.tpl

@@ -0,0 +1,5 @@
+% include('button-style')
+% setdefault('open_disabled', True) and 'disabled="true"' or ''
+<div class="pure-button-group" role="action" style="padding: 1em 0 0;">
+  % include('button-common')
+</div>

rest/templates/buttongroup-goto.tpl

@@ -0,0 +1,5 @@
+% include('button-style')
+<div class="pure-button-group" role="action" style="padding: 1em 0 0;">
+  % include('button-common')
+  <button class="button-resize pure-button" type="submit" form="goto" {{!disabled}}> Shrtn It! </button>
+</div>

rest/templates/buttongroup-upload.tpl

@@ -0,0 +1,6 @@
+% include('button-style')
+<div class="pure-button-group" role="action" style="padding: 1em 0 0;">
+  % include('button-common')
+  <button class="button-resize pure-button" type="submit" form="upload" {{!disabled}}> Upload </button>
+  <button class="button-resize pure-button" type="submit" form="download" {{!download_disabled}}> Download </button>
+</div>

rest/templates/clip-form.tpl → rest/templates/form-clip.tpl

@@ -35,5 +35,4 @@ textarea::-webkit-scrollbar-thumb {
   <input id="copy-paste" name="paste" type="text" value="{{ content }}" hidden="true" />
   <input id="copy" name="copy" type="text" value="true" hidden="true" />
 </form>
-<form id="new" method="get" action="{{ action }}"></form>
-<form id="open" method="get" action="{{ action }}/open"></form>
+% include('form-common')

rest/templates/form-common.tpl

@@ -0,0 +1,2 @@
+<form id="new" method="get" action="{{ action }}"></form>
+<form id="open" method="get" action="{{ action }}/open"></form>

rest/templates/goto-form.tpl → rest/templates/form-goto.tpl

@@ -31,5 +31,4 @@ input[type="url"]::-webkit-scrollbar-thumb {
     value="{{ content }}"
   ></input>
 </form>
-<form id="new" method="get" action="{{ action }}"></form>
-<form id="open" method="get" action="{{ action }}/open"></form>
+% include('form-common')

rest/templates/form-open.tpl

@@ -1,3 +1,4 @@
+% from rest.tool_color import color
 <!DOCTYPE html>
 <html>
   <head>
@@ -33,17 +34,18 @@ form {
 }
     </style>
     <title>{{tool.title()}}</title>
+    <link rel="manifest" href="/static/{{tool}}-manifest.json"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/purecss@2.1.0/build/pure-min.css" integrity="sha384-yHIFVG6ClnONEA5yB5DJXfW2/KC173DIQrYoZMEtBvGzmf0PKiGyNEqe9N6BNDBH" crossorigin="anonymous"/>
     <link rel="stylesheet" href="https://shandan.one/css/grids-responsive-min.css"/>
     <link rel="stylesheet" href="https://shandan.one/css/responsive-visibility-collapse.css"/>
   </head>
-  <body align="center" style="text-align: center">
-      % include('button-style')
+  <body style="text-align: center">
+      % include(f'buttongroup-common')
       <form id="{{tool}}-open" action="{{action}}" method="{{method}}">
         <label for="{{tool}}-code">
           <span hidden="true">Enter&nbs;</span>
-          <span>{{tool.title()}}</span>
+          <span style="color: {{ color[tool] }}">{{tool.title()}}</span>
           <span hidden="true">&nbs;Code</span></span>
         </label>
         <input
@@ -58,7 +60,8 @@ form {
           style="margin: 0.1em 0 0.3em"
           autofocus="true"
         ></input>
-        <button class="button-resize pure-button" type="submit" form="{{tool}}-open"> Open </button>
+        <button class="button-resize pure-button" type="submit" form="{{tool}}-open"> Submit </button>
     </form>
+    % include('form-common')
   </body>
-</html>
+</html>

rest/templates/file-form.tpl → rest/templates/form-upload.tpl

@@ -3,5 +3,4 @@
 <form id="upload" method="{{ method }}" action="{{ action }}" enctype="multipart/form-data">
   <input type="file" name="paste" required="true" {{disabled}} />
 </form>
-<form id="new" method="get" action="{{ action }}"></form>
-<form id="open" method="get" action="{{ action }}/open"></form>
+% include('form-common')

rest/templates/goto.tpl

@@ -1,3 +1,4 @@
+% from rest.tool_color import color
 % link = setdefault("link", "") or ""
 % disabled = setdefault("disabled", "") and 'disabled="true"'
 % preview = setdefault("preview", None)
@@ -29,16 +30,11 @@ img {
   </head>
   <body align="center" style="text-align: center">
     <div class="pure-g">
-      % include('button-style')
       <div class="pure-u-1">
-        <div class="pure-button-group" role="action" style="padding: 1em 0 0;">
-          <button class="button-resize pure-button" type="submit" form="open"> Open </button>
-          <button class="button-resize pure-button" type="submit" form="new"> New </button>
-          <button class="button-resize pure-button" type="submit" form="goto" {{!disabled}}> Shrtn It! </button>
-        </div>
+        % include('buttongroup-goto')
       </div>
       <div class="pure-u-1">
-        <div class="pure-button" style="margin: 1em 0 0; background: #8f4f4f">
+        <div class="pure-button" style="margin: 1em 0 0; background: {{ color['goto'] }}">
           <a href="{{!link}}" style="color: floralwhite;">{{ link }}</a>
         </div>
       </div>

rest/templates/paste.tpl

@@ -1,3 +1,4 @@
+% from rest.tool_color import color
 % link = setdefault("link", "") or ""
 % disabled = setdefault("disabled", "") and 'disabled="true"'
 % download = setdefault("download", "") or ""
@@ -30,18 +31,11 @@ img {
   </head>
   <body align="center" style="text-align: center">
     <div class="pure-g">
-      % include('button-style')
       <div class="pure-u-1">
-        <div class="pure-button-group" role="action" style="padding: 1em 0 0;">
-          <button class="button-resize pure-button" type="submit" form="open"> Open </button>
-          <button class="button-resize pure-button" type="submit" form="new"> New </button>
-          <button class="button-resize pure-button" type="submit" form="copy"> Edit as New </button>
-          <button class="button-resize pure-button" type="submit" form="paste" {{!disabled}}> Paste </button>
-          <button class="button-resize pure-button" type="submit" form="download" {{!download_disabled}}> Download </button>
-        </div>
+        % include('buttongroup-clip')
       </div>
       <div class="pure-u-1">
-        <div class="pure-button" style="margin: 1em 0 0; background: #4f8f4f;">
+        <div class="pure-button" style="margin: 1em 0 0; background: {{ color['clip'] }};">
           <a href="{{!link}}" style="color: floralwhite;">{{ link }}</a>
         </div>
       </div>

rest/templates/upload.tpl

@@ -1,3 +1,4 @@
+% from rest.tool_color import color
 % link = setdefault("link", "") or ""
 % disabled = setdefault("disabled", "") and 'disabled="true"'
 % download_disabled = "" if disabled else 'disabled="true"'
@@ -43,17 +44,11 @@ object.text {
   </head>
   <body align="center" style="text-align: center">
     <div class="pure-g">
-      % include('button-style')
       <div class="pure-u-1">
-        <div class="pure-button-group" role="action" style="padding: 1em 0 0;">
-          <button class="button-resize pure-button" type="submit" form="open"> Open </button>
-          <button class="button-resize pure-button" type="submit" form="new"> New </button>
-          <button class="button-resize pure-button" type="submit" form="upload" {{!disabled}}> Upload </button>
-          <button class="button-resize pure-button" type="submit" form="download" {{!download_disabled}}> Download </button>
-        </div>
+        % include('buttongroup-upload')
       </div>
       <div class="pure-u-1">
-        <div class="pure-button" style="margin: 1em 0 0; background: #afaf0f;">
+        <div class="pure-button" style="margin: 1em 0 0; background: {{ color['upload'] }};">
           <a href="{{link}}" style="color: floralwhite;">{{ link }}</a>
         </div>
       </div>

rest/tool_color.py

@@ -0,0 +1,5 @@
+color = {
+    'clip': '#4f8f4f',
+    'goto': '#8f4f4f',
+    'upload': '#afaf0f',
+}