X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fabout.tt;h=17fd1e88c63c0829add0b8a6ab673c6dbadf18ca;hb=acbfe26c9ef6e40f4509babd6e1d39e1762e13e3;hp=34ee031e003820e4e5e7cb1a728cf4549be12412;hpb=61d9d098e9fd60a8529c958421d8901f2083e64a;p=koha_fer

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 34ee031e00..17fd1e88c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -5,7 +5,7 @@
 //<![CDATA[
 
      $(document).ready(function() {
-        $('#abouttabs > ul').tabs();
+        $('#abouttabs').tabs();
      });
 //]]>
 </script>
@@ -24,12 +24,13 @@
 
     <div id="abouttabs" class="toptabs numbered">
         <ul>
-        <li><a href="about.pl#about">Server Information</a></li>
-        <li><a href="about.pl#perl">Perl modules</a></li>
-        <li><a href="about.pl#team">Koha Team</a></li>
-        <li><a href="about.pl#licenses">Licenses</a></li>
-        <li><a href="about.pl#translations">Translations</a></li>
-        <li><a href="about.pl#history">Koha Timeline</a></li>
+        <li><a href="#about">Server Information</a></li>
+        <li><a href="#perl">Perl modules</a></li>
+        <li><a href="#sysinfo">System information</a></li>
+        <li><a href="#team">Koha Team</a></li>
+        <li><a href="#licenses">Licenses</a></li>
+        <li><a href="#translations">Translations</a></li>
+        <li><a href="#history">Koha Timeline</a></li>
         </ul>
 
         <div id="about">
@@ -48,6 +49,11 @@
             <tr><th scope="row">MySQL version: </th><td>[% mysqlVersion |html %]</td></tr>
             <tr><th scope="row">Apache version: </th><td>[% apacheVersion |html %]</td></tr>
             <tr><th scope="row">Zebra version: </th><td>[% zebraVersion |html %]</td></tr>
+            [% IF (errZebraConnection == 10000) %]
+            <tr><th scope="row"><b>Error</b> </th><td>Zebra server seems not to be available. Is it started?</td></tr>
+            [% ELSIF (errZebraConnection) %]
+            <tr><th scope="row"><b>Warning</b> </th><td>Error message from Zebra: [% ( errZebraConnection ) %] </td></tr>
+            [% END %]
         </table>
         </div>
         <div id="perl">
@@ -69,57 +75,104 @@
                     <th scope="row" style="background-color:#FFCB2F;font-weight:normal" title="Module upgrade needed">
                     [% END %]
                     [% ELSE %]
-                    [% IF ( ro.require ) %]
+                    [% IF ( ro.name == '' ) %]
+                    <th>
+                    [% ELSIF ( ro.require ) %]
                     <th scope="row" style="background-color:#FF8A8A;font-weight:bold;" title="Required module missing">
                     [% ELSE %]
                     <th scope="row" style="background-color:#FF8A8A;font-weight:normal" title="Optional module missing">
                     [% END %]
                     [% END %]
-                        [% ro.name %]
+                    [% ro.name %]
                     </th>
-                    [% IF ( ro.version ) %]<td>[% ro.version %][% ELSE %]<td style="font-weight:bold">Not Installed[% END %]</td>
+                    [% IF ( ro.name == '' ) %]
+                    <td>
+                    [% ELSIF ( ro.version ) %]
+                    <td>[% ro.version %]
+                    [% ELSE %]
+                    <td style="font-weight:bold">Not Installed [% END %]</td>
                     [% END %]
                 </tr>
                 [% END %]
             </table>
         </div>
