Merge branch 'devel' of h1dev:/srv/APKPM/

diff --git a/public/CRM.html b/public/CRM.html
index e37eb27..812e273 100644 (file)
--- a/public/CRM.html
+++ b/public/CRM.html
@@ -16,6 +16,7 @@
       };
    
       this.clear = function() {
+        self.url = null;
         self.code = null;
         self.response = null;
       };
@@ -23,11 +24,12 @@
     PingCntl.$inject = ['$xhr'];
   </script>
   <div ng:controller="PingCntl">
-    <input type="text" name="function" value="CRM_username"      size="20"/>
+    <input type="text" name="function" value="CRM_search"      size="20"/>
     <input type="text" name="args"     value="test" size="10"/>
     <button ng:click="fetch()">fetch</button>
     <button ng:click="clear()">clear</button>
     <b ng:show="url && ! code">loading {{url}}</b>
+    <b ng:show="response">{{response.length}} results</b>
     <table ng:show="response">
     <tr>
        <th>USERNAME</th>
@@ -48,7 +50,8 @@
        <td>{{u.OPT82}}</td>
     </tr>
     </table>
-    <pre>
+    <input type=checkbox name=debug value=1>
+    <pre ng:show=debug>
 url={{url}}
 code={{code}}
 response={{response}}

diff --git a/web_ui.pl b/web_ui.pl
index 455777f..00ec7b0 100755 (executable)
--- a/web_ui.pl
+++ b/web_ui.pl
@@ -77,13 +77,11 @@ __DATA__
 @@ index.html.ep
 % layout 'default';
 % title 'Gearman demo';
-Welcome to Mojolicious Gearman integration demo!
 
-<p>
-
-<%= link_to 'Gearman web interface' => 'gearman.html' %>
-
-<p>
+<ul>
+<li><%= link_to 'Gearman' => 'gearman.html' %> web interface
+<li><%= link_to 'CRM' => 'CRM.html' %> search with tabular output
+</ul>
 
 Low-level API tests: