gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 22807: Ensure .maincontent appears on all pages 

Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit c5b173f7de)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 0923ccef50)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
This commit is contained in:
Martin Renvoize 2020-06-10 16:56:40 +01:00 committed by Aleisha Amohia
parent 36b9a1bf1b
commit 92742425dd
26 changed files with 101 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
View File

@ -27,7 +27,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="opac-maintenance-message">
<div id="opac-maintenance-message" class="maincontent">
[% IF Koha.Preference( 'OpacMaintenanceNotice' ) %]
[% Koha.Preference( 'OpacMaintenanceNotice' ) | $raw %]
[% ELSE %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="useraddbybiblionumber">
<div id="useraddbybiblionumber" class="maincontent">
[% IF ( authorized ) %]
[% UNLESS ( newshelf ) %]
[% IF ( multiple ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
View File

@ -17,7 +17,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="useralertsubscribe">
<div id="useralertsubscribe" class="maincontent">
[% IF ( typeissue ) %]
<h1>Subscribe to a subscription alert</h1>
<form action="opac-alert-subscribe.pl" method="post">

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
View File

@ -15,7 +15,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span9">
<div id="opac-blocked-message">
<div id="opac-blocked-message" class="maincontent">
<h3>Blocked</h3>
<p>You are not authorized to view this record.</p>
[% IF ( OpacSuppressionMessage ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
View File

@ -20,7 +20,7 @@
[% IF ( OpacNav ) %]<div class="span10">[% ELSE %]<div class="span12">[% END %]
<div id="userbrowser">
<div id="userbrowser" class="maincontent">
<h1>Browse our catalog</h1>
[% IF ( have_hierarchy ) %]

141
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
View File

@ -26,79 +26,80 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<h2>Course reserves for <i>[% course.course_name | html %]</i></h2>
<div class="rows">
<ol>
[% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]</li>[% END %]
<li><span class="label">Department:</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department, 1 ) | html %]</li>
[% IF ( course.course_number ) %]<li><span class="label">Course number:</span> [% course.course_number | html %]</li>[% END %]
[% IF ( course.section ) %]<li><span class="label">Section:</span> [% course.section | html %]</li>[% END %]
[% IF ( course.instructors ) %]
<li><span class="label">Instructors:</span>
<ul>
[% FOREACH i IN course.instructors %]
<li><div class="instructor">[% i.firstname | html %] [% i.surname | html %]</div></li>
[% END %]
</ul>
</li>
[% END %]
[% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | $raw %]</li>[% END %]
</ol>
</div>
[% IF ( course_reserves ) %]
<table id="course-items-table" class="table table-bordered table-striped table-condensed">
<thead>
<tr>
<th class="anti-the">Title</th>
<th>Author</th>
<th>Item type</th>
<th>Location</th>
<th>Collection</th>
<th>Call number</th>
<th>Copy number</th>
<th>Status</th>
<th class="title-string">Date due</th>
<th>Notes</th>
<th>Link</th>
</tr>
</thead>
<tbody>
[% FOREACH cr IN course_reserves %]
<tr>
<td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title-head.inc' biblio=cr.biblio %]</a></td>
<td>[% cr.biblio.author | html %]</td>
<td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
<td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]</i></td>
<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %]</td>
<td>[% cr.item.itemcallnumber | html %]</td>
<td>[% cr.item.copynumber | html %]</td>
<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
<td><span title="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates as_due_date => 1 %]</span></td>
<td>[% IF ( cr.public_note ) %]
[% cr.public_note | $raw %]
[% ELSIF ( cr.item.itemnotes ) %]
[% cr.item.itemnotes | $raw %]
<div id="course_reserves" class="maincontent">
<h2>Course reserves for <i>[% course.course_name | html %]</i></h2>
<div class="rows">
<ol>
[% IF ( course.term ) %]<li><span class="label">Term:</span> [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]</li>[% END %]
<li><span class="label">Department:</span> [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department, 1 ) | html %]</li>
[% IF ( course.course_number ) %]<li><span class="label">Course number:</span> [% course.course_number | html %]</li>[% END %]
[% IF ( course.section ) %]<li><span class="label">Section:</span> [% course.section | html %]</li>[% END %]
[% IF ( course.instructors ) %]
<li><span class="label">Instructors:</span>
<ul>
[% FOREACH i IN course.instructors %]
<li><div class="instructor">[% i.firstname | html %] [% i.surname | html %]</div></li>
[% END %]
</td>
<td>[% IF (cr.item.uri) %]
<a href="[% cr.item.uri | url %]">Item URI</a>
[% ELSIF (cr.biblioitem.url) %]
<a href="[% cr.biblioitem.url | url %]">Record URL</a>
[% END %]
</td>
</tr>
</ul>
</li>
[% END %]
</tbody>
</table>
[% ELSE %]
<br style="clear:both;" />
<div class="alert alert-info">
<p>No reserves have been selected for this course.</p>
[% IF ( course.public_note ) %]<li><span class="label">Notes:</span> [% course.public_note | $raw %]</li>[% END %]
</ol>
</div>
[% END %]
[% IF ( course_reserves ) %]
<table id="course-items-table" class="table table-bordered table-striped table-condensed">
<thead>
<tr>
<th class="anti-the">Title</th>
<th>Author</th>
<th>Item type</th>
<th>Location</th>
<th>Collection</th>
<th>Call number</th>
<th>Copy number</th>
<th>Status</th>
<th class="title-string">Date due</th>
<th>Notes</th>
<th>Link</th>
</tr>
</thead>
<tbody>
[% FOREACH cr IN course_reserves %]
<tr>
<td><a href="opac-detail.pl?biblionumber=[% cr.biblio.biblionumber | uri %]">[% INCLUDE 'biblio-title-head.inc' biblio=cr.biblio %]</a></td>
<td>[% cr.biblio.author | html %]</td>
<td>[% ItemTypes.GetDescription( cr.item.itype ) | html %]</td>
<td>[% Branches.GetName( cr.item.holdingbranch ) | html %] <br/> <i>[% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]</i></td>
<td>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %]</td>
<td>[% cr.item.itemcallnumber | html %]</td>
<td>[% cr.item.copynumber | html %]</td>
<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
<td><span title="[% cr.issue.date_due | html %]">[% cr.issue.date_due | $KohaDates as_due_date => 1 %]</span></td>
<td>[% IF ( cr.public_note ) %]
[% cr.public_note | $raw %]
[% ELSIF ( cr.item.itemnotes ) %]
[% cr.item.itemnotes | $raw %]
[% END %]
</td>
<td>[% IF (cr.item.uri) %]
<a href="[% cr.item.uri | url %]">Item URI</a>
[% ELSIF (cr.biblioitem.url) %]
<a href="[% cr.biblioitem.url | url %]">Record URL</a>
[% END %]
</td>
</tr>
[% END %]
</tbody>
</table>
[% ELSE %]
<br style="clear:both;" />
<div class="alert alert-info">
<p>No reserves have been selected for this course.</p>
</div>
[% END %]
</div> <!-- / #course_reserves -->
</div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->

