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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt (-12 / +13 lines)
Lines 7-13 Link Here
7
<div class="container">[% IF ( email ) %]
7
<div class="container">[% IF ( email ) %]
8
8
9
    [% IF ( SENT ) %]
9
    [% IF ( SENT ) %]
10
        <h3>Message sent</h3>
10
        <h2>Message sent</h2>
11
        <p>The list was sent to: [% email | html %]</p>
11
        <p>The list was sent to: [% email | html %]</p>
12
        <p><a class="close focus" href="#">Close window</a></p>
12
        <p><a class="close focus" href="#">Close window</a></p>
13
    [% END %]
13
    [% END %]
Lines 19-38 Link Here
19
19
20
<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
20
<form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
21
21
22
<fieldset class="rows"> 
22
<fieldset id="select-libs">
23
    <legend><h1>Sending your list</h1></legend>
23
<h3>Sending your list</h3>
24
<ol>   <li>
24
<ol>   <p>
25
        <label for="email">Email address:</label>
25
        <label for="email">Email address:</label>
26
        <input type="text" id="email" name="email" size="43" class="focus" />
26
        <input type="text" id="email" name="email" size="max" class="focus" />
27
    </li>
27
    </p>
28
    <li>
28
    <p>
29
            <label for="comment">Comment:</label>
29
            <label for="comment">Comment:</label>
30
            <textarea id="comment" name="comment" rows="4" cols="40"></textarea>
30
            <textarea id="comment" name="comment" rows="4"></textarea>
31
    </li>
31
    </p>
32
    <li>
32
    <p>
33
        <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
33
        <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
34
    </li></ol></fieldset>
34
    </p></ol>
35
       <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
35
36
    <input type="submit" value="Send" size="max" class="principal" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
36
</form>
37
</form>
37
38
38
[% END %]</div>
39
[% END %]</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-64 / +79 lines)
Lines 3-8 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% formulaire = BLOCK %]
7
    [% INCLUDE 'circ-search.inc' %]
8
[% END %]
6
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
7
<title>
10
<title>
8
    [% IF op == 'view' %]
11
    [% IF op == 'view' %]
Lines 43-50 Link Here
43
</head>
46
</head>
44
47
45
<body id="lists_shelves" class="lists">
48
<body id="lists_shelves" class="lists">
46
[% INCLUDE 'header.inc' %]
49
[% INCLUDE 'header.inc' form=formulaire %]
47
[% INCLUDE 'cat-search.inc' %]
48
50
49
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
51
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
50
    <ol>
52
    <ol>
Lines 115-120 Link Here
115
            </li>
117
            </li>
116
        [% END %]
118
        [% END %]
117
    </ol>
119
    </ol>
120
121
    <ol>
122
        [% IF Koha.Preference('showLastPatron') %][% INCLUDE 'last-borrower.inc' %][% END %]
123
    </ol>
124
125
    <ol>
126
        <a class="toplinks" href="/cgi-bin/koha/help.pl" id="helper"><i class="fa fa-question-circle"></i> <span>Help</span></a>
127
    </ol>
118
</nav>
128
</nav>
119
129
120
    <div class="main container-fluid">
130
    <div class="main container-fluid">
Lines 122-128 Link Here
122
            <div class="col-sm-10 col-sm-push-1">
132
            <div class="col-sm-10 col-sm-push-1">
123
                <main>
133
                <main>
124
134
125
                [% INCLUDE 'virtualshelves-toolbar.inc' %]
135
136
<h2>Lists</h2>
137
[% INCLUDE 'virtualshelves-toolbar.inc' %]
126
138
127
[% FOR m IN messages %]
139
[% FOR m IN messages %]
128
    <div class="dialog [% m.type | html %]">
140
    <div class="dialog [% m.type | html %]">
Lines 316-395 Link Here
316
[% IF op == 'add_form' OR op == 'edit_form' %]
328
[% IF op == 'add_form' OR op == 'edit_form' %]
317
329
318
    <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">
330
    <form method="post" action="/cgi-bin/koha/virtualshelves/shelves.pl" class="validated">
319
        <fieldset class="rows">
331
        <fieldset class="brief">
320
332
321
        [% IF op == 'add_form' %]
333
            [% IF op == 'add_form' %]
322
        <legend><h1>Create a new list</h1></legend>
334
                <h3>Create a new list</h3>
323
            <input type="hidden" name="op" value="add" />
335
                <input type="hidden" name="op" value="add" />
324
        [% ELSE %]
336
            [% ELSE %]
325
        <legend><h1>Edit list <em>[% shelf.shelfname | html %]</em></h1></legend>
337
                <h3>Edit list <em>[% shelf.shelfname | html %]</em></h3>
326
            <input type="hidden" name="op" value="edit" />
338
                <input type="hidden" name="op" value="edit" />
327
        [% END %]
339
            [% END %]
328
        <input type="hidden" name="referer" value="[% referer | html %]" />
340
            <input type="hidden" name="referer" value="[% referer | html %]" />
329
        <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
341
            <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
330
        <ol>
342
            <ol>
331
            <li>
343
                <li>
332
                <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname | html %]" required="required" class="focus required" />
344
                    <label for="shelfname" class="required">Name: </label><input type="text" id="shelfname" name="shelfname" size="25" value="[% shelf.shelfname | html %]" required="required" class="focus required" />
333
            <span class="required">Required</span>
345
                <span class="required">Required</span>
334
            </li>
346
                </li>
335
            <li>
347
                <li>
336
                <span class="label">Owner: </span>
348
                    <label>Owner: </label>
337
                [% IF op == 'add_form' %]
349
                    [% IF op == 'add_form' %]
338
                    <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
350
                        <input type="hidden" name="owner" id="owner" value="[% loggedinusernumber | html %]" /><span class="label">[% logged_in_user.userid | html %]</span>
339
                [% ELSE %]
340
                    [% IF owner %]
341
                        <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" />[% owner.firstname _ ' ' _ owner.surname | html %]
342
                    [% ELSE %]
351
                    [% ELSE %]
343
                        <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[% logged_in_user.userid | html %]
352
                        [% IF owner %]
353
                            <input type="hidden" id="owner" name="owner" value="[% owner.borrowernumber | html %]" /><span class="label">[% owner.firstname _ ' ' _ owner.surname | html %]</span>
354
                        [% ELSE %]
355
                            <input type="hidden" id="owner" name="owner" value="[% loggedinusernumber | html %]" />[<span class="label">% logged_in_user.userid | html %]</span>
356
                        [% END %]
344
                    [% END %]
357
                    [% END %]
345
                [% END %]
358
                </li>
346
            </li>
359
                <li><label for="sortfield" >Sort this list by: </label>
347
            <li><label for="sortfield" >Sort this list by: </label>
360
                <select name="sortfield">
348
            <select name="sortfield">
361
                [% IF shelf.sortfield == "title" %]<option value="title" selected="selected">Title</option>[% ELSE %]<option value="title">Title</option>[% END %]
349
            [% IF shelf.sortfield == "title" %]<option value="title" selected="selected">Title</option>[% ELSE %]<option value="title">Title</option>[% END %]
