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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+30 lines)
Lines 2154-2159 a.p1:active { Link Here
2154
div.ft {
2154
div.ft {
2155
	clear : both;
2155
	clear : both;
2156
}
2156
}
2157
2158
.authorSearch {
2159
    position: absolute;
2160
    display: none;
2161
    z-index: 2;
2162
    background-color: white;
2163
    border: 1px solid black;
2164
    padding: 4px;
2165
}
2166
.authorSearch li {
2167
    list-style-type: none;
2168
}
2169
.authorSearch ul {
2170
    padding-left: 0px;
2171
}
2172
.subjectSearch {
2173
    position: absolute;
2174
    display: none;
2175
    z-index: 2;
2176
    background-color: white;
2177
    border: 1px solid black;
2178
    padding: 4px;
2179
}
2180
.subjectSearch li {
2181
    list-style-type: none;
2182
}
2183
.subjectSearch ul {
2184
    padding-left: 0px;
2185
}
2186
2157
#basket td ul li {
2187
#basket td ul li {
2158
	font-size:90%;
2188
	font-size:90%;
2159
    list-style:disc outside url(data:image/gif;base64,R0lGODlhBQAHAJECAP///5zD6v///wAAACH5BAEAAAIALAAAAAAFAAcAAAIMjCUGkbvhFGQSmVAAADs=);
2189
    list-style:disc outside url(data:image/gif;base64,R0lGODlhBQAHAJECAP///5zD6v///wAAACH5BAEAAAIALAAAAAAFAAcAAAIMjCUGkbvhFGQSmVAAADs=);
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-9 / +174 lines)
Lines 292-297 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
292
 });
292
 });
293
//]]>
293
//]]>
294
</script>
294
</script>
295
296
<script type="text/JavaScript" language="JavaScript">
297
//<![CDATA[
298
    function showAuthors(element, authornumber){
299
        // Hide subjects menu if displayed
300
        hideMenu(".subjectSearch");
301
302
        // Check checkbox related to the clicked link
303
        $("#authorsList input[type='checkbox']").attr('checked', false);
304
        $("#author_"+authornumber).attr('checked', true);
305
306
        makeAuthorRequest();
307
308
        // Display menu
309
        var left = element.offsetLeft || 0;
310
        var top = element.offsetTop || 0;
311
        $('.authorSearch').css('display', 'block');
312
        $('.authorSearch').css('left', left);
313
        $('.authorSearch').css('top', top + 15);
314
    }
315
316
    function hideMenu(elem) {
317
        $(elem).css('display', 'none');
318
    }
319
320
    function checkAll(checkbox, elem) {
321
        var check = $(checkbox).attr('checked') ? true : false;
322
        $(elem).find("input[type='checkbox']").attr('checked', check);
323
        elem == "#authorsList" ? makeAuthorRequest() : makeSubjectRequest();
324
    }
325
326
    function makeAuthorRequest(){
327
        var values = [];
328
329
        $("#authorsList").find("input[type='checkbox']:checked").each(function () {
330
            values.push($(this).val());
331
        });
332
333
        if (values.length > 0) {
334
            var request = "/cgi-bin/koha/opac-search.pl?q=" + values.join(' and ');
335
            $("#validAuthorSearch").attr("href", request);
336
        } else {
337
            $("#validAuthorSearch").removeAttr("href");
338
        }
339
340
    }
341
342
    //Subjects
343
    function showSubjects(element, subjectnumber, subfieldnumber){
344
        // Hide author menu if displayed
345
        hideMenu(".authorSearch");
346
347
        // Check checkbox related to the clicked link
348
        $("#subjectsList input[type='checkbox']").attr('checked', false);
349
        $("#subject_"+subjectnumber+"_"+subfieldnumber).attr('checked', true);
350
351
        makeSubjectRequest();
352
353
        // Display menu
354
        var left = element.offsetLeft || 0;
355
        var top = element.offsetTop || 0;
356
        $('.subjectSearch').css('display', 'block');
357
        $('.subjectSearch').css('left', left);
358
        $('.subjectSearch').css('top', top + 15);
359
    }
360
361
    function makeSubjectRequest() {
362
        var values = [];
363
        $("#subjectsList > ul").each(function() {
364
            var all_checked = true;
365
            var local_values = [];
366
            $(this).find('input[type="checkbox"]').each(function() {
367
                if($(this).attr('checked')) {
368
                    local_values.push($(this).val());
369
                } else {
370
                    all_checked = false;
371
                }
372
            });
373
            var authid = $(this).attr('data-authid');
374
            if(all_checked && authid) {
375
                values.push('an:' + authid);
376
            } else {
377
                values = values.concat(local_values);
378
            }
379
        });
380
381
        if(values.length > 0) {
382
            var request = "/cgi-bin/koha/opac-search.pl?q=" + values.join(' and ');
383
            $("#validSubjectSearch").attr('href', request);
384
        } else {
385
            $("#validSubjectSearch").removeAttr("href");
386
        }
387
    }
388
//]]>
389
</script>
390
295
[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]<style type="text/css">
391
[% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]<style type="text/css">
296
    #addtagl { display: none; }
392
    #addtagl { display: none; }
297
</style>[% END %][% END %][% END %]
393
</style>[% END %][% END %][% END %]
Lines 359-373 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
359
    </span>
455
    </span>
360
456
361
    [% IF ( MARCAUTHORS ) %]
457
    [% IF ( MARCAUTHORS ) %]
362
    <span class="results_summary"><span class="label">Additional authors:</span>
458
    <span class="results_summary">
459
        <span class="label">Authors:</span>
460
        <div class="authorSearch" id="authorSearch">
461
            <span><b>Select the item(s) to search :</b></span>
462
            <ul id="authorsList">
463
                <li><input type="checkbox" onchange="checkAll(this, '#authorsList')"> <b>all</b></li>
464
                <li><hr /></li>
465
                [% FOREACH MARCAUTHOR IN MARCAUTHORS %]
466
                    <li>
467
                        [% IF (MARCAUTHOR.authoritylink) %]
468
                            <input type="checkbox" name="checkbox"
469
                                id="author_[% loop.count %]"
470
                                onclick="makeAuthorRequest()"
471
                                value="an:[% MARCAUTHOR.authoritylink %]" />
472
                        [% ELSE %]
473
                            <input type="checkbox" name="checkbox"
474
                                id="author_[% loop.count %]"
475
                                onclick="makeAuthorRequest()"
476
                                value="au,wrdl:[% FOREACH SUBFIELD IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% SUBFIELD.value |url %][% UNLESS (loop.last) %]+[% END %][% END %]" />
477
                        [% END %]
478
479
                        [% FOREACH SUBFIELD IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
480
                            [% SUBFIELD.value %]
481
                        [% END %]
482
                    </li>
483
                [% END %]
484
            </ul>
485
            <hr />
486
            <a href="#" onclick="hideMenu('.authorSearch'); return false">Cancel</a>
487
            &nbsp;|&nbsp;
488
            <a id="validAuthorSearch">Search</a>
489
        </div>
363
        [% FOREACH MARCAUTHOR IN MARCAUTHORS %]
490
        [% FOREACH MARCAUTHOR IN MARCAUTHORS %]
364
            [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
491
            [% authorsloop = loop %]
365
                [% MARCAUTHOR_SUBFIELDS_LOO.separator %]
492
            [% FOREACH SUBFIELD IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
366
                <a title="‡[% MARCAUTHOR_SUBFIELDS_LOO.code %] [% MARCAUTHOR_SUBFIELDS_LOO.value %]"
493
                <a title="$[% SUBFIELD.code %] [% SUBFIELD.value %]"
367
                    href="/cgi-bin/koha/opac-search.pl?q=[% FOREACH link_loo IN MARCAUTHOR_SUBFIELDS_LOO.link_loop %][% link_loo.operator |url %][% link_loo.limit |url %]:[% link_loo.link |url %][% END %]">[% MARCAUTHOR_SUBFIELDS_LOO.value %]</a>
494
                    onclick="showAuthors(this, [% authorsloop.count %]); return false;"
368
            [% END %] 
495
                    href="/cgi-bin/koha/opac-search.pl?q=[% FOREACH link IN SUBFIELD.link_loop %][% link.operator |url %][% link.limit |url %]:[% link.link |url %][% END %]">[% SUBFIELD.value %]</a>
496
                [% UNLESS (loop.last) %][% SUBFIELD.separator %][% END %]
497
            [% END %]
369
            [% IF (MARCAUTHOR.authoritylink) %]
498
            [% IF (MARCAUTHOR.authoritylink) %]
370
                <a class='authlink' href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCAUTHOR.authoritylink %]"><img style="vertical-align:middle" height="15" width="15" src="/opac-tmpl/prog/images/filefind.png"></a>
499
                <a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCAUTHOR.authoritylink %]"><img style="vertical-align:middle" height="15" width="15" src="/opac-tmpl/prog/images/filefind.png"></a>
371
            [% END %]
500
            [% END %]
372
            [% UNLESS ( loop.last ) %]|[% END %]
501
            [% UNLESS ( loop.last ) %]|[% END %]
373
        [% END %]
502
        [% END %]
Lines 426-431 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
426
    [% IF ( MARCSUBJCTS ) %]
555
    [% IF ( MARCSUBJCTS ) %]
427
        <span class="results_summary">
556
        <span class="results_summary">
428
            <span class="label">Subject(s):</span>
557
            <span class="label">Subject(s):</span>
558
            <div class="subjectSearch" >
559
                <span><b>Select the item(s) to search :</b></span>
560
                <div id="subjectsList">
561
                    <input type="checkbox" id="all_subjects"
562
                        onchange="checkAll(this, '#subjectsList')" />
563
                    <label for="all_subjects">
564
                        <b>all</b>
565
                    </label>
566
                    <hr />
567
                    [% FOREACH MARCSUBJCT IN MARCSUBJCTS %]
568
                        [% subjectsloop = loop %]
569
                        [% IF MARCSUBJCT.authoritylink %]
570
                            <ul id="subjectsList[% loop.count %]"
571
                                data-authid="[% MARCSUBJCT.authoritylink %]">
572
                        [% ELSE %]
573
                            <ul id="subjectsList[% loop.count %]">
574
                        [% END %]
575
                        [% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %]
576
                            <li>
577
                                <input type="checkbox" onclick="makeSubjectRequest()"
578
                                    name="checkbox"
579
                                    id="subject_[% subjectsloop.count %]_[% loop.count %]"
580
                                    value="su,wrdl:[% SUBFIELD.value |url %]" />
581
                                <label for="subject_[% subjectsloop.count %]_[% loop.count %]">
582
                                    [% SUBFIELD.value %]
583
                                </label>
584
                            </li>
585
                        [% END %]
586
                        </ul>
587
                        <hr />
588
                    [% END %]
589
                </div>
590
                <a href="#"
591
                onclick="hideMenu('.subjectSearch'); return false">Cancel</a>
592
                &nbsp;|&nbsp;
593
                <a id="validSubjectSearch">Search</a>
594
            </div>
429
            [% FOREACH MARCSUBJCT IN MARCSUBJCTS %]
595
            [% FOREACH MARCSUBJCT IN MARCSUBJCTS %]
430
                [% subjectsloop = loop %]
596
                [% subjectsloop = loop %]
431
                [% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %]
597
                [% FOREACH SUBFIELD IN MARCSUBJCT.MARCSUBJECT_SUBFIELDS_LOOP %]
Lines 433-439 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
433
                    <a title="$[% SUBFIELD.code %] [% SUBFIELD.value %]" href="/cgi-bin/koha/opac-search.pl?q=[% FOREACH link_loo IN SUBFIELD.link_loop %][% link_loo.operator |url %][% link_loo.limit |url %]:[% link_loo.link |url %][% END %]" onclick="showSubjects(this, [% subjectsloop.count %], [% loop.count %]); return false;">[% SUBFIELD.value %]</a>
599
                    <a title="$[% SUBFIELD.code %] [% SUBFIELD.value %]" href="/cgi-bin/koha/opac-search.pl?q=[% FOREACH link_loo IN SUBFIELD.link_loop %][% link_loo.operator |url %][% link_loo.limit |url %]:[% link_loo.link |url %][% END %]" onclick="showSubjects(this, [% subjectsloop.count %], [% loop.count %]); return false;">[% SUBFIELD.value %]</a>
434
                [% END %]
600
                [% END %]
435
                [% IF (MARCSUBJCT.authoritylink) %]
601
                [% IF (MARCSUBJCT.authoritylink) %]
436
                    <a class="authlink" href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCSUBJCT.authoritylink %]"><img style="vertical-align:middle" height="15" width="15" src="/opac-tmpl/prog/images/filefind.png" /></a>
602
                    <a href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% MARCSUBJCT.authoritylink %]"><img style="vertical-align:middle" height="15" width="15" src="/opac-tmpl/prog/images/filefind.png" /></a>
437
                [% END %]
603
                [% END %]
438
                [% UNLESS ( loop.last ) %] | [% END %]
604
                [% UNLESS ( loop.last ) %] | [% END %]
439
            [% END %]
605
            [% END %]
440
- 

Return to bug 5888