glib-web 0.0.9 → 0.0.10

data/app/views/json_ui/garage/panels/horizontal.json.jbuilder

@@ -2,212 +2,184 @@ json.title 'Panels'
 
 render "#{@path_prefix}/nav_menu", json: json
 
-json_body_with_scroll json do
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel'
-  end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.backgroundColor '#b3bac2'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '2'
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
-      end
+json_ui_page json do |page|
+  page.scroll childViews: ->(scroll) do
+    scroll.h1 text: 'Horizontal panel'
+    scroll.panels_horizontal backgroundColor: '#b3bac2', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.button text: '2'
+      panel.button text: '3'
     end
-  end
-
-  json.child! do
-    json.view 'label-v1'
-    json.text "\n"
-  end
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel with equal filling'
-  end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.backgroundColor '#b3bac2'
-    json.width 300
-    json.distribution 'fillEqually'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
 
-      json.child! do
-        json.view 'button-v1'
-        json.text '2'
-        json.height 50
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
-        json.height 70
-      end
+    scroll.label text: "\n"
+    scroll.h1 text: 'Horizontal panel with equal filling'
+    scroll.panels_horizontal backgroundColor: '#b3bac2', width: 300, distribution: 'fillEqually', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.button text: '2', height: 50
+      panel.button text: '3', height: 70
     end
-  end
 
-  json.child! do
-    json.view 'label-v1'
-    json.text "\n"
-  end
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel with equal spacing'
-  end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.backgroundColor '#b3bac2'
-    json.width 300
-    json.distribution 'spaceEqually'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '2'
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
-      end
+    scroll.label text: "\n"
+    scroll.h1 text: 'Horizontal panel with equal spacing'
+    scroll.panels_horizontal backgroundColor: '#b3bac2', width: 300, distribution: 'spaceEqually', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.button text: '2'
+      panel.button text: '3'
     end
-  end
 
-  json.child! do
-    json.view 'label-v1'
-    json.text "\n"
-  end
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel (containing vertical panel)'
-  end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
-
-      json.child! do
-        json.view 'panels/vertical-v1'
-        json.subviews do
-          json.child! do
-            json.view 'button-v1'
-            json.text 'A'
-          end
-
-          json.child! do
-            json.view 'button-v1'
-            json.text 'B'
-          end
-        end
-      end
-
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
+    scroll.label text: "\n"
+    scroll.h1 text: 'Horizontal panel (containing vertical panel)'
+    scroll.panels_horizontal distribution: 'spaceEqually', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.panels_vertical childViews: ->(v) do
+        v.button text: 'A'
+        v.button text: 'B'
       end
+      panel.button text: '3'
     end
-  end
-
-  json.child! do
-    json.view 'label-v1'
-    json.text "\n"
-  end
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel with equal filling (containing vertical panel)'
-  end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.width 'matchParent'
-    json.distribution 'fillEqually'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
 
-      json.child! do
-        json.view 'panels/vertical-v1'
-        json.subviews do
-          json.child! do
-            json.view 'button-v1'
-            json.text 'A'
-          end
-
-          json.child! do
-            json.view 'button-v1'
-            json.text 'B'
-          end
-        end
+    scroll.label text: "\n"
+    scroll.h1 text: 'Horizontal panel with equal filling (containing vertical panel)'
+    scroll.panels_horizontal width: 'matchParent', distribution: 'fillEqually', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.panels_vertical childViews: ->(v) do
+        v.button text: 'A'
+        v.button text: 'B'
       end
+      panel.button text: '3'
+    end
 
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
+    scroll.label text: "\n"
+    scroll.h1 text: 'Horizontal panel with equal spacing (containing vertical panel)'
+    scroll.panels_horizontal width: 'matchParent', distribution: 'spaceEqually', childViews: ->(panel) do
+      panel.button text: '1'
+      panel.panels_vertical childViews: ->(v) do
+        v.button text: 'A'
+        v.button text: 'B'
       end
+      panel.button text: '3'
     end
-  end
 
-  json.child! do
-    json.view 'label-v1'
-    json.text "\n"
-  end
-  json.child! do
-    json.view 'h1-v1'
-    json.text 'Horizontal panel with equal spacing (containing vertical panel)'
   end
