add ami_originate_call with more arguments

add hr in making a website

add ami_originate_call with more arguments
add hr in making a website
totoro
1 parent 647c64d2
Showing 4 changed files with 73 additions and 31 deletions Show diff stats
asterisk/ami.anubis
asterisk/ami_commands.anubis
web/CXM_form.anubis
web/CXM_making_a_web_site.anubis
@@ -9,15 +9,11 @@
 read system/string.anubis
 read tools/basis.anubis
 read tools/connections.anubis
+read calexium_lib/web/CXM_http_get_common.anubis
-read asterisk/ami_types.anubis
-read asterisk/ami_commands.anubis
-read web/CXM_http_get_common.anubis
+transmit calexium_lib/asterisk/ami_types.anubis
+transmit calexium_lib/asterisk/ami_commands.anubis
-
-  
- public define Result(
- 
 define Maybe(One)
   receive
   (
@@ -116,6 +112,7 @@ public define Maybe(Asterisk_client)
     String    server_name,
     AMI_Auth  auth
   )=
+  //println("asterisk_new_client "+server_name);
   if separate_name_port(server_name, 5038) is (name, server_port) then 
   //
   // resolve server name and call 'https_get' with numeric server address:
@@ -153,7 +150,7 @@ public define Maybe(Asterisk_client)
       failure.
-global define One
+ global define One
   ami_test
   (
     List(String) args
@@ -6,7 +6,7 @@
  * 
  */
-read asterisk/ami_types.anubis
+read calexium_lib/asterisk/ami_types.anubis
 public define AMI_Action ami_login(String user, String password, Bool events) =
   action("Login", [
@@ -32,3 +32,20 @@ public define AMI_Action ami_originate_call(String extension, String out_number)
         ]
   )
 .
+
+public define AMI_Action 
+  ami_originate_call
+  (
+    String extension, 
+    String out_number, 
+    String context
+  )=
+  action("Originate", [
+          key_value("Channel",  "SIP/"+extension),
+          key_value("Exten",    out_number),
+          key_value("Context",  context),
+          key_value("Priority", "1"),
+          key_value("Async",    "yes")
+        ]
+  )
+.
@@ -226,6 +226,7 @@ public type CXM_Form_Field:
    div              (List(CoreAttrs), HTML_In_Form content),
    partial          (HTML_Partial_Content p_content),
    br,
+   hr               (List(CoreAttrs) options),
 //   input_with_help  (CXM_Form_Field   field,
 //                    Maybe(String)  help_title,
 //                    String         help_text,
@@ -384,7 +385,12 @@ public define CXM_Form_Field
   )=
   hidden(html_Id(""), web_arg_name, value).
-   
+public define CXM_Form_Field
+  hr
+  =
+  hr([])
+.
+
    //--- explanation field ---------------------  
 // //////////////////////////////////////////////////////////
@@ -580,7 +586,8 @@ public define HTML_In_Form
     div(options, e)     then  div(options, e),
     partial(p_content)  then partial(p_content),
-    br                  then br,    
+    br                  then br,
+    hr(opts)            then hr(opts),
 //    input_with_help(input, help_title, help_text, width) then 
 //      sequence([
 //        format_CXM_Form_Field(input, lwa, html_tooltip(force_String(help_title), help_text, width)),
@@ -607,7 +614,7 @@ public define HTML_In_Form
                   failure     then same,
                   success(n)  then same(n)
                 },
-                submit(attrs + [class(htmlClass.class)], button_text),
+                submit(attrs + [class(htmlClass.class + " cxm_submit")], button_text),
                 action_name,
                 extra_operands
               ),
@@ -1385,7 +1385,8 @@ public type HTML_In_Form:
   li                    (List(CoreAttrs), HTML_In_Form content),
   button                (List(CoreAttrs), HTML_In_Form content),
   i                     (List(CoreAttrs), String text),
-  span                  (List(CoreAttrs), String text)
+  span                  (List(CoreAttrs), String text),
+  hr                    (List(CoreAttrs))
 .
@@ -1658,7 +1659,8 @@ public type HTML_Off_Form:
   li                    (List(CoreAttrs), HTML_Off_Form content),
   button                (List(CoreAttrs), HTML_Off_Form content),
   i                     (List(CoreAttrs), String text),
-  span                  (List(CoreAttrs), String text)
+  span                  (List(CoreAttrs), String text),
+  hr                    (List(CoreAttrs))
 .
    'HTML_Off_Form' defines all the elements you may put outside any form. 
