Bläddra i källkod

colorize submit button and tidy up

Pi 4 månader sedan
förälder
incheckning
907b04ddda

+ 1 - 6
util-sqlpage/clip/Index.sql

@@ -1,12 +1,7 @@
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties;
-SET hash = CASE $hash = ''
-  WHEN TRUE THEN NULL
-  ELSE $hash
-END;
-SET content = $paste;
 SET inner = CASE COALESCE($content,'') <> '' AND COALESCE($action, '') = 'Paste'
   WHEN TRUE THEN 'clip/save.sql'
-  ELSE CASE $hash IS NULL
+  ELSE CASE COALESCE($hash,'') = ''
     WHEN TRUE THEN 'sqlpage/Link.sql'
     ELSE 'sqlpage/link.sql'
   END

+ 5 - 4
util-sqlpage/clip/form.sql

@@ -19,25 +19,26 @@ SELECT 'Download' AS title
 
 SELECT 'form' AS component
 , '/clip.sql' AS action
-, '' AS validate
+, CASE $view WHEN TRUE THEN 'Edit as New' ELSE 'Paste' END AS validate
+, $tabler_color AS validate_color
 , 'post' AS method
 ;
 SELECT 'Paste' AS value
 , '' AS label
 , 1 AS width
-, 'submit' type
+, 'hidden' type
 , 'action' AS name
 WHERE NOT $view
 ;
 SELECT 'Edit as New' AS value
 , '' AS label
 , 2 AS width
-, 'submit' type
+, 'hidden' type
 , 'action' AS name
 WHERE $view
 ;
 SELECT 'Paste something here...' AS placeholder
-, 'paste' AS name
+, 'content' AS name
 , CASE $view WHEN FALSE THEN 'textarea' ELSE 'hidden' END AS type
 , '' AS label
 --, $view AS disabled

+ 1 - 1
util-sqlpage/goto/Index.sql

@@ -1,7 +1,7 @@
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties;
 SET inner = CASE COALESCE($content,'') <> '' AND COALESCE($action, '') = 'Shrtn It!'
   WHEN TRUE THEN 'goto/save.sql'
-  ELSE CASE $hash IS NULL
+  ELSE CASE COALESCE($hash,'') = ''
     WHEN TRUE THEN 'sqlpage/Link.sql'
     ELSE 'sqlpage/link.sql'
   END

+ 5 - 5
util-sqlpage/goto/form.sql

@@ -14,15 +14,15 @@ SELECT 'New' AS title
 
 SELECT 'form' AS component
 , '/goto.sql' AS action
-, '' AS validate
+, 'Shrtn It!' AS validate
+, $tabler_color AS validate_color
 , 'post' AS method
 WHERE NOT $view
 ;
-SELECT 'Shrtn It!' AS value
+SELECT 'action' AS name
 , '' AS label
-, 1 AS width
-, 'submit' type
-, 'action' AS name
+, 'hidden' AS type
+, 'Shrtn It!' AS value
 WHERE NOT $view
 ;
 SELECT 'content' AS name

+ 1 - 1
util-sqlpage/upload/Index.sql

@@ -2,7 +2,7 @@ SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS propertie
 SET content = $upload;
 SET inner = CASE COALESCE($content,'') <> '' AND COALESCE($action, '') = 'Upload'
   WHEN TRUE THEN 'upload/save.sql'
-  ELSE CASE $hash IS NULL
+  ELSE CASE COALESCE($hash,'') = ''
     WHEN TRUE THEN 'sqlpage/Link.sql'
     ELSE 'sqlpage/link.sql'
   END

+ 0 - 5
util-sqlpage/upload/download.sql

@@ -1,5 +0,0 @@
-SET content = (SELECT content FROM clip WHERE hash = $hash);
-SELECT 'shell-empty' AS component;
-SELECT 'text' AS component
-, $content AS html
-;

+ 6 - 6
util-sqlpage/upload/form.sql

@@ -9,29 +9,29 @@ SELECT 'Open' AS title
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, 'https://shandan.one/upload.sql?' AS link
+, '/upload.sql?' AS link
 ;
 SELECT 'Download' AS title
 , 2 AS width
 , 'gray-500' AS color
-, 'https://shandan.one/upload/download.sql?hash='||$hash AS link
+, '/upload/download.sql?hash='||$hash AS link
 ;
 
 SELECT 'form' AS component
 , '/upload.sql' AS action
-, '' AS validate
+, 'Upload' AS validate
 , 'post' AS method
+, $tabler_color AS validate_color
 WHERE NOT $view
 ;
 SELECT 'Upload' AS value
 , '' AS label
-, 1 AS width
-, 'submit' type
+, 'hidden' AS type
 , 'action' AS name
 WHERE NOT $view
 ;
 SELECT 'content' AS name
-, CASE $view WHEN FALSE THEN 'type' ELSE 'hidden' END AS type
+, CASE $view WHEN FALSE THEN 'file' ELSE 'hidden' END AS type
 , '' AS label
 --, $view AS disabled
 , CASE COALESCE($action, '')