362
                [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
350
            [% IF shelf.sortfield == "author" %]<option value="author" selected="selected">Author</option>[% ELSE %]<option value="author">Author</option>[% END %]
363
                [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
351
            [% IF shelf.sortfield == "copyrightdate" %]<option value="copyrightdate" selected="selected">Copyrightdate</option>[% ELSE %]<option value="copyrightdate">Copyrightdate</option>[% END %]
364
                [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
352
            [% IF shelf.sortfield == "itemcallnumber" %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
365
                [% IF shelf.sortfield == "dateadded" %]<option value="dateadded" selected="selected">Date added</option>[% ELSE %]<option value="dateadded">Date added</option>[% END %]
353
            [% IF shelf.sortfield == "dateadded" %]<option value="dateadded" selected="selected">Date added</option>[% ELSE %]<option value="dateadded">Date added</option>[% END %]
366
                </select></li>
354
            </select></li>
367
                <li><label for="public">Public: </label>
355
            <li><label for="public">Public: </label>
368
                    <select id="public" name="public" onchange="AdjustRemark()">
356
                <select id="public" name="public" onchange="AdjustRemark()">
369
                    [% IF shelf.is_private %]
357
                [% IF shelf.is_private %]
370
                        <option value="0" selected="selected">Private</option>
358
                    <option value="0" selected="selected">Private</option>
371
                    [% ELSE %]
359
                [% ELSE %]
372
                        <option value="0">Private</option>
360
                    <option value="0">Private</option>
373
                    [% END %]
361
                [% END %]
374
                    [% IF shelf.is_public %]
362
                [% IF shelf.is_public %]
375
                        <option value="1" selected="selected">Public</option>
363
                    <option value="1" selected="selected">Public</option>
376
                    [% ELSE %]
364
                [% ELSE %]
377
                        <option value="1">Public</option>
365
                    <option value="1">Public</option>
378
                    [% END %]
366
                [% END %]
379
                            </select></li>
367
                           </select></li>
368
380
369
            [% INCLUDE list_permissions %]
381
                [% INCLUDE list_permissions %]
370
382
371
        </ol>
383
            </ol>
372
    </fieldset>
373
384
374
    <fieldset class="action">
385
            <input type="submit" value="Save" class="principal" />
375
        <input type="submit" value="Save" class="submit" />
386
            [% IF referer == 'view' %]
376
        [% IF referer == 'view' %]
387
            <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
377
           <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel">Cancel</a>
388
        [% ELSE %]
378
       [% ELSE %]
389
                [% IF public %]
379
            [% IF public %]
390
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
380
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=1" class="cancel">Cancel</a>
391
                [% ELSE %]
381
            [% ELSE %]
392
                    <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
382
                <a href="/cgi-bin/koha/virtualshelves/shelves.pl?op=list&amp;public=0" class="cancel">Cancel</a>
393
                [% END %]
383
            [% END %]
394
            [% END %]
384
        [% END %]
395
        </fieldset>
385
    </fieldset>
386
    </form>
396
    </form>
387
397
388
[% END %]
398
[% END %]
389
399
390
[% IF op == 'list' %]
400
[% IF op == 'list' %]
391
    <h1>Lists</h1>
401
<<<<<<< HEAD
402
    <h2>Lists</h2>
403
=======
404
>>>>>>> Bug 30952: Virtualshelves Module
392
    <div id="tabs" class="toptabs">
405
    <div id="tabs" class="toptabs">
406
    <fieldset class="briefgr">
393
        <ul>
407
        <ul>
394
            <li id="privateshelves_tab" class="active"><a href="#tab_content">Your lists</a></li>
408
            <li id="privateshelves_tab" class="active"><a href="#tab_content">Your lists</a></li>
395
            <li id="publicshelves_tab" class="active"><a href="#tab_content">Public lists</a></li>
409
            <li id="publicshelves_tab" class="active"><a href="#tab_content">Public lists</a></li>
Lines 433-438 Link Here
433
                <tbody></tbody>
447
                <tbody></tbody>
434
            </table>
448
            </table>
435
        </div>
449
        </div>
450
    </fieldset>
436
    </div>
451
    </div>
437
[% END %]
452
[% END %]
438
453
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/tables/shelves_results.tt (-3 / +2 lines)
Lines 43-49 Link Here
43
        [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%]
43
        [%~ action_block = action_block _ '<input type="hidden" name="op" value="edit_form" />' ~%]
44
        [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
44
        [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
45
        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
45
        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
46
        [%~ action_block = action_block _ '<button class="editshelf btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</button>' ~%]
46
        [%~ action_block = action_block _ '<button id="lientype">Edit</button>' ~%]
47
        [%~ action_block = action_block _ '</form> ' ~%]
47
        [%~ action_block = action_block _ '</form> ' ~%]
48
    [%~ END ~%]
48
    [%~ END ~%]
49
    [%~ IF can_manage_shelf OR can_delete_shelf ~%]
49
    [%~ IF can_manage_shelf OR can_delete_shelf ~%]
Lines 53-59 Link Here
53
        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
53
        [%~ action_block = action_block _ '<input type="hidden" name="shelfnumber" value="' _ shelfnumber  _ '" />' ~%]
54
        [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
54
        [%~ action_block = action_block _ '<input type="hidden" name="public" value="' _ public _ '" />' ~%]
55
        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
55
        [%~ action_block = action_block _ '<input type="hidden" name="referer" value="list" />' ~%]
56
        [%~ action_block = action_block _ '<button type="submit" class="deleteshelf btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</button>' ~%]
56
        [%~ action_block = action_block _ '<button type="submit" id="lientype">Delete</button>' ~%]
57
        [%~ action_block = action_block _ '</form>' ~%]
57
        [%~ action_block = action_block _ '</form>' ~%]
58
    [%~ END ~%]
58
    [%~ END ~%]
59
[%~ ELSE ~%]
59
[%~ ELSE ~%]
60
- 

Return to bug 30952