3
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
View File

@ -23,7 +23,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="courses" class="maincontent">
<h1>Courses</h1>
<table id="course_reserves_table" class="table table-bordered table-striped table-condensed">
@ -56,6 +56,7 @@
[% END %]
</tbody>
</table>
</div> <!-- / #courses -->
</div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
View File

@ -21,7 +21,7 @@
</div>
</div>
<div class="span10">
<div id="discharge" class="maincontainer">
<div id="discharge" class="maincontent">
<h1>Discharge</h1>
[% FOR message IN messages %]
<div class="dialog [% message.type | html %]">

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
View File

@ -65,7 +65,7 @@
<div class="span12">
[% END %]
<div class="row-fluid">
<div class="span9">
<div class="span9 maincontent">
<h1 class="title">Images for
[% IF ( BiblioDefaultViewmarc ) %]
<a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% biblionumber |url %]" title="View details for this title">

8
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
View File

@ -44,13 +44,13 @@
[% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
[% IF ( OpacNav || OpacNavBottom ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
<div class="span7">
<div class="span7 maincontent">
[% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
<div class="span9">
<div class="span9 maincontent">
[% ELSIF ( OpacNav || OpacNavBottom ) %]
<div class="span10">
<div class="span10 maincontent">
[% ELSE %]
<div class="span12">
<div class="span12 maincontent">
[% END %]
[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
View File

@ -22,7 +22,7 @@
</div>
</div>
<div class="span10">
<div id="update-submitted">
<div id="update-submitted" class="maincontent">
<div class="alert alert-success">
<h3>Thank you</h3>
<p>Your updates have been submitted. A librarian will review your updates before applying them.</p>

4
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
View File

@ -55,9 +55,9 @@
</div>
<div class="span10">
[% IF action == 'edit' %]
<div id="update-account">
<div id="update-account" class="maincontent">
[% ELSE %]
<div id="add-account">
<div id="add-account" class="maincontent">
[% END %]
[% IF action == 'edit' %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
View File

@ -23,7 +23,7 @@
</div>
<div class="span10">
[% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %]
<div id="usermessaging">
<div id="usermessaging" class="maincontent">
<h3>Your messaging settings</h3>
[% IF ( settings_updated ) %]
<div class="alert alert-success"><h4>Settings updated</h4></div>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
View File

@ -24,7 +24,7 @@
</div>
</div>
<div class="span10">
<div id="userpasswd">
<div id="userpasswd" class="maincontent">
<h3>Change your password </h3>
[% IF ( Error_messages ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
View File

@ -44,7 +44,7 @@
</div>
[% END %]
</div>
<div class="span10">
<div class="span10 maincontent">
<h3>Forgotten password recovery</h3>
[% IF (hasError) %]
<div class="alert alert-warning">

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
View File

@ -23,7 +23,7 @@
</div>
</div>
<div class="span10">
<div id="patronconsents">
<div id="patronconsents" class="maincontent">
[% IF Koha.Preference('GDPR_Policy') %]
<div class="alert">

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
View File

@ -22,7 +22,7 @@
</div>
</div>
<div class="span10">
<div id="userprivacy">
<div id="userprivacy" class="maincontent">
<h3>Your privacy management</h3>
[% IF deleted %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
View File

@ -34,7 +34,7 @@
</div>
</div>
<div class="span10">
<div id="userreadingrecord">
<div id="userreadingrecord" class="maincontent">
<h3>Checkout history</h3>
[% IF READING_RECORD.size == 0 %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
View File

@ -31,7 +31,7 @@
<div class="span9">
[% END %]
<div id="registration-complete">
<div id="registration-complete" class="maincontent">
<h1>Registration Complete!</h1>
<p>You have successfully registered your new account.</p>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
View File

@ -25,7 +25,7 @@
[% ELSE %]
<div class="span12">
[% END %]
<div id="reistration-confirmation-pending">
<div id="reistration-confirmation-pending" class="maincontent">
<div id="confirmation-pending" class="alert alert-info">
<h1>Please confirm your registration</h1>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
View File

@ -25,7 +25,7 @@
[% ELSE %]
<div class="span12">
[% END %]
<div id="reistration-confirmation-error">
<div id="registration-confirmation-error" class="maincontent">
<div class="alert">
<h1>Registration invalid!</h1>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View File

@ -20,7 +20,7 @@
</ul>
<div class="container">
<div id="holds">
<div id="holds" class="maincontent">
[% IF ( message ) %]
<div id="holdmessages" class="alert">
<p>Sorry, you cannot place holds.</p>

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
View File

@ -57,7 +57,7 @@
[% ELSE %]
<div class="span12">
[% END %]
<div id="grouped-results">
<div id="grouped-results" class="maincontent">
<!-- Search Results Table -->
[% IF ( total ) %]
[% IF ( scan ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
View File

@ -8,7 +8,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div id="userreview">
<div id="userreview" class="maincontent">
[% IF ( cgi_debug ) %]
<div class="debug">CGI debug is on.</div>
[% END %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
View File

@ -26,7 +26,7 @@
[% ELSE %]
<div class="span12">
[% END %]
<div id="userserialissues">
<div id="userserialissues" class="maincontent">
<h2>Issues for a subscription</h2>
<div id="views">
<span class="view">

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
View File

@ -28,7 +28,7 @@
[% ELSE %]
<div class="span9">
[% END %]
<div id="subjectcloud">
<div id="subjectcloud" class="maincontent">
<h1>Subject cloud</h1>
[% IF Koha.Preference( 'OpacCloud' ) == 1 %]
[% IF ( LOOP ) %]