From fa8de4bd6b477c994ac63820fc836bfce76beb10 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 10 Jun 2020 16:56:40 +0100
Subject: [PATCH] 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>
---
 .../opac-tmpl/bootstrap/en/modules/maintenance.tt  |   2 +-
 .../bootstrap/en/modules/opac-addbybiblionumber.tt |   2 +-
 .../bootstrap/en/modules/opac-alert-subscribe.tt   |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-blocked.tt |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-browse.tt  |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-browser.tt |   2 +-
 .../bootstrap/en/modules/opac-course-details.tt    | 141 +++++++++++----------
 .../bootstrap/en/modules/opac-course-reserves.tt   |   3 +-
 .../bootstrap/en/modules/opac-discharge.tt         |   2 +-
 .../bootstrap/en/modules/opac-imageviewer.tt       |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |   8 +-
 .../modules/opac-memberentry-update-submitted.tt   |   2 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |   4 +-
 .../bootstrap/en/modules/opac-messaging.tt         |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt  |   2 +-
 .../bootstrap/en/modules/opac-password-recovery.tt |   2 +-
 .../bootstrap/en/modules/opac-patron-consent.tt    |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt |   2 +-
 .../bootstrap/en/modules/opac-readingrecord.tt     |   2 +-
 .../en/modules/opac-registration-confirmation.tt   |   2 +-
 .../en/modules/opac-registration-email-sent.tt     |   2 +-
 .../en/modules/opac-registration-invalid.tt        |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt |   2 +-
 .../bootstrap/en/modules/opac-results-grouped.tt   |   2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-review.tt  |   2 +-
 .../bootstrap/en/modules/opac-serial-issues.tt     |   2 +-
 .../bootstrap/en/modules/opac-tags_subject.tt      |   2 +-
 27 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
index 6d5d4df0d9..8583d22815 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt
@@ -35,7 +35,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 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
index 21f2c11adb..16672bb87a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
@@ -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 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
index bf83086bfe..a98f791ad8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt
@@ -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">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
index ec0a35f46e..48b46b554d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt
@@ -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 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
index 7336ae869c..e999fe98d1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt
@@ -36,7 +36,7 @@
             <div class="span12">
             [% END %]
 
-                <div id="browse-search">
+                <div id="browse-search" class="maincontent">
                     <h1>Browse search</h1>
 
                     <form>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
index 71bac82e51..42d32b05c0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt
@@ -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 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
index 5db0b526d3..3a22e713a0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt
@@ -27,79 +27,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 %]
-                                        [% 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>
+                <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>
-                                </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 -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
index 751e2ecc14..256071b747 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt
@@ -24,7 +24,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">
@@ -57,6 +57,7 @@
                             [% END %]
                         </tbody>
                     </table>
+                </div> <!-- / #courses -->
             </div> <!-- / .span12 -->
         </div> <!-- / .row-fluid -->
     </div> <!-- / .container-fluid -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
index 92479accdf..e8a2db76c4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt
@@ -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 %]">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
index 2a098baeb0..eeb453e4d0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
@@ -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">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index e9b4e34616..70ac981762 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -45,13 +45,13 @@
     [% END %]
 
     [% 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' ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
index acb4725462..3e602e652b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt
@@ -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>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
index 35af40224f..b28d6c98ea 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
@@ -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' %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
index 7fd4786503..d7c1161949 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
@@ -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>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
index 3dbd997344..5c1816f89c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
@@ -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 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
index 6d2e5d2ad4..6e8ff8ae95 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
@@ -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">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
index f40597198a..80b96031b8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt
@@ -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">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
index 789a23739a..605137a703 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt
@@ -22,7 +22,7 @@
                 </div>
             </div>
             <div class="span10">
-                <div id="userprivacy">
+                <div id="userprivacy" class="maincontent">
                     <h3>Your privacy management</h3>
 
                     [% IF deleted %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
index 3b95b586ed..9b1ca9d45e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
@@ -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 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
index 2fc4493983..8a151024b8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
@@ -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>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
index 1a4bdce4d4..2258bb5e68 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt
@@ -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>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
index 7647b0d4ed..d72914c30c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt
@@ -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>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 9e73090c6e..74e439ac6d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -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>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
index f254c499ce..28f31ef41e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
@@ -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 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
index 863e4ac696..423dcb0318 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt
@@ -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 %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index 6f6e879ca6..4be2764a6b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -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">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
index d28db08d1f..beccebaacf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt
@@ -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 ) %]
-- 
2.11.0