UI improvements

kyleu · Oct 12, 2024 · 19731f9 · 19731f9
1 parent 5eb6464
commit 19731f9
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 223 deletions.
diff --git a/views/components/edit/TableEdit.html b/views/components/edit/TableEdit.html
@@ -9,23 +9,35 @@
 {% endfunc %}
 
 {% func TableEditorNoForm(key string, columns []*util.FieldDesc, values util.ValueMap, name string, value string, title string) %}
-  <table class="mt expanded">
-    <tbody>
-      {%- for _, arg := range columns -%}
-      {%- switch arg.Type -%}
-      {%- case "bool" -%}
-      {%= BoolTable(arg.Key, arg.Title, values.GetBoolOpt(arg.Key), 3, arg.Description) %}
-      {%- default -%}
-      {%= StringTable(arg.Key, key + "-" + arg.Key, arg.Title, values.GetStringOpt(arg.Key), 3, arg.Description) %}
-      {%- endswitch -%}
-      {%- endfor -%}
-      <tr>
-        {%- if name == "" -%}
-        <td colspan="2"><button type="submit">{%s title %}</button></td>
-        {%- else -%}
-        <td colspan="2"><button name="{%s name %}" value="{%s value %}" type="submit">{%s title %}</button></td>
-        {%- endif -%}
-      </tr>
-    </tbody>
-  </table>
+  <div class="overflow full-width">
+    <table class="mt min-200 expanded">
+      <tbody>
+        {%= TableEditorNoTable(key, columns, values) %}
+        <tr>
+          {%- if name == "" -%}
+          <td colspan="2"><button type="submit">{%s title %}</button></td>
+          {%- else -%}
+          <td colspan="2"><button name="{%s name %}" value="{%s value %}" type="submit">{%s title %}</button></td>
+          {%- endif -%}
+        </tr>
+      </tbody>
+    </table>
+  </div>
 {% endfunc %}
+
+{% func TableEditorNoTable(key string, columns []*util.FieldDesc, values util.ValueMap) %}{% stripspace %}
+  {%- for _, arg := range columns -%}
+    {%- switch arg.Type -%}
+    {%- case "bool" -%}
+      {%= BoolTable(arg.Key, arg.Title, values.GetBoolOpt(arg.Key), 3, arg.Description) %}
+    {%- case "textarea" -%}
+      {%= TextareaTable(arg.Key, "", arg.Title, 12, values.GetStringOpt(arg.Key), 3, arg.Description) %}
+    {%- case "number", "int" -%}
+      {%= IntTable(arg.Key, "", arg.Title, values.GetIntOpt(arg.Key), 3, arg.Description) %}
+    {%- case "float" -%}
+      {%= FloatTable(arg.Key, "", arg.Title, values.GetFloatOpt(arg.Key), 3, arg.Description) %}
+    {%- default -%}
+      {%= DatalistTable(arg.Key, "", arg.Title, values.GetStringOpt(arg.Key), arg.Choices, nil, 3, arg.Description) %}
+    {%- endswitch -%}
+  {%- endfor -%}
+{% endstripspace %}{% endfunc %}
diff --git a/views/components/edit/TableEdit.html.go b/views/components/edit/TableEdit.html.go
diff --git a/views/vpage/Args.html b/views/vpage/Args.html
@@ -1,6 +1,5 @@
 {% import (
   "fmt"
-  "strconv"
   "strings"
 
   "github.com/kyleu/rituals/app"
@@ -32,36 +31,7 @@ <h3>{% if p.Directions == "" %}Enter Data{% else %}{%s p.Directions %}{% endif %
       {%- for k, v := range p.Hidden -%}
       <input type="hidden" name="{%s k %}" value="{%s v %}" />
       {%- endfor -%}
-      <div class="overflow full-width">
-        <table class="mt min-200 expanded">
-          <tbody>
-            {%- for _, arg := range p.Results.FieldDescs -%}
-            {%- code
-              v := util.OrDefault(p.Results.Values.GetStringOpt(arg.Key), arg.Default)
-              title := arg.Title
-              if len(title) > 50 {
-                title = title[:50] + "..."
-              }
-            -%}
-            {%- switch arg.Type -%}
-            {%- case "bool" -%}
-            {%= edit.BoolTable(arg.Key, title, v == "true", 5, arg.Description) %}
-            {%- case "textarea" -%}
-            {%= edit.TextareaTable(arg.Key, "", title, 12, v, 5, arg.Description) %}
-            {%- case "number", "int" -%}
-            {%- code i, _ := strconv.ParseInt(v, 10, 32) -%}
-            {%= edit.IntTable(arg.Key, "", title, int(i), 5, arg.Description) %}
-            {%- case "float" -%}
-            {%- code f, _ := strconv.ParseFloat(v, 64) -%}
-            {%= edit.FloatTable(arg.Key, "", title, f, 5, arg.Description) %}
-            {%- default -%}
-            {%= edit.DatalistTable(arg.Key, "", title, v, arg.Choices, nil, 5, arg.Description) %}
-            {%- endswitch -%}
-            {%- endfor -%}
-          </tbody>
-        </table>
-      </div>
-      <button class="mt" type="submit">Submit</button>
+      {%= edit.TableEditorNoForm("args", p.Results.FieldDescs, p.Results.Values, "", "", "Submit") %}
     </form>
   </div>
 {% endfunc %}