+
+        <div id="sysinfo">
+        [% IF (warnIsRootUser) %]
+            <h2>Warning regarding current user</h2>
+            <p>You are logged in as the database administrative user. This is not recommended because some parts of Koha will not function as expected when using this account.</p>
+            <p>Please log in instead with a regular staff account. To create a staff account, create a library, a patron category 'Staff' and add a new patron. Then give this patron permissions from 'More' in the toolbar.</p>
+        [% END %]
+            <h2>Warnings regarding the system configuration</h2>
+        [% IF ( (prefNoZebra) || (warnPrefBiblioAddsAuthorities) || warnPrefEasyAnalyticalRecords ) %]
+        <table>
+            <caption>Preferences</caption>
+            [% IF (prefNoZebra) %]
+            <tr><th scope="row"><b>Warning</b> </th><td>System preference 'nozebra' set. Deprectated!</td></tr>
+            [% END %]
+            [% IF (warnPrefBiblioAddsAuthorities) %]
+            <tr><th scope="row"><b>Warning</b> </th><td>System preference 'AutoCreateAuthorities' set, but needs 'BiblioAddsAuthorities' set as well.</td></tr>
+            [% END %]
+            [% IF (warnPrefEasyAnalyticalRecords) %]
+            <tr><th scope="row"><b>Warning</b> </th><td>System preference 'EasyAnalyticalRecords' set, but UseControlNumber preference is set to 'Use'. Set it to 'Don't use' or else the 'Show analytics' links in the staff client and the OPAC will be broken.</td></tr>
+            [% END %]
+        </table>
+        [% ELSE %]
+            <p>No warnings</p>
+        [% END %]
+        </div>
+
         <div id="team">
             <h2>Special thanks to the following organizations</h2>
             <ul>
                 <li><a href="http://library.org.nz">Horowhenua Library Trust</a>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
                 <li>The <a href="http://myacpl.org">Nelsonville Public Library System</a>, Ohio, USA (MARC sponsorship, documentation, template maintenance)</li>
                 <li><a href="http://www.emn.fr">EMN (Ecole des Mines de Nantes)</a>, France (Suggestions, Stats wizards and improved LDAP sponsorship)</li>
-                <li><a href="http://www.mines-paristech.fr">Mines Paristech (previously Ecole Nationale Supérieure des Mines de Paris)</a><, France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)</li>
+                <li><a href="http://www.mines-paristech.fr">Mines Paristech (previously Ecole Nationale Supérieure des Mines de Paris)</a>, France (biblio frameworks, MARC authorities, OPAC basket, Serials sponsorship)</li>
                 <li><a href="http://www.mediathequeouestprovence.fr/">SAN-Ouest Provence</a>, France (Koha 3.0 enhancements to patrons and holds modules)</li>
                 <li>The <a href="http://ccfls.org">Crawford County Federated Library System</a>, PA, USA (Koha 3.0 Zebra Integration sponsorship)</li>
                 <li>The <a href="http://www.geauga.lib.oh.us/">Geauga County Public Library</a>, OH, USA (Koha 3.0 beta testing)</li>
                 <li>The <a href="http://library.neu.edu.tr">Near East University</a>, Cyprus</li>
                 <li>OPUS International Consultants, Wellington, New Zealand (Corporate Serials sponsorship)</li>
                 <li><a href="http://www.famfamfam.com/">famfamfam.com</a> Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.</li>
+                <li><a href="http://www.ashs.school.nz/">Albany Senior High School</a>, Auckland, New Zealand (OPAC 'star-ratings' sponsorship)</li>
             </ul>
 
-            <h2>Koha release team</h2>
+            <h2>Release team for Koha 3.12</h2>
             <ul>
