From e77373d8ee6d99292915f88a42c0d6a9902e3fab Mon Sep 17 00:00:00 2001
From: abrudz <a.brudz@gmail.com>
Date: Mon, 19 Sep 2016 09:41:58 +0100
Subject: [PATCH] InputGrid now makes proper <label>s. Grid documentation block
 moved up so it can be found by WidgetDoc.

---
 HTML/_DC/Grid.dyalog      | 3 ++-
 HTML/_DC/InputGrid.dyalog | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/HTML/_DC/Grid.dyalog b/HTML/_DC/Grid.dyalog
index de8644d5..04717c42 100644
--- a/HTML/_DC/Grid.dyalog
+++ b/HTML/_DC/Grid.dyalog
@@ -1,5 +1,4 @@
 :Class Grid : #._DC.Table
-⍝∇:require =/Table.dyalog
 ⍝ Description:: Grid - like _.Table but with borders - accepts matrix of data
 ⍝ Constructor:: [Data [CellAttr [HeaderRows [HeaderAttr [MakeCellIds [MakeRowIds]]]]]
 ⍝
@@ -11,6 +10,8 @@
 ⍝ MakeCellIds - 1 to generate IDs      <td id="tableId_r2c3">
 ⍝ MakeRowIds  - 1 to generate Row IDs  <tr id="tableId_row2">
 
+⍝∇:require =/Table.dyalog
+
     ∇ Make0
       :Access public
       :Implements constructor
diff --git a/HTML/_DC/InputGrid.dyalog b/HTML/_DC/InputGrid.dyalog
index 3cf8d270..79f5c5dc 100644
--- a/HTML/_DC/InputGrid.dyalog
+++ b/HTML/_DC/InputGrid.dyalog
@@ -41,9 +41,12 @@
       :EndIf
     ∇
 
-    ∇ html←Render;cells;rows
+    ∇ html←Render;cells;rows;ids
       SetId
       :Access public
+      ids←Inputs.id
+      ((ids≡¨⎕NULL)/ids)←{GenId}¨⍳+/ids≡¨⎕NULL
+      Labels←ids{'<label for="',⍺,'">',(renderIt ⍵),'</label>'}¨Labels
       cells←{⎕NEW #._html.td(⍵)}¨renderIt¨(,Labels),[1.1],Inputs
       cells[;1].class←⊂id,'_label'
       cells[;2].class←⊂id,'_input'
@@ -61,4 +64,4 @@
       Set(⊂'border'(⍕Border))
       html←⎕BASE.Render
     ∇
-:endclass
\ No newline at end of file
+:endclass