- adding some css properties (minor)

- adding links in members menu

improvements from SAN Ouest Provence :
* introducing a category_type into categories. It can be A (adult), C (children), P (Professionnal), I (institution/organisation).
* each category_type has it's own forms to create members.
* the borrowers table has been heavily modified (many fields changed), to get something more logic & readable
* reintroducing guarantor/guanrantee system that is now independant from hardcoded C/A for categories
* updating templates to fit template rules

(see mail feb, 17 on koha-devel "new features for borrowers" for more details)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc
new file mode 100644 (file)
index 0000000..0bf3aa6
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc
@@ -0,0 +1,4 @@
+\r
+\r
+</body>\r
+</html>\r

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
new file mode 100644 (file)
index 0000000..1d761d5
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
@@ -0,0 +1,164 @@
+</title>\r
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">\r
+\r
+<!-- Estos scripts permiten manejar calendario de fechas. -->\r
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar.js"></script>\r
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-en.js"></script>\r
+<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-setup.js"></script>\r
+<!-- **************************************************** -->\r
+\r
+<script language="JavaScript" type="text/javascript">\r
+       // Captura el evento onmousemove para cualquier navegador\r
+       if (document.layers) { // Netscape\r
+               document.captureEvents(Event.MOUSEMOVE);\r
+           document.onmousemove = captureMousePosition;\r
+       } else if (document.all) { // Internet Explorer\r
+           document.onmousemove = captureMousePosition;\r
+       } else if (document.getElementById) { // Netcsape 6\r
+           document.onmousemove = captureMousePosition;\r
+       }\r
+\r
+       var mouseXMax = 0;\r
+       var mouseYMax = 0;\r
+       var mouseX = 0;\r
+       var mouseY = 0;\r
+\r
+       function captureMousePosition(e) {\r
+           if (document.layers) {\r
+                   mouseX = e.pageX;\r
+                       mouseY = e.pageY;\r
+               mouseXMax = window.innerWidth + window.pageXOffset;\r
+                   mouseYMax = window.innerHeight + window.pageYOffset;\r
+           } else if (document.all) {\r
+                   mouseX = window.event.x + document.body.scrollLeft;\r
+               mouseY = window.event.y + document.body.scrollTop;\r
+               mouseXMax = document.body.clientWidth + document.body.scrollLeft;\r
+               mouseYMax = document.body.clientHeight + document.body.scrollTop;\r
+           } else if (document.getElementById) {\r
+               mouseX = e.pageX;\r
+                   mouseY = e.pageY;\r
+               mouseXMax = window.innerWidth + window.pageXOffset;\r
+               mouseYMax = window.innerHeight + window.pageYOffset;\r
+           }\r
+       }\r
+\r
+       function holidayOperation(formObject, opType) {\r
+               var op = document.getElementsByName('operation');\r
+               op[0].value = opType;\r
+               formObject.submit();\r
+       }\r
+\r
+       // This function shows the "Show Holiday" panel //\r
+       function showHoliday (exceptionPosibility, dayName, day, month, year, weekDay, title, description) {\r
+               var panel = document.getElementById('showHoliday');\r
+               panel.style.display = 'inline';\r
+               document.getElementById('newHoliday').style.display = 'none';\r
+               panel.style.top = mouseYMax/2;\r
+               panel.style.left = (mouseXMax/2) - 250;\r
+               document.getElementById('showDayname').value = dayName;\r
+               document.getElementById('showBranchName').value = document.getElementById('branch').value;\r
+               document.getElementById('showDay').value = day;\r
+               document.getElementById('showMonth').value = month;\r
+               document.getElementById('showYear').value = year;\r
+               document.getElementById('showTitle').value = title;\r
+               document.getElementById('showDescription').value = description;\r
+               document.getElementsByName('showWeekday')[0].value = weekDay;\r
+               if (exceptionPosibility == 1) {\r
+                       document.getElementById('exceptionPosibility').style.display = 'inline';\r
+               } else {\r
+                       document.getElementById('exceptionPosibility').style.display = 'none';\r
+               }\r
+       }\r
+\r
+       // This function shows the "Add Holiday" panel //\r
+       function newHoliday (dayName, day, month, year, weekDay) {\r
+               var panel = document.getElementById('newHoliday');\r
+               panel.style.display = 'inline';\r
+               document.getElementById('showHoliday').style.display = 'none';\r
+               panel.style.top = mouseYMax/2;\r
+               panel.style.left = (mouseXMax/2)  - 250;\r
+               document.getElementById('newDayname').value = dayName;\r
+               document.getElementById('newBranchName').value = document.getElementById('branch').value;\r
+               document.getElementById('newDay').value = day;\r
+               document.getElementById('newMonth').value = month;\r
+               document.getElementById('newYear').value = year;\r
+               document.getElementsByName('newWeekday')[0].value = weekDay;\r
+       }\r
+\r
+       function hidePanel(aPanelName) {\r
+               document.getElementById(aPanelName).style.display = 'none';\r
+       }\r
+\r
+       function changeBranch () {\r
+               var branch = document.getElementById('branch').options[document.getElementById('branch').selectedIndex].value;\r
+               location.href='/cgi-bin/koha/tools/holidays.pl?branch=' + branch;\r
+       }\r
+\r
+       function additionalInformation (anExplanation) {\r
+               var panel = document.getElementById('information');\r
+               var paragraph = document.getElementById('explanation');\r
+               panel.style.display = 'inline'\r
+               panel.style.top = mouseY;\r
+               panel.style.left = mouseX;\r
+               var info = document.createTextNode(anExplanation);\r
+               if (paragraph.hasChildNodes()) {\r
+                       paragraph.removeChild(paragraph.lastChild);\r
+               }\r
+               paragraph.appendChild(info);\r
+       }\r
+\r
+       function Help() {\r
+               newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');\r
+       }\r
+</script>\r
+\r
+<style type="text/css">\r
+.normalday { \r
+       background-color: #EDEDED;\r
+       color: Black; \r
+       border:1px solid #000000;\r
+}\r
+\r
+.exception {\r
+       background-color: #EDEDED;\r
+       color: Black;           \r
+       border:1px solid #000000;\r
+}\r
+\r
+.holiday { \r
+       background-color: red;\r
+       color: Black; \r
+       border:1px solid #000000;\r
+}\r
+\r
+.repeatableday { \r
+       background-color: yellow;\r
+       color: Black; \r
+       border:1px solid #000000;\r
+}\r
+\r
+.information {\r
+       z-index:1;\r
+       background-color: #DCD2F1;\r
+       width:300px;\r
+       display:none;\r
+       border:1px solid #000000;\r
+       color: #000000;\r
+       font-size: 8pt;\r
+       font-weight: bold;\r
+    background-color: #FFD700;\r
+       cursor: pointer;\r
+       padding:2px;\r
+}\r
+\r
+.panel {\r
+       z-index:1;\r
+       width:500px;\r
+       display:none;\r
+       border:1px solid #000000;\r
+       padding:0px;\r
+}\r
+\r
+</style>\r
+\r
+\r

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
index eb86c6a..147d29c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
@@ -1,6 +1,6 @@
 body {
        font-family : Verdana, Geneva, Arial, sans-serif;
-       font-size : .7em;
+       font-size : .9em;
 }
 
 table {
@@ -33,6 +33,14 @@ th[scope=row] {
        text-align : right;
 }
 
+input {
+       font-size:0.9em;
+}
+
+select {
+       font-size:0.9em;
+}
+
 input[type=submit], input[type=button], input[type=reset] {
        background-color : #6699cc;
        color : #FFFFFF;
@@ -50,4 +58,16 @@ tr.highlight td, tr.highlight th {
 
 #admin_stopwords_select UL LI {
    white-space: nowrap;
+}
+fieldset {
+       display:inline;
+       vertical-align:top;
+}
+legend {
+       font-size:120%;
+       font-weight:bold;
+}
+
+label {
+       width:10em;
 }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
index 6760433..b881c63 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
@@ -14,8 +14,5 @@
        <a href="/cgi-bin/koha/admin/printers.pl">Printers</a>
        <a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
        <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
-       <a href="/cgi-bin/koha/export/marc.pl">Export</a>
        <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-       <a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes</a>
-       <a href="/cgi-bin/koha/admin/viewlog.pl">Log viewer</a>
 </p>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index d75c2bf..45819ad 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,5 +1,7 @@
 <p>
        <a href="/cgi-bin/koha/members/members-home.pl">Search</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add member</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&amp;actionType=Add">Add organisation</a>
+       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
+       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
+       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
+       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
 </p>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
new file mode 100644 (file)
index 0000000..d1cfcb2
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
@@ -0,0 +1,8 @@
+<p>
+       <a href="/cgi-bin/koha/tools/cities.pl">Cities</a>
+       <a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
+               <a href="/cgi-bin/koha/tools/marc.pl">Export</a>
+       <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
+       <a href="/cgi-bin/koha/tools/barcodes.pl">Barcodes</a>
+       <a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
+</p>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index 94a10aa..e1d8458 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -12,6 +12,7 @@ function Help() {
        <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
        <a href="/cgi-bin/koha/reports-home.pl">Reports</a>
        <a href="/cgi-bin/koha/admin/admin-home.pl">Parameters</a>
+       <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
        <a href="/cgi-bin/koha/about.pl">About</a>
        <a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
 </p>
\ No newline at end of file