Initial review in upgrading templates to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/blank.css b/koha-tmpl/intranet-tmpl/npl/en/includes/blank.css
new file mode 100644 (file)
index 0000000..f6e0353
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/blank.css
@@ -0,0 +1,62 @@
+a:link {
+       color : #000066;
+       text-decoration: none;
+}
+
+a:visited {
+       color : #000066;
+       text-decoration: none;
+}
+
+a:hover {
+       color : #993300;
+       text-decoration: none;
+}
+
+body {
+       background-color : #FFF;
+       font-size : 14px;
+       margin : 0px 0px 0px 0px;
+       padding : 0px;
+}
+
+caption {
+       color : #000000;
+       font-weight : bold;
+       margin-top : 5px;
+       text-align : left;
+}
+
+div.table {
+       font-weight: normal;
+}
+
+h3 {
+       color : #000000;
+       font-size : 14px;
+       font-weight : bold;
+       margin-bottom : 3px;
+       margin-top : 3px;
+}
+
+table {
+       border-collapse : collapse;
+       border : 0px solid #cccccc;
+
+}
+
+td, th {
+       border : 0px solid #cccccc;
+       padding : 2px;
+       }
+       
+th {
+       text-align : left;
+       }
+       
+
+#main {
+       background-color : #FFF;
+       border-left : 0px solid #CCCC99;
+       position : relative;
+}
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc
new file mode 100644 (file)
index 0000000..666697b
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-z3950.inc
@@ -0,0 +1,23 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<!-- TMPL_IF name="refresh" --><meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" /><!-- /TMPL_IF -->
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+       @import url(<!-- TMPL_VAR NAME="themelang" -->/includes/intranet.css);
+       #main {
+               background-color : #CCCC99;
+               border-left : 1px solid #CCCC99;
+               margin-left : 2%;
+               margin-right : 2%;
+               margin-top : 2%;
+               padding : 10px;
+               position : relative;
+       }
+</style>
+<script language="JavaScript" type="text/javascript">
+       function Import(GetThisOne) {
+               opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+               self.close();
+               return false;
+       }
+</script>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/favicon.ico b/koha-tmpl/intranet-tmpl/npl/en/includes/favicon.ico
new file mode 100644 (file)
index 0000000..586bd55
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/npl/en/includes/favicon.ico differ

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
index d7dd0d5..d8757d6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav-brief.inc
@@ -3,21 +3,35 @@
                                <li><h4>Koha</h4></li>
 
                                <li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li>
-                               <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>   </li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li> <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li> </ul></li>
+                               <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>   </li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li><!-- Display for NPL <li><a href="/reserve_list.php">Reserve List</a></li><li><a href="http://66.213.78.70/secret/reserves/index.cfm">New Title Waiting List</a></li> /Display for NPL --><!-- Hide from NPL --><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li><!-- /Hide from NPL --></ul></li>
                                <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a></li>
-                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li>
+                               <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
+<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><!-- Display for NPL <li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
 </ul></li>
-<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li>
+<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li>
 
- <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></li>
- <li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
+<!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><!-- /Hide from NPL --></ul></li>
+<!-- Hide from NPL --><li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
 <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a>
 <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li>
 <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul>
-</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> 
+</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li><!-- /Hide from NPL -->
 <!-- TMPL_IF NAME="loggedinusername" --><li>
     Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul></li><!-- /TMPL_IF -->
+<!-- Display for NPL                           <li><h4>Public Web Site</h4></li>
 
+                   <li><a href="http://www.athenscounty.lib.oh.us/index.html">public home</a></li>
+               <li><a href="http://www.athenscounty.lib.oh.us/library.html">your
+                  library</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/kids/index.asp">kids</a></li>
+               <li><a href="http://www.athenscounty.lib.oh.us/teens/index.asp">teens</a></li>
+                   <li><a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-main.pl">library
+                  catalog</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>
+
+                   <li><a href="http://www.athenscounty.lib.oh.us/branch.html">branches</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/mobile.asp">the bookmobile</a></li>
+                   <li><a href="http://www.oplin.org">OPLIN</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/contact.html">contact</a></li> /Display for NPL -->
                        </ul>
 </div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
index 5a59c59..d2e215a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet-nav.inc
@@ -10,8 +10,8 @@
                                <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
                                <input type="submit" class="submit" value="Submit" />
        </form></li><li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
