[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes i... [rel_3_0]

[paul poulain]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/10/31 16:42:16

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css menus.inc 
	                                          san-op.css 

Log message:
	reintroducing online help with specific css property

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.8&r2=1.7.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.15&r2=1.6.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/san-op.css?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3

Patches:
Index: intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.7.2.8
retrieving revision 1.7.2.9
diff -u -b -r1.7.2.8 -r1.7.2.9
--- intranet.css	31 Oct 2006 09:54:38 -0000	1.7.2.8
+++ intranet.css	31 Oct 2006 16:42:16 -0000	1.7.2.9
@@ -265,6 +265,10 @@
     margin-left:10px;
 }
 
+#onlinehelp {
+    float:right;
+}=======
+
 /* the design of the INactives tab buttons (all other tabs) */
 .tab_inactive {
     background-color : #6699CC;
@@ -307,3 +311,4 @@
     visibility:visible; /* you propably don't need to change this one */
 }
 
+>>>>>>> 1.7.2.8

Index: menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6.2.15
retrieving revision 1.6.2.16
diff -u -b -r1.6.2.15 -r1.6.2.16
--- menus.inc	30 Oct 2006 15:08:32 -0000	1.6.2.15
+++ menus.inc	31 Oct 2006 16:42:16 -0000	1.6.2.16
@@ -1,3 +1,6 @@
+<div id="onlinehelp">
+	<a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
+</div>
 <div id="mainmenu">
 <h3><a href="/cgi-bin/koha/mainpage.pl">Koha intranet</a></h3>
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->

Index: san-op.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/Attic/san-op.css,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- san-op.css	30 Oct 2006 10:03:01 -0000	1.1.2.2
+++ san-op.css	31 Oct 2006 16:42:16 -0000	1.1.2.3
@@ -384,3 +384,6 @@
     visibility:visible; /* you propably don't need to change this one */
 }
 
+#onlinehelp {
+    float:right;
+}
\ No newline at end of file