Attachment #60680 for bug #18002

View | Details | Raw Unified | Return to bug 18002
Collapse All | Expand All

Lines 223-230 if ($op eq 'add_form') { Link Here

(-)a/admin/aqbudgets.pl (-2 / +5 lines)
223	ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);	223	ModBudgetUsers($budget_hash->{budget_id}, @budgetusersid);
224	$budget_modified = 1;	224	$budget_modified = 1;
225		225
226	print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");	226	my $fundcreated = $input->param('fundcreated');
227	exit;	227	if ($fundcreated eq "onboarding") {
		228	print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl");
		229	exit;
		230	}
228		231
229	}	232	}
230		233





                    <li>
                        <label for="budget_period_active">Make budget active: </label>
                        <input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />
                    </li>
                </ol>
            </fieldset>

        </form>
    </div>
    [% ELSIF displayonboardscreen == "label" %]
    <div id="onboardingModal">
        <h2>Labels</h2>
        <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
             <fieldset class="rows">
             <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
             <ol>
                  <li>
                         <label for="layout_name">Layout name: </label>
                         <input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
                  </li>
                  <li>
                         <label for="barcode_type">Choose barcode type (encoding): </label>
                         <select name="barcode_type" id="barcode_type">
                            [% FOREACH barcode_type IN barcode_types %]
                                [% IF ( barcode_type.selected ) %]
                                    <option value="[% barcode_type.type %]" selected="selected">[% barcode_type.name %]</option>
                                [% ELSE %]
                                    <option value="[% barcode_type.type %]">[% barcode_type.name %]</option>
                                [% END %]
                            [% END %]
                         </select>
                  </li>
                  <li>
                         <label for="printing_type">Choose layout type: </label>
                         <select name="printing_type" id="printing_type">
                         [% FOREACH label_type IN label_types %]
                              [% IF ( label_type.selected ) %]
                                  <option value="[% label_type.type %]" selected="selected">[% PROCESS translate_label_types type=label_type.type %]</option>
                              [% ELSE %]
                                  <option value="[% label_type.type %]">[% PROCESS translate_label_types type=label_type.type %]</option>
                              [% END %]
                         [% END %]
                         </select>
                  </li>
                  <li>
                       <fieldset>
                           <legend>Bibliographic data to print</legend>
                           <ol>
                                 <li class="radio">
                                    [% IF ( layout_string ) %]
                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="che    cked" /><label for="layout_choice_order">Choose order of text fields to print</label>
                                    [% ELSE %]
                                        <input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" /><label for    ="layout_choice_order">Choose Order Of Text Fields to Print</label>
                                    [% END %]
                                    <div id="layout_table">
                                        <p>
                                        [% FOREACH text_field IN fields %]
                                            <select name="[% text_field.field_name %]" id="[% text_field.field_name |url %]">
                                                <option value=""></option>
                                                [% FOREACH orde IN [1..field_count] %]
                                                    [% IF ( orde == text_field.order ) %]
                                                         <option value="[% orde %]" selected="1">[% orde %]</option>
                                                    [% ELSE %]
                                                         <option value="[% orde %]">[% orde %]</option>
                                                    [% END %]
                                                [% END %]
                                            </select>&nbsp;<label for="[% text_field.field_name |url %]">[% text_field.field_la    bel %]</label>

                                            &nbsp;&nbsp;
                                        [% END %]
                                        </p>
                                    </div>
                                 </li>
                                 [% UNLESS ( layout_string ) %]
                                    <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou    t_string" checked="checked" /> <label for="layout_choice_list">List fields</label></li>
                                 [% ELSE %]
                                    <li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou    t_string" /> <label for="layout_choice_list">List Fields</label></li>
                                 [% END %]
[% END %]




                [% END %]
            </legend>
            <input type="hidden" name="op" value="add_validate" />
            <input type="hidden" name="fundcreated" value="onboarding" />
            <input type="hidden" name="checked" value="0" />
            <ol>
                [% budget_parent_id = 0 %]
                <li>
                     <span class="label">Fund parent: </span>
                     [% budget_parent_id %]
                     [% budget_parent_id %] - [% budget_parent_name %]
                     <input type="hidden" name="budget_parent_id" value= NULL />
                </li>
                <li>


        </fieldset>
        <fieldset class="action">
            <input type="submit" value="Submit" />
            <input type="hidden" name="budget_period_id" value="1" />
        </fieldset>
    </form>

Lines 464-469 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (+1 lines)
464		464
465	<input type="hidden" name="op" value="add_validate" />	465	<input type="hidden" name="op" value="add_validate" />
466	<input type="hidden" name="checked" value="0" />	466	<input type="hidden" name="checked" value="0" />
		467	<input type="hidden" name="fundcreated" value="acquiform" />