-</li><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li></ul></li>
-                               <li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/members/member.pl" method="post">
+</li><!-- Display for NPL <li><a href="/reserve_list.php">Reserve List</a></li><li><a href="http://66.213.78.70/secret/reserves/index.cfm">New Title Waiting List</a></li> /Display for NPL --><!-- Hide from NPL --><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li><!-- /Hide from NPL --></ul></li>
+                               <li><a href="/cgi-bin/koha/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/member.pl" method="post">
        <label for="member">Search:</label><input id="member" type="text" size="10" name="member" />
        <input type="submit" value="Search" class="submit" />
 
@@ -19,16 +19,30 @@
                                <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Catalog</a><ul><li><form action="/cgi-bin/koha/search.pl" method="post">
                <label for="keyword">Quick Search:</label><input id="keyword" type="text"  size="10" name="keyword" />
                <input type="submit" value="Search" class="submit" />
-               </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><
+               </form></li><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
+<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li><!-- Display for NPL <li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
 </ul></li>
-<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li> <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></li>
- <li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
+<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><!-- /Hide from NPL --></ul></li>
+<!-- Hide from NPL --><li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
 <li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a>
 <ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li>
 <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul>
-</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li> 
+</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li><!-- /Hide from NPL -->
 <!-- TMPL_IF NAME="loggedinusername" --><li>
     Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul></li><!-- /TMPL_IF -->
+                               <!-- Display for NPL <li><h4>Public Web Site</h4></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/index.html">public home</a></li>
+               <li><a href="http://www.athenscounty.lib.oh.us/library.html">your
+                  library</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/kids/index.asp">kids</a></li>
+               <li><a href="http://www.athenscounty.lib.oh.us/teens/index.asp">teens</a></li>
+                   <li><a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-main.pl">library
+                  catalog</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>
+
+                   <li><a href="http://www.athenscounty.lib.oh.us/branch.html">branches</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/mobile.asp">the bookmobile</a></li>
+                   <li><a href="http://www.oplin.org">OPLIN</a></li>
+                   <li><a href="http://www.athenscounty.lib.oh.us/contact.html">contact</a></li> /Display for NPL -->
                                </ul>
 </div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css
index e4c0f11..bb255fd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css
@@ -900,3 +900,66 @@ input.unfocus {
 #topmenu label {
        font-weight : bold;
 }
+
+.searchresults p {
+       margin : .2em;
+}
+
+.searchresults p+p {
+       text-indent : 1em;
+}
+
+.searchresults a {
+       font-weight : bold;
+       font-size : 14px;
+}
+
+div.members th {
+       background-color : #FFFFCC;
+       border-bottom : 1px solid #E7E7CA;
+       border-right : 1px solid #E7E7CA;
+       font-size : 12px;
+       padding : 3px 5px;
+       width : 25%;
+       font-weight : bold;
+       text-align : left;
+       vertical-align : top;
+}
+
+div.members th label {
+       display : block;
+       margin : 0;
+       padding : 0;
+}
+
+div.members label.focus {
+       color : #cc0000;
+}
+
+div.members th p {
+       font-weight : normal;
+       padding : 0;
+       margin : 0;
+       text-indent : 1em;
+}
+
+td fieldset {
+       border : 1px solid #CCCCCC;
+       margin : 0 0 3px 0;
+       padding : 0 0 3px 0;
+}
+
+fieldset label {
+       float : left;
+       margin-left : 3px;
+       width : 25%;
+}
+
+td legend {
+       margin : 0;
+       padding : 4px;
+}
+
+table.editing tr:hover td {
+       background-color: #EFF1D8;
+}
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
index ff30338..0073ef3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-addbiblio.inc
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Athens County Library Services -- Koha Intranet</title>
+<title>Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
index 7e620e4..5e298df 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-blank.inc
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Athens County Library Services -- Koha Intranet</title>
+<title>Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
index c847915..4cc75f1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-circ.inc
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Athens County Library Services -- Koha Intranet</title>
+<title>Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
index b9bb3e2..f06c248 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top-print.inc
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Athens County Library Services -- Koha Intranet</title>
+<title>Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 

diff --git a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
index 857be25..6dad387 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
+++ b/koha-tmpl/intranet-tmpl/npl/en/includes/main-top.inc
@@ -2,7 +2,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Athens County Library Services -- Koha Intranet</title>
+<title>Koha Intranet</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css">