[open-ils-commits] [GIT] Evergreen ILS branch master updated. 88ba882614149d699d7b25e25a8eb05fd7abb07b
Evergreen Git
git at git.evergreen-ils.org
Mon Jul 25 15:12:00 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 88ba882614149d699d7b25e25a8eb05fd7abb07b (commit)
via 77f9c6f5f87a5b0454b240bb10b7cfab325d4722 (commit)
via 6ae2cb8ee2dc4e5b143487a80f94c17b1dcbdb4b (commit)
from fbc7f4fa15da74ef2699da17ceac7685417b18f8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 88ba882614149d699d7b25e25a8eb05fd7abb07b
Merge: fbc7f4f 77f9c6f
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Mon Jul 25 15:08:48 2011 -0400
Merge branch 'acq-copies-li-summary-etc'
commit 77f9c6f5f87a5b0454b240bb10b7cfab325d4722
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Jul 25 14:15:25 2011 -0400
Lineitem copies page layout changes
Move the Distribution Formula selector above the batch editor widgets
mainly so the batch editor widgets sit closer to batch edit target copy
grid.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/web/css/skin/default/acq.css b/Open-ILS/web/css/skin/default/acq.css
index 91fceb4..6d03933 100644
--- a/Open-ILS/web/css/skin/default/acq.css
+++ b/Open-ILS/web/css/skin/default/acq.css
@@ -146,7 +146,8 @@ label[for="attr_search_type_scalar"] { vertical-align: top; }
.acq-lit-po-heading td span a[attr="name"] { font-weight: bold; }
#acq-lit-info-tbody td {padding:5px;}
#acq-lit-info-related { margin-top: 10px; }
-#acq-lit-li-details-table {margin-top:5px;}
+#acq-lit-distrib-formula-table { margin-top: 10px; margin-bottom: 5px;}
+#acq-lit-li-details-table {margin-top:5px; border-top;}
#acq-lit-li-details-table td {padding:0px 3px 1px 3px;}
#acq-lit-li-details-table th {padding:0px 3px 1px 3px; font-weight:bold;}
#acq-lit-li-details-table .dijit {width:130px;}
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index d3dad87..bc0c0a8 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -1118,7 +1118,7 @@ function AcqLiTable() {
if (!self.distribForms) {
// no formulas, hide the form
- openils.Util.hide('acq-lit-distrib-formula-tbody');
+ openils.Util.hide('acq-lit-distrib-formula-table');
return;
}
diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2
index 6f4606c..28ef757 100644
--- a/Open-ILS/web/templates/default/acq/common/li_table.tt2
+++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2
@@ -161,9 +161,7 @@
constraints="{min:0,max:1000,places:0}" style='width:40px' value='0'></input>
<div dojoType='dijit.form.Button' jsId='acqLitAddCopyCount' scrollOnFocus='false'>Go</div>
</span>
- </td>
- <td class="acq-lit-li-menu-right">
- <span>
+ <span style='margin-left:10px;padding-left:10px;border-left:2px solid #aaa;'>
<div dojoType='dijit.form.Button' jsId='acqLitSaveCopies' scrollOnFocus='false'>Save Changes</div>
</span>
<span id='acq-lit-update-copies-progress' class='hidden'>
@@ -175,6 +173,29 @@
</div>
<hr/>
+ <table id='acq-lit-distrib-formula-table'>
+ <tbody id='acq-lit-distrib-formula-tbody'>
+ <tr id='acq-lit-distrib-form-row'>
+ <td colspan='0'>
+ <span>Distribution Formulas</span>
+ <div name='selector'></div>
+ <div name='set_button'></div>
+ <div name="reset_button"></div>
+ </td>
+ </tr>
+ </tbody>
+ <tbody id="acq-lit-distrib-applied-tbody" class="hidden">
+ <tr>
+ <td colspan="5" id="acq-lit-distrib-applied-heading">
+ Distribution formulas applied to this lineitem:
+ </td>
+ </tr>
+ <tr id="acq-lit-distrib-applied-row" class="acq-lit-distrib-applied-row">
+ <th></th>
+ <td colspan="4"></td>
+ </tr>
+ </tbody>
+ <table>
<table id='acq-lit-li-details-table'>
<tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
@@ -203,31 +224,6 @@
</tr>
</tbody>
- <tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
-
- <tbody id='acq-lit-distrib-formula-tbody'>
- <tr id='acq-lit-distrib-form-row'>
- <td colspan='0'>
- <span>Distribution Formulas</span>
- <div name='selector'></div>
- <div name='set_button'></div>
- <div name="reset_button"></div>
- </td>
- </tr>
- </tbody>
-
- <tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
- <tbody id="acq-lit-distrib-applied-tbody" class="hidden">
- <tr>
- <td colspan="5" id="acq-lit-distrib-applied-heading">
- Distribution formulas applied to this lineitem:
- </td>
- </tr>
- <tr id="acq-lit-distrib-applied-row" class="acq-lit-distrib-applied-row">
- <th></th>
- <td colspan="4"></td>
- </tr>
- </tbody>
<tbody><tr><td class='acq-lit-table-spacer' colspan='0'></td></tr></tbody>
<tbody style='font-weight:bold;'>
commit 6ae2cb8ee2dc4e5b143487a80f94c17b1dcbdb4b
Author: Bill Erickson <berick at esilibrary.com>
Date: Mon Jul 25 13:24:53 2011 -0400
Show LI summary in copies display page
Using the new, self-contained Lineitem.fetchAndRender, show a full LI
summary along the top of the LI copies edit page.
Includes some minor layout smoothing
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/web/css/skin/default/acq.css b/Open-ILS/web/css/skin/default/acq.css
index 7844e17..91fceb4 100644
--- a/Open-ILS/web/css/skin/default/acq.css
+++ b/Open-ILS/web/css/skin/default/acq.css
@@ -146,7 +146,7 @@ label[for="attr_search_type_scalar"] { vertical-align: top; }
.acq-lit-po-heading td span a[attr="name"] { font-weight: bold; }
#acq-lit-info-tbody td {padding:5px;}
#acq-lit-info-related { margin-top: 10px; }
-#acq-lit-li-details-table {margin-top:20px;}
+#acq-lit-li-details-table {margin-top:5px;}
#acq-lit-li-details-table td {padding:0px 3px 1px 3px;}
#acq-lit-li-details-table th {padding:0px 3px 1px 3px; font-weight:bold;}
#acq-lit-li-details-table .dijit {width:130px;}
@@ -252,3 +252,8 @@ span[name="bib_origin"] img { vertical-align: middle; }
#acq-litpager-controls[disabled="true"] { color: #ccc; }
.acq-po-info th { text-align: right; }
+#acq-lit-copies-li-summary {
+ border: 1px #666 dashed;
+ margin-bottom: 15px;
+ padding: 4px;
+}
diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 4068294..d3dad87 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -921,6 +921,12 @@ function AcqLiTable() {
if (typeof force_fetch == "undefined")
force_fetch = false;
+ openils.acq.Lineitem.fetchAndRender(liId, {},
+ function(li, html) {
+ dojo.byId('acq-lit-copies-li-summary').innerHTML = html;
+ }
+ );
+
this.show('copies');
var self = this;
this.copyCache = {};
diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2
index 645a0ae..6f4606c 100644
--- a/Open-ILS/web/templates/default/acq/common/li_table.tt2
+++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2
@@ -144,7 +144,11 @@
<!-- Copies table -->
<div id='acq-lit-li-details' class='hidden'>
- <h2>Copies</h2>
+
+ <div id='acq-lit-copies-li-summary'></div>
+
+ <h3>Add/Edit Items</h3>
+ <hr/>
<div class='acq-lit-li-menu-bar'>
<table style='width:100%'>
@@ -170,6 +174,8 @@
</table>
</div>
+ <hr/>
+
<table id='acq-lit-li-details-table'>
<tbody><tr><td class='acq-lit-table-spacer' colspan='0'/></tr></tbody>
<tbody style='font-weight:bold;'>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/web/css/skin/default/acq.css | 8 ++-
Open-ILS/web/js/ui/default/acq/common/li_table.js | 8 ++-
.../web/templates/default/acq/common/li_table.tt2 | 60 ++++++++++----------
3 files changed, 45 insertions(+), 31 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list