make RFID window floating, better instructions

diff --git a/ffzg/rfid/README b/ffzg/rfid/README
new file mode 100644 (file)
index 0000000..ff46a9a
--- /dev/null
+++ b/ffzg/rfid/README
@@ -0,0 +1,28 @@
+0. add new rfid registration vhost to apache config
+
+dpavlin@koha-dev:/srv/koha_ffzg/ffzg/rfid(koha_ffzg) $ sudo ln -sf /srv/koha_ffzg/ffzg/rfid/rfid.koha-dev.vbz.ffzg.hr.conf /etc/apache2/sites-available/
+dpavlin@koha-dev:/srv/koha_ffzg/ffzg/rfid(koha_ffzg) $ sudo a2ensite rfid.koha-dev.vbz.ffzg.hr
+Enabling site rfid.koha-dev.vbz.ffzg.hr.
+To activate the new configuration, you need to run:
+  service apache2 reload
+dpavlin@koha-dev:/srv/koha_ffzg/ffzg/rfid(koha_ffzg) $ sudo service apache2 reload
+
+
+
+1. add following to IntranetUserJS system preferences in Koha:
+
+$.getScript('http://rfid.koha-dev.vbz.ffzg.hr/register.pl?intranet-js=1');
+
+
+2. start RFID reader and point it to your koha registration:
+
+pi@rfid0 ~/Biblio-RFID $ RFID_URL=http://rfid.koha-dev.vbz.ffzg.hr KOHA_URL=http://ffzg.koha-dev.rot13.org:8080 ./scripts/RFID-JSONP-server.pl
+http://ffzg.koha-dev.rot13.org:8080 at ./scripts/RFID-JSONP-server.pl line 31.
+{ _last => "eth0", eth0 => "10.60.1.210", lo => "127.0.0.1" } at ./scripts/RFID-JSONP-server.pl line 368, <DATA> line 1.
+GET http://rfid.koha-dev.vbz.ffzg.hr/register.pl?local_ip=10.60.1.210 at ./scripts/RFID-JSONP-server.pl line 375, <DATA> line 1.
+REGISTER: { local_ip => "10.60.1.210", remote_host => "10.60.1.210" } at ./scripts/RFID-JSONP-server.pl line 380, <DATA> line 1.
+Server ./scripts/RFID-JSONP-server.pl ready at http://:9000
+
+
+3. check under /srv/koha_ffzg/ffzg/rfid/ip/ for your client IP address, which should have IP address
+of RFID reader inside it

diff --git a/ffzg/rfid/koha-rfid.js b/ffzg/rfid/koha-rfid.js
index 53aa3c5..d619caf 100644 (file)
--- a/ffzg/rfid/koha-rfid.js
+++ b/ffzg/rfid/koha-rfid.js
@@ -55,7 +55,8 @@ function rfid_scan(data,textStatus) {
        var span = $('span#rfid');
 
        if ( span.size() == 0 ) // insert last in language bar on bottom
-               span = $('ul#i18nMenu').append('<li><span id=rfid>RFID reader found<span>');
+//             span = $('ul#i18nMenu').append('<li><span id=rfid>RFID reader found<span>');
+               span = $('#breadcrumbs').append('<div id="rfid_popup" style="position: fixed; bottom: 0; right: 0; background: #fff; border: 3px solid #ff0; padding: 1em; opacity: 0.7; z-index: 10;"><span id="rfid">RFID reader</span></div>');
 
        if ( span.size() == 0 ) // or before login on top
                span = $('div#login').prepend('<span id=rfid>RFID reader found</span>');

diff --git a/ffzg/rfid/register.pl b/ffzg/rfid/register.pl
index 90ca5dc..f56c465 100755 (executable)
--- a/ffzg/rfid/register.pl
+++ b/ffzg/rfid/register.pl
@@ -27,6 +27,7 @@ if ( my $ip = $query->param('local_ip') ) {
 } elsif ( -e $path ) {
        open(my $fh, '<', $path);
        my $ip = <$fh>;
+       chomp $ip;
        $hash->{local_ip} = $ip;
        close($fh);
 } else {

diff --git a/ffzg/rfid/rfid.koha-dev.vbz.ffzg.hr.conf b/ffzg/rfid/rfid.koha-dev.vbz.ffzg.hr.conf
new file mode 100644 (file)
index 0000000..50db3c8
--- /dev/null
+++ b/ffzg/rfid/rfid.koha-dev.vbz.ffzg.hr.conf
@@ -0,0 +1,5 @@
+<VirtualHost *:80>
+       ServerName rfid.koha-dev.vbz.ffzg.hr
+       DocumentRoot /srv/koha_ffzg/ffzg/rfid
+       ScriptAlias /register.pl /srv/koha_ffzg/ffzg/rfid/register.pl
+</VirtualHost>