Merge branch 'bug_10045' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-04-25 22:11:23 -04:00
commit fe85af6929

View file

@ -230,7 +230,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
<span class="label">Library:</span> [% branchname %]
</li>
<li>
<span class="label">Budget:</span> [% budgetname %]
<span class="label">Fund:</span> [% budgetname %]
</li>
<li>
<span class="label">Copies:</span>[% quantity %]
@ -329,7 +329,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
[% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %]
</select>
</li>
<li><label for="budgetid">Budget:</label>
<li><label for="budgetid">Fund:</label>
<select name="budgetid" id="budgetid">
<option value="">Any</option>[% FOREACH budgetsloo IN budgetsloop %]
[% IF ( budgetsloo.selected ) %]<option value="[% budgetsloo.budget_id %]" selected="selected">[% budgetsloo.budget_name %]</option>[% ELSE %]<option value="[% budgetsloo.budget_id %]">[% budgetsloo.budget_name %]</option>[% END %][% END %]
@ -392,7 +392,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
<th>Suggested by - on</th>
<th>Managed by - on</th>
<th>Library</th>
<th>Budget</th>
<th>Fund</th>
<th>Status</th></tr>
</thead>
<tbody>