Changeset 5680

Timestamp:

02/24/10 16:30:28 (3 years ago)

Author:

blogic

Message:

rename uci= into src=

Location:

luci2/cbi2

Files:

• cbi.c (modified) (4 diffs)
• cbi.h (modified) (1 diff)
• Makefile (modified) (1 diff)
• network.luci (modified) (4 diffs)
• widget.c (modified) (1 diff)
• widgets/file.c (modified) (1 diff)
• widgets/foreach.c (modified) (2 diffs)
• widgets/form.c (modified) (1 diff)
• widgets/option.c (modified) (2 diffs)
• widgets/page.c (modified) (1 diff)
• widgets/section.c (modified) (2 diffs)
• widgets/tsection.c (modified) (1 diff)

luci2/cbi2/cbi.c

@@ -122 +122 @@
     cbi_get_element_id(e->parent, buffer, file);
     id = cbi_find_prop(e, "id");
-    if(!id && (e->caps & CAP_UCI))
-        id = cbi_find_prop(e, "uci");
+    if(!id && (e->caps & CAP_DATA))
+        id = cbi_find_prop(e, "src");
     if(!id)
         return;
@@ -144 +144 @@
         return;
     if(w)
-        if(w->caps & CAP_UCI)
-            id = cbi_find_prop(e, "uci");
+        if(w->caps & CAP_DATA)
+            id = cbi_find_prop(e, "src");
     if(!id)
         id = cbi_find_prop(e, "name");
@@ -440 +440 @@
     INIT_LIST_HEAD(&f->e.properties);
     f->e.widget = strdup("file");
-    f->e.caps = CAP_UCI | CAP_PACKAGE;
-    cbi_add_property(&f->e, "uci", f->name, 1);
+    f->e.caps = CAP_DATA | CAP_PACKAGE;
+    cbi_add_property(&f->e, "src", f->name, 1);
     blob_for_each_attr(pos, map, rem)
     {
@@ -534 +534 @@
         }
     }
-    printf("\nglobals:\n");
+/*  printf("\nglobals:\n");
     cbi_dump_list(&ctx->globals);
     printf("\npagess:\n");
-    cbi_dump_list(&ctx->pages);
+    cbi_dump_list(&ctx->pages);*/
 }
 

luci2/cbi2/cbi.h

@@ -41 +41 @@
 #define CAP_OPTION          0x0004
 #define CAP_PAGE            0x0008
-#define CAP_UCI             0x0010
+#define CAP_DATA            0x0010
 #define CAP_FILE            0x0020
 #define CAP_TEMPLATE        0x0040

luci2/cbi2/Makefile

