1 files changed, 25 insertions, 66 deletions

diff --git a/examples/cloudflare/gui.go b/examples/cloudflare/gui.go
index 60fd5fe..ed08482 100644
--- a/examples/cloudflare/gui.go
+++ b/examples/cloudflare/gui.go
@@ -4,6 +4,8 @@ package main
 import 	(
 	"log"
 	"strconv"
+
+	"git.wit.org/jcarr/control-panel-dns/cloudflare"
 )
 
 func loadDNS(c *configT) {
@@ -11,7 +13,8 @@ func loadDNS(c *configT) {
 	log.Println("adding DNS record", hostname)
 
 	newt := mainWindow.NewTab(hostname)
-	newg := newt.NewGroup("more")
+	vb := newt.NewBox("vBox", false)
+	newg := vb.NewGroup("more zoneID = " + c.zoneID)
 
 	// make a grid 6 things wide
 	grid := newg.NewGrid("gridnuts", 6, gridH)
@@ -19,41 +22,22 @@ func loadDNS(c *configT) {
 //	grid.NewButton("Type", func () {
 //		log.Println("sort by Type")
 //	})
-	typedrop := grid.NewDropdown("type")
-	typedrop.AddText("A")
-	typedrop.AddText("AAAA")
-	typedrop.AddText("CNAME")
-	typedrop.Custom = func () {
-		log.Println("custom dropdown() a =", typedrop.Name, typedrop.S)
-	}
-	nb := grid.NewButton("Name", func () {
-		log.Println("sort by Name")
-	})
-	nb.Disable()
+	grid.NewLabel("RR type")
+	grid.NewLabel("hostname")
 
-	grid.NewButton("Protection", func () {
-		log.Println("sort proxied")
-	})
-	grid.NewButton("TTL", func () {
-		log.Println("sort by TTL")
-	})
-	nb = grid.NewButton("Value", func () {
-		log.Println("sort by Value")
-	})
-	nb.Disable()
-	nb = grid.NewButton("Save", func () {
-		log.Println("click below to save")
-	})
-	nb.Disable()
+	grid.NewLabel("Proxy")
+	grid.NewLabel("TTL")
+	grid.NewLabel("Value")
+	grid.NewLabel("Save")
 
-	masterSave = newt.NewButton("Master Save", func () {
+	masterSave = vb.NewButton("Master Save", func () {
 		log.Println("save stuff to cloudflare")
 	})
 	masterSave.Disable()
 
 	records := getZonefile(c)
 	for _, record := range records.Result {
-		var rr RRT // dns zonefile resource record
+		var rr cloudflare.RRT // dns zonefile resource record
 
 		// copy all the JSON values into the row record.
 		rr.ID = record.ID
@@ -62,59 +46,34 @@ func loadDNS(c *configT) {
 		rr.Content = record.Content
 		rr.Proxied = record.Proxied
 		rr.Proxiable = record.Proxiable
-		rr.TTL = record.TTL
+		// rr.Ttl = record.TTL
 
-		rr.typeNode = grid.NewLabel(record.Type)
-		rr.nameNode = grid.NewEntryLine(record.Name)
-		rr.nameNode.SetText(record.Name)
-		rr.nameNode.Disable()
+		grid.NewLabel(record.Type)
+		grid.NewLabel(record.Name)
 
-		// set proxy or unproxied
-		rr.proxyNode = grid.NewDropdown("proxy")
+		proxy := grid.NewLabel("proxy")
 		if (record.Proxied) {
-			rr.proxyNode.AddText("Proxied")
-			rr.proxyNode.AddText("DNS")
+			proxy.SetText("On")
 		} else {
-			rr.proxyNode.AddText("DNS")
-			rr.proxyNode.AddText("Proxied")
-		}
-		rr.proxyNode.Custom = func () {
-			log.Println("proxy dropdown() a =", rr.proxyNode.Name, rr.proxyNode.S, rr.ID)
-			rr.saveNode.Enable()
-			masterSave.Enable()
+			proxy.SetText("Off")
 		}
 
-		var ttl, short  string
+		var ttl  string
 		if (record.TTL == 1) {
 			ttl = "Auto"
 		} else {
 			ttl = strconv.Itoa(record.TTL)
 		}
-		rr.ttlNode = grid.NewLabel(ttl)
-		// short = fmt.Sprintf("%80s", record.Content)
-		short = record.Content
-		if len(short) > 40 {
-			short = short[:40] // Slice the first 20 characters
-		}
-
-		rr.valueNode = grid.NewEntryLine(short)
-		rr.valueNode.SetText(record.Content)
-
-		rr.valueNode.Custom = func () {
-			log.Println("value changed =", rr.valueNode.Name, rr.proxyNode.S, rr.ID)
-			rr.saveNode.Enable()
-			masterSave.Enable()
-		}
+		grid.NewLabel(ttl)
 
-		// fmt.Printf("ID: %s, Type: %s, Name: %s, short Content: %s\n", record.ID, record.Type, record.Name, short)
-		// fmt.Printf("\tproxied: %b, %b, string TTL: %i\n", record.Proxied, record.Proxiable, ttl)
+		val := grid.NewLabel("Value")
+		val.SetText(record.Content)
 
-		rr.saveNode = grid.NewButton("Save", nil)
-		rr.saveNode.Disable()
-		rr.saveNode.Custom = func () {
+		load := grid.NewButton("Load", nil)
+		load.Custom = func () {
 			name := "save stuff to cloudflare for " + rr.ID
 			log.Println(name)
-			doChange(&rr)
+			// doChange(&rr)
 		}
 	}