Attachment #67663 for bug #18060

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

Lines 3039-3044 div#aqhelp{ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+22 lines)
3039	border-radius:10px;	3039	border-radius:10px;
3040	}	3040	}
3041		3041
		3042	#LabelOnboardingModal{
		3043	z-index:1;
		3044	background-color:#EDF4F6;
		3045	padding: .2em 0;
		3046	width: 100%;
		3047	float:right;
		3048	left: 100%;
		3049	position:relative;
		3050	top: 10px;
		3051	padding-left:10px;
		3052	padding-right:10px;
		3053	border-radius:10px;
		3054	}
		3055
3042	#acqui-onboard{	3056	#acqui-onboard{
3043	text-align: center;	3057	text-align: center;
3044	padding-bottom:15px;	3058	padding-bottom:15px;
Lines 3059-3061 div#aqhelp{ Link Here
3059	#budget_code_onboard{	3073	#budget_code_onboard{
3060	width:55%;	3074	width:55%;
3061	}	3075	}
		3076
		3077
		3078
		3079
		3080
		3081
		3082
		3083




<style type="text/css">
    #onboardingModal{
        z-index:1;
        background-color:#EDF4F6;
        padding:20px;
        width:70%;
        position:absolute;
        overflow:scroll;
        left:auto;
        top:auto;
        right:auto;
        bottom:auto;
}
</style>

[% BLOCK translate_justification_types %]
 [%  SWITCH type %]
 [%   CASE 'L' %]Left

<div id="onboardingModal">
        <h1 id="acqui-onboard"> Acquisition onboarding wizard</h1>

        <h3> This onboarding wizard will take you through the process of setting up Acquisitions </h3>
        <p>Start by completing this form to create a currency which you will use to create your first budget and fund.<br>
        A fund is the accounting value you use to create orders</p>
         <form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">

</div>

[% ELSIF displayonboarding == "label" %]
<div id="LabelOnboardingModal">
    <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
        <h1> Label onboarding wizard</h1>

        <h3> This onboarding wizard will take you through the process of setting up labels </h3>
        <p> Start by completing this form to create a label which you will be able to print, after creating a printer profile </p>
        <fieldset class="rows">
        <legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
        <ol>




[% IF  displayonboarding == "acquisitions" %]
    <div id="onboardingModal">
        <h1> Acquisition onboarding wizard</h1>
        <h2> Acquisition onboarding wizard</h2>
        <p> Create a budget which is the highest level value in acquisitions accountancy. <br>
        After creating this budget you will be prompted to create a fund which is what you will use to set up orders.
        </p>
        <b>If you have previously created a budget (which was subsequently deleted) then you will be redirected to the budget administration page after creating a budget using this form. On the budget administration page click Actions->Add fund to create a fund</b>
        <h3> Create a budget</h3>
        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="acquisitiononboarding" name="acquisitiononboarding" method="post">
            <fieldset class="rows">
                <input type="hidden" name="op" value="add_validate" />
                <input type="hidden" name="step" value="3"/>

                </a>
            </fieldset>
        </form>
    </div>
[% ELSIF displayonboarding == "label" %]
    <div id="LabelOnboardingModal">
        <h1> Label omboarding wizard </h1>
        <h3> This onboarding wizard will take you through the process of setting up labels </h3>
        <p> Create a label template which can be printed after you have set up a printer profile </p>
        <form name="labelonboarding" id="labelonboarding" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
        <fieldset class="rows">
            <ol>
               <li>

                  <input type="hidden" name="template_id" value="[% template_id %]" />
            [% END %]
       </fieldset>
    </form>
    </div>
[% END %]
</div>




    </table>
    </div>
    [% END %]

  <button type="button" id="show" onclick"unhide(aqhelp)">Show the next steps to set up Acquisitions</button>
    <br><br>
    <div id="aqhelp">
        <h1> Next steps</h1>
        <h2> 1. Create your first vendor</h2>
        <p> A vendor is the organisation your institution purchases items from i.e. suppliers<br>
        You must create a vendor before you can create any orders</p>
        <b>Click <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">here</a> to create a vendor.</b>
        <br><br>
        <h2> 2. Create your first basket</h2>
        <p> A basket is the conceptual container that holds orders. Each basket is assigned to a single vendor so you can perform multiple seperate orders from a single vendor simultaneously. Because of its reliance on vendor the basket must be created after the vendor</p>
        <b> To create a basket, click the 'New basket' button on the Vendor Information page which is displayed after you create a vendor</b>
        <br><br>
        <h2> 3. Create an order</h2>
        <p> An order is a assignment of items purchased from a single vendor at a single time</p>
        You create an order by clicking "Add to basket" in the Basket page. From here you can choose the item(s) you want to purchase from existing MARC records in your Koha catalogue, subscription, new item record, external source, staged file (bibliographic file in the process of being uploaded), or from popularly held items.
        </p>
        <br><br>
        For further information about creating a vendor, basket and order go to the Koha manual:
        <a href="http://translate.koha-community.org/manual/master/en/html/09_acquisitions.html"> Koha manual Acquisitions section</a>
    </div>