@@ -26 +26 @@
     rm -f $(BINARY) *.luco *.o widgets/*.o validators/*.o
 
+run: $(BINARY)
+    mkdir -p ./root/lib/luci2
+    cp *.luci ./root/lib/luci2/
+    ./luci -v -r /root/lib/luci2/
+
 %.o: $(wildcard *.h)
 %.o: %.c

luci2/cbi2/network.luci

@@ -1 @@
-
-<luci:page id="internet" uci="network">
+<luci:page id="internet" src="network">
     <luci:title>Page title</luci:title>
     Page text
@@ -6 +5 @@
         <luci:title>Form title</luci:title>
         Form text
-        <luci:option uci="proto">Proto</luci:option>
-        <luci:option uci="dns_override">Manual DNS</luci:option>
-        <luci:option uci="ipaddr">IP</luci:option>
-        <luci:option uci="netmask">Netmask</luci:option>
-        <luci:option uci="gateway">Gateway</luci:option>
-        <luci:option uci="dns1">DNS1</luci:option>
-        <luci:option uci="dns2">DNS2</luci:option>
-        <luci:option uci="username">Username</luci:option>
-        <luci:option uci="password">Password</luci:option>
-        <luci:option uci="mtu">MTU</luci:option>
+        <luci:option src=".proto">Proto</luci:option>
+        <luci:option src=".dns_override">Manual DNS</luci:option>
+        <luci:option src=".ipaddr">IP</luci:option>
+        <luci:option src=".netmask">Netmask</luci:option>
+        <luci:option src=".gateway">Gateway</luci:option>
+        <luci:option src=".dns1">DNS1</luci:option>
+        <luci:option src=".dns2">DNS2</luci:option>
+        <luci:option src=".username">Username</luci:option>
+        <luci:option src=".password">Password</luci:option>
+        <luci:option src=".mtu">MTU</luci:option>
         <luci:field>custom</luci:field>
     </luci:section>
@@ -23 +22 @@
     <luci:title>Lan Configuration</luci:title>
     Lan Configuration description
-    <luci:option uci="ipaddr">IP</luci:option>
-    <luci:option uci="netmask" >Netmask</luci:option>
+    <luci:option src=".ipaddr">IP</luci:option>
+    <luci:option src=".netmask" >Netmask</luci:option>
 </luci:tsection>
 
 <luci:tsection name="dhcp_lease">
     <luci:title>DHCP lease</luci:title>
-    <luci:option uci="ipaddr">IP</luci:option>
-    <luci:option uci="netmask" >Netmask</luci:option>
+    <luci:option src=".ipaddr">IP</luci:option>
+    <luci:option src=".netmask" >Netmask</luci:option>
 </luci:tsection>
 
-<luci:page uci="network">
+<luci:page src="network">
     <luci:section ref="network.simple" name="wan">
         <luci:section package="dhcp" name="dhcp">
-            <luci:option uci="enable">Enable</luci:option>
-            <luci:option uci="start">start_ip</luci:option>
-            <luci:option uci="stop">stop_ip</luci:option>
-            <luci:foreach ref="network.dhcp_lease" package="dhcp" uci="leases">
+            <luci:option src=".enable">Enable</luci:option>
+            <luci:option src=".start">start_ip</luci:option>
+            <luci:option src=".stop">stop_ip</luci:option>
+            <luci:foreach ref="network.dhcp_lease" package="dhcp" src=".leases">
                 <luci:filter net="wan"/>
             </luci:foreach>
@@ -45 +44 @@
     </luci:section>
 </luci:page>
-<luci:option uci="enable">Enable</luci:option>
+<luci:option src=".enable">Enable</luci:option>
 

luci2/cbi2/widget.c

@@ -63 +63 @@
 static int widget_verify_uci(struct cbi_element *e, struct cbi_widget *w)
 {
-    if(!(w->caps | CAP_UCI))
+    if(!(w->caps | CAP_DATA))
         return 0;
     if(w->caps & CAP_PACKAGE)

luci2/cbi2/widgets/file.c

@@ -7 +7 @@
 
 struct cbi_widget_property file_props[] = {
-    { "uci", PROP_REQUIRED },
+    { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
 };
 
 struct cbi_widget file = {
-    .caps = CAP_UCI | CAP_PACKAGE,
+    .caps = CAP_DATA | CAP_PACKAGE,
     .init = file_init,
     WPROPS(file_props),

luci2/cbi2/widgets/foreach.c

@@ -7 +7 @@
 
 struct cbi_widget_property foreach_props[] = {
-    { "uci", PROP_REQUIRED },
+    { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
     { "package", PROP_OPTIONAL },
@@ -13 +13 @@
 
 struct cbi_widget foreach = {
-    .caps = CAP_UCI | CAP_PAGE | CAP_PACKAGE,
+    .caps = CAP_DATA | CAP_PAGE | CAP_PACKAGE,
     .parent_caps = CAP_SECTION,
     .init = foreach_init,

luci2/cbi2/widgets/form.c

@@ -7 +7 @@
 
 struct cbi_widget_property form_props[] = {
-    { "uci", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
 };

luci2/cbi2/widgets/option.c

@@ -2 +2 @@
 
 struct cbi_widget_property option_props[] = {
-    { "uci", PROP_REQUIRED },
+    { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
     { "section", PROP_OPTIONAL },
@@ -14 +14 @@
 
 struct cbi_widget option = {
-    .caps = CAP_UCI | CAP_OPTION,
+    .caps = CAP_DATA | CAP_OPTION,
     .parent_caps = CAP_SECTION,
     .init = option_init,

luci2/cbi2/widgets/page.c

@@ -7 +7 @@
 
 struct cbi_widget_property page_props[] = {
-    { "uci", PROP_REQUIRED },
+    { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
 };
 
 struct cbi_widget page = {
-    .caps = CAP_UCI | CAP_PAGE | CAP_PACKAGE,
+    .caps = CAP_DATA | CAP_PAGE | CAP_PACKAGE,
     .init = page_init,
     WPROPS(page_props),

luci2/cbi2/widgets/section.c

@@ -9 +9 @@
     { "name", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
-    { "uci", PROP_OPTIONAL },
+    { "src", PROP_OPTIONAL },
     { "package", PROP_OPTIONAL },
     { "ref", PROP_OPTIONAL },
@@ -15 +15 @@
 
 struct cbi_widget section = {
-    .caps = CAP_UCI | CAP_PACKAGE | CAP_SECTION,
+    .caps = CAP_DATA | CAP_PACKAGE | CAP_SECTION,
     .parent_caps = CAP_PACKAGE,
     .init = section_init,

luci2/cbi2/widgets/tsection.c

@@ -12 +12 @@
 
 struct cbi_widget tsection = {
-    .caps = CAP_UCI | CAP_SECTION | CAP_TEMPLATE,
+    .caps = CAP_DATA | CAP_SECTION | CAP_TEMPLATE,
     .parent_caps = CAP_PACKAGE,
     .init = tsection_init,