-               <li>Colin Campbell (Koha 3.4 QA Manager)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a> (Koha 3.2 Release Manager)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a>(Koha 3.4, 3.6 Translation Manager)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a> (Koha 3.x Documentation Manager)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
+               <li>D Ruth Bavousett (Translation Manager)</li>
+               <li>Jared Camins-Esakov (Release Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a> (3.8, 3.10 Release Maintainer)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a> (Documentation Manager)</li>
+               <li>Katrin Fischer (QA Manager)</li>
+               <li>Liz Rea (3.6 Release Maintainer)</li>
+            </ul>
+
+            <h2>Former Koha release team members</h2>
+            <ul>
+               <li>Jared Camins-Esakov (3.6 Release Maintainer)</li>
+               <li>Colin Campbell (3.4 QA Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a> (3.2 Release Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a> (1.x, 3.4, 3.6 Release Manager, 3.2 Translation Manager, 3.8 Release Maintainer)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a> (3.4, 3.6, 3.8, 3.10 Translation Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a> (3.x Documentation Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a> (3.0 Release Manager &amp; Translation Manager)</li>
                <li>Rachel Hamilton-Williams (Kaitiaki from 2004 to present)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a> (Koha 3.0 Release Maintainer)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a> (Koha 3.x Interface Design)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a> (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
-               <li><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a> (Koha 2.0 Release Maintainer)</li>
-                <li>Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a> (3.0 Release Maintainer)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a> (3.x Interface Design)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a> (3.2, 3.4, 3.6 Release Maintainer)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a> (2.0 Release Manager, 2.2 Release Manager/Maintainer, 3.8, 3.10 Release Manager)</li>
+               <li><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a> (2.0 Release Maintainer)</li>
+                <li>Ian Walls (3.6, 3.8, 3.10 QA Manager)</li>
                 </ul>
+
             <h2>Koha development team</h2>
             <ul>
                 <li>Md. Aftabuddin</li>
                 <li>Jon Aker</li>
                 <li>Edward Allen</li>
                 <li>Francisco M. Marzoa Alonso</li>
+                <li>Joseph Alway</li>
                 <li>Cindy Murdock Ames</li>
                 <li>Richard Anderson</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
@@ -140,6 +193,7 @@
                 <li>Gaetan Boisson</li>
                 <li>Danny Bouman</li>
                 <li>Stan Brinkerhoff</li>
+                <li>Ivan Brown</li>
                 <li>Roger Buck</li>
                 <li>Steven Callender</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
@@ -197,6 +251,7 @@
                 <li>Brian Harrington</li>
                 <li>Friedrich zur Hellen</li>
                 <li>Michaes Herman</li>
+                <li>Claire Hernandez</li>
                 <li>Wolfgang Heymans</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
                 <li>Sèbastien Hinderer</li>
@@ -214,6 +269,7 @@
                 <li>Janusz Kaczmarek</li>
                 <li>Koustubha Kale</li>
                 <li>Ulrich Kleiber</li>
+                <li>Piotr Kowalski</li>
                 <li>Arnaud Laurin</li>
                 <li>Ambrose Li (translation tool)</li>
                 <li>Gynn Lomax</li>
@@ -226,6 +282,7 @@
                 <li>Brig C. McCoy</li>
                 <li>Dorian Meid (German translation)</li>
                 <li>Meenakshi. R</li>
+                <li>Melia Meggs</li>
                 <li>Matthias Meusburger</li>
                 <li>Sophie Meynieux</li>
                 <li>Alan Millar</li>
@@ -241,6 +298,7 @@
                 <li>Dobrica Pavlinusic</li>
                 <li>Maxime Pelletier</li>
                 <li>Polytechnic University</li>
+                <li>Shari Perkins</li>
                 <li>Meenakshi.R</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
@@ -251,6 +309,7 @@
                 <li>Waylon Robertson</li>
                 <li>Marcel de Rooy</li>
                 <li>Salvador Zaragoza Rubio</li>
+                <li>Mathieu Saby</li>
                 <li>Brice Sanchez</li>
                 <li>Sam Sanders</li>
                 <li>Adrien Saurat</li>
@@ -264,6 +323,7 @@
                 <li>Southeastern University</li>
                 <li>Glen Stewart</li>
                 <li>Will Stokes</li>
+                <li>Simon Story</li>
                 <li>David Strainchamps</li>
                 <li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
                 <li>Daniel Sweeney</li>
@@ -271,13 +331,17 @@
                 <li>Adam Thick</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
                 <li>Fabio Tiana</li>
+        <li>Mirko Tietgen</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>
                 <li>Andrei V. Toutoukine</li>
+                <li>Kathryn Tyree</li>
                 <li>Darrell Ulm</li>
                 <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
+                <li>Marc Veron</li>
                 <li>Aleksa Vujicic</li>
                 <li>Reed Wade</li>
+                <li>Stacey Walker</li>
                 <li>Ian Walls</li>
                 <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
                 <li>Ward van Wanrooij</li>
@@ -287,6 +351,7 @@
                 <li>Ron Wickersham</li>
                 <li>Brett Wilkins</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692127299">Olwen Williams (Database design and data extraction for Koha 1.0)</a></li>
+                <li>Robert Williams</li>
                 <li>James Winter</li>
                 <li>Lars Wirzenius</li>
             </ul>
@@ -343,6 +408,31 @@
                   by the Bridge Consortium of Carleton College and St. Olaf College.</li>
               </ul>
 
+            <h2>The Sudoc Icon Set</h2>
+              <ul>
+                <li><a href="http://www.abes.fr/Sudoc/Boite-a-outils-Sudoc-public/Les-icones-Sudoc">Les icones Sudoc</a></li>
+                <li>The Sudoc Icon Set is licensed under a
+                  <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License</a>
+                  by Agence Bibliographique de l'Enseignement Supérieur</li>
+              </ul>
+            <h2>The Noun Project icons</h2>
+                <ul>
+                    <li>All images come from <a href="http://thenounproject.com/">The Noun Project</a> collection</li>
+                    <li>
+                        Circulation ("fair-trade") symbol by Edward Boatman ; Patrons
+                        ("children's library") symbol by Edward Boatman, Saul Tannenbaum,
+                        Stephen Kennedy, Nikki Snow, Brooke Hamilton ; Search ("magnifying
+                        glass") symbol by Philipp Suess ; Lists ("folder") symbol by Jack
+                        Biesek, Gladys Brenner, Margaret Faye, Healther Merrifield, Kate
+                        Keating, Wendy Olmstead, Todd Pierce, Jamie Cowgill, Jim Bolek ;
+                        Cataloging ("price tag") symbol by the Noun Project ; Authorities
+                        ("link") symbol by Matthew Exton ; Serials ("newspaper") symbol by John
+                        Caserta ; Acquisitions ("present") symbol by David Goodger ; Reports
+                        ("pie chart") symbol by Scott Lewis ; Administration ("gears") symbol by
+                        Jeremy Minnick ; Tools ("wrench") symbol by National Park Service
+                    </li>
+                </ul>
+
             <h2>jQuery Star Rating Plugin</h2>
               <p>jQuery Star Rating Plugin v3.14 by <a href="http://www.fyneworks.com/">Fyneworks.com</a> is licensed under the <a target="_blank" href="http://en.wikipedia.org/wiki/MIT_License">MIT License</a> and the <a target="_blank" href="http://creativecommons.org/licenses/GPL/2.0/">GPL License</a>.</p>
 
@@ -369,7 +459,7 @@
 <li>suomi, suomen kieli (Finnish) Pasi Korkalo</li>
 <li>Fran&ccedil;ais (French) <a href="http://www.koha-fr.org/category/tags/association">Kohala</a>, Pascale Nalon (ENSMP), and many more </li>
 <li>Galego (Galician) Ignacio Javier</li>
-<li>Deutsch (German) Friedrich zur Hellen, Robert Hillig, Katrin Fischer and Beda Szukics</li>
+<li>Deutsch (German) Friedrich zur Hellen, Robert Hillig, Katrin Fischer, Beda Szukics, Mirko Tietgen and Marc Véron</li>
 <li>&#949;&#955;&#955;&#951;&#957;&#953;&#954;&#940; (Greek, Modern [1453- ])Georgia Katsarou, Panoraia Gaitanou</li>
 <li>&#1506;&#1489;&#1512;&#1497;&#1514; (Hebrew)</li>
 <li>&#2361;&#2367;&#2344;&#2381;&#2342;&#2368; (Hindi)</li>