1 سال پیش · e3b6ae9835
--- a/rest/templates/button-common.tpl
+++ b/rest/templates/button-common.tpl
@@ -1,3 +1,2 @@
 
				-% 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>
			
 
				+% include('button-new')
			
 
				+<button class="button-resize pure-button" type="submit" form="open"> Open </button>
			
--- a/rest/templates/button-new.tpl
+++ b/rest/templates/button-new.tpl
@@ -0,0 +1,6 @@
 
				+% from rest.tool_color import color
			
 
				+% setdefault('tool', None)
			
 
				+% color = color.get(tool, None)
			
 
				+% label = "New" if not tool else f"New {tool.title()}"
			
 
				+% style = f'style="background-color: {color}"' if color else ''
			
 
				+<button class="button-resize pure-button" type="submit" form="new" {{!style}}>{{ label }}</button>
			
--- a/rest/templates/buttongroup-common.tpl
+++ b/rest/templates/buttongroup-common.tpl
@@ -1,5 +0,0 @@
 
				-% 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>
			
--- a/rest/templates/form-common.tpl
+++ b/rest/templates/form-common.tpl
@@ -1,2 +1,2 @@
 
				-<form id="new" method="get" action="{{ action }}"></form>
			
 
				+% include('form-new')
			
 
				 <form id="open" method="get" action="{{ action }}/open"></form>
			
--- a/rest/templates/form-new.tpl
+++ b/rest/templates/form-new.tpl
@@ -0,0 +1 @@
 
				+<form id="new" method="get" action="{{ action }}"></form>
			
--- a/rest/templates/form-open.tpl
+++ b/rest/templates/form-open.tpl
@@ -41,13 +41,9 @@ form {
 
				     <link rel="stylesheet" href="https://shandan.one/css/responsive-visibility-collapse.css"/>
			
 
				   </head>
			
 
				   <body style="text-align: center">
			
 
				-      % include(f'buttongroup-common')
			
 
				+      % include('form-new')
			
 
				       <form id="{{tool}}-open" action="{{action}}" method="{{method}}">
			
 
				-        <label for="{{tool}}-code">
			
 
				-          <span hidden="true">Enter&nbs;</span>
			
 
				-          <span style="color: {{ color[tool] }}">{{tool.title()}}</span>
			
 
				-          <span hidden="true">&nbs;Code</span></span>
			
 
				-        </label>
			
 
				+        % include(f'button-new')
			
 
				         <input
			
 
				           type="text"
			
 
				           id="{{tool}}-code"
			
@@ -57,11 +53,10 @@ form {
 
				           pattern="[A-TV-Za-tv-z0-9]{1,5}"
			
 
				           title="Base32 Code: Any of letters A-Z (excluding U) or digits 0-9.&#10;&#10;Note: O 0 and i I l L 1 can be used interchangeably"
			
 
				           size="5"
			
 
				-          style="margin: 0.1em 0 0.3em"
			
 
				+          style="margin: 0.3em 0 0.3em"
			
 
				           autofocus="true"
			
 
				         ></input>
			
 
				         <button class="button-resize pure-button" type="submit" form="{{tool}}-open"> Submit </button>
			
 
				     </form>
			
 
				-    % include('form-common')
			
 
				   </body>
			
 
				 </html>
		`@@ -0,0 +1 @@`
		`+<form id="new" method="get" action="{{ action }}"></form>`