-  json.child! do
-    json.view 'panels/horizontal-v1'
-    json.width 'matchParent'
-    json.distribution 'spaceEqually'
-    json.subviews do
-      json.child! do
-        json.view 'button-v1'
-        json.text '1'
-      end
-
-      json.child! do
-        json.view 'panels/vertical-v1'
-        json.subviews do
-          json.child! do
-            json.view 'button-v1'
-            json.text 'A'
-          end
-
-          json.child! do
-            json.view 'button-v1'
-            json.text 'B'
-          end
-        end
-      end
+end
 
-      json.child! do
-        json.view 'button-v1'
-        json.text '3'
-      end
-    end
-  end
 
-end
+#   json.child! do
+#     json.view 'label-v1'
+#     json.text "\n"
+#   end
+#   json.child! do
+#     json.view 'h1-v1'
+#     json.text 'Horizontal panel (containing vertical panel)'
+#   end
+#   json.child! do
+#     json.view 'panels/horizontal-v1'
+#     json.subviews do
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '1'
+#       end
+
+#       json.child! do
+#         json.view 'panels/vertical-v1'
+#         json.subviews do
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'A'
+#           end
+
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'B'
+#           end
+#         end
+#       end
+
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '3'
+#       end
+#     end
+#   end
+
+#   json.child! do
+#     json.view 'label-v1'
+#     json.text "\n"
+#   end
+#   json.child! do
+#     json.view 'h1-v1'
+#     json.text 'Horizontal panel with equal filling (containing vertical panel)'
+#   end
+#   json.child! do
+#     json.view 'panels/horizontal-v1'
+#     json.width 'matchParent'
+#     json.distribution 'fillEqually'
+#     json.subviews do
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '1'
+#       end
+
+#       json.child! do
+#         json.view 'panels/vertical-v1'
+#         json.subviews do
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'A'
+#           end
+
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'B'
+#           end
+#         end
+#       end
+
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '3'
+#       end
+#     end
+#   end
+
+#   json.child! do
+#     json.view 'label-v1'
+#     json.text "\n"
+#   end
+#   json.child! do
+#     json.view 'h1-v1'
+#     json.text 'Horizontal panel with equal spacing (containing vertical panel)'
+#   end
+#   json.child! do
+#     json.view 'panels/horizontal-v1'
+#     json.width 'matchParent'
+#     json.distribution 'spaceEqually'
+#     json.subviews do
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '1'
+#       end
+
+#       json.child! do
+#         json.view 'panels/vertical-v1'
+#         json.subviews do
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'A'
+#           end
+
+#           json.child! do
+#             json.view 'button-v1'
+#             json.text 'B'
+#           end
+#         end
+#       end
+
+#       json.child! do
+#         json.view 'button-v1'
+#         json.text '3'
+#       end
+#     end
+#   end
+
+# end

data/app/views/json_ui/garage/panels/index.json.jbuilder

@@ -2,33 +2,50 @@ json.title 'Panels'
 
 render "#{@path_prefix}/nav_menu", json: json
 
-json_body_with_list json do
-  json.rows do
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Vertical'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'panels/vertical')
+json_ui_page json do |page|
+  page.list firstSection: ->(section) do
+    section.rows do |row|
+      row.thumbnail title: 'Vertical', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'panels/vertical')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Horizontal'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'panels/horizontal')
+      row.thumbnail title: 'Horizontal', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'panels/horizontal')
       end
-    end
-
-    json.child! do
-      json.template 'thumbnail-v1'
-      json.title 'Split'
-      json.onClick do
-        json.action 'windows/open-v1'
-        json.url json_ui_garage_url(path: 'panels/split')
+      row.thumbnail title: 'Split', onClick: ->(action) do 
+        action.windows_open url: json_ui_garage_url(path: 'panels/split')
       end
     end
+
   end
 end
+
+# json_body_with_list json do
+#   json.rows do
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Vertical'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'panels/vertical')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Horizontal'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'panels/horizontal')
+#       end
+#     end
+
+#     json.child! do
+#       json.template 'thumbnail-v1'
+#       json.title 'Split'
+#       json.onClick do
+#         json.action 'windows/open-v1'
+#         json.url json_ui_garage_url(path: 'panels/split')
+#       end
+#     end
+#   end
+# end