@@ -1867,11 +1869,11 @@ public define HTML_Off_Form
 .
 public define HTML_Off_Form
-   text
-     (
-       String s
-     ) =
-   text([],s)
+  text
+  (
+    String s
+  )=
+  text([], s)
 .
@@ -1892,6 +1894,18 @@ public define HTML_Off_Form
   span([], to_decimal(i))
 .
+public define HTML_Off_Form
+  hr 
+  =
+  hr([])
+.
+
+public define HTML_In_Form
+  hr 
+  =
+  hr([])
+.
+
    - Cell a gap between two other cells : 
 public define HTML_Cell(HTML_Off_Form)
@@ -3513,7 +3527,8 @@ type HTML_Any($T):
    any_li                 (List(CoreAttrs), $T content),
    any_button             (List(CoreAttrs), $T element),
    any_i                  (List(CoreAttrs), String text),
-   any_span               (List(CoreAttrs), String text)
+   any_span               (List(CoreAttrs), String text),
+   any_hr                 (List(CoreAttrs))
 .
@@ -3815,8 +3830,6 @@ define URL_or_JavaScript
          )
      }.
-   
-   
    Now, we format the actioner according to its aspect. 
 define List(Text_Option)
@@ -4926,9 +4939,11 @@ define Printable_tree
         ["<i", format_attrs(opts), ">",t,"</i>\n"],
     any_span(opts , t)            then 
        ["<span", format_attrs(opts), ">",t,"</span>"]
-     }. 
-   
-   
+    any_hr(opts)            then
+      ["<hr", format_attrs(opts),">"]
+    }
+.
+
   //    *** [5.8] Formating 'in form' elements. 
@@ -5158,6 +5173,8 @@ define Printable_tree
          format(cinfo,ic_v,any_i(opts,t),format_element,is_https, action_count, head_tags),
        span(opts,t)           then 
          format(cinfo,ic_v,any_span(opts,t),format_element,is_https, action_count, head_tags)
+       hr(opts)           then 
+         format(cinfo,ic_v,any_hr(opts),format_element,is_https, action_count, head_tags)         
      }. 
@@ -5219,12 +5236,12 @@ define Bool
    mail_to(m,e)               then false, // 'e' may but should not contain an upload 
    scroller(w,h,cw,ch,e)      then contains_an_upload(e), 
    actioner(c,t,a,an,eo,ja)   then false, 
-   foreign_link_new(_,_,_)        then false,
+   foreign_link_new(_,_,_)    then false,
    foreign_link(o,u)          then false,
    foreign_link(o,u,n)        then false,
    private_download(p,n,e,a)  then false, 
-   text_input(o,lt,l,n,i,w)   then false,
-   text_input_ro(o,lt,l,n,i,w) then false,
+   text_input(o,lt,l,n,i,w)     then false,
+   text_input_ro(o,lt,l,n,i,w)  then false,
    password_input(o,lt,l,n,i,w) then false,
    text_area(o,lt,id,n,i,w,h)   then false, 
    file_upload(o,l,i,n,w)     then true, 
@@ -5233,7 +5250,7 @@ define Bool
    selector_c(o,l,i,n,s,c)    then false, 
    selector_c(o,l,i,n,s,c,p)  then false,  
    radio_button(o,_,_,n,v,c)  then false,
-   radio_button_r(o,_,_,n,v,c) then false,
+   radio_button_r(o,_,_,n,v,c)  then false,
    check_box(o,_,_,n,v,c)     then false,
    check_box_r(o,_,_,n,v,c)   then false,
    div(o,c)                   then contains_an_upload(c),
@@ -5247,7 +5264,8 @@ define Bool
    li(_,_)                    then false,
    button(_,_)                then false,
    i(_,_)                     then false,
-   span(_,_)                  then false   
+   span(_,_)                  then false,
+   hr(_)                      then false
   }
 .
@@ -5391,7 +5409,10 @@ define Printable_tree
        i(opts, t)             then 
          format(cinfo,ic_v,any_i(opts,t),format_element,is_https, action_count, head_tags),
        span(opts,t)           then 
-         format(cinfo,ic_v,any_span(opts,t),format_element,is_https, action_count, head_tags),          
+         format(cinfo,ic_v,any_span(opts,t),format_element,is_https, action_count, head_tags),
+       hr(opts)               then 
+         format(cinfo,ic_v,any_hr(opts),format_element,is_https, action_count, head_tags),
+       
      }.