467	<ol>	468	<ol>
468	[% IF ( budget_parent_id ) %]	469	[% IF ( budget_parent_id ) %]
469	<li>	470	<li>

Lines 20-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt (-2 / +3 lines)
20	<div class="yui-g">	20	<div class="yui-g">
21	[% INCLUDE 'labels-toolbar.inc' %]	21	[% INCLUDE 'labels-toolbar.inc' %]
22	<div class="yui-u first">	22	<div class="yui-u first">
23		23	[% IF
		24	[% displayonboardscreen == "label" %]
		25	[% INCLUDE 'onboardinginclude.inc' %]
24	</div>	26	</div>
25	</div>	27	</div>
26	</div>	28	</div>
27	-

Return to bug 18002

Lines 47-53 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc (-6 / +69 lines)
47		47
48	<li>	48	<li>
49	<label for="budget_period_active">Make budget active: </label>	49	<label for="budget_period_active">Make budget active: </label>
50	[% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %] <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]	50	<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />
51	</li>	51	</li>
52	</ol>	52	</ol>
53	</fieldset>	53	</fieldset>
Lines 59-67 Link Here
59	</form>	59	</form>
60	</div>	60	</div>
61	[% ELSIF displayonboardscreen == "label" %]	61	[% ELSIF displayonboardscreen == "label" %]
62	<h2>testing</h2>	62	<div id="onboardingModal">
63		63	<h2>Labels</h2>
64		64	<form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
65		65	<fieldset class="rows">
		66	<legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
		67	<ol>
		68	<li>
		69	<label for="layout_name">Layout name: </label>
		70	<input type="text" name="layout_name" id="layout_name" size="20" value="[% layout_name %]" />
		71	</li>
		72	<li>
		73	<label for="barcode_type">Choose barcode type (encoding): </label>
		74	<select name="barcode_type" id="barcode_type">
		75	[% FOREACH barcode_type IN barcode_types %]
		76	[% IF ( barcode_type.selected ) %]
		77	<option value="[% barcode_type.type %]" selected="selected">[% barcode_type.name %]</option>
		78	[% ELSE %]
		79	<option value="[% barcode_type.type %]">[% barcode_type.name %]</option>
		80	[% END %]
		81	[% END %]
		82	</select>
		83	</li>
		84	<li>
		85	<label for="printing_type">Choose layout type: </label>
		86	<select name="printing_type" id="printing_type">
		87	[% FOREACH label_type IN label_types %]
		88	[% IF ( label_type.selected ) %]
		89	<option value="[% label_type.type %]" selected="selected">[% PROCESS translate_label_types type=label_type.type %]</option>
		90	[% ELSE %]
		91	<option value="[% label_type.type %]">[% PROCESS translate_label_types type=label_type.type %]</option>
		92	[% END %]
		93	[% END %]
		94	</select>
		95	</li>
		96	<li>
		97	<fieldset>
		98	<legend>Bibliographic data to print</legend>
		99	<ol>
		100	<li class="radio">
		101	[% IF ( layout_string ) %]
		102	<input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" checked="che cked" /><label for="layout_choice_order">Choose order of text fields to print</label>
		103	[% ELSE %]
		104	<input type="radio" name="layout_choice" id="layout_choice_order" value="layout_table" /><label for ="layout_choice_order">Choose Order Of Text Fields to Print</label>
		105	[% END %]
		106	<div id="layout_table">
		107	<p>
		108	[% FOREACH text_field IN fields %]
		109	<select name="[% text_field.field_name %]" id="[% text_field.field_name \|url %]">
		110	<option value=""></option>
		111	[% FOREACH orde IN [1..field_count] %]
		112	[% IF ( orde == text_field.order ) %]
		113	<option value="[% orde %]" selected="1">[% orde %]</option>
		114	[% ELSE %]
		115	<option value="[% orde %]">[% orde %]</option>
		116	[% END %]
		117	[% END %]
		118	</select> <label for="[% text_field.field_name \|url %]">[% text_field.field_la bel %]</label>
66		119
67	[% END %]	120
		121	[% END %]
		122	</p>
		123	</div>
		124	</li>
		125	[% UNLESS ( layout_string ) %]
		126	<li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou t_string" checked="checked" /> <label for="layout_choice_list">List fields</label></li>
		127	[% ELSE %]
		128	<li class="radio"><input type="radio" id="layout_choice_list" name="layout_choice" value="layou t_string" /> <label for="layout_choice_list">List Fields</label></li>
		129	[% END %]
		130	[% END %]