[open-ils-commits] r9167 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils:
. default/acq/picklist default/common
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Mar 31 21:59:38 EDT 2008
Author: djfiander
Date: 2008-03-31 21:23:33 -0400 (Mon, 31 Mar 2008)
New Revision: 9167
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
Log:
Misc dojo updates. About to go dynamic on the UI.
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-03-31 20:51:39 UTC (rev 9166)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/base.html 2008-04-01 01:23:33 UTC (rev 9167)
@@ -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>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html 2008-03-31 20:51:39 UTC (rev 9166)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view.html 2008-04-01 01:23:33 UTC (rev 9167)
@@ -30,7 +30,7 @@
% for list in c.oils.acq.picklist_list.value:
<option value='${list.id()}'>${list.name()}</option>
% endfor
- </select> <button dojoType="dijit.form.Button" type='submit' value='${_("Submit")}'>${_("Submit")}</button>
+ </select> <button type='submit' dojoType="dijit.form.Button">${_("Submit")}</button>
</div>
<div class='spacer'> </div>
</div>
@@ -65,14 +65,17 @@
<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>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html 2008-03-31 20:51:39 UTC (rev 9166)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist/view_lineitem.html 2008-04-01 01:23:33 UTC (rev 9167)
@@ -38,23 +38,25 @@
<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>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html 2008-03-31 20:51:39 UTC (rev 9166)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html 2008-04-01 01:23:33 UTC (rev 9167)
@@ -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:
More information about the open-ils-commits
mailing list