Misc dojo updates. About to go dynamic on the UI.

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9167 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
index b2c652a..98ba7d9 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
@@ -25,14 +25,24 @@
 <%def name='block_body_content()'/>
 
 <%def name='block_css()'>
-    <link rel="stylesheet" type="text/css" href="/dojo/dijit/themes/tundra/tundra.css" />
-    <link rel="stylesheet" type="text/css" href="/dojo/dojo/resources/dojo.css" />
+    <style type="text/css">
+       @import "/js/dijit/themes/tundra/tundra.css";
+       @import "/js/dojo/resources/dojo.css";
+
+        html, body, #oils-base-body-block {
+           width:100%;
+           height:100%;
+           border:0;
+           margin:0;
+           padding: 0;
+       }
+    </style>
     <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/skin/${c.oils.core.skin.value}.css'/>
     <link rel='stylesheet' type='text/css' href='${c.oils.core.media_prefix.value}/css/theme/${c.oils.core.theme.value}.css'/>
 </%def>
 
 <%def name='block_js()'>
-    <script type="text/javascript" src="/dojo/dojo/dojo.js"
+    <script type="text/javascript" src="/js/dojo/dojo.js"
             djConfig="parseOnLoad: true"></script>
     <script type="text/javascript">
         dojo.require("dojo.parser");
@@ -44,5 +54,7 @@
        dojo.require("dijit.form.Button");
        dojo.require("dijit.form.TextBox");
        dojo.require("dijit.form.NumberTextBox");
+       dojo.require("dijit.form.NumberSpinner");
+       dojo.require("dijit.form.FilteringSelect");
     </script>
 </%def>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
index a406160..9f5b3e4 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
@@ -30,7 +30,7 @@ ${picklist.summary(c.oils.acq.picklist.value)}
             % for list in c.oils.acq.picklist_list.value:
                 <option value='${list.id()}'>${list.name()}</option>
             % endfor
-        </select>&nbsp;<button dojoType="dijit.form.Button" type='submit' value='${_("Submit")}'>${_("Submit")}</button>
+        </select>&nbsp;<button type='submit' dojoType="dijit.form.Button">${_("Submit")}</button>
     </div>
     <div class='spacer'>&nbsp;</div>
 </div>
@@ -65,14 +65,17 @@ ${picklist.summary(c.oils.acq.picklist.value)}
                        <input name="${c.oils.acq.picklist_source_id.cgi_name}"
                               type="hidden"
                               value="${c.oils.acq.picklist.value.id()}" />
+                       <input name="${c.oils.acq.lineitem_id.cgi_name}"
+                              type="hidden"
+                              value="${lineitem.id()}" />
                        <input name="${c.oils.acq.lineitem_item_count.cgi_name}"
                               type="text" size="3"
                               value="${lineitem.item_count()}"
-                              dojoType="dijit.form.NumberTextBox"
+                              smallDelta="1"
+                              dojoType="dijit.form.NumberSpinner"
                               constraints="{min:0,places:0}" />
-                       <button dojotype='dijit.form.Button'
-                               name='${c.oils.acq.lineitem_id.cgi_name}'
-                               value='${lineitem.id()}'>${_("Update")}</button>
+                       <button type='submit'
+                               dojoType="dijit.form.Button">${_("Update")}</button>
                    </form>
                % endif
            </td>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
index b12823e..fc76775 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
@@ -38,23 +38,25 @@ ${picklist.summary(c.oils.acq.picklist.value, link=True)}
     <tbody>
         ${c.oils.acq.lineitem.value.lineitem_details().sort(sort_lid)}
         % for detail in c.oils.acq.lineitem.value.lineitem_details():
-           <Form method="post"
-                 action="${c.oils.acq.prefix.value}/picklist/update_lineitem">
-               <input type="hidden"
-                      name="${c.oils.acq.lineitem_id.cgi_name}"
-                      value="${c.oils.acq.lineitem.value.id()}" />
-               <tr>
-                   <td>${detail.id()}</td>
-                   <td>
-                       ${widget.build_selector(c.oils.acq.fund_id.cgi_name, fund_map, detail.fund())}
-                   </td>
-                   <td>${detail.owning_lib() or 'None'}</td>
-                   <td>
-                       <button dojotype='dijit.form.Button' name='${c.oils.acq.lineitem_detail_id.cgi_name}'
-                               value='${detail.id()}'>${_("Update")}</button>
-                   </td>
-               </tr>
-           </form>
+       <tr>
+             <td>${detail.id()}</td>
+             <td>
+               <form dojoType="dijit.form.Form" method="post"
+                     action="${c.oils.acq.prefix.value}/picklist/update_lineitem">
+                   <input type="hidden"
+                          name="${c.oils.acq.lineitem_id.cgi_name}"
+                          value="${c.oils.acq.lineitem.value.id()}" />
+                   <input type="hidden"
+                          name="${c.oils.acq.lineitem_detail_id.cgi_name}"
+                          value="${detail.id()}">
+                   ${widget.build_selector(c.oils.acq.fund_id.cgi_name, fund_map, detail.fund())}
+                   <button type="submit" dojoType="dijit.form.Button">${_("Update")}</button>
+               </form>
+             </td>
+             <td>${detail.owning_lib() or 'None'}</td>
+             <td>
+             </td>
+       </tr>
        % endfor
     </tbody>
 </table>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
index b0002a4..d12d092 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
@@ -76,10 +76,10 @@
 </%def>
 
 <%def name='build_selector(name, optionmap, chosen=None)'>
-    <select name="${name}">
+    <select name="${name}" dojoType="dijit.form.FilteringSelect">
 
-    %if not selected:
-        <option value="" selected="selected">${_("-- Select --")}</option>
+    %if not chosen:
+        <option value="" selected="selected" />
     %endif
 
     %for (id, name) in optionmap: