Attachment #19689 for bug #10566

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




	margin-bottom : 1em;
}

div.rows+div.rows {
    margin-top : .6em;
}

div.rows {
    float : left;
    clear : left;
    margin: 0 0 0 0;
    padding: 0;
    width: 100%;
}


div.rows span.label {
    float: left;
    font-weight : bold;
    width: 9em;
    margin-right: 1em;
    text-align: left;
}

div.rows ol {
    padding: .5em 1em 0 0;
    list-style-type: none;
}

div.rows ol li li {
    border-bottom: 0;
}

div.rows li {
    border-bottom :  1px solid #EEE;
    float : left;
    clear : left;
    padding-bottom: .2em;
    padding-top: .1em;
    list-style-type: none;
    width: 100%;
}

div.rows ul li:first-child {
    float: none;
    clear: none;
    margin-left: 0;
}

div.rows ul li {
    margin-left : 9em;
}

form {
	display : inline;
	margin : 0;




[% USE ItemTypes %]
[% USE Branches %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Course reserves for [% course.course_name %]
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">


<div id="doc2" class="yui-t7">
    <div id="yui-main">
        <h2><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a> &#8674; Course reserves for <i>[% course.course_name %]</i></h2>
        <div class="rows clearfix">
            <ol>
                [% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</li>[% END %]
                <li><span class="label">Department:</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</li>
                [% IF ( course.course_number ) %]<li><span class="label">Course number:</span> [% course.course_number %]</li>[% END %]
                [% IF ( course.section ) %]<li><span class="label">Section:</span> [% course.section %]</li>[% END %]
                [% IF ( course.instructors ) %]
                    <li><span class="label">Instructors:</span>
                        <ul>
                            [% FOREACH i IN course.instructors %]
                                <li><div class="instructor">[% i.firstname %] [% i.surname %]</div></li>
                            [% END %]
                        </ul>
                    </li>
                [% END %]
                [% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note %]</li>[% END %]
            </ol>
        </div>

        [% IF ( course_reserves ) %]
            <table>
                <thead>
            <tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
            <tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
            <tr><th>Section</th><td>[% course.section %]</td></tr>
            <tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
            <tr><th>Notes</th><td>[% course.public_note %]</td></tr>
        </table>

        <table>
            <thead>
                <tr>
                    <th>Title</th>
                    <th>Item type</th>
                    <th>Location</th>
                    <th>Collection</th>
                    <th>Call number</th>
                    <th>Copy</th>
                    <th>Status</td>
                    <th>Date due</td>
                    <th>Notes</th>
                </tr>
            </thead>

            <tbody>
                [% FOREACH cr IN course_reserves %]
                    <tr>
                        <th>Title</th>
                        <th>Item type</th>
                        <th>Location</th>
                        <th>Collection</th>
                        <th>Call number</th>
                        <th>Copy</th>
                        <th>Status</td>
                        <th>Date due</td>
                        <th>Notes</th>
                    </tr>
                </thead>
            </tbody>
        </table>

                <tbody>
                    [% FOREACH cr IN course_reserves %]
                        <tr>
                            <td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
                            <td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
                            <td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
                            <td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
                            <td>[% cr.item.itemcallnumber %]</td>
                            <td>[% cr.item.copynumber %]</td>
                            <td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
                            <td>[% cr.issue.date_due | $KohaDates %]</td>
                            <td>[% cr.public_note %]</td>
                        </tr>
                    [% END %]
                </tbody>
            </table>
        [% ELSE %]
            <br style="clear:both;" />
            <div class="dialog message">
                <p>No reserves have been selected for this course.</p>
            </div>
        [% END %]
    </div>
</div>





[% USE AuthorisedValues %]

[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Courses
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="opac-main">

            <div class="yui-b">
                <div class="yui-g">

                    <h1>Courses</h1>
                    <div id="search-toolbar">
                        <form action="/cgi-bin/koha/opac-course-reserves.pl" method="get" id="search_courses_form">
                            <fieldset>
                                <label for="search_on">Search courses:</label> <input type="text" name="search_on" id="search_on" />
                                <input type="submit" value="Search" />
                            </fieldset>
                        </form>
                    </div><!-- /search-toolbar -->

                    <h1>Courses</h1>
                    <table id="course_reserves_table">
                        <thead>
                            <tr>
- 

Return to bug 10566

Lines 165-170 fieldset.action p { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+50 lines)
165	margin-bottom : 1em;	165	margin-bottom : 1em;
166	}	166	}
167		167
		168	div.rows+div.rows {
		169	margin-top : .6em;
		170	}
		171
		172	div.rows {
		173	float : left;
		174	clear : left;
		175	margin: 0 0 0 0;
		176	padding: 0;
		177	width: 100%;
		178	}
		179
		180
		181	div.rows span.label {
		182	float: left;
		183	font-weight : bold;
		184	width: 9em;
		185	margin-right: 1em;
		186	text-align: left;
		187	}
		188
		189	div.rows ol {
		190	padding: .5em 1em 0 0;
		191	list-style-type: none;
		192	}
		193
		194	div.rows ol li li {
		195	border-bottom: 0;
		196	}
		197
		198	div.rows li {
		199	border-bottom : 1px solid #EEE;
		200	float : left;
		201	clear : left;
		202	padding-bottom: .2em;
		203	padding-top: .1em;
		204	list-style-type: none;
		205	width: 100%;
		206	}
		207
		208	div.rows ul li:first-child {
		209	float: none;
		210	clear: none;
		211	margin-left: 0;
		212	}
		213
		214	div.rows ul li {
		215	margin-left : 9em;
		216	}
		217
168	form {	218	form {
169	display : inline;	219	display : inline;
170	margin : 0;	220	margin : 0;

Lines 3-9 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt (-40 / +55 lines)
3	[% USE ItemTypes %]	3	[% USE ItemTypes %]
4	[% USE Branches %]	4	[% USE Branches %]
5	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
6	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog	6	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Course reserves for [% course.course_name %]
7	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]
8	</head>	8	</head>
9	<body id="opac-main">	9	<body id="opac-main">
Lines 13-61 Link Here
13		13
14	<div id="doc2" class="yui-t7">	14	<div id="doc2" class="yui-t7">
15	<div id="yui-main">	15	<div id="yui-main">
		16	<h2><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a> ⇢ Course reserves for <i>[% course.course_name %]</i></h2>
		17	<div class="rows clearfix">
		18	<ol>
		19	[% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</li>[% END %]
		20	<li><span class="label">Department:</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</li>
		21	[% IF ( course.course_number ) %]<li><span class="label">Course number:</span> [% course.course_number %]</li>[% END %]
		22	[% IF ( course.section ) %]<li><span class="label">Section:</span> [% course.section %]</li>[% END %]
		23	[% IF ( course.instructors ) %]
		24	<li><span class="label">Instructors:</span>
		25	<ul>
		26	[% FOREACH i IN course.instructors %]
		27	<li><div class="instructor">[% i.firstname %] [% i.surname %]</div></li>
		28	[% END %]
		29	</ul>
		30	</li>
		31	[% END %]
		32	[% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note %]</li>[% END %]
		33	</ol>
		34	</div>
16		35
17	<table>	36	[% IF ( course_reserves ) %]
18	<tr><th>Course Name</th><td>[% course.course_name %]</td></tr>	37	<table>
19	<tr><th>Term</th><td>[% AuthorisedValues.GetByCode( 'TERM', course.term ) %]</td></tr>	38	<thead>
20	<tr><th>Department</th><td>[% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department ) %]</td></tr>
21	<tr><th>Course Number</th><td>[% course.course_number %]</td></tr>
22	<tr><th>Section</th><td>[% course.section %]</td></tr>
23	<tr><th>Instructors</th><td>[% FOREACH i IN course.instructors %]<div class="instructor">[% i.firstname %] [% i.surname %]</div>[% END %]</td></tr>
24	<tr><th>Notes</th><td>[% course.public_note %]</td></tr>
25	</table>
26
27	<table>
28	<thead>
29	<tr>
30	<th>Title</th>
31	<th>Item type</th>
32	<th>Location</th>
33	<th>Collection</th>
34	<th>Call number</th>
35	<th>Copy</th>
36	<th>Status</td>
37	<th>Date due</td>
38	<th>Notes</th>
39	</tr>
40	</thead>
41
42	<tbody>
43	[% FOREACH cr IN course_reserves %]
44	<tr>	39	<tr>
45	<td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>	40	<th>Title</th>
46	<td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>	41	<th>Item type</th>
47	<td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>	42	<th>Location</th>
48	<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>	43	<th>Collection</th>
49	<td>[% cr.item.itemcallnumber %]</td>	44	<th>Call number</th>
50	<td>[% cr.item.copynumber %]</td>	45	<th>Copy</th>
51	<td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>	46	<th>Status</td>
52	<td>[% cr.issue.date_due \| $KohaDates %]</td>	47	<th>Date due</td>
53	<td>[% cr.public_note %]</td>	48	<th>Notes</th>
54	</tr>	49	</tr>
55	[% END %]	50	</thead>
56	</tbody>
57	</table>
58		51
		52	<tbody>
		53	[% FOREACH cr IN course_reserves %]
		54	<tr>
		55	<td><a href="opac-detail.pl?biblionumber=[% cr.item.biblionumber %]">[% cr.item.title %]</a></td>
		56	<td>[% ItemTypes.GetDescription( cr.item.itype ) %]</td>
		57	<td>[% Branches.GetName( cr.item.holdingbranch ) %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) %]</i></td>
		58	<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) %]</td>
		59	<td>[% cr.item.itemcallnumber %]</td>
		60	<td>[% cr.item.copynumber %]</td>
		61	<td>[% INCLUDE 'item-status.inc' item = cr.item %]</td>
		62	<td>[% cr.issue.date_due \| $KohaDates %]</td>
		63	<td>[% cr.public_note %]</td>
		64	</tr>
		65	[% END %]
		66	</tbody>
		67	</table>
		68	[% ELSE %]
		69	<br style="clear:both;" />
		70	<div class="dialog message">
		71	<p>No reserves have been selected for this course.</p>
		72	</div>
		73	[% END %]