</div>
</div>
<div class="yui-b">

Lines 114-120 elsif ($op eq 'save') { Link Here

(-)a/labels/label-edit-template.pl (-1 / +1 lines)
114		114
115	my $profilevalue = C4::Creators::Profile->retrieve_all();	115	my $profilevalue = C4::Creators::Profile->retrieve_all();
116	if ($profilevalue == 0) {	116	if ($profilevalue == 0) {
117	print $cgi->redirect("label-edit-profile.pl");	117	print $cgi->redirect("label-edit-profile.pl?op=new");
118	exit;	118	exit;
119	}else{	119	}else{
120	print $cgi->redirect("/cgi-bin/koha/labels/label-home.pl");	120	print $cgi->redirect("/cgi-bin/koha/labels/label-home.pl");




use C4::Creators::Template;
use C4::Creators;
use C4::Labels;
use C4::Labels::Layout;

my $cgi = new CGI;
my $layout = C4::Labels::Layout->new();
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "labels/label-home.tt",

my $op = $cgi->param('op') || '';
my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || '';
my $layout_choice = $cgi->param('layout_choice') || '';
my $layout = C4::Labels::Layout->new();

sub _set_selected {
    my ($type_list, $object, $data_type) = @_;
    SET_SELECTED:
    warn $layout;
    foreach my $type (@$type_list) {
    if ($layout->get_attr($data_type)) {
     if ($type->{'type'} eq $layout->get_attr($data_type)) {
- 

Return to bug 18060

Lines 255-282 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-22 lines)
255	</table>	255	</table>
256	</div>	256	</div>
257	[% END %]	257	[% END %]
258
259	<button type="button" id="show" onclick"unhide(aqhelp)">Show the next steps to set up Acquisitions</button>
260	<br><br>
261	<div id="aqhelp">
262	<h1> Next steps</h1>
263	<h2> 1. Create your first vendor</h2>
264	<p> A vendor is the organisation your institution purchases items from i.e. suppliers<br>
265	You must create a vendor before you can create any orders</p>
266	<b>Click <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">here</a> to create a vendor.</b>
267	<br><br>
268	<h2> 2. Create your first basket</h2>
269	<p> A basket is the conceptual container that holds orders. Each basket is assigned to a single vendor so you can perform multiple seperate orders from a single vendor simultaneously. Because of its reliance on vendor the basket must be created after the vendor</p>
270	<b> To create a basket, click the 'New basket' button on the Vendor Information page which is displayed after you create a vendor</b>
271	<br><br>
272	<h2> 3. Create an order</h2>
273	<p> An order is a assignment of items purchased from a single vendor at a single time</p>
274	You create an order by clicking "Add to basket" in the Basket page. From here you can choose the item(s) you want to purchase from existing MARC records in your Koha catalogue, subscription, new item record, external source, staged file (bibliographic file in the process of being uploaded), or from popularly held items.
275	</p>
276	<br><br>
277	For further information about creating a vendor, basket and order go to the Koha manual:
278	<a href="http://translate.koha-community.org/manual/master/en/html/09_acquisitions.html"> Koha manual Acquisitions section</a>
279	</div>
280	</div>	258	</div>
281	</div>	259	</div>
282	<div class="yui-b">	260	<div class="yui-b">

Lines 1-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude1.inc (-17 / +6 lines)
1	<style type="text/css">
2	#onboardingModal{
3	z-index:1;
4	background-color:#EDF4F6;
5	padding:20px;
6	width:70%;
7	position:absolute;
8	overflow:scroll;
9	left:auto;
10	top:auto;
11	right:auto;
12	bottom:auto;
13	}
14	</style>
15
16	[% BLOCK translate_justification_types %]	1	[% BLOCK translate_justification_types %]
17	[% SWITCH type %]	2	[% SWITCH type %]
18	[% CASE 'L' %]Left	3	[% CASE 'L' %]Left
Lines 35-41 Link Here
35	<div id="onboardingModal">	20	<div id="onboardingModal">
36	<h1 id="acqui-onboard"> Acquisition onboarding wizard</h1>	21	<h1 id="acqui-onboard"> Acquisition onboarding wizard</h1>
37		22
38	<h3> This onboarding wizard will take you through the process of setting up Acquistions </h3>	23	<h3> This onboarding wizard will take you through the process of setting up Acquisitions </h3>
39	<p>Start by completing this form to create a currency which you will use to create your first budget and fund.<br>	24	<p>Start by completing this form to create a currency which you will use to create your first budget and fund.<br>
40	A fund is the accounting value you use to create orders</p>	25	A fund is the accounting value you use to create orders</p>
41	<form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">	26	<form action="/cgi-bin/koha/admin/currency.pl" name="Aform" method="post" class="validated">
Lines 76-83 Link Here
76	</div>	61	</div>
77		62
78	[% ELSIF displayonboarding == "label" %]	63	[% ELSIF displayonboarding == "label" %]
79	<div id="onboardingModal">	64	<div id="LabelOnboardingModal">
80	<form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">	65	<form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
		66	<h1> Label onboarding wizard</h1>
		67
		68	<h3> This onboarding wizard will take you through the process of setting up labels </h3>
		69	<p> Start by completing this form to create a label which you will be able to print, after creating a printer profile </p>
81	<fieldset class="rows">	70	<fieldset class="rows">
82	<legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>	71	<legend>[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] label layout</legend>
83	<ol>	72	<ol>

Lines 1-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude2.inc (-7 / +12 lines)
		1	[% IF displayonboarding == "acquisitions" %]
1	<div id="onboardingModal">	2	<div id="onboardingModal">
2	[% IF displayonboarding == "acquisitions" %]	3	<h1> Acquisition onboarding wizard</h1>
3	<h2> Acquisition onboarding wizard</h2>
4	<p> Create a budget which is the highest level value in acquisitions accountancy. <br>	4	<p> Create a budget which is the highest level value in acquisitions accountancy. <br>
5	After creating this budget you will be prompted to create a fund which is what you will use to set up orders.	5	After creating this budget you will be prompted to create a fund which is what you will use to set up orders.
6	</p>	6	</p>
7	<b>If you have previously created a budget (which was subsequently deleted) then you will be redirected to the budget administration page after creating a budget using this form. On the budget administration page click Actions->Add fund to create a fund</b>	7	<b>If you have previously created a budget (which was subsequently deleted) then you will be redirected to the budget administration page after creating a budget using this form. On the budget administration page click Actions->Add fund to create a fund</b>
8	<h3> Create a budget</h3>	8	<h3> Create a budget</h3>
9	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">	9	<form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" id="acquisitiononboarding" name="acquisitiononboarding" method="post">
10	<fieldset class="rows">	10	<fieldset class="rows">
11	<input type="hidden" name="op" value="add_validate" />	11	<input type="hidden" name="op" value="add_validate" />
12	<input type="hidden" name="step" value="3"/>	12	<input type="hidden" name="step" value="3"/>
Lines 43-50 Link Here
43	</a>	43	</a>
44	</fieldset>	44	</fieldset>
45	</form>	45	</form>
46	[% ELSIF displayonboarding == "label" %]	46	</div>
47	<form name="input" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">	47	[% ELSIF displayonboarding == "label" %]
		48	<div id="LabelOnboardingModal">
		49	<h1> Label omboarding wizard </h1>
		50	<h3> This onboarding wizard will take you through the process of setting up labels </h3>
		51	<p> Create a label template which can be printed after you have set up a printer profile </p>
		52	<form name="labelonboarding" id="labelonboarding" action="/cgi-bin/koha/labels/label-edit-template.pl" method="get">
48	<fieldset class="rows">	53	<fieldset class="rows">
49	<ol>	54	<ol>
50	<li>	55	<li>
Lines 149-154 Link Here
149	<input type="hidden" name="template_id" value="[% template_id %]" />	154	<input type="hidden" name="template_id" value="[% template_id %]" />
150	[% END %]	155	[% END %]
151	</fieldset>	156	</fieldset>
152	</form>	157	</form>
		158	</div>
153	[% END %]	159	[% END %]
154	</div>

Lines 30-37 use C4::Creators::Layout; Link Here

(-)a/labels/label-home.pl (-2 / +3 lines)
30	use C4::Creators::Template;	30	use C4::Creators::Template;
31	use C4::Creators;	31	use C4::Creators;
32	use C4::Labels;	32	use C4::Labels;
		33	use C4::Labels::Layout;
33		34
34	my $cgi = new CGI;	35	my $cgi = new CGI;
		36	my $layout = C4::Labels::Layout->new();
35	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	37	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
36	{	38	{
37	template_name => "labels/label-home.tt",	39	template_name => "labels/label-home.tt",
Lines 46-56 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
46	my $op = $cgi->param('op') \|\| '';	48	my $op = $cgi->param('op') \|\| '';
47	my $layout_id = $cgi->param('layout_id') \|\| $cgi->param('element_id') \|\| '';	49	my $layout_id = $cgi->param('layout_id') \|\| $cgi->param('element_id') \|\| '';
48	my $layout_choice = $cgi->param('layout_choice') \|\| '';	50	my $layout_choice = $cgi->param('layout_choice') \|\| '';
49	my $layout = C4::Labels::Layout->new();
50		51
51	sub _set_selected {	52	sub _set_selected {
52	my ($type_list, $object, $data_type) = @_;	53	my ($type_list, $object, $data_type) = @_;
53	SET_SELECTED:	54	SET_SELECTED:
		55	warn $layout;
54	foreach my $type (@$type_list) {	56	foreach my $type (@$type_list) {
55	if ($layout->get_attr($data_type)) {	57	if ($layout->get_attr($data_type)) {
56	if ($type->{'type'} eq $layout->get_attr($data_type)) {	58	if ($type->{'type'} eq $layout->get_attr($data_type)) {
57	-