59	</div>	74	</div>
60	</div>	75	</div>
61		76

Lines 1-7 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-reserves.tt (-7 / +8 lines)
1	[% USE AuthorisedValues %]	1	[% USE AuthorisedValues %]
2		2
3	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
4	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog	4	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Courses
5	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
6	</head>	6	</head>
7	<body id="opac-main">	7	<body id="opac-main">
Lines 15-28 Link Here
15	<div class="yui-b">	15	<div class="yui-b">
16	<div class="yui-g">	16	<div class="yui-g">
17		17
		18	<h1>Courses</h1>
18	<div id="search-toolbar">	19	<div id="search-toolbar">
19	<form id="search_courses_form">	20	<form action="/cgi-bin/koha/opac-course-reserves.pl" method="get" id="search_courses_form">
20	<input type="text" name="search_on" id="search_on" />	21	<fieldset>
21	<input type="submit" value="Search" />	22	<label for="search_on">Search courses:</label> <input type="text" name="search_on" id="search_on" />
		23	<input type="submit" value="Search" />
		24	</fieldset>
22	</form>	25	</form>
23	</div><!-- /toolbar -->	26	</div><!-- /search-toolbar -->
24		27
25	<h1>Courses</h1>
26	<table id="course_reserves_table">	28	<table id="course_reserves_table">
27	<thead>	29	<thead>
28	<tr>	30	<tr>
29	-