From e88748aa0e257f258872440a7c636506931c4967 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Sat, 2 Mar 2013 14:46:09 +0100
Subject: [PATCH 01/21] Upped version to 2.200

---
 VERSION | 1 +
 bin/mh  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 VERSION

diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..b0bb4f56c
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+This is Misterhouse stable release v2-200.
diff --git a/bin/mh b/bin/mh
index b6a8afcb8..e5bf30b93 100755
--- a/bin/mh
+++ b/bin/mh
@@ -77,7 +77,7 @@ BEGIN {
 		close (ENTRIES);
     }
 
-	$Version = "mh 2.105";
+	$Version = "mh 2.200";
 	if ($revision) {
 		$Version.=" R${revision}";
 	}

From 236dd90e8f2dc87e517db03a9cba4413b0b55480 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Wed, 13 Mar 2013 21:38:53 +0100
Subject: [PATCH 02/21] Update README.md

Ensure the naming is consistent with what we agreed upon on the mailing list.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index eff1684c3..8b6692a56 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-misterhouse
+MisterHouse
 ===========
 
 Perl open source home automation program. It's fun, it's free, and it's entirely geeky.
 
 A quickstart guide is documented [here](https://github.com/hollie/misterhouse/wiki/Getting-started).
 
-The Misterhouse wiki with more information is located here: http://misterhouse.wikispaces.com/
\ No newline at end of file
+The Misterhouse wiki with more information is located here: http://misterhouse.wikispaces.com/

From cc7c439239b8caac60b99b107aa17bdc0ed74432 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Wed, 13 Mar 2013 21:56:13 +0100
Subject: [PATCH 03/21] Modified the contents of the VERSION file in
 preparation of MH depending on this file to know what version it is running

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index b0bb4f56c..dd8ca3155 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-This is Misterhouse stable release v2-200.
+2.200

From b3ba252c0b0d471ffa4b5ba114dd85f07fc21f41 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Thu, 20 Jun 2013 21:27:26 +0200
Subject: [PATCH 04/21] Upped version to 3.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 76cff7f1f..f398a2061 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-unstable
\ No newline at end of file
+3.0
\ No newline at end of file

From 5e6d5ae4707cdcbb8e5aa3045b56ec9e4e13442d Mon Sep 17 00:00:00 2001
From: Jon Whitear <jon@whitear.org>
Date: Sun, 24 Nov 2013 13:14:35 +1100
Subject: [PATCH 05/21] Cbus update to support current CGate

---
 code/public/cbus.pl | 73 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/code/public/cbus.pl b/code/public/cbus.pl
index af913bd00..b6a38ced0 100755
--- a/code/public/cbus.pl
+++ b/code/public/cbus.pl
@@ -84,6 +84,12 @@
 #            Changed DEV to DEBUG for commonality.
 #            Monitor and Talker attempt to always run unless in DEBUG state.
 #
+#	V3.0.1	 2013-11-22
+#	     Fixed to work with C-Gate Version: v2.9.7 (build 2569), which returns
+#	     cbus addresses in the form NETWORK/APPLICATION/GROUP rather than
+#	     //PROJECT/NETWORK/APPLICATION/GROUP.
+#	     Add logging to aid debugging cbus_builder
+#	     Contributed by Jon Whitear <jonATwhitearDOTorg>
 #
 # How Cgate integrates with MH
 #
@@ -153,7 +159,7 @@
 ##############################################################################
 ##############################################################################
 ###########                                                     ##############
-###########    Globals, Startup, Menus, Voice COmmands          ##############
+###########    Globals, Startup, Menus, Voice Commands          ##############
 ###########                                                     ##############
 ##############################################################################
 ##############################################################################
@@ -261,9 +267,9 @@ sub cbus_configure {
     if ($data eq 'Run') {
         load_def_file();
         if (not defined $cbus_def) {
-            # Their was no cbus def file to load.
+            # There was no cbus def file to load.
             # Help out a new user, by auto-building the def file.
-            # Otherwise, their will be nothing to build.
+            # Otherwise, there will be nothing to build.
             print_log "CBus: Builder is initiating scan of CGate";
             scan_cgate();
         }
@@ -315,11 +321,11 @@ sub load_def_file {
     $cbus_def_filename = $config_parms{code_dir} . "/" . 
                             $config_parms{cbus_dat_file};
     if (not -e $cbus_def_filename) {
-        print_log "CBus: Definition file $cbus_def_filename does not exist";
+        print_log "CBus: [load_def_file] XML definition file $cbus_def_filename does not exist";
         return;
     }
 
-    print_log "CBus: Builder - Loading CBus config from file ".
+    print_log "CBus: Builder - Loading CBus config from XML file ".
                 $cbus_def_filename;
     $cbus_def = XMLin($cbus_def_filename, 
                       ForceArray => ['mh_group', 'note'], 
@@ -330,7 +336,7 @@ sub load_def_file {
     delete $cbus_def->{'Creation_Date'};
     delete $cbus_def->{'Version'};
 
-    # print_log Dumper($cbus_def);
+     #print_log Dumper($cbus_def);
 }
 
 
@@ -355,7 +361,7 @@ sub load_def_file {
 sub scan_cgate {
     # Initiate scan of CGate data
     # The scan is controlled by code in the Talker mh main loop code
-    print_log "CBus: Scanning CGate...";
+    print_log "CBus: [scan_cgate] Scanning CGate...";
 
     # Cleanup from any previous scan and initialise flags/counters
     @cbus_net_list = [ ];
@@ -423,12 +429,16 @@ sub write_def_file {
                         );
 
     # Write the file to disk
+    print_log "CBus: [write_def_file] Writing XML definition to $cbus_def_filename,";
     $xml_file->XMLout($cbus_def, 
                       OutputFile => $cbus_def_filename,
                     );
 }
 
-#sub dump_cbus_data {
+sub dump_cbus_data {
+
+     print_log "CBus: Device list function disabled";
+
 #    # Basic diagnostic routine for dumping the cbus objects hash
 #    my $count = 0;
 #    my $msg = "<H2>CBUS Device Listing</H2><HR>";
@@ -448,7 +458,7 @@ sub write_def_file {
 #    
 #    $msg .= "<HR><p>List CBus Devices: Listed $count CBus devices<p>";
 #    display $msg;
-#}
+}
 
 
 #
@@ -1058,6 +1068,8 @@ sub attempt_level_sync {
         $msg_code = $2;
     }
 
+###### Message code 320: Tree information. Returned from the tree command.
+
     if ($msg_code == 320) {
         if (not $cbus_got_tree_list) {
             if (not $cbus_units_config) {
@@ -1073,6 +1085,7 @@ sub attempt_level_sync {
             } else {
                 # CGate is listing CBus "groups"
                 if ($cbus_data =~ /end/) {
+		            print_log "CBus: end of CBus scan data, got tree list";
                     $cbus_got_tree_list = 1;
                 } elsif ($cbus_data =~ /(\/\/.+\/\d+\/\d+\/\d+).+level=(\d+)/) {
                     print_log "CBus: scanned group=$1 at level $2";
@@ -1082,17 +1095,24 @@ sub attempt_level_sync {
             }
         }
 
+###### Message code 342: DBGet response (not documented in CGate Server Guide 1.0.)
+
     } elsif ($msg_code == 342) {
-        if ($cbus_scanning_cgate) {
-            if ($cbus_data =~ /(\/\/.+\/\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/) {
+        if ($cbus_scanning_cgate) {  
+         
+            print_log "CBus: Message 342 response data: $cbus_data"; 
+                   
+            if ($cbus_data =~ /\d+\s+(\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/) {
                 my ($addr, $name) = ($1, $2);
+                $addr = "//$cbus_project_name/$addr";
+                print_log "CBus: Address $addr, name $name";
                 $cbus_scan_last_addr_seen = $addr;
                 # $name =~ s/ /_/g;  Change spaces, depends on user usage...
 
                 my $addr_type;
                 if ($addr =~ /\/p\/(\d+)/) {    
                     # Data is for a CBus device eg. switch, relay, dimmer
-                    $addr_type = 'unit';
+                    $addr_type = 'unit';	
                     $addr = $1;
                 } else {
                     # Data is for a CBus "group"
@@ -1124,9 +1144,12 @@ sub attempt_level_sync {
                         };
                     }
                 }
+                print_log "Cbus: end message";
             }
-        }
-
+	}
+	
+###### Message code 300: Object information, for example: 300 1/56/1: level=200	
+	
     } elsif ($msg_code == 300) {
 
         if ($cbus_data =~ /(sessionID=.+)/) {
@@ -1181,9 +1204,13 @@ sub attempt_level_sync {
             print_log "CBus: UNEXPECTED 300 msg \"$cbus_data\"";
         }
 
+###### Message code 200: Completed successfully
+
     } elsif ($msg_code == 200) {
         print_log "CBus: Cmd OK - $cbus_data" if $Debug{cbus};
 
+###### Message code 201: Service ready
+
     } elsif ($msg_code == 201) {
         print_log "CBus: Comms established - $cbus_data";
 
@@ -1204,9 +1231,14 @@ sub attempt_level_sync {
             eval_with_timer $cmd, 2;
         }
 
+###### Message code 401: Bad object or device ID
+
     } elsif ($msg_code == 401) {
         print_log "CBus: $cbus_data";
 
+###### Message code 408: Indicates that a SET, GET or other method
+###### failed for a given object
+
     } elsif ($msg_code == 408) {
         print_log "CBus: **** Failed Cmd - $cbus_data";
         if ($msg_id =~ /\[MisterHouse(\d+)\]/) {
@@ -1221,6 +1253,8 @@ sub attempt_level_sync {
             }
         }
 
+###### Message code unhandled
+
     } else {
         print_log "CBus: Cmd port - UNHANDLED: $cbus_data";
     }
@@ -1251,6 +1285,7 @@ sub attempt_level_sync {
         } else {
             # All networks scanned - set completion flag
             ### FIXME - RichardM test with two networks??
+            print_log "Cbus: leaving scanning mode";
             $cbus_scanning_cgate = 0;
             print_log "CBus: CBus server scan complete";
             write_def_file();
@@ -1259,17 +1294,19 @@ sub attempt_level_sync {
     } elsif ($cbus_got_tree_list) {
         if ($cbus_group_idx < @cbus_group_list) {
             my $group = $cbus_group_list[$cbus_group_idx++];
+	        print_log "Cbus: dbget group $group";
             set $cbus_talker "dbget $group/TagName";
 
         } elsif ($cbus_unit_idx < @cbus_unit_list) {
             my $unit = $cbus_unit_list[$cbus_unit_idx++];
+            print_log "Cbus: dbget unit $unit";
             set $cbus_talker "dbget $unit/TagName";
         
-        } else {
-            if ($cbus_scan_last_addr_seen eq 
-                            $cbus_unit_list[$#cbus_unit_list]) {
+        } else {	
+            if ($cbus_scan_last_addr_seen eq $cbus_unit_list[$#cbus_unit_list]) {
                 # Tree Scan complete - set tree completion flag
-                $cbus_scanning_tree = 0;
+                print_log "Cbus: leaving scanning mode";
+				$cbus_scanning_tree = 0;
             }
         }
 

From ed6a66548977846487a80d3ae6c4d4a7a5e627a2 Mon Sep 17 00:00:00 2001
From: Jon Whitear <jon@whitear.org>
Date: Mon, 25 Nov 2013 12:45:07 +1100
Subject: [PATCH 06/21] Cbus update to support new and old message response
 formats

---
 code/public/cbus.pl | 112 +++++++++++++++++++++++++++-----------------
 1 file changed, 68 insertions(+), 44 deletions(-)

diff --git a/code/public/cbus.pl b/code/public/cbus.pl
index b6a38ced0..984b96680 100755
--- a/code/public/cbus.pl
+++ b/code/public/cbus.pl
@@ -85,11 +85,15 @@
 #            Monitor and Talker attempt to always run unless in DEBUG state.
 #
 #	V3.0.1	 2013-11-22
-#	     Fixed to work with C-Gate Version: v2.9.7 (build 2569), which returns
-#	     cbus addresses in the form NETWORK/APPLICATION/GROUP rather than
-#	     //PROJECT/NETWORK/APPLICATION/GROUP.
-#	     Add logging to aid debugging cbus_builder
-#	     Contributed by Jon Whitear <jonATwhitearDOTorg>
+#	         Fixed to work with C-Gate Version: v2.9.7 (build 2569), which returns
+#	         cbus addresses in the form NETWORK/APPLICATION/GROUP rather than
+#	         //PROJECT/NETWORK/APPLICATION/GROUP.
+#	         Add logging to aid debugging cbus_builder
+#	         Contributed by Jon Whitear <jonATwhitearDOTorg>
+#
+#	V3.0.2  2013-11-25
+#			 Add support for both formats of return code, i.e. NETWORK/APPLICATION/GROUP 
+#	         and //PROJECT/NETWORK/APPLICATION/GROUP.
 #
 # How Cgate integrates with MH
 #
@@ -1054,6 +1058,51 @@ sub attempt_level_sync {
     }
 }
 
+#
+# Add an address or group to the hash
+#
+
+sub add_address_to_hash {
+	my ($addr, $name) = @_;
+	my $addr_type;
+	
+	if ($addr =~ /\/p\/(\d+)/) {    
+		# Data is for a CBus device eg. switch, relay, dimmer
+		$addr_type = 'unit';	
+		$addr = $1;
+	} else {
+		# Data is for a CBus "group"
+		$addr_type = 'group';
+	}
+
+	print_log "CBus: Addr $addr is $name of type $addr_type";
+
+	# Store the CBus name and address in the cbus_def hash
+	if ($addr_type eq 'group') {
+		if (not exists $cbus_def->{group}{$addr}) {
+			print_log "CBus: group not defined yet, ".
+						"adding $addr, $name";
+			$cbus_def->{group}{$addr} = {     
+				name => $name,
+				note =>["Added by MisterHouse $Date_Now $Time_Now"],
+				type => 'dimmer',
+				mh_group => ['CBus']
+			};
+			# print_log Dumper($cbus_def);
+		}
+	} elsif ($addr_type eq 'unit') {
+		if (not exists $cbus_def->{unit}{$addr}) {
+			print_log "CBus: unit not defined yet, ".
+						"adding $addr, $name";
+			$cbus_def->{unit}{$addr} = {     
+				name => $name,
+				note => ["Added by MisterHouse $Date_Now $Time_Now"]
+			};
+		}
+	}
+
+}
+
 #
 # Main MH Loop Code for  ***** TALKER *****
 #
@@ -1103,50 +1152,25 @@ sub attempt_level_sync {
             print_log "CBus: Message 342 response data: $cbus_data"; 
                    
             if ($cbus_data =~ /\d+\s+(\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/) {
+                #response matched against "new" format, i.e. network/app/group                
                 my ($addr, $name) = ($1, $2);
                 $addr = "//$cbus_project_name/$addr";
-                print_log "CBus: Address $addr, name $name";
+
                 $cbus_scan_last_addr_seen = $addr;
                 # $name =~ s/ /_/g;  Change spaces, depends on user usage...
-
-                my $addr_type;
-                if ($addr =~ /\/p\/(\d+)/) {    
-                    # Data is for a CBus device eg. switch, relay, dimmer
-                    $addr_type = 'unit';	
-                    $addr = $1;
-                } else {
-                    # Data is for a CBus "group"
-                    $addr_type = 'group';
-                }
-
-                print_log "CBus: Addr $addr is $name of type $addr_type";
-
-                # Store the CBus name and address in the cbus_def hash
-                if ($addr_type eq 'group') {
-                    if (not exists $cbus_def->{group}{$addr}) {
-                        print_log "CBus: group not defined yet, ".
-                                    "adding $addr, $name";
-                        $cbus_def->{group}{$addr} = {     
-                            name => $name,
-                            note =>["Added by MisterHouse $Date_Now $Time_Now"],
-                            type => 'dimmer',
-                            mh_group => ['CBus']
-                        };
-                        # print_log Dumper($cbus_def);
-                    }
-                } elsif ($addr_type eq 'unit') {
-                    if (not exists $cbus_def->{unit}{$addr}) {
-                        print_log "CBus: unit not defined yet, ".
-                                    "adding $addr, $name";
-                        $cbus_def->{unit}{$addr} = {     
-                            name => $name,
-                            note => ["Added by MisterHouse $Date_Now $Time_Now"]
-                        };
-                    }
-                }
-                print_log "Cbus: end message";
+                add_address_to_hash($addr, $name);
+                
+			} elsif ($cbus_data =~ /(\/\/.+\/\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/) {
+                #response matched against "old" format, i.e. //project/network/app/group
+                my ($addr, $name) = ($1, $2);
+            
+                $cbus_scan_last_addr_seen = $addr;
+                # $name =~ s/ /_/g;  Change spaces, depends on user usage...
+                add_address_to_hash($addr, $name);            
+            
             }
-	}
+            print_log "Cbus: end message";
+	    }
 	
 ###### Message code 300: Object information, for example: 300 1/56/1: level=200	
 	

From b61d5ab20b6dd73b8c10a5c245a83efdb896dd2c Mon Sep 17 00:00:00 2001
From: Jon Whitear <jon@whitear.org>
Date: Thu, 28 Nov 2013 11:08:18 +1100
Subject: [PATCH 07/21] Cbus update to add debug flag test to logging
 statements, i.e. reduce logging

---
 code/public/cbus.pl | 54 ++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/code/public/cbus.pl b/code/public/cbus.pl
index 984b96680..d3948ec54 100755
--- a/code/public/cbus.pl
+++ b/code/public/cbus.pl
@@ -91,10 +91,13 @@
 #	         Add logging to aid debugging cbus_builder
 #	         Contributed by Jon Whitear <jonATwhitearDOTorg>
 #
-#	V3.0.2  2013-11-25
+#	V3.0.2   2013-11-25
 #			 Add support for both formats of return code, i.e. NETWORK/APPLICATION/GROUP 
 #	         and //PROJECT/NETWORK/APPLICATION/GROUP.
 #
+#	V3.0.3	 2013-11-28
+#			 Test debug flag for logging statements.
+#
 # How Cgate integrates with MH
 #
 #    All Cbus objects are defined in a standard XML file (cbus.xml), this file is
@@ -247,6 +250,9 @@ sub cbus_configure {
         $cbus_system_debug = 1;
         print_log "CBus: DEBUG mode - No CGate communications started";
     }
+    
+    print_log "CBus: MisterHouse CBus debug mode - additional logging enabled" if $Debug{cbus};
+    
 }
 
 
@@ -325,11 +331,11 @@ sub load_def_file {
     $cbus_def_filename = $config_parms{code_dir} . "/" . 
                             $config_parms{cbus_dat_file};
     if (not -e $cbus_def_filename) {
-        print_log "CBus: [load_def_file] XML definition file $cbus_def_filename does not exist";
+        print_log "CBus: load_def_file() XML definition file $cbus_def_filename does not exist";
         return;
     }
 
-    print_log "CBus: Builder - Loading CBus config from XML file ".
+    print_log "CBus: load_def_file () Loading CBus config from XML file ".
                 $cbus_def_filename;
     $cbus_def = XMLin($cbus_def_filename, 
                       ForceArray => ['mh_group', 'note'], 
@@ -365,7 +371,7 @@ sub load_def_file {
 sub scan_cgate {
     # Initiate scan of CGate data
     # The scan is controlled by code in the Talker mh main loop code
-    print_log "CBus: [scan_cgate] Scanning CGate...";
+    print_log "CBus: scan_cgate() Scanning CGate...";
 
     # Cleanup from any previous scan and initialise flags/counters
     @cbus_net_list = [ ];
@@ -380,7 +386,7 @@ sub scan_cgate {
     if (defined $cbus_project_name) {
         set $cbus_talker "project load " . $cbus_project_name;
         set $cbus_talker "project use " . $cbus_project_name;
-        print_log "CBus: Command - project start " . $cbus_project_name;
+        print_log "CBus: scan_cgate() Command - project start " . $cbus_project_name;
         set $cbus_talker "project start " . $cbus_project_name;
     }
 
@@ -433,7 +439,7 @@ sub write_def_file {
                         );
 
     # Write the file to disk
-    print_log "CBus: [write_def_file] Writing XML definition to $cbus_def_filename,";
+    print_log "CBus: write_def_file() Writing XML definition to $cbus_def_filename,";
     $xml_file->XMLout($cbus_def, 
                       OutputFile => $cbus_def_filename,
                     );
@@ -486,20 +492,20 @@ sub build_cbus_file {
 
     # Setup output filename
     if ($cbus_build_debug) {
-        print_log "CBus: Builder - Start CBus build in TEST mode";
+        print_log "CBus: build_cbus_file() Start CBus build in TEST mode";
         $cbus_file = $config_parms{code_dir} . "/cbus_procedures.pl.test";
     
     } else {
-        print_log "CBus: Builder - Starting build";
+        print_log "CBus: build_cbus_file() Starting build";
         $cbus_file = $config_parms{code_dir} . "/cbus_procedures.pl";
     }
     
     rename ($cbus_file,  $cbus_file . '.old')
-        or print_log "CBus: Builder - Could not backup $cbus_file: $!";
+        or print_log "CBus: build_cbus_file() Could not backup $cbus_file: $!";
     
-    print_log "CBus: Builder - Saving CBus configs to $cbus_file";
+    print_log "CBus: build_cbus_file() Saving CBus configs to $cbus_file";
     open (CF, ">$cbus_file")
-        or print_log "CBus: Builder - Could not open $cbus_file: $!";
+        or print_log "CBus: build_cbus_file() Could not open $cbus_file: $!";
     
     print CF "# Category=CBus_Items\n#\n#\n";
     print CF "# Created: $Time_Now, from cbus.xml file: \"$config_parms{cbus_dat_file}\"\n";
@@ -677,9 +683,9 @@ sub build_cbus_file {
     print CF "#\n#\n# EOF\n#\n#\n";
 
     close (CF)
-        or print_log "Could not close $cbus_file: $!";
+        or print_log "CBbus: build_cbus_file() Could not close $cbus_file: $!";
 
-    print_log "CBus: Builder - Completed CBus build to $cbus_file";
+    print_log "CBUs: build_cbus_file() Completed CBus build to $cbus_file";
         
 }
 
@@ -705,6 +711,7 @@ sub build_cbus_file {
     # Currently set to 5 seconds 
     if ($New_Minute or ($New_Second and $cbus_monitor_retry++ > $CBUS_RETRY_SECS) ) {
         $cbus_monitor_retry = 0;
+        print_log "CBus: Restarting CBus Monitor" if $Debug{cbus};
         cbus_monitor_start();
     }
 }
@@ -908,6 +915,7 @@ sub cbus_monitor_status {
     # Currently set to 5 seconds 
     if ($New_Minute or ($New_Second and $cbus_talker_retry++ > $CBUS_RETRY_SECS)) {
         $cbus_talker_retry = 0;
+        print_log "CBus: Restarting CBus Talker" if $Debug{cbus};
         cbus_talker_start(); 
     }
 }
@@ -1075,12 +1083,12 @@ sub add_address_to_hash {
 		$addr_type = 'group';
 	}
 
-	print_log "CBus: Addr $addr is $name of type $addr_type";
+	print_log "CBus: add_address_to_hash() Addr $addr is $name of type $addr_type";
 
 	# Store the CBus name and address in the cbus_def hash
 	if ($addr_type eq 'group') {
 		if (not exists $cbus_def->{group}{$addr}) {
-			print_log "CBus: group not defined yet, ".
+			print_log "CBus: add_address_to_hash() group not defined yet, ".
 						"adding $addr, $name";
 			$cbus_def->{group}{$addr} = {     
 				name => $name,
@@ -1092,7 +1100,7 @@ sub add_address_to_hash {
 		}
 	} elsif ($addr_type eq 'unit') {
 		if (not exists $cbus_def->{unit}{$addr}) {
-			print_log "CBus: unit not defined yet, ".
+			print_log "CBus: add_address_to_hash() unit not defined yet, ".
 						"adding $addr, $name";
 			$cbus_def->{unit}{$addr} = {     
 				name => $name,
@@ -1134,7 +1142,7 @@ sub add_address_to_hash {
             } else {
                 # CGate is listing CBus "groups"
                 if ($cbus_data =~ /end/) {
-		            print_log "CBus: end of CBus scan data, got tree list";
+		            print_log "CBus: end of CBus scan data, got tree list" if $Debug{cbus};
                     $cbus_got_tree_list = 1;
                 } elsif ($cbus_data =~ /(\/\/.+\/\d+\/\d+\/\d+).+level=(\d+)/) {
                     print_log "CBus: scanned group=$1 at level $2";
@@ -1149,7 +1157,7 @@ sub add_address_to_hash {
     } elsif ($msg_code == 342) {
         if ($cbus_scanning_cgate) {  
          
-            print_log "CBus: Message 342 response data: $cbus_data"; 
+            print_log "CBus: Message 342 response data: $cbus_data" if $Debug{cbus}; 
                    
             if ($cbus_data =~ /\d+\s+(\d+\/[a-z\d]+\/\d+)\/TagName=(.+)/) {
                 #response matched against "new" format, i.e. network/app/group                
@@ -1169,7 +1177,7 @@ sub add_address_to_hash {
                 add_address_to_hash($addr, $name);            
             
             }
-            print_log "Cbus: end message";
+            print_log "Cbus: end message" if $Debug{cbus};
 	    }
 	
 ###### Message code 300: Object information, for example: 300 1/56/1: level=200	
@@ -1309,7 +1317,7 @@ sub add_address_to_hash {
         } else {
             # All networks scanned - set completion flag
             ### FIXME - RichardM test with two networks??
-            print_log "Cbus: leaving scanning mode";
+            print_log "Cbus: leaving scanning mode" if $Debug{cbus};
             $cbus_scanning_cgate = 0;
             print_log "CBus: CBus server scan complete";
             write_def_file();
@@ -1318,18 +1326,18 @@ sub add_address_to_hash {
     } elsif ($cbus_got_tree_list) {
         if ($cbus_group_idx < @cbus_group_list) {
             my $group = $cbus_group_list[$cbus_group_idx++];
-	        print_log "Cbus: dbget group $group";
+	        print_log "Cbus: dbget group $group" if $Debug{cbus};
             set $cbus_talker "dbget $group/TagName";
 
         } elsif ($cbus_unit_idx < @cbus_unit_list) {
             my $unit = $cbus_unit_list[$cbus_unit_idx++];
-            print_log "Cbus: dbget unit $unit";
+            print_log "Cbus: dbget unit $unit" if $Debug{cbus};
             set $cbus_talker "dbget $unit/TagName";
         
         } else {	
             if ($cbus_scan_last_addr_seen eq $cbus_unit_list[$#cbus_unit_list]) {
                 # Tree Scan complete - set tree completion flag
-                print_log "Cbus: leaving scanning mode";
+                print_log "Cbus: leaving scanning mode" if $Debug{cbus};
 				$cbus_scanning_tree = 0;
             }
         }

From 55a75ac97b6ad591200d2aa8ef7be73e04405eea Mon Sep 17 00:00:00 2001
From: Michael Stovenour <ms-github@stovenour.net>
Date: Sun, 22 Dec 2013 09:27:43 -0600
Subject: [PATCH 08/21] Updating download.pod to revision v3.0

---
 docs/download.html | 82 ----------------------------------------------
 docs/download.pod  | 17 +++++++---
 2 files changed, 12 insertions(+), 87 deletions(-)
 delete mode 100644 docs/download.html

diff --git a/docs/download.html b/docs/download.html
deleted file mode 100644
index 62b504321..000000000
--- a/docs/download.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Download Misterhouse</title>
-<link rel="stylesheet" href="default.css" type="text/css" />
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:root@localhost" />
-</head>
-
-<body>
-
-
-<!-- INDEX BEGIN -->
-<div name="index">
-<p><a name="__index__"></a></p>
-
-<ul>
-
-	<li><a href="#download_misterhouse">Download Misterhouse</a></li>
-	<li><a href="#current">Current</a></li>
-	<li><a href="#previous_stable">Previous Stable</a></li>
-	<li><a href="#older_versions">Older Versions</a></li>
-	<li><a href="#mailing_list">Mailing List</a></li>
-</ul>
-
-<hr name="index" />
-</div>
-<!-- INDEX END -->
-
-<p>
-</p>
-<h1><a name="download_misterhouse">Download Misterhouse</a></h1>
-<p>
-</p>
-<hr />
-<h1><a name="current">Current</a></h1>
-<p><strong>Version 2.200</strong> - released on 03/02/2012</p>
-<ul>
-<li><strong><a name="for_linux_windows_and_macos_https_github_com_hollie_misterhouse_archive_stable_zip" class="item">For Linux, Windows and MacOS: <a href="https://github.com/hollie/misterhouse/archive/stable.zip">https://github.com/hollie/misterhouse/archive/stable.zip</a></a></strong>
-
-</li>
-<li><strong><a name="the_windows_only_compiled_version_of_misterhouse_is_sadly_no_longer_supported" class="item">The Windows only compiled version of Misterhouse is sadly no longer supported.</a></strong>
-
-</li>
-<li><strong><a name="misterhouse" class="item">Between formal releases, you can pick up the latest updates from: <a href="https://github.com/hollie/misterhouse">https://github.com/hollie/misterhouse</a> (not recommended for beginners!)</a></strong>
-
-</li>
-<li><strong><a name="large" class="item">A large (30MB) zip of optional files (mainly sound files) is here: <a href="http://misterhouse.sf.net/misterhouse_misc.zip">http://misterhouse.sf.net/misterhouse_misc.zip</a></a></strong>
-
-</li>
-</ul>
-<p>
-</p>
-<hr />
-<h1><a name="previous_stable">Previous Stable</a></h1>
-<p><strong>Version 2.105</strong> - released on 12/01/2008</p>
-<ul>
-<li><strong><a name="http_prdownloads_sourceforge_net_misterhouse_misterhouse_src_2105_zip" class="item"><a href="http://prdownloads.sourceforge.net/misterhouse/misterhouse_src_2105.zip">http://prdownloads.sourceforge.net/misterhouse/misterhouse_src_2105.zip</a></a></strong>
-
-</li>
-</ul>
-<p>
-</p>
-<hr />
-<h1><a name="older_versions">Older Versions</a></h1>
-<ul>
-<li><strong><a name="sourceforge" class="item">You can get older versions from Sourceforge (not recommended): <a href="http://sourceforge.net/project/showfiles.php?group_id=1365&package_id=1347">http://sourceforge.net/project/showfiles.php</a></a></strong>
-
-</li>
-</ul>
-<p>
-</p>
-<hr />
-<h1><a name="mailing_list">Mailing List</a></h1>
-<p>Subscribe to the Misterhouse release announcement mailing list here:  <a href="http://lists.sourceforge.net/mailman/listinfo/misterhouse-announce">http://lists.sourceforge.net/mailman/listinfo/misterhouse-announce</a></p>
-<p>Or join the Misterhouse community mailing list here: <a href="http://lists.sourceforge.net/mailman/listinfo/misterhouse-users">http://lists.sourceforge.net/mailman/listinfo/misterhouse-users</a></p>
-<p>Last modified 03/02/2013 11:03:55</p>
-
-</body>
-
-</html>
diff --git a/docs/download.pod b/docs/download.pod
index b22c75b3c..10a9e9aac 100644
--- a/docs/download.pod
+++ b/docs/download.pod
@@ -1,12 +1,19 @@
+=begin comment
+
+!!Note that if you change the format or layout of this page you must also 
+modify the code/common/mh_release.pl file to search the new format!!
+
+=end comment
+
 =head1 Download Misterhouse
 
-=head1 Current 
+=head1 Current Stable
 
-B<Version 2.200> - released on 03/02/2012
+B<Version 3.0> - released on 06/20/2013
 
 =over
 
-=item * For Linux, Windows and MacOS: L<https://github.com/hollie/misterhouse/archive/stable.zip>
+=item * For Linux, Windows and MacOS: L<https://api.github.com/repos/hollie/misterhouse/zipball/v3.0>
 
 =item * The Windows only compiled version of Misterhouse is sadly no longer supported.
 
@@ -18,11 +25,11 @@ B<Version 2.200> - released on 03/02/2012
 
 =head1 Previous Stable
 
-B<Version 2.105> - released on 12/01/2008
+B<Version 2.200> - released on 03/02/2012
 
 =over
 
-=item * L<http://prdownloads.sourceforge.net/misterhouse/misterhouse_src_2105.zip>
+=item * L<https://api.github.com/repos/hollie/misterhouse/zipball/v2.200>
 
 =back
 

From 24b71a57f26187ffc1dfb54019ec47abaef73ec0 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Thu, 27 Mar 2014 14:10:48 -0700
Subject: [PATCH 09/21] Upped version to v3.1

---
 VERSION           | 2 +-
 docs/download.pod | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index f398a2061..06a445799 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0
\ No newline at end of file
+3.1
\ No newline at end of file
diff --git a/docs/download.pod b/docs/download.pod
index f67d43b35..58ea5ed05 100644
--- a/docs/download.pod
+++ b/docs/download.pod
@@ -9,13 +9,13 @@ modify the code/common/mh_release.pl file to search the new format!!
 
 =head1 Current Stable
 
-B<Version 3.0> - released on 06/20/2013
+B<Version 3.1> - released on 03/30/2014
 
 =over
 
 =item Linux, Windows and MacOS
 
-L<https://api.github.com/repos/hollie/misterhouse/zipball/v3.0>
+L<https://api.github.com/repos/hollie/misterhouse/zipball/v3.1>
 
 The Windows only compiled version of Misterhouse is sadly no longer supported.
 
@@ -27,7 +27,7 @@ A large (30MB) zip of optional files (mainly sound files) is here: L<http://mist
 
 =head1 Previous Stable
 
-B<Version 2.200> - released on 03/02/2012
+B<Version 3.0> - released on 06/20/2013
 
 =over
 
@@ -36,7 +36,7 @@ B<Version 2.200> - released on 03/02/2012
 =begin HTML
 
 <strong>
-<a href='https://api.github.com/repos/hollie/misterhouse/zipball/v2.200' target='_blank'>https://api.github.com/repos/hollie/misterhouse/zipball/v2.200</a>
+<a href='https://api.github.com/repos/hollie/misterhouse/zipball/v3.0' target='_blank'>https://api.github.com/repos/hollie/misterhouse/zipball/v3.0</a>
 </strong>
 
 =end HTML

From 61f183946d2d62119395b895bd4bbd0ae238f042 Mon Sep 17 00:00:00 2001
From: KRKeegan <kevin@krkeegan.com>
Date: Mon, 31 Mar 2014 19:44:57 -0700
Subject: [PATCH 10/21] Fix Release Date

---
 docs/download.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/download.pod b/docs/download.pod
index 58ea5ed05..1d402985d 100644
--- a/docs/download.pod
+++ b/docs/download.pod
@@ -9,7 +9,7 @@ modify the code/common/mh_release.pl file to search the new format!!
 
 =head1 Current Stable
 
-B<Version 3.1> - released on 03/30/2014
+B<Version 3.1> - released on 03/31/2014
 
 =over
 

From 3b3336b9b9d4a43a4755e085f796fdb5aa226f26 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Sun, 12 Oct 2014 20:16:21 +0200
Subject: [PATCH 11/21] Changed link to wiki.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 19764f356..b7520e6f0 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@ Perl open source home automation program. It's fun, it's free, and it's entirely
 
 * [Quickstart Guide](https://github.com/hollie/misterhouse/wiki/Getting-started)
 * [Standard Installation Guide](http://misterhouse.sourceforge.net/install.html)
-* [User Wiki](http://misterhouse.wikispaces.com/)
+* [User Wiki](https://github.com/hollie/misterhouse/wiki)
 * [User Mail List misterhouse-users](https://sourceforge.net/p/misterhouse/mailman/misterhouse-users/)
 
 * Active Development Repository - [GitHub hollie/misterhouse](https://github.com/hollie/misterhouse)
 
-The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/
\ No newline at end of file
+The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/

From fee14bb86050167d5c557b7c21e92c9dc7173756 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Mon, 24 Nov 2014 09:17:55 +0100
Subject: [PATCH 12/21] Removed duplicated link

Wikispace is no longer active.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b7520e6f0..76359864d 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,3 @@ Perl open source home automation program. It's fun, it's free, and it's entirely
 
 * Active Development Repository - [GitHub hollie/misterhouse](https://github.com/hollie/misterhouse)
 
-The MisterHouse wiki with more information is located here: http://misterhouse.wikispaces.com/

From 5a8eae686fd2dc2ebee18047e05b42225ed82b4f Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Wed, 17 Feb 2016 21:19:46 +0100
Subject: [PATCH 13/21] Upped version to v4.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 06a445799..5186d0706 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1
\ No newline at end of file
+4.0

From 218b9d656f151334b50263c8eb6da7d45c6546ec Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Sun, 21 Feb 2016 18:18:12 +0100
Subject: [PATCH 14/21] Upped version to 4.0.1 after merging user feedback on
 v4.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 5186d0706..1454f6ed4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.0.1

From 9e20c5d34c0bfc99ce39bf92c903522aa3548238 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Sun, 21 Feb 2016 20:10:23 +0100
Subject: [PATCH 15/21] Upped to version 4.1 after consensus on mailing list

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 1454f6ed4..7d5c902e7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0.1
+4.1

From b7c96fb13e7e3a7267d6b7e7a3f752f8e3e7231e Mon Sep 17 00:00:00 2001
From: Marc <root@pvr2.nm156.net>
Date: Thu, 21 Apr 2016 10:47:31 -0400
Subject: [PATCH 16/21] Allows the control of WGL rain8Net serial sprinkler
 control modules (see http://www.wgldesigns.com/rain8pc.html)

---
 lib/Rain8Net.pm | 801 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 801 insertions(+)
 create mode 100644 lib/Rain8Net.pm

diff --git a/lib/Rain8Net.pm b/lib/Rain8Net.pm
new file mode 100644
index 000000000..96599ad97
--- /dev/null
+++ b/lib/Rain8Net.pm
@@ -0,0 +1,801 @@
+=begin comment
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
+Rain8Net.pm  v1.1
+by Marco Maddalena (mhcoder@nowheremail.com)
+
+Description:
+
+Allows the control of WGL rain8Net serial sprinkler control modules
+(see http://www.wgldesigns.com/rain8pc.html)
+Each unit can control 8 zones, and 8 units can be daisy-chained on 1 serial connection.
+
+
+Methods
+  status_zone  - returns the zone status (1=on,0=off).
+                 Parms:  Unit  (required) : Numeric    - Unit number
+                         Zone  (required) : numeric    - Zone number
+
+
+
+  cmd          - send Rain8Net Cmd to the unit (some function below alias these commands)
+                 Parms   cmd    (required) : string     - See list
+                         Unit   (optional) : numeric    - Unit number IF required by the cmd
+                         Zone   (optional) : numeric    - Zone number IF required by the cmd
+
+                 Supported commands are
+                        "COMCheck"       - Check communications link. No parameters.
+                        "StatusRequest"  - Request an update of zone statuses. Unit number required.
+                                           (Note: automatic status request happens via RAIN8NET_AutoStatusRequestTimer value)
+                        "ZoneON"         - Turn zone on. Requires unit and Zone number
+                        "ZoneOFF"        - Turn zone off. Requires unit and Zone number
+                        "AllModuleOFF"   - Turn all zones of a unit off. Requires unit number.
+                        "AllGlobalOff"   - Turns all zones of all units. No paramters
+
+  ZoneOn       - send the ZoneOn command to Rain8Net
+                 Parms   Unit   (required) : numeric    - Unit number
+                         Zone   (required) : numeric    - Zone number
+
+  ZoneOff      - send the ZoneOff/AllUnitOff/AllGlobalOff command to Rain8Net
+                 Parms   Unit   (optional) : numeric    - Unit number (if not passed, then the equivalent to AllGlobalOff is performed)
+                         Zone   (optional) : numeric    - Zone number (if not passed, but unit was, the  equivalent to AllModuleOff is performed)
+
+
+
+
+
+Examples
+
+    use Rain8Net;
+    $Rain8 = new Rain8Net;
+
+
+    if (time_now("22:00"))
+    {
+      print_log "Sprinkler ON for unit 1, Zone 2 [" . $Rain8->get_name(1,2) . "]";
+      $Rain8->cmd('ZoneON',1,2);
+    }
+
+    if (time_now("01:00"))
+    {
+      print_log "Sprinkler OFF for unit 1, Zone 2 [" . $Rain8->get_name(1,2) . "]";
+      $Rain8->cmd('ZoneOFF',1,2);
+    }
+
+    if ((time_now("23:00")) && (Rain8->status_zone(1,5)))
+    {
+      print_log "Sprinkler OFF for unit 1, Zone 5 [" . $Rain8->get_name(1,5) . "]";
+      $Rain8->cmd('ZoneOFF',1,5);
+    }
+
+
+
+
+mh.ini parameter Values
+
+RAIN8NET_serial_port
+  Required
+  Serial port where Rain8Net module is connected.
+  ie /dev/ttySx
+
+
+RAIN8NET_Units
+  Optional (default 1)
+  Number of Rain8Net units linked on 1 serial connection. rain8Net support 1-8
+  Valid Values: 1 - 8
+
+
+RAIN8NET_AutoStatusRequestTimer
+  Optional (default 30)
+  Number of seconds between auto executions of StatusRequests
+  Valid Values: 0 - 999999
+  If 0, no automatic Status request are performed.
+
+
+RAIN8NET_unit_[U]_zone_[Z]
+  Optional (no default)
+  String name of a Unit/Zone (see zone_name method)
+  Allows for zones to be named. ie "RAIN8NET_unit_1_zone_2=Front Yard Sprinklers" names the zone 2 of unit 1
+
+
+RAIN8NET_ModuleDebug
+  Optional (default 0)
+  if 1, echo debug messasges of the Rain8Net.pm module into the MH log
+  Valid Values: 0,1
+
+
+
+Notes:
+
+This is my 1st Perl module and I am a novice, so I welcome comments and criticism but please be gentle ... I bruise easily ;)
+This module was heavily derived from the DSC5401.pm module by Jocelyn Brouillard and Gaetan lord. Thanks to them
+
+
+Changes
+
+v1.0  2015-07-14  initial module construction
+v1.1  2015-12-11  Fixes and more documentation
+
+
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+=cut
+
+use strict;
+
+package Rain8Net;
+
+
+# Rain8Net Serial parameters
+use constant RAIN8NET_BAUDRATE  => 4800;
+use constant RAIN8NET_DATABITS  => 8;
+use constant RAIN8NET_PARITY    => "none";
+use constant RAIN8NET_STOPBITS  => 1;
+use constant RAIN8NET_HANDSHAKE => 'none';
+use constant RAIN8NET_MAXUNITS  => 8;
+use constant RAIN8NET_MAXZONES  => 8;
+
+use constant SUBCOMMAND_STATUSREQUEST => 1;
+use constant SUBCOMMAND_ZONEON        => 2;
+use constant SUBCOMMAND_ZONEOFF       => 4;
+use constant SUBCOMMAND_ALLUNITOFF    => 8;
+
+
+@Rain8Net::ISA = ('Generic_Item');
+
+my %CmdMsg;
+my %CmdMsgRev;
+my @Rain8Net_Objects = ();
+my $IncompleteCmd;
+my $ModuleDebug = 0;
+
+
+
+# ---------------------------------------------------------------------------
+# Method: new (public)
+# Desc:  Instantiate the new object
+sub new
+{
+  my ($class) = @_;
+  my $self = {};
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [new]...") if $ModuleDebug;
+
+  bless $self, $class;
+
+  $$self{state}                 = 'Unknown';
+  $$self{said}                  = '';
+  $$self{MaxUnits}              = 0;
+  $$self{LastCmdSent}           = '';
+  $$self{LastSubCmdSent}        = -1;
+  $$self{LastCmdSentUnit}       = -1;
+  $$self{LastCmdSentZone}       = -1;
+  $$self{LastResponseRaw}       = '';
+  $$self{LastCmdResponse}       = '';
+  $$self{TimerInterval}         = 0;
+
+  # Module-level reference to self
+  push @Rain8Net_Objects, $self;
+
+  # read event message hash
+  _DefineCmdMsg();
+
+  # test if ModuleDebug is on
+  $ModuleDebug = 1 if (exists $main::config_parms{RAIN8NET_ModuleDebug});
+
+  &main::print_log("Rain8Net Starting interface module");
+
+  # Call Startup to initialize serial port
+  $self->startup();
+
+  select(undef, undef, undef, 0.250); # wait 250 millseconds
+
+  # We send a COMCheck, which is really a NOP.
+  $self->cmd('COMCheck'); # request an initial COMCheck
+
+  select(undef, undef, undef, 0.250); # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
+
+  return $self;
+}
+
+
+
+
+# ---------------------------------------------------------------------------
+# Method: _init_serial_port (private)
+# Description: serial port configuration
+sub _init_serial_port
+{
+  my ($self, $serial_port) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_init_serial_port]...") if $ModuleDebug;
+
+  $serial_port->error_msg(1);
+
+  $serial_port->databits(RAIN8NET_DATABITS);
+  $serial_port->parity(RAIN8NET_PARITY);
+  $serial_port->stopbits(RAIN8NET_STOPBITS);
+  $serial_port->handshake(RAIN8NET_HANDSHAKE);
+  $serial_port->datatype('raw');
+  $serial_port->dtr_active(1);
+  $serial_port->rts_active(1);
+
+  $serial_port->debug(1) if ($ModuleDebug eq 1);
+
+  select( undef, undef, undef, .100 );    # Sleep a bit
+}
+
+
+
+# ---------------------------------------------------------------------------
+# Method: startup (public)
+# Description: Called by MH on startup
+sub startup
+{
+  my ($self) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_startup]...") if $ModuleDebug;
+
+  my $port;
+
+  if ($::config_parms{'RAIN8NET_serial_port'} )
+  {
+    $port = $::config_parms{'RAIN8NET_serial_port'};
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_serial_port] read, value is [" . $port ."]") if ($ModuleDebug);
+    if (not (-c "$port"))
+    {
+      &main::print_log("Rain8Net.pm Error : Invalid port [" . $port ."] defined in mh.ini [RAIN8NET_serial_port]. Cannot create object.");
+      $$self{state} = "Error";
+      return;
+    }
+  }
+  else
+  {
+    &main::print_log("Rain8Net.pm Error : Port not defined in mh.ini [RAIN8NET_serial_port]. Cannot create object.");
+    $$self{state} = "Error";
+    return;
+  }
+
+
+  # If here, validate other settings
+  $$self{MaxUnits} = ( defined $::config_parms{RAIN8NET_Units} ) ? $main::config_parms{RAIN8NET_Units} : 1;
+  if ((($$self{MaxUnits} + 0) eq $$self{MaxUnits}) && (($$self{MaxUnits} +0 ) => 1) && (($$self{MaxUnits} + 0) <= RAIN8NET_MAXUNITS))
+  {
+    $$self{MaxUnits} = ($$self{MaxUnits} + 0);  # convert numeric
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_Units] read, value is [" . $$self{MaxUnits} ."]") if ($ModuleDebug);
+  }
+  else
+  {
+    &main::print_log("Rain8Net.pm Error : Invalid value for mh.ini [RAIN8NET_Units], ignoring and setting to 1");
+    $$self{MaxUnits} = 1;
+  }
+
+
+  # initialize state of all units/zones as off
+  for (my $j = 1; $j <= $$self{MaxUnits}; $j++)
+  {
+    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
+    {
+      $$self{zone_status}{$j}{$i} = 0;
+    }
+  }
+
+
+  # create the Serial port item
+  if ( &main::serial_port_create( 'Rain8Net', $port, RAIN8NET_BAUDRATE, 'none', 'raw' ) )
+  {
+    $self->_init_serial_port( $::Serial_Ports{Rain8Net}{object}, $port );
+    &main::print_log("Rain8Net.pm initializing port $port at " . RAIN8NET_BAUDRATE . " baud") if $ModuleDebug;
+    &::MainLoop_pre_add_hook( \&Rain8Net::_check_for_data, 1 ) if $main::Serial_Ports{Rain8Net}{object};
+    $$self{state} = "Active";
+  }
+  else
+  {
+    &main::print_log("Rain8Net.pm Error : Unable to open serial port [$port]. Cannot create object.");
+    $$self{state} = "Error";
+    return;
+  }
+
+
+  # Get the Auto Status request value and validate
+  my $timerinterval = ( defined $::config_parms{RAIN8NET_AutoStatusRequestTimer} ) ? $main::config_parms{RAIN8NET_AutoStatusRequestTimer} : 30;
+  if ((($timerinterval + 0) eq $timerinterval) && (($timerinterval+0) >= 0) && (($timerinterval+0) <= 9999))
+  {
+    $$self{TimerInterval} = ($timerinterval + 0); # convert numeric
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_AutoStatusRequestTimer] read, value is [" . $$self{TimerInterval} ."]") if ($ModuleDebug);
+  }
+  else
+  {
+    &main::print_log("Rain8Net.pm Error : Invalid value for mh.ini [RAIN8NET_AutoStatusRequestTimer], ignoring and setting to 0");
+    $$self{TimerInterval} = 0;
+  }
+}
+
+
+
+# ---------------------------------------------------------------------------
+# Method: _check_for_data (private)
+# Description: hooked routine that checks data on port
+sub _check_for_data
+{
+   # &main::print_log("Rain8Net.pm - MODULE DEBUG : entering init [_check_for_data]...") if $ModuleDebug;
+
+   $main::Serial_Ports{'Rain8Net'}{data} = '';
+   &main::check_for_generic_serial_data('Rain8Net');
+   #-- my $NewCmd = $main::Serial_Ports{'Rain8Net'}{data};
+
+   my $NewCmd = $main::Serial_Ports{'Rain8Net'}{data};
+   #-- $main::Serial_Ports{'Rain8Net'}{data} = '';
+
+   &main::print_log("Rain8Net.pm - MODULE DEBUG : Received the following [$NewCmd]") if (($NewCmd) && ($ModuleDebug));
+
+   # we need to buffer the information received, because many command could be include in a single pass
+   $NewCmd = $IncompleteCmd . $NewCmd if $IncompleteCmd;
+   return if !$NewCmd;
+
+   my $self = $Rain8Net_Objects[0];
+
+   # Flush last buffered response
+   $$self{LastResponseRaw} = '';
+
+   # Rain8Net commands are 3 bytes
+   if (length($NewCmd) ge 3)
+   {
+     $IncompleteCmd = substr($NewCmd,3);    # Keep rest of Command
+     &_CheckCmd($self,$NewCmd);
+   }
+}
+
+
+# ---------------------------------------------------------------------------
+# Method: _SetTimers (private)
+# Description: set up auto status request timers for all units
+sub _SetTimers
+{
+  my ($self) = @_;
+
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_SetTimers]...") if $ModuleDebug;
+
+  # set a timer to perform auto Statusrequest every 30
+  if (($$self{object_name}) && ($$self{TimerInterval} > 0))
+  {
+    &::print_log("Rain8Net.pm - MODULE DEBUG : creating timer(s) for object [" . $$self{object_name} . "]") if $ModuleDebug;
+    for (my $count = 1; $count <= $$self{MaxUnits}; $count++)
+    {
+      my $timername = 'statusrequest_timer' . $count;
+
+      if (not ($$self{$timername}))
+      {
+        &::print_log("Rain8Net.pm - MODULE DEBUG : creating timer [$timername]") if $ModuleDebug;
+        $$self{$timername} = new Timer;
+        $$self{$timername}->set($$self{TimerInterval}, "$$self{object_name}->cmd('StatusRequest',$count)", -1);
+      }
+    }
+  }
+
+}
+
+# ---------------------------------------------------------------------------
+# Method: _CheckCmd (private)
+# Description: validate in incoming command string from the Rain8 unit and apply the data updates
+sub _CheckCmd
+{
+  my ($self,$CmdStr) = @_;
+
+  my $UnitNumber = -1;
+  my $ZoneNumber = -1;
+  my $ZoneBitFlag = 0;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_CheckCmd]...") if $ModuleDebug;
+
+  &_SetTimers($self);
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd - cmdstr is ($CmdStr)") if $ModuleDebug;
+
+  return if !$CmdStr;
+
+  $$self{LastResponseRaw} = $CmdStr;
+
+  my $l     = length($CmdStr);
+  my $code  = unpack("H*", substr( $CmdStr, 0, 1 ));
+  my $arg1  = unpack("H*", substr( $CmdStr, 1, 1 ));
+  my $arg2  = unpack("H*", substr( $CmdStr, 2, 1 ));
+  my $hexcode = sprintf("0x%d",$code);
+
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG :  _CheckCmd Raw input is [$code] [$arg1] [$arg2], length [$l]") if $ModuleDebug;
+
+  # test received command is valid
+  if (not ( exists $CmdMsgRev{$hexcode} ))
+  {
+   &::print_log("Unknown rain8Net response code recieved : code [$code] with arguments [$arg1] , [$arg2]");
+   $$self{LastSubCmdSent} = 0;
+   return;
+  }
+
+  my $CmdName;
+
+
+  # Since StatusRequest and ZoneOn and ZoneOFF all return the same god-damn 40 hex, use our flag
+  if (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_STATUSREQUEST))
+  {
+    $CmdName = "StatusRequest";
+  }
+  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ZONEON))
+  {
+    $CmdName = "ZoneON";
+  }
+  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ZONEOFF))
+  {
+    $CmdName = "ZoneOFF";
+  }
+  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ALLUNITOFF))
+  {
+    $CmdName = "AllModuleOFF";
+  }
+  else
+  {
+    $CmdName = ($CmdMsgRev{$hexcode});
+  }
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd Command recived is = [" . $CmdName . "]") if $ModuleDebug;
+
+  # At this point process the response...--------------
+
+  # If Status request response, the last  byte is a bit pattern of active zones
+  if ($CmdName eq "StatusRequest")
+  {
+    $UnitNumber  = hex($arg1);
+    $ZoneBitFlag = hex($arg2);
+    my $match = 1;
+    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
+    {
+      $$self{zone_status}{$UnitNumber}{$i} = ( $ZoneBitFlag & $match ) ? 1 : 0;
+      $match = $match << 1;
+    }
+  }
+
+
+  # Echo from ZoneOFF
+  if ($CmdName eq "ZoneOFF")
+  {
+    $UnitNumber    = hex($arg1);
+    my $UpperNible = hex($arg2) & hex('0x40');
+    my $LowerNible = hex($arg2) & hex('0x08');
+
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub _checkCmd - ZONE OFF, Unit [$UnitNumber], uppernibble [$UpperNible], lowerninble [$LowerNible]") if $ModuleDebug;
+
+    $$self{zone_status}{$UnitNumber}{$LowerNible} = 0;
+  }
+
+  # Echo from ZoneON
+  if ($CmdName eq "ZoneON")
+  {
+    $UnitNumber    = hex($arg1);
+    my $UpperNible = hex($arg2) & hex("0x30");
+    my $LowerNible = hex($arg2) & hex('0x08');
+
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub _checkCmd - ZONE ON, Unit [$UnitNumber], uppernibble [$UpperNible], lowerninble [$LowerNible]") if $ModuleDebug;
+
+    $$self{zone_status}{$UnitNumber}{$LowerNible} = 1;
+  }
+
+  # Echo from AllModuleOff
+  if ($CmdName eq "AllModuleOFF")
+  {
+    $UnitNumber = hex($arg1);
+
+    if (hex($arg2) eq hex("0x55"))
+    {
+      for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
+      {
+        $$self{zone_status}{$UnitNumber}{$i} = 0;
+      }
+    }
+  }
+
+
+  # Dump debug
+  if (($ModuleDebug) && ($UnitNumber >= 1))
+  {
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd dump status -->");
+    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
+    {
+      &main::print_log("         Unit [$UnitNumber], zone [$i] is [" . ($$self{zone_status}{$UnitNumber}{$i}) . "]");
+    }
+  }
+
+
+  # Reset the last subcommand
+  $$self{LastSubCmdSent} = 0;
+
+  return;
+}
+
+
+
+
+#}}}
+#    Define hash with DSC command                                           {{{
+sub _DefineCmdMsg {
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_DefineCmdMsg]...") if $ModuleDebug;
+
+  %CmdMsg = (
+      lc("COMCheck")                          => "0x70",
+      lc("StatusRequest")                     => "0x40",
+      lc("ZoneON")                            => "0x40",
+      lc("ZoneOFF")                           => "0x40",
+      lc("AllModuleOFF")                      => "0x40",
+      lc("AllGlobalOFF")                      => "0x20",
+      lc("ReadRainSwitchStatus")              => "0x50",
+      lc("ReadFlowMeterCounter")              => "0x50",
+      lc("ClearFlowMeterCounter")             => "0x50"
+  );
+
+  %CmdMsgRev = reverse %CmdMsg;
+  return;
+}
+
+
+
+
+
+#}}}
+#    Sending command to Rain8Net
+sub cmd
+{
+
+  my ( $self, $cmd, $arg1, $arg2 ) = @_;
+  my $CmdName;
+
+  if ($ModuleDebug)
+  {
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [cmd]...");
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - cmd  is [" . $cmd . "]");
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - arg1 is [" . $arg1 . "]");
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - arg2 is [" . $arg2 . "]");
+  }
+
+  $cmd = lc($cmd);
+  if (not (exists $CmdMsg{$cmd}) )
+  {
+    &::print_log("Rain8Net.pm ERROR - Invalid command : ($cmd) with arguments $arg1 , $arg2");
+    return;
+  }
+
+  my $CmdByte = hex($CmdMsg{$cmd});
+  my $CmdStr  = chr($CmdByte);
+  my $UnitNumber = 0;
+  my $ZoneNumber = 0;
+
+  if ($cmd eq lc("COMCheck"))
+  {
+    # pad command with 2 extra bytes, does not matter which
+    $CmdStr .= "xx";
+  }
+  elsif ($cmd eq lc("StatusRequest"))
+  {
+    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
+    return if ( $UnitNumber lt 0 );
+
+    # Second arg is "all status code"
+    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0xf0"));
+    $$self{LastSubCmdSent} = SUBCOMMAND_STATUSREQUEST;
+  }
+  elsif ($cmd eq lc("ZoneON"))
+  {
+    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
+    return if ( $UnitNumber lt 0 );
+
+    $ZoneNumber = $self->_ConvertZone($cmd, $arg2);
+    return if ( $ZoneNumber lt 0 );
+
+    # Second arg is 3 upper nibble, zone - lower nibble
+    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x3" . "$ZoneNumber"));
+    $$self{LastSubCmdSent} = SUBCOMMAND_ZONEON;
+    $$self{zone_status}{$UnitNumber}{$ZoneNumber} = 1;
+  }
+  elsif ($cmd eq lc("ZoneOFF"))
+  {
+    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
+    return if ( $UnitNumber lt 0 );
+
+    $ZoneNumber = $self->_ConvertZone($cmd, $arg2);
+    return if ( $ZoneNumber lt 0 );
+
+    # Second arg is 4 upper nibble, zone - lower nibble
+    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x4" . "$ZoneNumber"));
+    $$self{LastSubCmdSent} = SUBCOMMAND_ZONEOFF;
+    $$self{zone_status}{$UnitNumber}{$ZoneNumber} = 0;
+  }
+  elsif ($cmd eq lc("AllModuleOFF"))
+  {
+    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
+    return if ( $UnitNumber lt 0 );
+
+    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x55"));
+    $$self{LastSubCmdSent} = SUBCOMMAND_ALLUNITOFF;
+    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
+    {
+      $$self{zone_status}{$UnitNumber}{$i} = 0;
+    }
+
+
+  }
+  elsif ($cmd eq lc("AllGlobalOff"))
+  {
+    $$self{LastSubCmdSent} = 0;
+    $CmdStr .= chr(hex("0x55")) . chr(hex("0x55"));
+    for (my $i = 1; $i <= $$self{MaxUnits}; $i++)
+    {
+      for (my $j = 1; $j <= RAIN8NET_MAXZONES; $j++)
+      {
+        $$self{zone_status}{$i}{$j} = 0;
+      }
+    }
+  }
+
+
+
+#  &::print_log("Sending to Rain8Net panel     ($cmd) with argument ($arg1, $arg2)");
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd  - Writing (" . $CmdStr . ")") if $ModuleDebug;
+  if ($main::Serial_Ports{Rain8Net}{object}->write($CmdStr))
+  {
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd  - Command (" . $CmdStr . ") successfully written to serial port.") if $ModuleDebug;
+    $$self{LastCmdSent} = $cmd;
+    $$self{LastCmdSentUnit} = $UnitNumber;
+    $$self{LastCmdSentZone} = $ZoneNumber;
+  }
+
+
+  return "Sent to Rain8Net panel: ($cmd) with argument ($arg1,$arg2) - Successful";
+
+}
+
+
+
+
+#}}}
+# validate and Convert Unit Number to value
+sub _ConvertUnit
+{
+  my ($self, $cmd, $Unit) = @_;
+
+  my $UnitNumber = $Unit + 0;
+  if ( ($UnitNumber >= 1) && ($UnitNumber <= $$self{MaxUnits}) )
+  {
+    # $UnitNumber is in the range
+    return ($UnitNumber);
+  }
+  else
+  {
+    &::print_log("Rain8Net Error - Invalid Unit number on command : [$cmd], Unit [$Unit]");
+    return -1;
+  }
+}
+
+#}}}
+# validate and Convert Zone Number to numeric value.
+# retrun -1 if invalid
+sub _ConvertZone
+{
+
+  my ($self, $cmd, $Zone) = @_;
+
+  my $ZoneNumber = $Zone + 0;
+
+  if ( ($ZoneNumber >= 1) && ($ZoneNumber <= RAIN8NET_MAXZONES) )
+  {
+    # $ZoneNumber is in the range
+    return ($ZoneNumber);
+  }
+  else
+  {
+    &::print_log("Rain8Net Error - Invalid zone number on command : [$cmd], zone [$Zone])");
+    return -1;
+  }
+}
+
+
+
+
+
+#}}}
+#    user call from MH                                                         {{{
+# most of them are replicate to hash value, easier to code
+
+sub status_zone
+{
+  my ( $self, $unit, $zone ) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [status_zone]...") if $ModuleDebug;
+
+  my $UnitNumber = $self->_ConvertUnit("method: status_zone",$unit);
+  return -1 if ($UnitNumber < 1);
+
+  my $ZoneNumber = $self->_ConvertZone("method: status_zone",$zone);
+  return -1 if ($ZoneNumber < 1);
+
+  return $$self{zone_status}{$UnitNumber}{$ZoneNumber} if defined $$self{zone_status}{$UnitNumber}{$ZoneNumber};
+}
+
+sub zone_name
+{
+  my ( $self, $unit, $zone ) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [zone_name]...") if $ModuleDebug;
+
+  my $UnitNumber = $self->_ConvertUnit("method: zone_name",$unit);
+  return -1 if ($UnitNumber < 1);
+
+  my $ZoneNumber = $self->_ConvertZone("method: zone_name",$zone);
+  return -1 if ($ZoneNumber < 1);
+
+  my $unitstr = sprintf "%d", $UnitNumber;
+  my $zonestr = sprintf "%d", $ZoneNumber;
+
+  my $cfgparmname = "RAIN8NET_unit_" . $unitstr . "_zone_" . $zonestr;
+
+  my $ZoneName = $main::config_parms{$cfgparmname} if exists $main::config_parms{$cfgparmname};
+
+  return $ZoneName if $ZoneName;
+
+  return $ZoneNumber;
+}
+
+
+
+sub ZoneOn
+{
+  my ( $self, $unit, $zone ) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [ZoneOn]...") if $ModuleDebug;
+
+  my $UnitNumber = $self->_ConvertUnit("method: ZoneOn",$unit);
+  return -1 if ($UnitNumber < 1);
+
+  my $ZoneNumber = $self->_ConvertZone("method: ZoneOn",$zone);
+  return -1 if ($ZoneNumber < 1);
+
+  $self->cmd("ZoneOn", $UnitNumber, $ZoneNumber);
+}
+
+
+sub ZoneOff
+{
+  my ( $self, $unit, $zone ) = @_;
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [ZoneOff]...") if $ModuleDebug;
+
+  # If no unit or zone, all global off!!!!
+  if (@_ < 2)
+  {
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] missing unit/zone - calling AllGlobalOff...") if $ModuleDebug;
+    $self->cmd("AllGlobalOff");
+    return;
+  }
+
+  my $UnitNumber = $self->_ConvertUnit("method: ZoneOff",$unit);
+  return -1 if ($UnitNumber < 1);
+
+  # If unit but no zone
+  if (@_ < 3)
+  {
+    &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] missing zone - calling AllModuleOFF...") if $ModuleDebug;
+    $self->cmd("AllModuleOFF",$UnitNumber);
+    return;
+  }
+
+  # If Here ... a particular unit/zone is to be turned off
+
+  my $ZoneNumber = $self->_ConvertZone("method: ZoneOff",$zone);
+  return -1 if ($ZoneNumber < 1);
+
+  &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] call ZoneOff...") if $ModuleDebug;
+  $self->cmd("ZoneOff", $UnitNumber, $ZoneNumber);
+}
+
+
+1;
+

From fff2dbe3f58f631bfa4a9bed1b6cc0aa347e1d7c Mon Sep 17 00:00:00 2001
From: Marc <gitwork@nowheremail.com>
Date: Fri, 29 Apr 2016 10:45:18 -0400
Subject: [PATCH 17/21] Added HTML message format to API (as per Pushover
 v2.3+)

---
 lib/Pushover.pm | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/lib/Pushover.pm b/lib/Pushover.pm
index 0f30cef37..806922a69 100644
--- a/lib/Pushover.pm
+++ b/lib/Pushover.pm
@@ -12,6 +12,7 @@ Configure the required pushover settings in your mh.private.ini file:
   Pushover_token = <API token from Pushover.net registration> 
   Pushover_user =  <User or Group ID from Pushover.net registraton>
   Pushover_priority = [-1 | 0 | 1 | 2]  Default message priority,  defaults to 0.
+  Pushover_html = [ 0 | 1 ]  Support HTML messages, see https://pushover.net/api#html. Defaults to 0.
   Pushover_title = "MisterHouse" Default title for messages if none provided 
   Pushover_disable = 1  Disable notifications.  Messages will still be logged
 
@@ -39,6 +40,9 @@ values provided on initialization.   See the method documentation for below more
 
   $push->notify( "Some important message", { title => 'Security Alert', priority => 2 });
 
+Or with HTML formmatting   
+  $push->notify( "Some <b>important</b> message", { title => 'Security Alert', priority => 2, html => 1 });
+
 =head2 DESCRIPTION
 
 The Pushover instance establishes the defaults for messages and acts as a rudimentary rate limiter for notifications.
@@ -90,7 +94,8 @@ Creates a new Pushover object. The parameter hash is optional.  Defaults will be
 B<This must be excluded from the primary misterhouse loop, or the acknowledgment checking and duplicate message rate limiting will be lost>
 
   my $push = Pushover->new( {   priority  => 0,            # Set default Message priority,  -1, 0, 1, 2
-  				retry     => 60,           # Set default retry priority 2 notification every 60 seconds
+        html      => 1,            # Support HTML formatting of message ...see https://pushover.net/api#html
+  			retry     => 60,           # Set default retry priority 2 notification every 60 seconds
 				expire    => 3600,         # Set default expration of the retry timer 
 				title     => "Some title", # Set default title for messages
 			 	token     => "xxxx...",    # Set the API Token 
@@ -122,11 +127,12 @@ sub new {
     $params = {} unless defined $params;
 
     my $self = {};
-    $self->{priority} = 0;    # Priority zero - honor quite times
-    $self->{speak}    = 1;    # Speak notifications and acknowledgments
+    $self->{priority} = 0;    # Priority zero - honour quite times
+    $self->{speak}    = 1;    # Speak notifications and acknowledgements
+    $self->{html}     = 0;    # Default html off
 
     # Merge the mh.private.ini defaults into the object
-    foreach (qw( token user priority title server retry expire speak disable)) {
+    foreach (qw( token user priority html title server retry expire speak disable)) {
         $self->{$_} = $params->{$_};
         $self->{$_} = $::config_parms{"Pushover_$_"} unless defined $self->{$_};
     }
@@ -163,7 +169,8 @@ information for the notification.  The list is not exclusive.  Additional parame
 in the POST to Pushover.net.  This allows support of any API parameter as defined at https://pushover.net/api
 
   $push->notify("Some urgent message", {  priority => 2,            # Message priority,  -1, 0, 1, 2
-  				          retry    => 60,           # Retry priority 2 notification every 60 seconds
+            html     => 1,            # HTML formatting of message 0-off, 1-on ... see https://pushover.net/api#html
+            retry    => 60,           # Retry priority 2 notification every 60 seconds
 					  expire   => 3600,         # Give up if not ack of priority 2 notify after 1 hour
 					  title    => "Some title", # Override title of message
 					  token    => "xxxx...",    # Override the API Token - probably not useful
@@ -210,7 +217,7 @@ sub notify {
     }
 
     # Merge in the message defaults, They can be overridden
-    foreach (qw( token user priority title url url_title sound retry expire )) {
+    foreach (qw( token user priority html title url url_title sound retry expire )) {
         next unless ( defined $self->{$_} );
         $callparms->{$_} = $self->{$_} unless defined $callparms->{$_};
     }
@@ -354,6 +361,11 @@ sub _checkReceipt {
 
 George Clark
 
+=head2 MODIFICATIONS
+
+2016/04/29 Marc  mhcoder@nowheremail.com
+           Added html support on API call
+
 =head2 SEE ALSO
 
 http://Pushover.net/
@@ -368,3 +380,4 @@ You should have received a copy of the GNU General Public License along with thi
 
 =cut
 
+

From a5cc6d2a5037813087b8d0512661b9f857516a2b Mon Sep 17 00:00:00 2001
From: Marc <gitwork@nowheremail.com>
Date: Fri, 29 Apr 2016 14:09:38 -0400
Subject: [PATCH 18/21] Added device to API call

---
 lib/Pushover.pm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/Pushover.pm b/lib/Pushover.pm
index 806922a69..0501be78d 100644
--- a/lib/Pushover.pm
+++ b/lib/Pushover.pm
@@ -11,6 +11,7 @@ Configure the required pushover settings in your mh.private.ini file:
 
   Pushover_token = <API token from Pushover.net registration> 
   Pushover_user =  <User or Group ID from Pushover.net registraton>
+  Pushover_device = <Default device or device list to sedn notifications to. List is comma-separated>
   Pushover_priority = [-1 | 0 | 1 | 2]  Default message priority,  defaults to 0.
   Pushover_html = [ 0 | 1 ]  Support HTML messages, see https://pushover.net/api#html. Defaults to 0.
   Pushover_title = "MisterHouse" Default title for messages if none provided 
@@ -132,7 +133,7 @@ sub new {
     $self->{html}     = 0;    # Default html off
 
     # Merge the mh.private.ini defaults into the object
-    foreach (qw( token user priority html title server retry expire speak disable)) {
+    foreach (qw( token user priority html title device server retry expire speak disable)) {
         $self->{$_} = $params->{$_};
         $self->{$_} = $::config_parms{"Pushover_$_"} unless defined $self->{$_};
     }
@@ -169,12 +170,13 @@ information for the notification.  The list is not exclusive.  Additional parame
 in the POST to Pushover.net.  This allows support of any API parameter as defined at https://pushover.net/api
 
   $push->notify("Some urgent message", {  priority => 2,            # Message priority,  -1, 0, 1, 2
-            html     => 1,            # HTML formatting of message 0-off, 1-on ... see https://pushover.net/api#html
-            retry    => 60,           # Retry priority 2 notification every 60 seconds
-					  expire   => 3600,         # Give up if not ack of priority 2 notify after 1 hour
-					  title    => "Some title", # Override title of message
-					  token    => "xxxx...",    # Override the API Token - probably not useful
-					  user     => "xxxx...",    # Override the target user/group
+            html     => 1,              # HTML formatting of message 0-off, 1-on ... see https://pushover.net/api#html
+            retry    => 60,             # Retry priority 2 notification every 60 seconds
+					  expire   => 3600,           # Give up if not ack of priority 2 notify after 1 hour
+					  title    => "Some title",   # Override title of message
+            device   => "nexus5,iphone" # Device or device-list 
+					  token    => "xxxx...",      # Override the API Token - probably not useful
+					  user     => "xxxx...",      # Override the target user/group
 				       });
 
 Notify will record the last message sent along with a timestamp.   If the duplicate message is sent within
@@ -217,7 +219,7 @@ sub notify {
     }
 
     # Merge in the message defaults, They can be overridden
-    foreach (qw( token user priority html title url url_title sound retry expire )) {
+    foreach (qw( token user priority html title device url url_title sound retry expire )) {
         next unless ( defined $self->{$_} );
         $callparms->{$_} = $self->{$_} unless defined $callparms->{$_};
     }
@@ -232,6 +234,11 @@ sub notify {
         $callparms->{expire} = 86400 if ( $callparms->{expire} > 86400 );
     }
 
+    # remove html if off
+    if ( $callparms->{html} != 1 ) {
+      delete $callparms->{html};
+    }
+    
     &::print_log(
         "[Pushover] Notify parameters: " . Data::Dumper::Dumper( \$callparms ) )
       if TRACE;
@@ -364,7 +371,7 @@ George Clark
 =head2 MODIFICATIONS
 
 2016/04/29 Marc  mhcoder@nowheremail.com
-           Added html support on API call
+           Added html and device support on API call
 
 =head2 SEE ALSO
 

From d40b0850649b345f6787c451c420368eef153357 Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Thu, 12 May 2016 22:29:43 +0200
Subject: [PATCH 19/21] Revert "Allows the control of WGL rain8Net serial
 sprinkler control modules"

---
 lib/Pushover.pm |  40 +--
 lib/Rain8Net.pm | 801 ------------------------------------------------
 2 files changed, 10 insertions(+), 831 deletions(-)
 delete mode 100644 lib/Rain8Net.pm

diff --git a/lib/Pushover.pm b/lib/Pushover.pm
index 0501be78d..0f30cef37 100644
--- a/lib/Pushover.pm
+++ b/lib/Pushover.pm
@@ -11,9 +11,7 @@ Configure the required pushover settings in your mh.private.ini file:
 
   Pushover_token = <API token from Pushover.net registration> 
   Pushover_user =  <User or Group ID from Pushover.net registraton>
-  Pushover_device = <Default device or device list to sedn notifications to. List is comma-separated>
   Pushover_priority = [-1 | 0 | 1 | 2]  Default message priority,  defaults to 0.
-  Pushover_html = [ 0 | 1 ]  Support HTML messages, see https://pushover.net/api#html. Defaults to 0.
   Pushover_title = "MisterHouse" Default title for messages if none provided 
   Pushover_disable = 1  Disable notifications.  Messages will still be logged
 
@@ -41,9 +39,6 @@ values provided on initialization.   See the method documentation for below more
 
   $push->notify( "Some important message", { title => 'Security Alert', priority => 2 });
 
-Or with HTML formmatting   
-  $push->notify( "Some <b>important</b> message", { title => 'Security Alert', priority => 2, html => 1 });
-
 =head2 DESCRIPTION
 
 The Pushover instance establishes the defaults for messages and acts as a rudimentary rate limiter for notifications.
@@ -95,8 +90,7 @@ Creates a new Pushover object. The parameter hash is optional.  Defaults will be
 B<This must be excluded from the primary misterhouse loop, or the acknowledgment checking and duplicate message rate limiting will be lost>
 
   my $push = Pushover->new( {   priority  => 0,            # Set default Message priority,  -1, 0, 1, 2
-        html      => 1,            # Support HTML formatting of message ...see https://pushover.net/api#html
-  			retry     => 60,           # Set default retry priority 2 notification every 60 seconds
+  				retry     => 60,           # Set default retry priority 2 notification every 60 seconds
 				expire    => 3600,         # Set default expration of the retry timer 
 				title     => "Some title", # Set default title for messages
 			 	token     => "xxxx...",    # Set the API Token 
@@ -128,12 +122,11 @@ sub new {
     $params = {} unless defined $params;
 
     my $self = {};
-    $self->{priority} = 0;    # Priority zero - honour quite times
-    $self->{speak}    = 1;    # Speak notifications and acknowledgements
-    $self->{html}     = 0;    # Default html off
+    $self->{priority} = 0;    # Priority zero - honor quite times
+    $self->{speak}    = 1;    # Speak notifications and acknowledgments
 
     # Merge the mh.private.ini defaults into the object
-    foreach (qw( token user priority html title device server retry expire speak disable)) {
+    foreach (qw( token user priority title server retry expire speak disable)) {
         $self->{$_} = $params->{$_};
         $self->{$_} = $::config_parms{"Pushover_$_"} unless defined $self->{$_};
     }
@@ -170,13 +163,11 @@ information for the notification.  The list is not exclusive.  Additional parame
 in the POST to Pushover.net.  This allows support of any API parameter as defined at https://pushover.net/api
 
   $push->notify("Some urgent message", {  priority => 2,            # Message priority,  -1, 0, 1, 2
-            html     => 1,              # HTML formatting of message 0-off, 1-on ... see https://pushover.net/api#html
-            retry    => 60,             # Retry priority 2 notification every 60 seconds
-					  expire   => 3600,           # Give up if not ack of priority 2 notify after 1 hour
-					  title    => "Some title",   # Override title of message
-            device   => "nexus5,iphone" # Device or device-list 
-					  token    => "xxxx...",      # Override the API Token - probably not useful
-					  user     => "xxxx...",      # Override the target user/group
+  				          retry    => 60,           # Retry priority 2 notification every 60 seconds
+					  expire   => 3600,         # Give up if not ack of priority 2 notify after 1 hour
+					  title    => "Some title", # Override title of message
+					  token    => "xxxx...",    # Override the API Token - probably not useful
+					  user     => "xxxx...",    # Override the target user/group
 				       });
 
 Notify will record the last message sent along with a timestamp.   If the duplicate message is sent within
@@ -219,7 +210,7 @@ sub notify {
     }
 
     # Merge in the message defaults, They can be overridden
-    foreach (qw( token user priority html title device url url_title sound retry expire )) {
+    foreach (qw( token user priority title url url_title sound retry expire )) {
         next unless ( defined $self->{$_} );
         $callparms->{$_} = $self->{$_} unless defined $callparms->{$_};
     }
@@ -234,11 +225,6 @@ sub notify {
         $callparms->{expire} = 86400 if ( $callparms->{expire} > 86400 );
     }
 
-    # remove html if off
-    if ( $callparms->{html} != 1 ) {
-      delete $callparms->{html};
-    }
-    
     &::print_log(
         "[Pushover] Notify parameters: " . Data::Dumper::Dumper( \$callparms ) )
       if TRACE;
@@ -368,11 +354,6 @@ sub _checkReceipt {
 
 George Clark
 
-=head2 MODIFICATIONS
-
-2016/04/29 Marc  mhcoder@nowheremail.com
-           Added html and device support on API call
-
 =head2 SEE ALSO
 
 http://Pushover.net/
@@ -387,4 +368,3 @@ You should have received a copy of the GNU General Public License along with thi
 
 =cut
 
-
diff --git a/lib/Rain8Net.pm b/lib/Rain8Net.pm
deleted file mode 100644
index 96599ad97..000000000
--- a/lib/Rain8Net.pm
+++ /dev/null
@@ -1,801 +0,0 @@
-=begin comment
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-
-Rain8Net.pm  v1.1
-by Marco Maddalena (mhcoder@nowheremail.com)
-
-Description:
-
-Allows the control of WGL rain8Net serial sprinkler control modules
-(see http://www.wgldesigns.com/rain8pc.html)
-Each unit can control 8 zones, and 8 units can be daisy-chained on 1 serial connection.
-
-
-Methods
-  status_zone  - returns the zone status (1=on,0=off).
-                 Parms:  Unit  (required) : Numeric    - Unit number
-                         Zone  (required) : numeric    - Zone number
-
-
-
-  cmd          - send Rain8Net Cmd to the unit (some function below alias these commands)
-                 Parms   cmd    (required) : string     - See list
-                         Unit   (optional) : numeric    - Unit number IF required by the cmd
-                         Zone   (optional) : numeric    - Zone number IF required by the cmd
-
-                 Supported commands are
-                        "COMCheck"       - Check communications link. No parameters.
-                        "StatusRequest"  - Request an update of zone statuses. Unit number required.
-                                           (Note: automatic status request happens via RAIN8NET_AutoStatusRequestTimer value)
-                        "ZoneON"         - Turn zone on. Requires unit and Zone number
-                        "ZoneOFF"        - Turn zone off. Requires unit and Zone number
-                        "AllModuleOFF"   - Turn all zones of a unit off. Requires unit number.
-                        "AllGlobalOff"   - Turns all zones of all units. No paramters
-
-  ZoneOn       - send the ZoneOn command to Rain8Net
-                 Parms   Unit   (required) : numeric    - Unit number
-                         Zone   (required) : numeric    - Zone number
-
-  ZoneOff      - send the ZoneOff/AllUnitOff/AllGlobalOff command to Rain8Net
-                 Parms   Unit   (optional) : numeric    - Unit number (if not passed, then the equivalent to AllGlobalOff is performed)
-                         Zone   (optional) : numeric    - Zone number (if not passed, but unit was, the  equivalent to AllModuleOff is performed)
-
-
-
-
-
-Examples
-
-    use Rain8Net;
-    $Rain8 = new Rain8Net;
-
-
-    if (time_now("22:00"))
-    {
-      print_log "Sprinkler ON for unit 1, Zone 2 [" . $Rain8->get_name(1,2) . "]";
-      $Rain8->cmd('ZoneON',1,2);
-    }
-
-    if (time_now("01:00"))
-    {
-      print_log "Sprinkler OFF for unit 1, Zone 2 [" . $Rain8->get_name(1,2) . "]";
-      $Rain8->cmd('ZoneOFF',1,2);
-    }
-
-    if ((time_now("23:00")) && (Rain8->status_zone(1,5)))
-    {
-      print_log "Sprinkler OFF for unit 1, Zone 5 [" . $Rain8->get_name(1,5) . "]";
-      $Rain8->cmd('ZoneOFF',1,5);
-    }
-
-
-
-
-mh.ini parameter Values
-
-RAIN8NET_serial_port
-  Required
-  Serial port where Rain8Net module is connected.
-  ie /dev/ttySx
-
-
-RAIN8NET_Units
-  Optional (default 1)
-  Number of Rain8Net units linked on 1 serial connection. rain8Net support 1-8
-  Valid Values: 1 - 8
-
-
-RAIN8NET_AutoStatusRequestTimer
-  Optional (default 30)
-  Number of seconds between auto executions of StatusRequests
-  Valid Values: 0 - 999999
-  If 0, no automatic Status request are performed.
-
-
-RAIN8NET_unit_[U]_zone_[Z]
-  Optional (no default)
-  String name of a Unit/Zone (see zone_name method)
-  Allows for zones to be named. ie "RAIN8NET_unit_1_zone_2=Front Yard Sprinklers" names the zone 2 of unit 1
-
-
-RAIN8NET_ModuleDebug
-  Optional (default 0)
-  if 1, echo debug messasges of the Rain8Net.pm module into the MH log
-  Valid Values: 0,1
-
-
-
-Notes:
-
-This is my 1st Perl module and I am a novice, so I welcome comments and criticism but please be gentle ... I bruise easily ;)
-This module was heavily derived from the DSC5401.pm module by Jocelyn Brouillard and Gaetan lord. Thanks to them
-
-
-Changes
-
-v1.0  2015-07-14  initial module construction
-v1.1  2015-12-11  Fixes and more documentation
-
-
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
-=cut
-
-use strict;
-
-package Rain8Net;
-
-
-# Rain8Net Serial parameters
-use constant RAIN8NET_BAUDRATE  => 4800;
-use constant RAIN8NET_DATABITS  => 8;
-use constant RAIN8NET_PARITY    => "none";
-use constant RAIN8NET_STOPBITS  => 1;
-use constant RAIN8NET_HANDSHAKE => 'none';
-use constant RAIN8NET_MAXUNITS  => 8;
-use constant RAIN8NET_MAXZONES  => 8;
-
-use constant SUBCOMMAND_STATUSREQUEST => 1;
-use constant SUBCOMMAND_ZONEON        => 2;
-use constant SUBCOMMAND_ZONEOFF       => 4;
-use constant SUBCOMMAND_ALLUNITOFF    => 8;
-
-
-@Rain8Net::ISA = ('Generic_Item');
-
-my %CmdMsg;
-my %CmdMsgRev;
-my @Rain8Net_Objects = ();
-my $IncompleteCmd;
-my $ModuleDebug = 0;
-
-
-
-# ---------------------------------------------------------------------------
-# Method: new (public)
-# Desc:  Instantiate the new object
-sub new
-{
-  my ($class) = @_;
-  my $self = {};
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [new]...") if $ModuleDebug;
-
-  bless $self, $class;
-
-  $$self{state}                 = 'Unknown';
-  $$self{said}                  = '';
-  $$self{MaxUnits}              = 0;
-  $$self{LastCmdSent}           = '';
-  $$self{LastSubCmdSent}        = -1;
-  $$self{LastCmdSentUnit}       = -1;
-  $$self{LastCmdSentZone}       = -1;
-  $$self{LastResponseRaw}       = '';
-  $$self{LastCmdResponse}       = '';
-  $$self{TimerInterval}         = 0;
-
-  # Module-level reference to self
-  push @Rain8Net_Objects, $self;
-
-  # read event message hash
-  _DefineCmdMsg();
-
-  # test if ModuleDebug is on
-  $ModuleDebug = 1 if (exists $main::config_parms{RAIN8NET_ModuleDebug});
-
-  &main::print_log("Rain8Net Starting interface module");
-
-  # Call Startup to initialize serial port
-  $self->startup();
-
-  select(undef, undef, undef, 0.250); # wait 250 millseconds
-
-  # We send a COMCheck, which is really a NOP.
-  $self->cmd('COMCheck'); # request an initial COMCheck
-
-  select(undef, undef, undef, 0.250); # wait 250 millseconds to avoid overrunning RS-232 receive buffer on panel
-
-  return $self;
-}
-
-
-
-
-# ---------------------------------------------------------------------------
-# Method: _init_serial_port (private)
-# Description: serial port configuration
-sub _init_serial_port
-{
-  my ($self, $serial_port) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_init_serial_port]...") if $ModuleDebug;
-
-  $serial_port->error_msg(1);
-
-  $serial_port->databits(RAIN8NET_DATABITS);
-  $serial_port->parity(RAIN8NET_PARITY);
-  $serial_port->stopbits(RAIN8NET_STOPBITS);
-  $serial_port->handshake(RAIN8NET_HANDSHAKE);
-  $serial_port->datatype('raw');
-  $serial_port->dtr_active(1);
-  $serial_port->rts_active(1);
-
-  $serial_port->debug(1) if ($ModuleDebug eq 1);
-
-  select( undef, undef, undef, .100 );    # Sleep a bit
-}
-
-
-
-# ---------------------------------------------------------------------------
-# Method: startup (public)
-# Description: Called by MH on startup
-sub startup
-{
-  my ($self) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_startup]...") if $ModuleDebug;
-
-  my $port;
-
-  if ($::config_parms{'RAIN8NET_serial_port'} )
-  {
-    $port = $::config_parms{'RAIN8NET_serial_port'};
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_serial_port] read, value is [" . $port ."]") if ($ModuleDebug);
-    if (not (-c "$port"))
-    {
-      &main::print_log("Rain8Net.pm Error : Invalid port [" . $port ."] defined in mh.ini [RAIN8NET_serial_port]. Cannot create object.");
-      $$self{state} = "Error";
-      return;
-    }
-  }
-  else
-  {
-    &main::print_log("Rain8Net.pm Error : Port not defined in mh.ini [RAIN8NET_serial_port]. Cannot create object.");
-    $$self{state} = "Error";
-    return;
-  }
-
-
-  # If here, validate other settings
-  $$self{MaxUnits} = ( defined $::config_parms{RAIN8NET_Units} ) ? $main::config_parms{RAIN8NET_Units} : 1;
-  if ((($$self{MaxUnits} + 0) eq $$self{MaxUnits}) && (($$self{MaxUnits} +0 ) => 1) && (($$self{MaxUnits} + 0) <= RAIN8NET_MAXUNITS))
-  {
-    $$self{MaxUnits} = ($$self{MaxUnits} + 0);  # convert numeric
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_Units] read, value is [" . $$self{MaxUnits} ."]") if ($ModuleDebug);
-  }
-  else
-  {
-    &main::print_log("Rain8Net.pm Error : Invalid value for mh.ini [RAIN8NET_Units], ignoring and setting to 1");
-    $$self{MaxUnits} = 1;
-  }
-
-
-  # initialize state of all units/zones as off
-  for (my $j = 1; $j <= $$self{MaxUnits}; $j++)
-  {
-    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
-    {
-      $$self{zone_status}{$j}{$i} = 0;
-    }
-  }
-
-
-  # create the Serial port item
-  if ( &main::serial_port_create( 'Rain8Net', $port, RAIN8NET_BAUDRATE, 'none', 'raw' ) )
-  {
-    $self->_init_serial_port( $::Serial_Ports{Rain8Net}{object}, $port );
-    &main::print_log("Rain8Net.pm initializing port $port at " . RAIN8NET_BAUDRATE . " baud") if $ModuleDebug;
-    &::MainLoop_pre_add_hook( \&Rain8Net::_check_for_data, 1 ) if $main::Serial_Ports{Rain8Net}{object};
-    $$self{state} = "Active";
-  }
-  else
-  {
-    &main::print_log("Rain8Net.pm Error : Unable to open serial port [$port]. Cannot create object.");
-    $$self{state} = "Error";
-    return;
-  }
-
-
-  # Get the Auto Status request value and validate
-  my $timerinterval = ( defined $::config_parms{RAIN8NET_AutoStatusRequestTimer} ) ? $main::config_parms{RAIN8NET_AutoStatusRequestTimer} : 30;
-  if ((($timerinterval + 0) eq $timerinterval) && (($timerinterval+0) >= 0) && (($timerinterval+0) <= 9999))
-  {
-    $$self{TimerInterval} = ($timerinterval + 0); # convert numeric
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : mh.ini [RAIN8NET_AutoStatusRequestTimer] read, value is [" . $$self{TimerInterval} ."]") if ($ModuleDebug);
-  }
-  else
-  {
-    &main::print_log("Rain8Net.pm Error : Invalid value for mh.ini [RAIN8NET_AutoStatusRequestTimer], ignoring and setting to 0");
-    $$self{TimerInterval} = 0;
-  }
-}
-
-
-
-# ---------------------------------------------------------------------------
-# Method: _check_for_data (private)
-# Description: hooked routine that checks data on port
-sub _check_for_data
-{
-   # &main::print_log("Rain8Net.pm - MODULE DEBUG : entering init [_check_for_data]...") if $ModuleDebug;
-
-   $main::Serial_Ports{'Rain8Net'}{data} = '';
-   &main::check_for_generic_serial_data('Rain8Net');
-   #-- my $NewCmd = $main::Serial_Ports{'Rain8Net'}{data};
-
-   my $NewCmd = $main::Serial_Ports{'Rain8Net'}{data};
-   #-- $main::Serial_Ports{'Rain8Net'}{data} = '';
-
-   &main::print_log("Rain8Net.pm - MODULE DEBUG : Received the following [$NewCmd]") if (($NewCmd) && ($ModuleDebug));
-
-   # we need to buffer the information received, because many command could be include in a single pass
-   $NewCmd = $IncompleteCmd . $NewCmd if $IncompleteCmd;
-   return if !$NewCmd;
-
-   my $self = $Rain8Net_Objects[0];
-
-   # Flush last buffered response
-   $$self{LastResponseRaw} = '';
-
-   # Rain8Net commands are 3 bytes
-   if (length($NewCmd) ge 3)
-   {
-     $IncompleteCmd = substr($NewCmd,3);    # Keep rest of Command
-     &_CheckCmd($self,$NewCmd);
-   }
-}
-
-
-# ---------------------------------------------------------------------------
-# Method: _SetTimers (private)
-# Description: set up auto status request timers for all units
-sub _SetTimers
-{
-  my ($self) = @_;
-
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_SetTimers]...") if $ModuleDebug;
-
-  # set a timer to perform auto Statusrequest every 30
-  if (($$self{object_name}) && ($$self{TimerInterval} > 0))
-  {
-    &::print_log("Rain8Net.pm - MODULE DEBUG : creating timer(s) for object [" . $$self{object_name} . "]") if $ModuleDebug;
-    for (my $count = 1; $count <= $$self{MaxUnits}; $count++)
-    {
-      my $timername = 'statusrequest_timer' . $count;
-
-      if (not ($$self{$timername}))
-      {
-        &::print_log("Rain8Net.pm - MODULE DEBUG : creating timer [$timername]") if $ModuleDebug;
-        $$self{$timername} = new Timer;
-        $$self{$timername}->set($$self{TimerInterval}, "$$self{object_name}->cmd('StatusRequest',$count)", -1);
-      }
-    }
-  }
-
-}
-
-# ---------------------------------------------------------------------------
-# Method: _CheckCmd (private)
-# Description: validate in incoming command string from the Rain8 unit and apply the data updates
-sub _CheckCmd
-{
-  my ($self,$CmdStr) = @_;
-
-  my $UnitNumber = -1;
-  my $ZoneNumber = -1;
-  my $ZoneBitFlag = 0;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_CheckCmd]...") if $ModuleDebug;
-
-  &_SetTimers($self);
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd - cmdstr is ($CmdStr)") if $ModuleDebug;
-
-  return if !$CmdStr;
-
-  $$self{LastResponseRaw} = $CmdStr;
-
-  my $l     = length($CmdStr);
-  my $code  = unpack("H*", substr( $CmdStr, 0, 1 ));
-  my $arg1  = unpack("H*", substr( $CmdStr, 1, 1 ));
-  my $arg2  = unpack("H*", substr( $CmdStr, 2, 1 ));
-  my $hexcode = sprintf("0x%d",$code);
-
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG :  _CheckCmd Raw input is [$code] [$arg1] [$arg2], length [$l]") if $ModuleDebug;
-
-  # test received command is valid
-  if (not ( exists $CmdMsgRev{$hexcode} ))
-  {
-   &::print_log("Unknown rain8Net response code recieved : code [$code] with arguments [$arg1] , [$arg2]");
-   $$self{LastSubCmdSent} = 0;
-   return;
-  }
-
-  my $CmdName;
-
-
-  # Since StatusRequest and ZoneOn and ZoneOFF all return the same god-damn 40 hex, use our flag
-  if (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_STATUSREQUEST))
-  {
-    $CmdName = "StatusRequest";
-  }
-  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ZONEON))
-  {
-    $CmdName = "ZoneON";
-  }
-  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ZONEOFF))
-  {
-    $CmdName = "ZoneOFF";
-  }
-  elsif (($hexcode eq "0x40") && ($$self{LastSubCmdSent} eq SUBCOMMAND_ALLUNITOFF))
-  {
-    $CmdName = "AllModuleOFF";
-  }
-  else
-  {
-    $CmdName = ($CmdMsgRev{$hexcode});
-  }
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd Command recived is = [" . $CmdName . "]") if $ModuleDebug;
-
-  # At this point process the response...--------------
-
-  # If Status request response, the last  byte is a bit pattern of active zones
-  if ($CmdName eq "StatusRequest")
-  {
-    $UnitNumber  = hex($arg1);
-    $ZoneBitFlag = hex($arg2);
-    my $match = 1;
-    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
-    {
-      $$self{zone_status}{$UnitNumber}{$i} = ( $ZoneBitFlag & $match ) ? 1 : 0;
-      $match = $match << 1;
-    }
-  }
-
-
-  # Echo from ZoneOFF
-  if ($CmdName eq "ZoneOFF")
-  {
-    $UnitNumber    = hex($arg1);
-    my $UpperNible = hex($arg2) & hex('0x40');
-    my $LowerNible = hex($arg2) & hex('0x08');
-
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub _checkCmd - ZONE OFF, Unit [$UnitNumber], uppernibble [$UpperNible], lowerninble [$LowerNible]") if $ModuleDebug;
-
-    $$self{zone_status}{$UnitNumber}{$LowerNible} = 0;
-  }
-
-  # Echo from ZoneON
-  if ($CmdName eq "ZoneON")
-  {
-    $UnitNumber    = hex($arg1);
-    my $UpperNible = hex($arg2) & hex("0x30");
-    my $LowerNible = hex($arg2) & hex('0x08');
-
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub _checkCmd - ZONE ON, Unit [$UnitNumber], uppernibble [$UpperNible], lowerninble [$LowerNible]") if $ModuleDebug;
-
-    $$self{zone_status}{$UnitNumber}{$LowerNible} = 1;
-  }
-
-  # Echo from AllModuleOff
-  if ($CmdName eq "AllModuleOFF")
-  {
-    $UnitNumber = hex($arg1);
-
-    if (hex($arg2) eq hex("0x55"))
-    {
-      for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
-      {
-        $$self{zone_status}{$UnitNumber}{$i} = 0;
-      }
-    }
-  }
-
-
-  # Dump debug
-  if (($ModuleDebug) && ($UnitNumber >= 1))
-  {
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : _CheckCmd dump status -->");
-    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
-    {
-      &main::print_log("         Unit [$UnitNumber], zone [$i] is [" . ($$self{zone_status}{$UnitNumber}{$i}) . "]");
-    }
-  }
-
-
-  # Reset the last subcommand
-  $$self{LastSubCmdSent} = 0;
-
-  return;
-}
-
-
-
-
-#}}}
-#    Define hash with DSC command                                           {{{
-sub _DefineCmdMsg {
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [_DefineCmdMsg]...") if $ModuleDebug;
-
-  %CmdMsg = (
-      lc("COMCheck")                          => "0x70",
-      lc("StatusRequest")                     => "0x40",
-      lc("ZoneON")                            => "0x40",
-      lc("ZoneOFF")                           => "0x40",
-      lc("AllModuleOFF")                      => "0x40",
-      lc("AllGlobalOFF")                      => "0x20",
-      lc("ReadRainSwitchStatus")              => "0x50",
-      lc("ReadFlowMeterCounter")              => "0x50",
-      lc("ClearFlowMeterCounter")             => "0x50"
-  );
-
-  %CmdMsgRev = reverse %CmdMsg;
-  return;
-}
-
-
-
-
-
-#}}}
-#    Sending command to Rain8Net
-sub cmd
-{
-
-  my ( $self, $cmd, $arg1, $arg2 ) = @_;
-  my $CmdName;
-
-  if ($ModuleDebug)
-  {
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [cmd]...");
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - cmd  is [" . $cmd . "]");
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - arg1 is [" . $arg1 . "]");
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd - arg2 is [" . $arg2 . "]");
-  }
-
-  $cmd = lc($cmd);
-  if (not (exists $CmdMsg{$cmd}) )
-  {
-    &::print_log("Rain8Net.pm ERROR - Invalid command : ($cmd) with arguments $arg1 , $arg2");
-    return;
-  }
-
-  my $CmdByte = hex($CmdMsg{$cmd});
-  my $CmdStr  = chr($CmdByte);
-  my $UnitNumber = 0;
-  my $ZoneNumber = 0;
-
-  if ($cmd eq lc("COMCheck"))
-  {
-    # pad command with 2 extra bytes, does not matter which
-    $CmdStr .= "xx";
-  }
-  elsif ($cmd eq lc("StatusRequest"))
-  {
-    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
-    return if ( $UnitNumber lt 0 );
-
-    # Second arg is "all status code"
-    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0xf0"));
-    $$self{LastSubCmdSent} = SUBCOMMAND_STATUSREQUEST;
-  }
-  elsif ($cmd eq lc("ZoneON"))
-  {
-    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
-    return if ( $UnitNumber lt 0 );
-
-    $ZoneNumber = $self->_ConvertZone($cmd, $arg2);
-    return if ( $ZoneNumber lt 0 );
-
-    # Second arg is 3 upper nibble, zone - lower nibble
-    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x3" . "$ZoneNumber"));
-    $$self{LastSubCmdSent} = SUBCOMMAND_ZONEON;
-    $$self{zone_status}{$UnitNumber}{$ZoneNumber} = 1;
-  }
-  elsif ($cmd eq lc("ZoneOFF"))
-  {
-    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
-    return if ( $UnitNumber lt 0 );
-
-    $ZoneNumber = $self->_ConvertZone($cmd, $arg2);
-    return if ( $ZoneNumber lt 0 );
-
-    # Second arg is 4 upper nibble, zone - lower nibble
-    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x4" . "$ZoneNumber"));
-    $$self{LastSubCmdSent} = SUBCOMMAND_ZONEOFF;
-    $$self{zone_status}{$UnitNumber}{$ZoneNumber} = 0;
-  }
-  elsif ($cmd eq lc("AllModuleOFF"))
-  {
-    $UnitNumber = $self->_ConvertUnit($cmd, $arg1);
-    return if ( $UnitNumber lt 0 );
-
-    $CmdStr .= chr(hex("0x0" . $UnitNumber)) . chr(hex("0x55"));
-    $$self{LastSubCmdSent} = SUBCOMMAND_ALLUNITOFF;
-    for (my $i = 1; $i <= RAIN8NET_MAXZONES; $i++)
-    {
-      $$self{zone_status}{$UnitNumber}{$i} = 0;
-    }
-
-
-  }
-  elsif ($cmd eq lc("AllGlobalOff"))
-  {
-    $$self{LastSubCmdSent} = 0;
-    $CmdStr .= chr(hex("0x55")) . chr(hex("0x55"));
-    for (my $i = 1; $i <= $$self{MaxUnits}; $i++)
-    {
-      for (my $j = 1; $j <= RAIN8NET_MAXZONES; $j++)
-      {
-        $$self{zone_status}{$i}{$j} = 0;
-      }
-    }
-  }
-
-
-
-#  &::print_log("Sending to Rain8Net panel     ($cmd) with argument ($arg1, $arg2)");
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd  - Writing (" . $CmdStr . ")") if $ModuleDebug;
-  if ($main::Serial_Ports{Rain8Net}{object}->write($CmdStr))
-  {
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : sub cmd  - Command (" . $CmdStr . ") successfully written to serial port.") if $ModuleDebug;
-    $$self{LastCmdSent} = $cmd;
-    $$self{LastCmdSentUnit} = $UnitNumber;
-    $$self{LastCmdSentZone} = $ZoneNumber;
-  }
-
-
-  return "Sent to Rain8Net panel: ($cmd) with argument ($arg1,$arg2) - Successful";
-
-}
-
-
-
-
-#}}}
-# validate and Convert Unit Number to value
-sub _ConvertUnit
-{
-  my ($self, $cmd, $Unit) = @_;
-
-  my $UnitNumber = $Unit + 0;
-  if ( ($UnitNumber >= 1) && ($UnitNumber <= $$self{MaxUnits}) )
-  {
-    # $UnitNumber is in the range
-    return ($UnitNumber);
-  }
-  else
-  {
-    &::print_log("Rain8Net Error - Invalid Unit number on command : [$cmd], Unit [$Unit]");
-    return -1;
-  }
-}
-
-#}}}
-# validate and Convert Zone Number to numeric value.
-# retrun -1 if invalid
-sub _ConvertZone
-{
-
-  my ($self, $cmd, $Zone) = @_;
-
-  my $ZoneNumber = $Zone + 0;
-
-  if ( ($ZoneNumber >= 1) && ($ZoneNumber <= RAIN8NET_MAXZONES) )
-  {
-    # $ZoneNumber is in the range
-    return ($ZoneNumber);
-  }
-  else
-  {
-    &::print_log("Rain8Net Error - Invalid zone number on command : [$cmd], zone [$Zone])");
-    return -1;
-  }
-}
-
-
-
-
-
-#}}}
-#    user call from MH                                                         {{{
-# most of them are replicate to hash value, easier to code
-
-sub status_zone
-{
-  my ( $self, $unit, $zone ) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [status_zone]...") if $ModuleDebug;
-
-  my $UnitNumber = $self->_ConvertUnit("method: status_zone",$unit);
-  return -1 if ($UnitNumber < 1);
-
-  my $ZoneNumber = $self->_ConvertZone("method: status_zone",$zone);
-  return -1 if ($ZoneNumber < 1);
-
-  return $$self{zone_status}{$UnitNumber}{$ZoneNumber} if defined $$self{zone_status}{$UnitNumber}{$ZoneNumber};
-}
-
-sub zone_name
-{
-  my ( $self, $unit, $zone ) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [zone_name]...") if $ModuleDebug;
-
-  my $UnitNumber = $self->_ConvertUnit("method: zone_name",$unit);
-  return -1 if ($UnitNumber < 1);
-
-  my $ZoneNumber = $self->_ConvertZone("method: zone_name",$zone);
-  return -1 if ($ZoneNumber < 1);
-
-  my $unitstr = sprintf "%d", $UnitNumber;
-  my $zonestr = sprintf "%d", $ZoneNumber;
-
-  my $cfgparmname = "RAIN8NET_unit_" . $unitstr . "_zone_" . $zonestr;
-
-  my $ZoneName = $main::config_parms{$cfgparmname} if exists $main::config_parms{$cfgparmname};
-
-  return $ZoneName if $ZoneName;
-
-  return $ZoneNumber;
-}
-
-
-
-sub ZoneOn
-{
-  my ( $self, $unit, $zone ) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [ZoneOn]...") if $ModuleDebug;
-
-  my $UnitNumber = $self->_ConvertUnit("method: ZoneOn",$unit);
-  return -1 if ($UnitNumber < 1);
-
-  my $ZoneNumber = $self->_ConvertZone("method: ZoneOn",$zone);
-  return -1 if ($ZoneNumber < 1);
-
-  $self->cmd("ZoneOn", $UnitNumber, $ZoneNumber);
-}
-
-
-sub ZoneOff
-{
-  my ( $self, $unit, $zone ) = @_;
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : entering [ZoneOff]...") if $ModuleDebug;
-
-  # If no unit or zone, all global off!!!!
-  if (@_ < 2)
-  {
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] missing unit/zone - calling AllGlobalOff...") if $ModuleDebug;
-    $self->cmd("AllGlobalOff");
-    return;
-  }
-
-  my $UnitNumber = $self->_ConvertUnit("method: ZoneOff",$unit);
-  return -1 if ($UnitNumber < 1);
-
-  # If unit but no zone
-  if (@_ < 3)
-  {
-    &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] missing zone - calling AllModuleOFF...") if $ModuleDebug;
-    $self->cmd("AllModuleOFF",$UnitNumber);
-    return;
-  }
-
-  # If Here ... a particular unit/zone is to be turned off
-
-  my $ZoneNumber = $self->_ConvertZone("method: ZoneOff",$zone);
-  return -1 if ($ZoneNumber < 1);
-
-  &main::print_log("Rain8Net.pm - MODULE DEBUG : [ZoneOff] call ZoneOff...") if $ModuleDebug;
-  $self->cmd("ZoneOff", $UnitNumber, $ZoneNumber);
-}
-
-
-1;
-

From 9ac2270c5d114c2a868fdf973abdd98ef5f23cfe Mon Sep 17 00:00:00 2001
From: Lieven Hollevoet <hollie@lika.be>
Date: Mon, 25 Jul 2016 10:49:58 +0200
Subject: [PATCH 20/21] Revert "Ia7 v1.2.301"

---
 code/common/ia7_collection_upgrader.pl        |   51 -
 code/common/ia7_notifications.pl              |   45 -
 data/web/collections.json                     |   13 +-
 data/web/ia7_config.json                      |    4 +-
 lib/ajax.pm                                   |    5 +-
 lib/http_server.pl                            |  154 +-
 lib/json_server.pl                            |  233 +--
 web/bin/code_select.pl                        |   12 +-
 web/bin/code_unselect.pl                      |    2 +-
 web/bin/iniedit.pl                            |    4 +-
 web/bin/items.pl                              |   29 +-
 web/bin/set_func.pl                           |    5 +-
 web/bin/triggers.pl                           |   15 +-
 web/ia7/graphics/help.gif                     |  Bin 1582 -> 0 bytes
 web/ia7/graphics/important.gif                |  Bin 1492 -> 0 bytes
 web/ia7/graphics/info.gif                     |  Bin 1487 -> 0 bytes
 web/ia7/graphics/title.gif                    |  Bin 317 -> 0 bytes
 web/ia7/house/main.shtml                      |   19 +-
 .../include/bootstrap-custom-button.3.3.5.css |   29 -
 web/ia7/include/bootstrap-theme.3.0.2.min.css |    9 +
 web/ia7/include/bootstrap.3.0.2.min.css       |    9 +
 web/ia7/include/bootstrap.3.0.2.min.js        |    9 +
 web/ia7/include/font-awesome.4.0.3.min.css    |    4 +
 web/ia7/include/javascript.js                 | 1488 +++--------------
 web/ia7/include/jquery.alerts.css             |   57 -
 web/ia7/include/jquery.alerts.js              |  237 ---
 web/ia7/include/tables.css                    |    8 +-
 web/ia7/index.shtml                           |   50 +-
 web/organizer/contacts.pl                     |    2 +-
 29 files changed, 441 insertions(+), 2052 deletions(-)
 delete mode 100644 code/common/ia7_collection_upgrader.pl
 delete mode 100644 code/common/ia7_notifications.pl
 delete mode 100755 web/ia7/graphics/help.gif
 delete mode 100755 web/ia7/graphics/important.gif
 delete mode 100755 web/ia7/graphics/info.gif
 delete mode 100755 web/ia7/graphics/title.gif
 delete mode 100644 web/ia7/include/bootstrap-custom-button.3.3.5.css
 create mode 100644 web/ia7/include/bootstrap-theme.3.0.2.min.css
 create mode 100644 web/ia7/include/bootstrap.3.0.2.min.css
 create mode 100644 web/ia7/include/bootstrap.3.0.2.min.js
 create mode 100644 web/ia7/include/font-awesome.4.0.3.min.css
 delete mode 100755 web/ia7/include/jquery.alerts.css
 delete mode 100644 web/ia7/include/jquery.alerts.js

diff --git a/code/common/ia7_collection_upgrader.pl b/code/common/ia7_collection_upgrader.pl
deleted file mode 100644
index b8c8697db..000000000
--- a/code/common/ia7_collection_upgrader.pl
+++ /dev/null
@@ -1,51 +0,0 @@
-# Category = IA7
-
-#@ IA7 v1.2 : This is a helper utility that can find and update collections.json files 
-#@  if any structural changes are required.
-#@
-#@  v1.2 - add in new login system id 700
-
-my $ia7_coll_current_ver = 1.2;
-
-if ($Startup) {
-
-	my @collection_files = ("$Pgm_Root/data/web/collections.json",
-        					"$config_parms{data_dir}/web/collections.json",
-       						"$config_parms{ia7_data_dir}/collections.json");      							
-    for my $file (@collection_files) {
-       	if (-e $file) {
-       		print_log "[IA7_Collection_Updater] : Checking $file to current version $ia7_coll_current_ver";
-       		my $json_data;
-       		my $file_data;
-        	eval {
-            	$file_data = file_read($file);
-            	$json_data = decode_json($file_data);    #HP, wrap this in eval to prevent MH crashes
-        	};
-        
-            if ($@) {
-            	print_log "[IA7_Collection_Updater] : WARNING: decode_json failed for $file. Please check this file!";
-        	} else {
- 				my $updated = 0;
- 				      		
-        		if ((! defined $json_data->{meta}->{version}) or ($json_data->{meta}->{version} < 1.2)) { #IA7 v1.2 required change
-        			$json_data->{700}->{user} = '$Authorized' unless (defined $json_data->{700}->{user});
-        			my $found = 0;
-        			foreach my $i (@{$json_data->{500}->{children}})	{
-        				$found = 1 if ($i == 700);
-        			}
-        			push (@{$json_data->{500}->{children}},700) unless ($found);
-        			$json_data->{meta}->{version} = "1.2";
-       				print_log "[IA7_Collection_Updater] : Checking $file to version $ia7_coll_current_ver";
-       				$updated = 1; 			
-        		}
-        		if ($updated) {
-        			my $json_newdata = to_json($json_data, {utf8 => 1, pretty => 1});
-        			my $backup_file = $file . ".v" . $version . ".backup";
-        			file_write($backup_file,$file_data);
-          			print_log "[IA7_Collection_Updater] : Saved backup " . $file . ".v" . $version . ".backup";     			
-        			file_write($file,$json_newdata);
-        		}
-        	}
-        }
-    }  
-}
\ No newline at end of file
diff --git a/code/common/ia7_notifications.pl b/code/common/ia7_notifications.pl
deleted file mode 100644
index 1739e51bd..000000000
--- a/code/common/ia7_notifications.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-# Category = IA7
-
-#@   IA7 v1.1 : Enables speech notifications to browsers.
-#@   also includes some sample code of how to use other notifications
-
-if ($Startup or $Reload) {
-	if (! defined $Info{IPAddress_local}) {
-		print_log "json_server.pl: \$Info{IPAddress_local} not defined. Json speech disabled";
-	} else {
-		print_log "IA7 Speech Notifications enabled";
-   		&Speak_parms_add_hook(\&json_speech_enable);
-    }
-}
-
-$v_ia7_test_sound = new Voice_Cmd ("Test playing a sound");
-$v_ia7_test_banner = new Voice_Cmd("Test [blue,green,yellow,red] Banner Notification");
-
-if (my $said = said $v_ia7_test_banner) {
-  	my %data;
-  	$data{text} = "This is a test of the IA7 notification";
-  	$data{color} = $said;
-  	&json_notification("banner",{%data});
-}
-
-if (said $v_ia7_test_sound) {
-	my %data;
-	$data{url} = "http://" . $Info{IPAddress_local} . ":" . $config_parms{http_port} . "/misc/tellme_welcome.wav";
-	&json_notification("sound",{%data});
-}
-
-sub json_speech_enable {
-    	my ($parms) = @_;
-    	push @{$parms->{web_hook}},\&file_ready_for_ia7;
-}
-
-sub file_ready_for_ia7 {
-    	my (%parms) = @_;
-    	my %data;
-    	$data{mode} = $parms{mode};
-    	$data{url} = "http://" . $Info{IPAddress_local} . ":" . $config_parms{http_port} . "/" . $parms{web_file};
-    	$data{text} = $parms{raw_text};
-	$data{client} = $parms{requestor};
-    	&json_notification("speech",{%data});
-}
-
diff --git a/data/web/collections.json b/data/web/collections.json
index 2d0618eb1..7efe8a56c 100644
--- a/data/web/collections.json
+++ b/data/web/collections.json
@@ -395,7 +395,6 @@
   "28" : {
      "link" : "/bin/set_parm_tv_provider.pl",
      "name" : "Setup TV Provider",
-     "mode" : "advanced",     
      "icon" : "fa-desktop"
   },
   "5" : {
@@ -488,7 +487,6 @@
   "26" : {
      "link" : "/ia5/house/irman.shtml",
      "name" : "Program IRMAN",
-     "mode" : "advanced",     
      "icon" : "fa-rss"
   },
   "57" : {
@@ -709,7 +707,6 @@
   "27" : {
      "icon" : "fa-wrench",
      "name" : "Header Control",
-     "mode" : "advanced",     
      "link" : "/bin/headercontrol.pl"
   },
   "78" : {
@@ -720,7 +717,7 @@
   "102" : {
      "name" : "Picture Frame",
      "icon" : "fa-desktop",
-     "external" : "$config_parms{html_dir}/misc/photos.shtml"
+     "external" : "http://home.krkeegan.com:8081/misc/photos.shtml"
   },
   "105" : {
      "link" : "/ia5/calendar/main.shtml",
@@ -775,12 +772,14 @@
      "icon" : "fa-home",
      "name" : "Gear Settings",
      "children" : [
-       700
+       501
 
      ]
    },
-   "700" : {
-     "user" : "$Authorized"
+   "501" : {
+     "link" : "/UNSET_PASSWORD?user=admin",
+     "name" : "Authorize",
+     "icon" : "fa-lock"
   },
    "600" : {
      "link" : "/ia7/#path=/objects&parents=ia7_status_items",
diff --git a/data/web/ia7_config.json b/data/web/ia7_config.json
index fec693a36..2fb7e729e 100644
--- a/data/web/ia7_config.json
+++ b/data/web/ia7_config.json
@@ -7,9 +7,7 @@
      "fp_icon_size" : "32",
      "fp_state_popovers" : "yes",
      "substate_percentages" : "20",
-     "disable_current_state" : "yes",
-     "notifications" : "yes",
-     "speech_default" : "banner"
+     "disable_current_state" : "yes"
   },
   "objects" : {
   	  "example_object" : {
diff --git a/lib/ajax.pm b/lib/ajax.pm
index 0d44b1ff0..dd7819c30 100644
--- a/lib/ajax.pm
+++ b/lib/ajax.pm
@@ -101,10 +101,7 @@ sub checkForUpdate {
         &main::print_log("checkForUpdate sub ${$$self{sub}} returned $xml")
           if $main::Debug{ajax};
         &::print_socket_fork( ${ $$self{waitingSocket} }, $xml );
-        &main::print_log( "Closing Socket " . ${ $$self{waitingSocket} } )
-          if $main::Debug{ajax};
-        ${ $$self{waitingSocket} }->shutdown(2)
-          ; #Changed this from close() to shutdown(2). In some cases, the parent port wasn't being closed -- ie. speech events
+        ${ $$self{waitingSocket} }->close;
         ${ $$self{changed} } = 1;
     }
     else {
diff --git a/lib/http_server.pl b/lib/http_server.pl
index 5f8100d55..8bb6ef8ea 100644
--- a/lib/http_server.pl
+++ b/lib/http_server.pl
@@ -9,8 +9,6 @@
 use Text::ParseWords;
 require 'http_utils.pl';
 
-#use Data::Dumper;
-#$main::Debug{http} = 4;
 #no warnings 'uninitialized';   # These seem to always show up.  Dang, will not work with 5.0
 
 use vars
@@ -184,23 +182,13 @@ sub http_process_request {
     unless ($header) {
 
         # Ignore empty requests, like from 'check the http server' command
-        print "http: Error, not header request.  header=[$temp]\n"
+        print "http: Error, not header request.  header=$temp\n"
           if $main::Debug{http} and $temp;
-        my ( $type, $file ) = ( $temp =~ /^(\S*)\s(.*)\sHTTP/ );
-        print "t=[$type] f=[$file]\n" if $main::Debug{http2};
-        if ( $type eq "HEAD" ) {
-            print "yes\n";
-            print $socket &mime_header( $file, 1, 4592100 );
-        }
         return;
     }
 
     $Socket_Ports{http}{data_record} = $header;
-    print "http: Header = $header\n" if $main::Debug{http};
 
-    #print Dumper %Http if $main::Debug{http};
-    print "http: Range Header $Http{Range} encountered for $header"
-      if ( defined $Http{Range} );
     $Http{loop} =
       $Loop_Count;    # Track which pass we last processes a web request
     $Http{request} = $header;
@@ -429,16 +417,13 @@ sub http_process_request {
 
     # Prompt for password (SET_PASSWORD) and allow for UNSET_PASSWORD
     if ( $get_req =~ /SET_PASSWORD$/ ) {
-    	my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-
         if ( $config_parms{password_menu} eq 'html' ) {
-            my $html = &html_authorized;
             if ( $get_req =~ /^\/UNSET_PASSWORD$/ ) {
                 $Authorized = 0;
                 $Cookie .= "Set-Cookie: password=xyz ; ; path=/;\n";
-                $html .= "<meta name='unset' content='true'>";
             }
-            $html .= "<br>Refresh: <a target='_top' href='/'> Main Page</a>\n" unless (lc $mode eq "ia7");
+            my $html = &html_authorized;
+            $html .= "<br>Refresh: <a target='_top' href='/'> Main Page</a>\n";
             $html .= &html_password('') . '<br>';
             print $socket &html_page( undef, $html, undef, undef, undef,
                 undef );
@@ -446,7 +431,6 @@ sub http_process_request {
         else {
             my $html = &html_authorized;
             $html .= "<br>Refresh: <a target='_top' href='/'> Main Page</a>\n";
-			$html .= "<br>set_password else Referrer: $Http{Referer}\n";   
 
             #           $html .= &html_reload_link('/', 'Refresh Main Page');   # Does not force reload?
             my ( $name, $name_short ) = &net_domain_name('http');
@@ -474,15 +458,14 @@ sub http_process_request {
 
     # Process the html password form
     elsif ( $get_req =~ /\/SET_PASSWORD_FORM$/ ) {
-        my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
         my ($password) = $get_arg =~ /password=(\S+)/;
         my ($html);
         my ( $name, $name_short )       = &net_domain_name('http');
         my ( $user, $password_crypted ) = &password_check2($password);
         $Authorized = $user if $password_crypted;
         $html .= &html_authorized;
-        $html .= "REMOVEME = get_arg = " . $get_arg . "<br>\n";
         $html .= "<br>Refresh: <a target='_top' href='/'> Main Page</a>\n";
+
         #       $html .= &html_reload_link('/', 'Refresh Main Page');
         $html .= &html_password('');
         if ($password_crypted) {
@@ -510,9 +493,7 @@ sub http_process_request {
 
             #           &speak("app=admin Password NOT set by $name_short");
         }
-
         print $socket &html_page( undef, $html );
-
         return;
     }
 
@@ -798,23 +779,24 @@ sub http_process_request {
 sub html_password {
     my ($menu) = @_;
     $menu = $config_parms{password_menu} unless $menu;
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
 
     #   return $html_unauthorized unless $Authorized;
 
     my $html;
     if ( $menu eq 'html' ) {
-        	$html = qq[<BODY onLoad="self.focus();document.pw.password.focus(); top.frames[0].location.reload()">\n] unless (lc $mode eq "ia7");
+        $html =
+          qq[<BODY onLoad="self.focus();document.pw.password.focus(); top.frames[0].location.reload()">\n];
 
-        	#       $html .= qq[<BASE TARGET='_top'>\n];
-        	$html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="post">\n];
+        #       $html .= qq[<BASE TARGET='_top'>\n];
+        $html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="post">\n];
 
-        	#       $html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="get">\n]; ... get not secure from browser history list!!
-        	#       $html .= qq[<h3>Password:<INPUT size=10 name='password' type='password'></h3>\n</FORM>\n];
-        	$html .= qq[<b>Password:</b><INPUT size=10 name='password' type='password'>\n];
-        	$html .= qq[<INPUT type=submit value='Submit Password'>\n</FORM>\n];
-        	$html .= qq[<P> This form is used for logging into MisterHouse.<br> For administration please see the documentation of <a href="http://misterhouse.net/mh.html"> set_password </a></P>\n];
-#		}
+        #       $html .= qq[<FORM name=pw action="SET_PASSWORD_FORM" method="get">\n]; ... get not secure from browser history list!!
+        #       $html .= qq[<h3>Password:<INPUT size=10 name='password' type='password'></h3>\n</FORM>\n];
+        $html .=
+          qq[<b>Password:</b><INPUT size=10 name='password' type='password'>\n];
+        $html .= qq[<INPUT type=submit value='Submit Password'>\n</FORM>\n];
+        $html .=
+          qq[<P> This form is used for logging into MisterHouse.<br> For administration please see the documentation of <a href="http://misterhouse.net/mh.html"> set_password </a></P>\n];
     }
     else {
         $html = qq[HTTP/1.0 401 Unauthorized\n];
@@ -826,20 +808,13 @@ sub html_password {
 }
 
 sub html_authorized {
-	my $html = "Status: <b>";
     if ($Authorized) {
-        $html .= "<a href=UNSET_PASSWORD>";
-        $html .= "Logged In as $Authorized";
-        $html .= "</a>";
-        $html .= "</b><br>";
+        return
+          "Status: <b><a href=UNSET_PASSWORD>Logged In as $Authorized</a></b><br>";
     }
     else {
-        $html .= "<a href=SET_PASSWORD>";
-        $html .= "Not Logged In";
-        $html .= "</a>";
-        $html .= "</b><br>";
+        return "Status: <b><a href=SET_PASSWORD>Not Logged In</a></b><br>";
     }
-    return $html;
 }
 
 sub html_unauthorized {
@@ -1107,7 +1082,7 @@ sub html_sub {
     }
 
     # Allow for &sub1 and &sub1(args)
-    if (   ( ( $sub_name, $sub_arg ) = $data =~ /^\&(\S+?)\((.*)\)$/ )
+    if (   ( ( $sub_name, $sub_arg ) = $data =~ /\&([^\&]+?)\((.*)\)$/ )
         or ( ($sub_name) = $data =~ /^\&(\S+)$/ ) )
     {
         $sub_arg = '' unless defined $sub_arg;    # Avoid uninit warninng
@@ -1180,8 +1155,8 @@ sub html_response {
             #           $leave_socket_open_action = "&speak_log_last(1)"; # Only show the last spoken text
             #           $leave_socket_open_action = "&Voice_Text::last_spoken(1)"; # Only show the last spoken text
         }
-        elsif ( $h_response =~ /^http:\S+$/i or $h_response =~ /^reff?erer/i ) {
-
+        elsif ( $h_response =~ /^https?:\S+$/i or $h_response =~ /^reff?erer/i )
+        {
             # Allow to use just the base part of the referer
             #  - some browsers (audrey) do not return full referer url :(
             #    so allow for referer(url)...
@@ -1578,10 +1553,7 @@ sub html_error_log {
 # These html_form functions are used by mh/web/bin/*.pl scrips
 sub html_form_input_set_func {
     my ( $func, $resp, $var1, $var2 ) = @_;
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-    my $id = "";
-    #$id = "id='mhresponse'" if ($mode eq 'ia7');
-    my $html .= qq|<td><form action='/bin/set_func.pl' $id method=post>\n|;
+    my $html .= qq|<form action='/bin/set_func.pl' method=post><td>\n|;
     $html    .= qq|<input name='func' value="$func"  type='hidden'>\n|;
     $html    .= qq|<input name='resp' value="$resp"  type='hidden'>\n|;
     $html    .= qq|<input name='var1' value="$var1"  type='hidden'>\n|;
@@ -1589,21 +1561,18 @@ sub html_form_input_set_func {
     $size = 10 if $size < 10;
     $size = 30 if $size > 30;
     $html .= qq|<input name='var2' value="$var2" size=$size>\n|;
-    $html .= qq|</form></td>\n|;
+    $html .= qq|</td></form>\n|;
     return $html;
 }
 
 sub html_form_input_set_var {
     my ( $var, $resp, $default ) = @_;
     $default = HTML::Entities::encode($default);
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-    my $id = "";
-    #$id = "id='mhresponse'" if ($mode eq 'ia7');    
-    my $html .= qq|<td><form action='/bin/set_var.pl' $id method=post>\n|;
+    my $html .= qq|<form action='/bin/set_var.pl' method=post><td>\n|;
     $html    .= qq|<input name='var'   value="$var"   type='hidden'>\n|;
     $html    .= qq|<input name='resp'  value="$resp"  type='hidden'>\n|;
     $html    .= qq|<input name='value' value="$default" size=30>\n|;
-    $html    .= qq|</form></td>\n|;
+    $html    .= qq|</td></form>\n|;
     return $html;
 }
 
@@ -1626,11 +1595,7 @@ sub html_form_select {
 
 sub html_form_select_set_func {
     my ( $func, $resp, $var1, $default, @values ) = @_;
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-    my $id = "";
-    #$id = "id='mhresponse'" if ($mode eq 'ia7');
-#    my $form .= qq|<td><form action='/bin/set_func.pl' $id method=post>\n|;
-    my $form .= qq|<td><form action='/bin/set_func.pl' $id method=post>\n|;
+    my $form .= qq|<form action='/bin/set_func.pl' method=post><td>\n|;
     $form    .= qq|<input name='func' value="$func"  type='hidden'>\n|;
     $form    .= qq|<input name='resp' value="$resp"  type='hidden'>\n|;
     $form    .= qq|<input name='var1' value="$var1"  type='hidden'>\n|;
@@ -1643,20 +1608,16 @@ sub html_form_select_set_func {
         $form .= qq|<option value='$option' $selected>$value</option>\n|;
     }
     $form .= "</select></td></form>\n";
-#    $form .= "</select></td></form>\n";
     return $form;
 }
 
 sub html_form_select_set_var {
     my ( $var, $default, @values ) = @_;
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-    my $id = "";
-    #$id = "id='mhresponse'" if ($mode eq 'ia7');    
-    my $html = "<td><form action=/bin/set_var.pl $id method=post>\n";
+    my $html = "<form action=/bin/set_var.pl method=post><td>\n";
     $html .= qq|<input type='hidden' name='var'  value="$var">\n|;
     $html .= qq|<input type='hidden' name='resp' value='/bin/triggers.pl'>\n|;
     $html .=
-      &html_form_select( 'value', 1, $default, @values ) . "</form></td>\n";
+      &html_form_select( 'value', 1, $default, @values ) . "</td></form>\n";
     return $html;
 }
 
@@ -1666,10 +1627,8 @@ sub html_file {
 
     # Do not cach shtml files
     my ($cache) = ( $file =~ /\.shtm?l?$/ or $file =~ /\.vxml?$/ ) ? 0 : 1;
-    ($cache) = ( defined $Http{Range} ) ? 0 : 1;
 
-    # Return right away if the file has not changed, don't return a cache entry if there is
-    # a http Range header though...
+    # Return right away if the file has not changed
     #http:   header key=If-Modified-Since value=Sat, 27 Mar 2004 02:49:29 GMT; length=1685.
     if (    $cache
         and $Http{'If-Modified-Since'}
@@ -1678,7 +1637,7 @@ sub html_file {
         my $time2 = &str2time($1);
         my $time3 = ( stat($file) )[9];
         print "db web file cache check: f=$file t=$time2/$time3\n"
-          if $main::Debug{http};
+          if $main::Debug{http3};
         if ( $time3 <= $time2 ) {
             return "HTTP/1.0 304 Not Modified\nServer: MisterHouse\n";
         }
@@ -1693,8 +1652,6 @@ sub html_file {
         return;
     }
 
-    print "http: processing file\n" if $main::Debug{http};
-
     # Allow for 'server side include' directives
     #  <!--#include file="whatever"-->
     if (   $file =~ /\.shtm?l?$/
@@ -1714,7 +1671,6 @@ sub html_file {
     # Note: These differ from classic .cgi in that they return
     #       the results, rather than print them to stdout.
     elsif ( $file =~ /\.(pl|cgi)$/ ) {
-        print "Processing perl or CGI file: $file\n" if $main::Debug{http};
         my $code = join( '', <HTML> );
 
         # Check if authorized
@@ -1758,7 +1714,6 @@ sub html_file {
         #       print "Http_server  .pl file results:$html.\n" if $main::Debug{http};
     }
     else {
-        print "http: Reading file: $file\n" if $main::Debug{http};
         binmode HTML;
 
         #       my $data = join '', <HTML>;
@@ -1768,22 +1723,7 @@ sub html_file {
             local $/ = undef;
             $data = join( '', <HTML> );
         }
-        my $full_length = length $data;
-
-        # yes, this is somewhat inefficient to read in the whole file only to then
-        # take a subset of the requested bytes. There are more effective means however
-        # since this is only in place to stream wav speak files to safari clients, it
-        # minimizes the overall change to http_server.
-        if ( defined $Http{Range} ) {
-            my ( $start, $end ) = $Http{Range} =~ /bytes=(\d*)-(\d*)/;
-            $end = ( length $data ) - $start if ( $end eq "" );
-            print "http:start=$start end=$end\n" if ( $main::Debug{http} );
-            my $tmpdata = substr $data, $start, $end;
-            $data = $tmpdata;
-        }
-        $html =
-          &mime_header( $file, 1, length $data, $Http{Range}, $full_length )
-          unless $no_header;
+        $html = &mime_header( $file, 1, length $data ) unless $no_header;
         $html .= $data;
     }
     close HTML;
@@ -1954,7 +1894,7 @@ sub html_cgi {
 }
 
 sub mime_header {
-    my ( $file_or_type, $cache, $length, $range, $full_length ) = @_;
+    my ( $file_or_type, $cache, $length ) = @_;
 
     # Allow for passing filename or filetype
     my ( $mime, $date );
@@ -1971,9 +1911,8 @@ sub mime_header {
     }
 
     #   print "dbx2 m=$mime f=$file_or_type\n";
-    my $code = "HTTP/1.0 200 OK";
-    $code = "HTTP/1.1 206 Partial Content" if $range;
-    my $header = "$code\nServer: MisterHouse\nContent-Type: $mime\n";
+
+    my $header = "HTTP/1.0 200 OK\nServer: MisterHouse\nContent-type: $mime\n";
 
     #   $header .= ($cache) ? "Cache-Control: max-age=1000000\n" : "Cache-Control: no-cache\n";
     if ($cache) {
@@ -1986,25 +1925,6 @@ sub mime_header {
     # Allow for a length header, as this allows for faster 'persistant' connections
     $header .= "Content-Length: $length\n" if $length;
 
-    #(my $range_bytes) = $range =~ /bytes=(.*)/;
-    my ( $start, $end ) = $range =~ /bytes=(\d*)-(\d*)/;
-    $end = ($full_length) - $start - 1 if ( $end eq "" );
-
-    #$header .= "Content-Range: bytes " . $range_bytes . "/" . $full_length . "\n" if $range_bytes;
-    #print "http: Server responds: bytes " . $range_bytes . "/" . $full_length . "\n" if $range_bytes;
-    $header .=
-      "Content-Range: bytes " . $start . "-" . $end . "/" . $full_length . "\n"
-      if $range;
-    print "http: Server responds: HTTP/1.1 206; bytes "
-      . $start . "-"
-      . $end . "/"
-      . $full_length . "\n"
-      if $range;
-
-    $header .= "Accept-Ranges: bytes\n";
-
-    print "returned header = $header\n" if ( $main::Debug{http} );
-
     return $header . "\n";
 
     #Expires: Mon, 01 Jul 2002 08:00:00 GMT
@@ -3184,16 +3104,10 @@ sub print_socket_fork {
             }
         }
         else {
-            my $keep_alive = 0;
-            $keep_alive = 1
-              if (  ( defined $Http{Connection} )
-                and ( $Http{Connection} eq "keep-alive" ) );
             &print_socket_fork_unix( $socket, $html );
         }
     }
     else {
-        print "http: printing with regular socket l=$length s=$socket\n"
-          if $main::Debug{http};
         print $socket $html;
     }
 }
diff --git a/lib/json_server.pl b/lib/json_server.pl
index 8dc59fd71..1d5965fbd 100644
--- a/lib/json_server.pl
+++ b/lib/json_server.pl
@@ -45,7 +45,6 @@ =head2 METHODS
 use JSON qw(decode_json);
 use IO::Compress::Gzip qw(gzip);
 use vars qw(%json_table);
-my @json_notifications = ();    #noloop
 
 sub json {
     my ( $request_type, $path_str, $arguments, $body ) = @_;
@@ -171,9 +170,8 @@ sub json_get {
 
         eval {
             my $json_collections = file_read($collection_file);
-            $json_collections =~ s/\$config_parms\{(.+?)\}/$config_parms{$1}/gs;
-     		$json_collections =~ s/\$Authorized/$Authorized/gs; # needed for including current "Authorize" status
-            $json_data{'collections'} = decode_json($json_collections);    #HP, wrap this in eval to prevent MH crashes
+            $json_data{'collections'} = decode_json($json_collections)
+              ;    #HP, wrap this in eval to prevent MH crashes
         };
         if ($@) {
             print_log
@@ -181,7 +179,7 @@ sub json_get {
             $json_data{'collections'} =
               decode_json('{ "0" : { "name" : "error" } }')
               ;    #write a blank collection
-            config_checker($collection_file);
+
         }
     }
 
@@ -204,29 +202,7 @@ sub json_get {
             $json_data{'ia7_config'} =
               decode_json('{ "prefs" : { "status" : "error" } }')
               ;                     #write a blank collection
-        	config_checker($prefs_file);
-        }
 
-        # Look at the client ip overrides, and replace any pref key with the client_ip specific item
-        if (
-            defined $json_data{'ia7_config'}->{clients}
-            ->{ $Http{Client_address} } )
-        {
-            print_log
-              "Json_Server.pl: Client override section for $Http{Client_address} found";
-            for my $key (
-                keys $json_data{'ia7_config'}->{clients}
-                ->{ $Http{Client_address} } )
-            {
-                print_log
-                  "Json_Server.pl: Client key=$key, value = $json_data{'ia7_config'}->{clients}->{$Http{Client_address}}->{$key}";
-                print_log
-                  "Json_Server.pl: Master value = $json_data{'ia7_config'}->{prefs}->{$key}";
-                $json_data{'ia7_config'}->{prefs}->{$key} =
-                  $json_data{'ia7_config'}->{clients}
-                  ->{ $Http{Client_address} }->{$key};
-            }
-            delete $json_data{'ia7_config'}->{clients};
         }
     }
 
@@ -260,11 +236,6 @@ sub json_get {
         my $default_cf = "AVERAGE";
         $default_cf = $json_data{'rrd_config'}->{'prefs'}->{'default_cf'}
           if ( defined $json_data{'rrd_config'}->{'prefs'}->{'default_cf'} );
-        my $default_timestamp = "true";
-        $default_timestamp =
-          $json_data{'rrd_config'}->{'prefs'}->{'get_last_update'}
-          if (
-            defined $json_data{'rrd_config'}->{'prefs'}->{'get_last_update'} );
 
         my @dss      = ();
         my @defs     = ();
@@ -275,7 +246,6 @@ sub json_get {
         my @type     = ();
         my $celsius  = 0;
         my $arg_time = 0;
-        my $xml_info;
         $arg_time = int( $args{time}[0] ) if ( defined int( $args{time}[0] ) );
         $celsius = 1 if ( $config_parms{weather_uom_temp} eq 'C' );
         $celsius = 1
@@ -360,10 +330,13 @@ sub json_get {
             }
 
             push @defs, @xports;
+
+            #print "defs=" . join (',',@defs) . "\n";
+            #print "start=$start end=$end\n";
+
             my $rrd = RRDTool::Rawish->new( rrdfile => "$path/$rrd_file" );
             my $xml =
               $rrd->xport( [@defs], { '--start' => $start, '--end' => $end, } );
-            $xml_info = $rrd->info if ( $default_timestamp eq "true" );
             my @lines = split /\n/, $xml;
 
             foreach my $line (@lines) {
@@ -380,23 +353,40 @@ sub json_get {
                 }
                 my ($time) = $line =~ /\<row\>\<t\>(\d*)\<\/t\>/;
                 $time = $time * 1000;    #javascript is in milliseconds
+
+                #print "time=$time, $arg_time\n";
                 next if ( $arg_time > int($time) );    #only return new items
                 my (@values) = $line =~ /\<v\>(-?[e.+-\d]*|NaN)\<\/v\>/g;
                 if ($time) {
+
+                    #print "line=$line\n";
+                    #print "[$time";
                     my $index = 0;
                     foreach my $value (@values) {
                         my $value1 = sprintf( "%.10g", $value );
+
+                        #print "index=$index,value=$value,value1=$value1,";
                         $value1 = ( $value1 - 32 ) * ( 5 / 9 )
                           if (  ($celsius)
                             and ( lc $type[$index] eq "temperature" ) );
                         $value1 =
                           sprintf( "%." . $round[$index] . "f", $value1 )
                           if ( defined $round[$index] );
+
+                        #print "value1=$value1";
                         $value1 =~ s/\.0*$//
                           unless ( $value1 == 0 )
                           ;    #remove unneccessary trailing decimals
                         $value1 = "null" if ( lc $value1 eq "nan" );
+
+                        #print "value1=$value1\n";
+                        #my @array = ();
+                        #$array[0] = $time;
+                        #$array[1] = $value1;
+                        ##push @{$dataset[$index]->{data}},"$time,$value1"; ###Need to get a 2d array here####***
                         push @{ $dataset[$index]->{data} }, [ $time, $value1 ];
+
+                        #push @{$dataset[$index]->{data}},@array;
                         $index++;
                     }
                 }
@@ -407,9 +397,11 @@ sub json_get {
           if ( defined $json_data{'rrd_config'}->{'options'} );
         $data{'periods'} = $json_data{'rrd_config'}->{'periods'}
           if ( defined $json_data{'rrd_config'}->{'periods'} );
-        $data{'last_update'} = $xml_info->{'last_update'} * 1000
-          if ( defined $xml_info->{'last_update'} );
+
+        #$json_data{'rrd'} = \@dataset;
         $json_data{'rrd'} = \%data;
+
+        #print Dumper %data;
     }
 
     # List objects
@@ -541,31 +533,12 @@ sub json_get {
         $json_data{vars} = \%json_vars;
     }
 
-    if ( $path[0] eq 'notifications' ) {
-
-        for my $i ( 0 .. $#json_notifications ) {
-            my $n_time = int( $json_notifications[$i]{time} );
-            my $x      = $args{time}[0]
-              ; #Weird, does nothing, but notifications doesn't work if removed...
-            if (    ($n_time)
-                and
-                ( ( defined $args{time} && int( $args{time}[0] ) < $n_time ) ) )
-            {
-                push(
-                    @{ $json_data{'notifications'} },
-                    $json_notifications[$i]
-                );
-            }
-            else {
-                #if older than X minutes, then remove the array values to keep things tidy
-            }
-        }
-    }
-
     if ( $path[0] eq 'table_data' ) {
         if ( $args{var} ) {
             my $length = $#{ $json_table{ $args{var}[0] }->{data} } + 1;
 
+            #print "json_db: length = $length start=" . $args{start}[0] . " records=" . $args{records}[0] . "\n";
+
             #need to check if vars and keys exist
 
             my $start = 0;
@@ -576,13 +549,30 @@ sub json_get {
               if ( defined $json_table{ $args{var}[0] }{page} );
             $records = $args{records}[0] if ( $args{records}[0] );
 
-            # TODO: At some point have a hook that pulls in more data into the table if it's missing
-            #  ie read a file
-
+            #		if ($length < ($start + $records)) {
+            #			print "db: will have to request data, $length, $start, $records\n";
+            #			print "&" . $json_table{$args{var}[0]}{hook} . "($start,$records)\n";
+            #			my $hook = 	$json_table{$args{var}[0]}{hook} . "($start,$records)";
+            #
+            #		#eval (&get_inbound_data($start,$records));
+            #			eval ("&$hook");
+            #			if ($@) {
+            #	  			print_log "Json_Server.pl: WARNING: fetch data failed for " . $args{var}[0] . " " . $json_table{$args{var}[0]}{hook} . "!";
+            #			} else {
+            #	  			$page++ if (scalar @{$json_table{$args{var}[0]}->{data}} > $json_table{$args{var}[0]}{page_size});
+            #			}
+            #			#$json_table{$args{var}[0]}{page} = $page;
+            #		}
+            #if requesting data beyond what's available, fetch it.
+            #test bad table
+            #remove data from hash
             my $jt_time = int( $json_table{ $args{var}[0] }{time} );
+
+            #print "arg time = " . int($args{time}[0]) . " table time = " .$jt_time . "\n";
             if (   ( $args{time} && int( $args{time}[0] ) < $jt_time )
                 or ( !$args{time} ) )
             {
+                #$json_data->{'table_data'} = $json_table{$args{var}[0]};
                 #need to copy all the data since we can adjust starts and records
 
                 $json_data{'table_data'}{exist} =
@@ -603,6 +593,8 @@ sub json_get {
                   if ( $args{records}[0] );
                 $json_data{'table_data'}{records} =
                   scalar @{ $json_data{'table_data'}->{data} };
+
+                #print "db=$json_data{'table_data'}{records}\n";
             }
         }
     }
@@ -626,14 +618,6 @@ sub json_get {
         }
     }
 
-    if ( $path[0] eq 'fp_icon_sets' ){
-        my $p = "../web/ia7/graphics/*default_".$args{px}[0].".png";
-        my @icons = glob($p);
-        s/^..\/web// for @icons;
-        $json_data{'icon_sets'} = [];
-        push( @{ $json_data{'fp_icon_sets'} }, @icons);
-    }
-
     # List speak phrases
     if ( $path[0] eq 'print_speaklog' || $path[0] eq '' ) {
         my ( @log, @tmp );
@@ -645,6 +629,7 @@ sub json_get {
             @log = ::print_speaklog_since( $args{time}[0] );
             push @log, ''
               ; #TODO HP - Kludge, the javascript seems to want an extra line in the array for some reason
+                #print "db/json: " . join(", ",@log) . "\n";
         }
         elsif ( !$args{time} ) {
             @log = ::print_speaklog_since();
@@ -672,16 +657,20 @@ sub json_get {
     # Insert Data or Error Message
     if ($output_ref) {
         $json{data} = $output_ref;
+
+        #	   foreach my $key (sort (keys(%{$output_ref}))) {
+        #	   print "db:key = $key\n";
+        #  		 $json{data}{$key} = $output_ref->{$key};
+        #		}
     }
     else {
         $json{error}{msg} = 'No data, or path does not exist.';
     }
 
     #Insert Meta Data fields
-    $json{meta}{time}      = $output_time;
-    $json{meta}{path}      = \@path;
-    $json{meta}{args}      = \%args;
-    $json{meta}{client_ip} = $Http{Client_address};
+    $json{meta}{time} = $output_time;
+    $json{meta}{path} = \@path;
+    $json{meta}{args} = \%args;
 
     my $json_raw = JSON->new->allow_nonref;
 
@@ -1032,8 +1021,6 @@ sub filter_object {
 sub json_page {
     my ($json_raw) = @_;
     my $json;
-
-    #utf8::encode( $json_raw ); #may need to wrap gzip in an eval and encode it if errors develop. It crashes if a < is in the text
     gzip \$json_raw => \$json;
     my $output = "HTTP/1.0 200 OK\r\n";
     $output .= "Server: MisterHouse\r\n";
@@ -1266,104 +1253,6 @@ sub json_table_purge_data {
     my ( $key, $posx, $records ) = @_;
 }
 
-sub json_notification {
-    my ( $type, $data ) = @_;
-    $data->{type} = $type;
-    $data->{time} = &::get_tickcount;
-    for my $i ( 0 .. $#json_notifications ) {
-
-        #clean up any old notifications, or empty entries (ie less than 5 seconds old)
-        my $n_time = int( $json_notifications[$i]{time} );
-        if (   ( &get_tickcount > $n_time + 5000 )
-            or ( !defined $json_notifications[$i]{time} ) )
-        {
-            splice @json_notifications, $i, 1;
-        }
-    }
-    push @json_notifications, $data;
-}
-
-sub config_checker { 
-	my ($file) = @_;
-	
-	my (%collections, $key, $output, $temp);
-	my @data = file_read($file);
-
-
-	foreach my $row (@data) {
-  		$key = $1 if $row =~ /\"(\d+?)\" \:/;
-  		$row =~ /\"(.+?)\" \: \"(.+?)\"/ ;
-  		$collections{$key}{$1} = $2 if $1;  
-  	}
-
-	foreach my $row (@data) {
-  		$key = $1 if $row =~ /\"(\d+?)\" \:/;
-  		if ($row =~ /(\d+?)(\,|\n)/) {
-			my $sub_key = $1;
-    		my $comma = $2;
-    		$collections{$key}{children} .= "\t$1: " ;  
-			$collections{$key}{children} .= "$collections{$sub_key}{name}";
-			$collections{$key}{children} .= "\n";
-		}
-  	}
-
- 
-	#foreach $key (sort check_numerically keys %collections) {
-	#	$output .= "$key: $collections{$key}{name}:$collections{$key}{link}$collections{$key}{external}$collections{$key}{iframe}:$collections{$key}{comment}:$collections{$key}{mode}:$collections{$key}{children}";  
-   	#}
-  
-	my ($row, $show_row, $bracket_errors, $comma_errors1, $comma_errors2, %brackets, $curly, $square);
-	$curly = 'closed';
-	$square = 'closed';
-
-	while ($row < @data) {
-  		$show_row = $row + 1;
-  		$data[$row] =~ s/\s+$//; # remove trailing spaces
-  		if ($data[$row] =~ /\{/ and $data[$row] !~ /iframe|external/) {
-    		$brackets{open_curly} ++;
-    		$bracket_errors .= "Repeated open curly bracket in line $show_row: '$data[$row]'\n" if $curly and $curly eq 'open';
-    		$curly = 'open';
-    	}
-  		if ($data[$row] =~ /\}/ and $data[$row] !~ /iframe|external/) {
-    		$brackets{close_curly} ++;
-    		$bracket_errors .= "Repeated close curly bracket in line $show_row: '$data[$row]'\n" if $curly eq 'closed';
-    		$curly = 'closed';
-  		}
-  		if ($data[$row] =~ /\[/) {
-    		$brackets{open_square} ++;
-    		$bracket_errors .= "Repeated open square bracket in line $show_row: '$data[$row]'\n" if $square eq 'open';
-    		$square = 'open';
-  		}
-  		if ($data[$row] =~ /\]/) {
-    		$brackets{close_square} ++;
-    		$bracket_errors .= "Repeated close square bracket in line $show_row: '$data[$row]'\n" if $square eq 'closed';
-    		$square = 'closed';
-  		}
-  
-  		$comma_errors1 .= $row + 1 . ": '$data[$row]'\n" if $data[$row] !~ /\, *$/ 
-     		and $data[$row + 1] !~ /(\}|\])/ 
-     		and $data[$row] !~ /\: (\{|\[)/ 
-     		and $data[$row] !~ /^\{/ 
-     		and $data[$row] !~ /\}$/;
-
-  		$comma_errors2 .= $row + 1 . ": '$data[$row]'\n" if $data[$row] =~ /\,/ and $data[$row + 1] =~ /(\}|\])\,/; 
-
-  		$row ++;
-	}
-
-	$output .= "Possible bracket errors:\n$bracket_errors\n" if $bracket_errors;
-	$output .= "The following lines should possibly have a comma at the end:\n$comma_errors1\n" if $comma_errors1;
-	$output .= "The following lines should possibly not have a comma at the end:\n$comma_errors2\n" if $comma_errors2;
-
-	$output .= "There are $brackets{open_square} '[' and $brackets{close_square} ']'.\n";
-	$output .= "There are $brackets{open_curly} '{' and $brackets{close_curly} '}'.\n";
-
-	print_log $output;
-}
-
-sub check_numerically { $a <=> $b }
-
-
 return 1;    # Make require happy
 
 =back
diff --git a/web/bin/code_select.pl b/web/bin/code_select.pl
index aa375efda..de47f06fa 100644
--- a/web/bin/code_select.pl
+++ b/web/bin/code_select.pl
@@ -38,12 +38,14 @@ sub select_code_form {
 The following are standardized MisterHouse code files which need no
 modifications, but which may require settings in your ini file to
 activate properly.|;
-    $html .= qq| Simply check those that you'd like to run and they'll be automatically activated within MisterHouse.| if $Authorized eq 'admin';
-    my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
-  
-    $html .= qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>| unless $Authorized eq 'admin';
+    $html .= qq| Simply check those that you'd like to run and
+they'll be automatically activated within MisterHouse.|
+      if $Authorized eq 'admin';
+    $html .=
+      qq|<br><font color=red><b>Read-Only</b>: <a href="/bin/SET_PASSWORD">Login as admin</a> to edit</font>|
+      unless $Authorized eq 'admin';
     $html .= qq|
-<CENTER><FORM ACTION="/bin/code_select.pl" id="mhresponse" method=post>
+<CENTER><FORM ACTION="/bin/code_select.pl" method=post>
 <TABLE BORDER="0" cellspacing="0" cellpadding="0" width="100%">
 <tr><td colspan="2"><B>Search</B> (file or description): <input  align='left' size='25' name='search'>&nbsp;<INPUT TYPE='submit' VALUE='Search'>
 |;
diff --git a/web/bin/code_unselect.pl b/web/bin/code_unselect.pl
index 1269e5253..805ffa244 100644
--- a/web/bin/code_unselect.pl
+++ b/web/bin/code_unselect.pl
@@ -42,7 +42,7 @@ sub select_code_form {
     $html .= qq|Simply uncheck files you want to disable or check to re-enable.|
       if $Authorized eq 'admin';
     $html .= qq|
-<CENTER><FORM ACTION="/bin/code_unselect.pl" id="mhresponse" method=post>
+<CENTER><FORM ACTION="/bin/code_unselect.pl" method=post>
 <TABLE BORDER="0" cellspacing="0" cellpadding="0" width="100%">
 <tr><td colspan="2"><B>Search</B> (file or description): <input  align='left' size='25' name='search'>&nbsp;<INPUT TYPE='submit' VALUE='Search'>
 |;
diff --git a/web/bin/iniedit.pl b/web/bin/iniedit.pl
index 33ecb1591..cce5a3e8b 100644
--- a/web/bin/iniedit.pl
+++ b/web/bin/iniedit.pl
@@ -175,7 +175,7 @@ sub edit {
         Note: Commit will resort and filter out comments.'
       if $Authorized eq 'admin';
     $data .= '
-        <FORM method=post id="mhresponse" action="/bin/iniedit.pl">
+        <FORM method=post>
     ';
 
     $data .= '
@@ -264,7 +264,7 @@ sub edit {
 
 sub edit_list {
     my $data = '
-        <FORM method=post id="mhresponse" action="/bin/iniedit.pl">
+        <FORM method=post>
     ';
     $data .= '
         <TABLE WIDTH="98%" CELLSPACING=0 CELLPADDING=0 BORDER=0>
diff --git a/web/bin/items.pl b/web/bin/items.pl
index 630288ba6..f93a91951 100644
--- a/web/bin/items.pl
+++ b/web/bin/items.pl
@@ -64,7 +64,7 @@ sub web_items_list {
 
     # Create a form to pick which file
     $html .=
-      "<table border width='100%'><tr><form action=/bin/items.pl method=post><td>Which .mht file to edit?\n";
+      "<table border><tr><form action=/bin/items.pl method=post><td>Which .mht file to edit?\n";
     $html .= &html_form_select( 'file', 1, $web_item_file_name, @file_paths )
       . "</td></form></tr>\n";
 
@@ -99,17 +99,17 @@ sub web_items_list {
 
     #form action='/bin/items.pl?add' method=post>
     $html .= qq|<tr>
-<td><form action='/bin/set_func.pl' method=post>
+<form action='/bin/set_func.pl' method=post><td>
 <input type=submit value='Create'>
 <input name='func' value="web_item_add"  type='hidden'>
 <input name='resp' value="/bin/items.pl" type='hidden'>
 $form_type
-<input type=text name=address  size=10 value='A1'>
-<input type=text name=name     size=10 value='Test_light'>
-<input type=text name=group    size=10 value=''>
-<input type=text name=other1   size=10 value=''>
-<input type=text name=other2   size=10 value=''>
-</form></td></tr>
+<input type=input name=address  size=10 value='A1'>
+<input type=input name=name     size=10 value='Test_light'>
+<input type=input name=group    size=10 value=''>
+<input type=input name=other1   size=10 value=''>
+<input type=input name=other2   size=10 value=''>
+<td></form><tr>
 | if $Authorized eq 'admin';
 
     # Parse table data
@@ -122,7 +122,7 @@ sub web_items_list {
         # Do not list comments
         unless ( $record =~ /^\s*\#/
             or $record =~ /^\s*$/
-            or $record =~ /^Format *=/i )
+            or $record =~ /^Format *=/ )
         {
             $record =~ s/#.*//;    # Ignore comments
             $record =~ s/,? *$//;
@@ -179,7 +179,6 @@ sub web_items_list {
         INSTEON_TRIGGERLINC     => [qw(Address Name Groups)],
         INSTEON_ICONTROLLER     => [qw(Address Name Groups)],
         SCENE_MEMBER            => [qw(MemberName LinkName OnLevel RampRate)],
-        CODE					=> [qw(Code)],
         default                 => [qw(Address Name Groups Other)]
     );
 
@@ -188,12 +187,11 @@ sub web_items_list {
 
         my @headers =
           ( $headers{$type} ) ? @{ $headers{$type} } : @{ $headers{default} };
-        my $headers = 2 + @headers;
+        my $headers = 1 + @headers;
 
-        $html .= "<br><table border width='100%' id='mhexec'><tr><td colspan=$headers><B>$type</B>\n";
+        $html .= "<table border><tr><td colspan=$headers><B>$type</B>\n";
         $html .= "(<a name='$type' href='#Top'>back to top</a>)</td></tr>\n";
-		$headers--;
-		
+
         $html .= "<tr>";
         for my $header ( '', 'Type', @headers ) {
             $html .=
@@ -328,8 +326,6 @@ sub web_item_add {
     # write out new record to mht file
     $file_data[@file_data] = sprintf( "%-20s%-20s%-20s%-20s%-20s%s",
         $type, $address, $name, $group, $other1, $other2 );
-        
-    #&main::print_log("DB: in webitem, $type, $address, $name, $group, $other1, $other2");
     &mht_item_file_write( $web_item_file_name, \@file_data );
 
     return 0;
@@ -360,7 +356,6 @@ sub web_item_help {
         Options =>
           'List the device options separated by | (e.g. preset, resume=80)',
         FloorPlan => 'Floor Plan location',
-        Code	  => 'Perl code executed at startup',
         Other     => 'Other stuff :)'
     );
 
diff --git a/web/bin/set_func.pl b/web/bin/set_func.pl
index 8fd77d5c7..e746376b4 100644
--- a/web/bin/set_func.pl
+++ b/web/bin/set_func.pl
@@ -11,7 +11,7 @@
 
 use strict;
 
-#&main::print_log("db a=@ARGV\n");
+#print "db a=@ARGV\n";
 
 # Process form
 if ( @ARGV > 2 ) {
@@ -35,12 +35,9 @@
         }
     }
     $func = "$func($args)";
-	#&main::print_log("func=$func($args)");
     my $html = eval $func;
     print "\nError in set_func.pl: $@\n" if $@;
-#print_log "html=$html";
     return $html if $html;    # Allow function to override response
-#print_log "redir=" &http_redirect($resp). 
     return &http_redirect($resp);
 }
 
diff --git a/web/bin/triggers.pl b/web/bin/triggers.pl
index c55cfbd3f..78d022c61 100644
--- a/web/bin/triggers.pl
+++ b/web/bin/triggers.pl
@@ -12,7 +12,6 @@
 $^W = 0;    # Avoid redefined sub msgs
 
 my ( $function, @parms ) = @ARGV;
-my ($mode) = ($Http{Referer} =~ /https?:\/\/\S+:?\D*\/(\S+)\//);
 
 #print "dbx a=@ARGV.\n";
 
@@ -62,12 +61,12 @@ sub web_trigger_list {
 triggers, change the type to "Disabled".  If you delete it, the trigger will be recreated the next  
 time Misterhouse is restarted.   
 
-<form action='/bin/triggers.pl?add' id='mhresponse' method=post>
-<input type=text name=name     size=10 value="Test">
+<form action='/bin/triggers.pl?add' method=post>
+<input type=input name=name     size=10 value="Test">
 $form_trigger
-<input type=text name=trigger2 size=18 value="12 pm">
+<input type=input name=trigger2 size=18 value="12 pm">
 $form_code
-<input type=text name=code2    size=30 value="hi">
+<input type=input name=code2    size=30 value="hi">
 <select name='type'>
 <option value='OneShot' selected>OneShot</option>
 <option value='NoExpire'>NoExpire</option>
@@ -110,7 +109,7 @@ sub web_trigger_list {
             $type_prev = $type;
             $html .=
               "<p><B>$type:</B> (<a name='$type' href='#Top'>back to top</a>)\n";
-            $html .= qq|<table class="EditTrigger" id="mhexec" border width="100%">\n|;
+            $html .= qq|<table class="EditTrigger" border width="100%">\n|;
             $html .=
               "<tr><th></th><th>Name</th><th>Trigger Event</th><th>Action Code</th><th>Type</th><th>Last Run</th></tr>\n";
         }
@@ -150,8 +149,6 @@ sub web_trigger_list {
             my $triggered_date = &time_date_stamp( 7, $triggered )
               if $triggered;
             $html .= "<td>$triggered_date</td>\n";
-        } else {
-        	$html .= "<td></td>\n";	#put in a blank cell.
         }
 
         $html .= "</tr>\n\n";
@@ -203,7 +200,7 @@ sub web_trigger_add {
     # Create form
     else {
         my $html =
-          "Add a trigger:<form action='/bin/triggers.pl?add' id='mhresponse' method=post>\n";
+          "Add a trigger:<form action='/bin/triggers.pl?add' method=post>\n";
         $html .= qq|<br>Name   <input type=input name=name    value="Test">\n|;
         $html .=
           qq|<br>Trigger<input type=input name=trigger value="time_now '12 pm'">\n|;
diff --git a/web/ia7/graphics/help.gif b/web/ia7/graphics/help.gif
deleted file mode 100755
index 3b514253179abc826410a1c983b15d1a3239c95d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1582
zcmV+}2GRLPNk%w1VITk?0QUd@a-QcgY19By)8y*(0Y$ncH=K#G^kS3d07=4csQ(&X
z(dz8=8bqk<@%PQv>NrNC3roHrT+OS`|3i4w09o7{S<REX`PJF%I&H>PmH8rU=6$U5
zMPst`_4yGqq#<F`ONHbCT;oJir%r;_06?)jeCleM=_+H=08z~xPr*fY&c({*T6Vhd
z@%LGS&YGOe06C;ce&8ZXs6KPm7;fxLmHPlbt@`-(5mLpj)BhD(%66mfW0vPWgzTiN
z)C(-606eLs%KxIr{sBzLJ#^b-YO}n}>iGHmg0uan%>SCf`vOS5jJNqidEQZl;Q%?Y
ztGwPVWyuXrz`n%cMU3+(aP}i%+<TeQQ;hCklI3@)^ZEDmEl{Z?WXu^?%MC=nREOWL
zuhtbRn|!kW09Mx#Rmn4j_JN$xe5dcb)boa|<^25qfvxkM#Qp$W>HtEt+2HOraMl|!
zn^S|*dwaXt;_(1P!4Xl&E^*#cknR8d^Zxtw2NsV%dfauD&`EvT|Ns5}|M^IL)&2eZ
z|Nr#;`}hDvwp@+nTZYdCKdlf$yB{T!PHeVYT&yKu&^lVK4^GH5Jf0mZn*aa*|Nr~{
z|Nb|7=5&R@I(*{>K(26|>;O8fK863=<?}Xj<P}xQv$NNVki`y0!68q&smbvvUdbO|
z(-2<QOkl2@vfSk4@eESMhOqRt!QUfi*pIX3DP!3xY0y`S;jqHvx5(vYe7qrY?3>8{
zH*(v0pxsQ4@ob^$S%AuJo!^$k{qXJR2qmB#Adiur&5NhlnWN8`sME;N=+58sB`cMp
zrO{rc|7o4=ZlLf1JEyq5-e!)|T#)Vh`}lvW@sg6pXqV}l#{X)a<qcTQUW?Z`hV(y=
z`<TK0jEuu8YR_Yt<O*NmDqX`LRJXy@?cU+=-{<mbgTNO|uwb75Zk_OIpZlZA|KQ;7
zL2bb;W5qpj&l6bCGk*URP{<Tm&lW(j2uQgfPOlkO#!8I-w7uQz>gfOd`FNMm5h<1R
z`1ygA$yko*A^8LV00000EC2ui03ZM$000R804E6?NU)&6g9sBUT!?UuF@KD>Fkm2q
z!zFwj7#?iJq22@@S~h55_HPCQF2s&#6gYrUxLwtfsB5#$0uv--5?~qiV1-5pTm;?9
zkt9eP1Jck)lePn0x^qP2_*m#bMwT2Bk|Y7Z%g>oByi`y#aR6F|5+0@^T)@Q}(I82%
zoq<zHU<)Yhz+?gA<X#DWE9x3#G2!jjGXiN{NtF=}1}9GbG~ooRK*oZ`%=wZKL`a)C
zZ~#@>_h*8ix=^CTXfneSym_Gtu3>Stvl1n990<H33!RD<fCgY7G9ylaDjEtbAPA@4
z7zsj@Sg-&9(X3%AOi*)IhtePy0gRvjuu{cCGJ?h0DMKQ}rU6za1dSk@#od5HfDoMs
zaKe!nS1A-hP&pvfKm!vN7{CS^JM5sz0f)qa$RIZ~fWZm<RX~pp5j-$ZC5+^ujT^SG
zVE}`gm;lBM?mRQV4S^V8PlgbXAjJoA5cEhMX1Eao4a=aB;sFyFL5@CK?9q=35u8u~
z1aFW)k11m4$YTg0P!IwpJWzAU2+<@NNGBtB;Rp@{yzzz&^e9l}KpcRO4VGDwaS9$W
z2+~0Z;^flBC-y91h?*p@S%D-3)zSwQSyDg&83G6}L@b5Wfq)$dEJ1)FgBA*e6!Ant
zkTBrX@QtHnKq_fB!40v5rfEk1X@d>Tl%Yr?1YN*D1{$OaDGDeIp@SN|WJ<uMveKG}
zJixp_&>E=p(SxeMqJTgbuc)DeA;=bL0}wDk5YHm25LC$&^XQ^MwZWEgj2?uf0cEn_
zCi2b?bR2|ADO8*?M6h<m5lue7G!Vfi-h$iA9bW{~!a?H{fJ+b83^4=(WuyTwDfG<x
zEey>_0SO;rBs7H>0hFMCu{v1e4GuPt07Nq|WOB#I(=6nS9Hm&|$|?kq@Wd0FeA`SS
z5WFJ_AKYkkfe0R)fQKtO;2;GA5J-W8Jn{U13@9s2vc?OM{E$KfAAF!d1@R~X%p!Cw
g7q&nRgi*u;1&ASrB#|@=^1?cE2QK*F1O)^DJ1*7%H2?qr

diff --git a/web/ia7/graphics/important.gif b/web/ia7/graphics/important.gif
deleted file mode 100755
index 41d49438fd08230095c699b2d6f80593f3aa8667..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1492
zcmV;_1uObTNk%w1VITk?0QUd@^z`)Eb7#)h*Tlrc=H}-7{QT+Z>E~xw>oytxN=v#C
z3-#mU{-vh>s;bCCJ^wW|q?nlc`ugH}ZMPa1&LtPsD;WRS*!ZHK+gwrqwYC4TvBhg^
zqXGcbMn1c{yVS9*{=vO_dwcy@Sjj9U$;rv<i-r97_^UcP|H8xn)6=3860;;BTq-K!
z8UU^#9`${A-QC^2E-BMfOM-%eV=5~DhK9!-5o#+dvk3-@4GZb;@bB;M>&L~^IWt5=
zM5_q}|GvK6G#$bN0Nc2<|H{g(9vk)k{@U8w`1ttSot^B0e5|FVW(Ee+76ZFkR;(2h
zqzw$63klpE0J9DYg(oNe{QS?Zs?W~O#yK*krlz_L1@rp)*5c&<pPp$$Lw^Yf;wlT?
z=;`7-BmcR%;^N|}0RW>N9i9aO|9g7%`uTEkaaAfR<nHg|?(f4kF#-YtybTNHK_>t0
z?d0R*%M}IX6ad2!1-UCH|7K>T7Zt%XF2ouU7#J8WEiM25|MT<n{{H^)@$uN=;<GR?
zsu~#on3%+#o9Ms4{`2$ipPPRc7Uk*b*|o2dWo7beRQ~_}%BiQq83yAqF7EB^{r&yw
zLnV=bfbLK<<iWiEYiitUWYp;CaeI9GfpMP?4)z)uzcDP~tE*>cXUs@IaVRM0_xRkb
ztpAmk{Xjl<Ha1>pY1P%$^OuqLvaHYE;aNXF_uAF|kd4B?!1dPF{<F0IDk{v$$@2XE
zw6Cx4KpX$JxbkF6|GBsL>+AXN@BixR|Lp6qXJ_a!4y`OKc~@6t5fQfn0E|CB+|J9=
zkdXi6<m2h;_v`D`jEw)!&&H>v@A~@3sHklsBG<OE-@Un6KtS-=*uWJHv`9nIt*73r
zrTWdy_s7TdYiH}$(!@VG$vrpZx3}cJzP_}ymH+^g3km<y&5@Cjo1LBKF(>l!@aXdN
z?(y;L?Ci{TcE30@xH~(7WMqh7V2^5Q@moRY9{~T`+kHt%{M_8`NiF}PqSlOkuti0e
zetx@8PnwE~A^8LV00000EC2ui03ZM$000R80R0FYNU)&6g9sBUT*xrVib2r;F`Ve<
z&=d(6qKu=sunIgGz|4&}Muua;P*YmjOQGZpgaRfF`WmFk9uX8{uuwS?vtY9cAe;fo
zkfCKim_7aUA`~D65LyiwbOA@@N>V@WVt_!QYZkXcr(Qsr2OuV(1y4#4(Xh?P76vtH
zI8Zd8=LS6>#%Mq!5FZ*e-Bid6#1Rk=C?!xdu(wFfj5G}JWa{t*7so388~|yc!4JAO
zZ>|8tBSJ);d+jKOd%{Xr7Ylx}fL;ZtOM(PFzATw&Vvvk6`Z84U<KYb-0)FI(K!u7>
zDi{kNC3$i|Lm_1XVZ7->*pI$i4<vp6`G*uCvtcqi#iAwAPXRtYC<&C4;8Qvmq<AJw
zw!%?81h70ZP#>ZYl!y?K<Yq|(2rXa+2D#L6KpO4&;X?=mQKAkO#!#?=G`1kL!5zEQ
z1BN$SAR!+mA!OkPAO#>{gf=*6F~S$|{9%waDqw&>9TJqX0{{`g6oEtqL;wIgIyg{<
z4K5TTi$PAjLr)7qAhV1CJN!`q436y(!5=#q(8dQi{6Ikt#7shvIG!9JObh#P0mB>y
zxH$u89z@WN0dv40h!bTfFaZ<02~-6?-(1oH7`C{=MHp?YbBh3~aMA`e>#z}qAe$Ic
z1_yiO;01Din3Bf<U`QcF09ItN^8q7641oy`JWw;lG#^+2$urn+z`+lPzU0RVqg3Lm
z6iqZs2OV}qtHrc9r1`@SX9#-+ISQ2H#T<T^(Lp|O#36<lL8M#3x)ii)gAIG^am_Uf
z)H?+Za73{N34R3g1Qu?%p$8~2#Bj&KD<tef5k(L}NFI5ppn@l!L=goO)$lt<BR6#1
uF%37+ATkXskj%o#C$FLM%4@uG4yx*0F~H0;*KG66HIqO<g;ymM5CA)7{Mokv

diff --git a/web/ia7/graphics/info.gif b/web/ia7/graphics/info.gif
deleted file mode 100755
index c81828d1c220c5663904b187102f74a613be018f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1487
zcmV;=1u*(YNk%w1VITk?0QUd@5<s{CUE@7+(jio~`TG0_7mWV>_^QO}Uy|%CWX}LS
zx=MZBAY0FAlG>-f<V%3xHf_%wU)28l^E7MKLPDJR_3fj`|7oTCO^4+!V!|L~(TTG4
z89JQh<>igF^zQENt<nEWmHPl#+yG9?nzZ2nO2mbx-846uQ;6Yhg~1Y4%Zseymc983
zC6fR^vHAG+p~wC&XvwkG|6GdM(%<o=$^Q{b!a;f3LwDO2NWC+1+yFVGd#3D!uJh{e
z^AbC!3rV`Sx7r6Cnep-XeyQ>?d+U$A{>91UbfWH5TB`W=^h<r#d!5_k>GS|Tt^qu%
z7G~lG3WESr(EviUK92ffi`M-8{+-GH09M*wkLCbd=~s&3MS0W_Q^sYL=>t&Ap2hs?
z>FIucz1`#S07b(>chAw->kd%E3o4rb|NJ6GqAq6Bk+0$mOu(AO{}ep17Fy0yhS|^3
z=qD_c09DpIgYN(R_9<b~o2}MreZ7X0$Z?n2WtHZJio>YP|8tAP4^GEfisVsIr95%h
zYHG1<pz2#`v2UI0SY)q9Vy_)Zv_e~}P=nwGH=j^~-vC6oFL&e$O2G{?tPCfdFHNKk
zL%t6|r~m)||Ns7?ve+kJ&whu(_xJS(D5C&W)5OH#ny1ogm*_i)_5A$(K6lt-mEe!J
z_d0jq7-QL1huAStrD&GtHgV86ZrRV(>X^U!{P^)1R>=%c$uUl){QUYrc-#O+$4E$^
z;^OdgpXvxZqg9RFS%=tMh}QG>`(JUkI&jR};O{A0z$akXFnj+bXxS=h)CNer?Ca}v
zqVsU2`FN)A^7;Ou%>RC||0ZkWcb3v(p8xai=(5rFGI!%QcI(^f`;)r&EoRh#tnUC<
z-~~UeP?Gdip8r~y|1@vk3slJpNwo!3&_09zCvEV%%H{w&r~o>#A70>{!~31X{9tjm
zgs}9c!t6|p`aq5MOONxBy7>xB!3<5r*y8g5FsR<-@;h<ZPl4BmqSo^B^<a_WKYZ%T
z)aVgn+y4IlA^8LV00000EC2ui03ZM$000R8051s~NU)&6g9sBUT*$DYLxD{)rARc3
z(xN<|f;}uaCWRVH8MxqEB0$&=4(nWPyo86tfKo=TG;8L@h_ee16t&PpprMsNjpAGZ
zQ3FP{D!p<MNv14Xs}_caEd2LJS0Nc7EWqHA&rCmP`wsCz;Ef*|L_HJYX>`?34KVST
z(7J?4UllJ|wlH#6t;ME<_Bh0m;a1%%b|x;3qJ^nJpg@ck;21Zoz!8Kg1`Mr{j)kcW
z4a%iS<6sG7$%DQTdy{08!6s_<$*`c#^M)SFcrn?tWQ!xz6B3X^S3r)zOqMRVfnmD`
z61)#?+;|}Q-h?%pB0QVa$6$&K-9)|rx^|n-9yTl3kRY+7)}ZT}7_`yA+F&99A+*%-
z(1XYp6ZE8EfE{VfFu?@a#5a!%aO7};L8_2Kg%(;AfdmhSpuhzUN__AFFW9VchkR4G
z&_xb&7(|JL0R*586d0@$3MmfQ;bAIw+!4z$Q%vE+i76Je2n6r67yuS@prV5@2T0%{
zK4-}DNRKW&(FFh}{8LaK!h{fj2w>77#R#@EiOdUSC@^J-PCTK4B!U<O$`9N?fd!JD
zj9DfuVW6o1l}?zm4IDy<VNfs})KUZ;bmaL3nFsKR<~eLWu>%k`MDfW%zbFEaKT?c2
z!U$v>P(cTrlyQy=ZSLS^C%2@mRgf7iOi+h7qmEF50_~j22{84vy2BZjL=i+ndZ2L%
zBwv)^tR^%_(?JC*<lw{(JG22v0fcCY&?ttWp#vn~D6oq)zWAUnGt-1)&KcWMAeBNx
zAku;+)I^{GD>3xz?-?poQUC?GG(^BA1^l2%F>rJ-Pb87dBa024L_x^B4jqw10h7Fu
p!^Z$fB19Co1YyNW0?E-w5+}?t#|eUn@yW?3*KG66I2RNU06WRi?&Sag

diff --git a/web/ia7/graphics/title.gif b/web/ia7/graphics/title.gif
deleted file mode 100755
index f92b59665df2fd0d1c5e798af0945d14daa880bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 317
zcmXw!J4?e*0EI8wN-32h7TQhgQjvln@ljoL@C8l|R^8kj6#5fHry?#Er!G$Z0e^zs
zG`(qJ;%%Db=Jw|1)uw4iH`{{Wa5x+e2hQQ~!B*)i4zfT7Ac~^laM<tnTdh{J+2naX
z48tG@BvDjV6(Q8~eL{%iI2L0N!eB7aG+op6?=iCP`)a47D9Vqbc&=-YY8Jx=wr$(<
zTnGh>aX1K}04b%WX}Ye94MPwF)JDW42FALk8HT|avmJZ1Lc3i`yOJcip7+J`vMh_D
zG|8yn^V<k9%Ob=C|KxvT6I&eX_!F49+`X$DrE*XC2N9IG^!+tgz9_D|pS)Qf$IX^M
z3A(Lpp5HVUqtnz&^<!%PY_8gPHVc{Lc5-<&m(AwZGxLvYiNr=?x>idsEfmtRdOgm?
IU-!VyACo}9@&Et;

diff --git a/web/ia7/house/main.shtml b/web/ia7/house/main.shtml
index fbb530279..f958fb5db 100644
--- a/web/ia7/house/main.shtml
+++ b/web/ia7/house/main.shtml
@@ -1,22 +1,12 @@
 <div class='row top-buffer'>
 	<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
-		<div class='col-sm-6'>
+		<div class='col-sm-12'>
 			<p><strong>Version: </strong><!--#include var="$Version"--><br>
 			<strong>Modified:</strong> <!--#include var="$Version_date"--><br>
 			<strong>OS:</strong> <!--#include var="$^O"--><br>
 			<strong>Perl:</strong> <!--#include code="sprintf '%vd', $^V;"--><br>
 			<strong>User:</strong> <!--#include var="$Info{User}"--><br>
 		</div>
-		<div class='col-sm-6'>
-			<div class='col-sm-8'>
-				<a href="/ia7/#path=/prefs/ia7" style='margin-bottom:5px' class='btn btn-default btn-md btn-block btn-list' role='button'>
-					<i class='fa fa-file-text-o fa-2x fa-fw'></i> IA7 Prefs File</a>
-			</div>
-			<div class='col-sm-8'>
-				<a href="/ia7/#path=/prefs/ia7_rrd" style='margin-bottom:5px' class='btn btn-default btn-md btn-block btn-list' role='button'>
-					<i class='fa fa-file-text-o fa-2x fa-fw'></i> RRD Prefs File</a>
-			</div>		
-		</div>		
 	</div>
 </div>
 <div class='row top-buffer'>
@@ -82,10 +72,7 @@
 	<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
 		<div class='col-sm-12'>
 			<p class="text-muted"><small> MisterHouse was created by Bruce Winter.  Ron Klinkien developed the v2.3 web interface.  Kevin Robert Keegan 
-			developed the v4 web interface, updates by H.Plato. IA7 v1.2.350 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
+			developed the v4 web interface, updates by H.Plato. IA7 v1.0.800 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
 		</div>
 	</div>
-</div>
-<script>
-	fixIA7Nav();
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/web/ia7/include/bootstrap-custom-button.3.3.5.css b/web/ia7/include/bootstrap-custom-button.3.3.5.css
deleted file mode 100644
index 5d329999f..000000000
--- a/web/ia7/include/bootstrap-custom-button.3.3.5.css
+++ /dev/null
@@ -1,29 +0,0 @@
-.btn-purple {
-  color: #fff;
-  background-color: #834087;
-  border-color: #834087;
-}
-.btn-purple:hover,
-.btn-purple:focus,
-.btn-purple:active,
-.btn-purple.active {
-  color: #fff !important;
-  background-color: #723876;
-  border-color: #613064;
-}
-.btn-purple.disabled:hover,
-.btn-purple.disabled:focus,
-.btn-purple.disabled:active,
-.btn-purple.disabled.active,
-.btn-purple[disabled]:hover,
-.btn-purple[disabled]:focus,
-.btn-purple[disabled]:active,
-.btn-purple[disabled].active,
-fieldset[disabled] .btn-purple:hover,
-fieldset[disabled] .btn-purple:focus,
-fieldset[disabled] .btn-purple:active,
-fieldset[disabled] .btn-purple.active {
-  color: #fff;
-  background-color: #834087;
-  border-color: #834087;
-}
diff --git a/web/ia7/include/bootstrap-theme.3.0.2.min.css b/web/ia7/include/bootstrap-theme.3.0.2.min.css
new file mode 100644
index 000000000..916427705
--- /dev/null
+++ b/web/ia7/include/bootstrap-theme.3.0.2.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.2 by @fat and @mdo
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#e0e0e0));background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-moz-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe0e0e0',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#2d6ca2));background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:-moz-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);background-repeat:repeat-x;border-color:#2b669a;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff2d6ca2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#419641));background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);background-repeat:repeat-x;border-color:#3e8f3e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff419641',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#eb9316));background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);background-repeat:repeat-x;border-color:#e38d13;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffeb9316',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c12e2a));background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);background-repeat:repeat-x;border-color:#b92c28;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#2aabd2));background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);background-repeat:repeat-x;border-color:#28a4c9;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2aabd2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.navbar-default{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#f8f8f8));background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-moz-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff8f8f8',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f3f3f3));background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff3f3f3',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-gradient(linear,left 0,left 100%,from(#3c3c3c),to(#222));background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-moz-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-gradient(linear,left 0,left 100%,from(#222),to(#282828));background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:-moz-linear-gradient(top,#222 0,#282828 100%);background-image:linear-gradient(to bottom,#222 0,#282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff282828',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#c8e5bc));background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;border-color:#b2dba1;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0)}.alert-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#b9def0));background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;border-color:#9acfea;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0)}.alert-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#f8efc0));background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;border-color:#f5e79e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fff8efc0',GradientType=0)}.alert-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#e7c3c3));background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-moz-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;border-color:#dca7a7;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffe7c3c3',GradientType=0)}.progress{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff5f5f5',GradientType=0)}.progress-bar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.progress-bar-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.progress-bar-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.progress-bar-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.progress-bar-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3278b3));background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:-moz-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;border-color:#3278b3;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0)}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#d0e9c6));background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#c4e3f3));background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#faf2cc));background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fffaf2cc',GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#ebcccc));background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-moz-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffebcccc',GradientType=0)}.well{background-image:-webkit-gradient(linear,left 0,left 100%,from(#e8e8e8),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-moz-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;border-color:#dcdcdc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
diff --git a/web/ia7/include/bootstrap.3.0.2.min.css b/web/ia7/include/bootstrap.3.0.2.min.css
new file mode 100644
index 000000000..3deec3488
--- /dev/null
+++ b/web/ia7/include/bootstrap.3.0.2.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.2 by @fat and @mdo
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-primary:hover{color:#3071a9}.text-warning{color:#c09853}.text-warning:hover{color:#a47e3c}.text-danger{color:#b94a48}.text-danger:hover{color:#953b39}.text-success{color:#468847}.text-success:hover{color:#356635}.text-info{color:#3a87ad}.text-info:hover{color:#2d6987}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small,h1 .small,h2 .small,h3 .small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small,h4 .small,h5 .small,h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}.list-inline>li:first-child{padding-left:0}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small,blockquote.pull-right .small{text-align:right}blockquote.pull-right small:before,blockquote.pull-right .small:before{content:''}blockquote.pull-right small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}.col-xs-offset-0{margin-left:0}@media(min-width:768px){.container{width:750px}.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-0{margin-left:0}}@media(min-width:992px){.container{width:970px}.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-0{margin-left:0}}@media(min-width:1200px){.container{width:1170px}.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}@media(max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#c09853}.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-control-static{padding-top:7px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1;-moz-osx-font-smoothing:grayscale}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn:first-child>.btn{margin-right:-1px}.input-group-btn:last-child>.btn{margin-left:-1px}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .open>a .caret,.nav .open>a:hover .caret,.nav .open>a:focus .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-pills>li.active>a .caret,.nav-pills>li.active>a:hover .caret,.nav-pills>li.active>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:auto}.navbar-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%;margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive{margin-bottom:0}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-heading>.dropdown .caret{border-color:#333 transparent}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-heading>.dropdown .caret{border-color:#fff transparent}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading>.dropdown .caret{border-color:#468847 transparent}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading>.dropdown .caret{border-color:#c09853 transparent}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading>.dropdown .caret{border-color:#b94a48 transparent}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading>.dropdown .caret{border-color:#3a87ad transparent}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,tr.hidden-xs.hidden-md,th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,tr.hidden-sm.hidden-md,th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs,tr.hidden-md.hidden-xs,th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,tr.hidden-md.hidden-sm,th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg,tr.hidden-md.hidden-lg,th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,tr.hidden-lg.hidden-md,th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/web/ia7/include/bootstrap.3.0.2.min.js b/web/ia7/include/bootstrap.3.0.2.min.js
new file mode 100644
index 000000000..0e668e85c
--- /dev/null
+++ b/web/ia7/include/bootstrap.3.0.2.min.js
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap v3.0.2 by @fat and @mdo
+ * Copyright 2013 Twitter, Inc.
+ * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world by @mdo and @fat.
+ */
+
+if("undefined"==typeof jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]');if(a.length){var b=this.$element.find("input").prop("checked",!this.$element.hasClass("active")).trigger("change");"radio"===b.prop("type")&&a.find(".active").removeClass("active")}this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i<h.length-1&&i++,~i||(i=0),h.eq(i).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("dropdown");d||c.data("dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu]",f.prototype.keydown)}(jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.load(this.options.remote)};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show(),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h<o?"right":d,c.removeClass(k).addClass(d)}var p=this.getCalculatedOffset(d,g,h,i);this.applyPlacement(p,d),this.$element.trigger("shown.bs."+this.type)}},b.prototype.applyPlacement=function(a,b){var c,d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),a.top=a.top+g,a.left=a.left+h,d.offset(a).addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;if("top"==b&&j!=f&&(c=!0,a.top=a.top+f-j),/bottom|top/.test(b)){var k=0;a.left<0&&(k=-2*a.left,a.left=0,d.offset(a),i=d[0].offsetWidth,j=d[0].offsetHeight),this.replaceArrow(k-e+i,i,"left")}else this.replaceArrow(j-f,j,"top");c&&d.offset(a)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach()}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.$element.trigger("hidden.bs."+this.type),this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);
\ No newline at end of file
diff --git a/web/ia7/include/font-awesome.4.0.3.min.css b/web/ia7/include/font-awesome.4.0.3.min.css
new file mode 100644
index 000000000..449d6ac55
--- /dev/null
+++ b/web/ia7/include/font-awesome.4.0.3.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.3');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.2857142857142858em;text-align:center}.fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.142857142857143em;width:2.142857142857143em;top:.14285714285714285em;text-align:center}.fa-li.fa-lg{left:-1.8571428571428572em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:spin 2s infinite linear;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0,mirror=1);-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2,mirror=1);-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-asc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-desc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-reply-all:before{content:"\f122"}.fa-mail-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}
\ No newline at end of file
diff --git a/web/ia7/include/javascript.js b/web/ia7/include/javascript.js
index ef70b9a34..417dd00e9 100644
--- a/web/ia7/include/javascript.js
+++ b/web/ia7/include/javascript.js
@@ -1,21 +1,14 @@
-// v1.2
+// Optimization opportunity
+//  add print_errorlog
+//  updateStaticPage has lots of copy paste
+
 
 var entity_store = {}; //global storage of entities
 var json_store = {};
 var updateSocket;
-var updateSocketN; //Second socket for notifications
 var display_mode;
 if (display_mode == undefined) display_mode = "simple";
-var notifications;
-var speech_sound;
-var speech_banner;
-var audio_init;
-var audioElement = document.getElementById('sound_element');
-var authorized = "false";
-var developer = false;
 
-var ctx; //audio context
-var buf; //audio buffer
 
 //Takes the current location and parses the achor element into a hash
 function URLToHash() {
@@ -119,6 +112,7 @@ function getJSONDataByPath (path){
 	return returnJSON;
 }
 
+
 //Called anytime the page changes
 function changePage (){
 	var URLHash = URLToHash();
@@ -128,7 +122,10 @@ function changePage (){
 		URLHash.path = "collections";
 	}
 	if (getJSONDataByPath("ia7_config") === undefined){
-		// Load all the specific preferences
+		// We need at minimum the basic collections data to render all pages
+		// (the breadcrumb)
+		// NOTE may want to think about how to handle dynamic changes to the 
+		// collections list
 		$.ajax({
 			type: "GET",
 			url: "/json/ia7_config",
@@ -139,34 +136,11 @@ function changePage (){
 			}
 		});
 	} else {
-		if (json_store.ia7_config.prefs.header_button == "no") $("#mhstatus").remove();
-		if (json_store.ia7_config.prefs.audio_controls !== undefined && json_store.ia7_config.prefs.audio_controls == "yes") {
-  			$("#sound_element").attr("controls", "controls");  //Show audio Controls
-  		}
-		if (json_store.ia7_config.prefs.substate_percentages === undefined) json_store.ia7_config.prefs.substate_percentages = 20;
-		if (json_store.ia7_config.prefs.developer !== undefined) developer = json_store.ia7_config.prefs.developer;
-		// First time loading, set the default speech notifications
-		if (speech_sound === undefined) {
-			if ((json_store.ia7_config.prefs.speech_default !== undefined) && (json_store.ia7_config.prefs.speech_default.search("audio") >= 0 )) {
-				speech_sound = "yes";
-			} else {
-				speech_sound = "no";
-			}
-		}
-		if (speech_banner === undefined) {
-			if ((json_store.ia7_config.prefs.speech_default !== undefined) && (json_store.ia7_config.prefs.speech_default.search("banner") >= 0 )) {
-				speech_banner = "yes";
-			} else {
-				speech_banner = "no";
-			}
-		}
-		if ((json_store.ia7_config.prefs.notifications == undefined) || ((json_store.ia7_config.prefs.notifications !== undefined) && (json_store.ia7_config.prefs.notifications == "no" ))) {
-			  	notifications = "disabled";
-			  	speech_sound = "no";
-			  	speech_banner = "no";
-		} else {
-				notifications = "enabled";
+		//console.log("x "+json_store.ia7_config.prefs.substate_percentages);
+		if (json_store.ia7_config.prefs.header_button == "no") {
+			$("#mhstatus").remove();
 		}
+		if (json_store.ia7_config.prefs.substate_percentages === undefined) json_store.ia7_config.prefs.substate_percentages = 20;
 	}
 	if (getJSONDataByPath("collections") === undefined){
 		// We need at minimum the basic collections data to render all pages
@@ -184,14 +158,9 @@ function changePage (){
 		});
 	} 
 	else {
-		// Check for authorize
-		authDetails();
 		// Clear Options Entity by Default
 		$("#toolButton").attr('entity', '');
 		
-		// Remove the RRD Last Updated 
-		$('#Last_updated').remove();
-		
 		//Trim leading and trailing slashes from path
 		var path = URLHash.path.replace(/^\/|\/$/g, "");
 		if (path.indexOf('objects') === 0){
@@ -200,11 +169,6 @@ function changePage (){
 		else if (path.indexOf('vars') === 0){
 			loadVars();
 		}
-		else if (path.indexOf('prefs') === 0){
-			var pref_name = path.replace(/\prefs\/?/,'');
-			console.log("loadprefs() "+pref_name);
-			loadPrefs(pref_name);
-		}		
 		else if(URLHash._request == 'page'){
 			var link = URLHash.link.replace(/\?+.*/,''); //HP for some reason, this often has the first arg with no value, ie ?bob
 			var args = HashPathArgs(URLHash);
@@ -212,13 +176,16 @@ function changePage (){
 				args = args.replace(/\=undefined/img,''); //HP sometimes arguments are just items and not key=value...
 				link += "?"+args;
 			}
-
+			//alert("link="+link);
+			//$.get(URLHash.link, function( data ) {
 			$.get(link, function( data ) {
-				
+				data = data.replace(/<link[^>]*>/img, ''); //Remove stylesheets
+				data = data.replace(/<title[^>]*>((\r|\n|.)*?)<\/title[^>]*>/img, ''); //Remove title
+				data = data.replace(/<meta[^>]*>/img, ''); //Remove meta refresh
+				data = data.replace(/<base[^>]*>/img, ''); //Remove base target tags
 				$('#list_content').html("<div id='buffer_page' class='row top-buffer'>");
 				$('#buffer_page').append("<div id='row_page' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>");
-				parseLinkData(link,data); //remove css & fix up Mr.House setup stuff
-		
+				$('#row_page').html(data);
 			});
 		}
 		else if(path.indexOf('print_log') === 0){
@@ -230,7 +197,7 @@ function changePage (){
 		else if(path.indexOf('display_table') === 0){
 			var path_arg = path.split('?');
 			display_table(path_arg[1]);
-		}	
+		}
 		else if(path.indexOf('floorplan') === 0){
 			var path_arg = path.split('?');
 			floorplan(path_arg[1]);
@@ -281,207 +248,6 @@ function changePage (){
 	}
 }
 
-function loadPrefs (config_name){ //show ia7 prefs, args ia7_prefs, ia7_rrd_prefs if no arg then both
-
-	$('#list_content').html("<div id='prefs_table' class='row top-buffer'>");
-	$('#prefs_table').append("<div id='prtable' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-xs-11 col-xs-offset-0'>");
-	var html = "<table class='table table-curved'><thead><tr>";
-	var config_data;
-	if (config_name === undefined || config_name === '')  config_name="ia7";
-	if (config_name == "ia7") {
-		config_data = json_store.ia7_config;
-	} else if (config_name == "ia7_rrd") {
-		$.ajax({
-			type: "GET",
-			async: false,  //async is always better, but since this is the only point of the sub, it's OK
-			url: "/json/rrd_config",
-			dataType: "json",
-			success: function( json ) {
-				config_data = json.data;
-			}
-		});
-	}		
-	html += "<th>"+ config_name + "_config.json </th></tr></thead><tbody>";
-	console.log(config_data);
-	console.log("in prefs="+config_data.length);
-	for (var i in config_data){
-		if ( typeof config_data[i] === 'object') {
-			console.log("i "+i+":");
-			html += "<tr class='info'><td><b>"+ i + "</b></td></tr>";
-			for (var j in config_data[i]) {
-				if ( typeof config_data[i][j] === 'object') {
-					//console.log("j      "+j+":");
-					html += "<tr class='info'><td style='padding-left:40px'>"+ j + "</td></tr>";
-
-					for (var k in config_data[i][j]){
-						//console.log("k             "+k+" = "+json_store.ia7_config[i][j][k]);
-						 html += "<tr><td style='padding-left:80px'>"+k+" = "+config_data[i][j][k]+"</td></tr>";
-					}
-				//html +="<tr>";
-				} else {
-					//console.log("j      "+j+" = "+json_store.ia7_config[i][j]);
-					html += "<tr><td style='padding-left:40px'>"+j+" = "+config_data[i][j]+"</td></tr>"
-				}
-			}
-			//html +="<tr>";
-		} else {
-			//console.log("i "+i+" : "+json_store.ia7_config[i]);
-			//html += "<th>"+ String(json_store.ia7_config[i]) + "</th></tr></thead><tbody>";
-		}	
-	}
-
-	html += "</tbody></table></div>";
-	$('#prtable').html(html);
-
-}
-
-function parseLinkData (link,data) {
-
-	data = data.replace(/<link[^>]*>/img, ''); //Remove stylesheets
-	data = data.replace(/<title[^>]*>((\r|\n|.)*?)<\/title[^>]*>/img, ''); //Remove title
-	data = data.replace(/<meta[^>]*>/img, ''); //Remove meta refresh
-	data = data.replace(/<base[^>]*>/img, ''); //Remove base target tags
-				
-	if (link == "/bin/code_select.pl" || link == "/bin/code_unselect.pl") { //fix links in the code select / unselect modules
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))
-		data = data.replace(/href=\/bin\/browse.pl(.*?)>/img, function (path,r1) {
-			return 'href=/ia7/#_request=page&link=/bin/browse.pl'+r1+'&'+coll_key+',>';
-		});
-		data = data.replace(/\(<a name=.*?>back to top<\/a>\)/img, '');
-		data = data.replace(/Category Index:/img,'');
-		data = data.replace(/<a href='#.+?'>.*?<\/a>/img,'');
-		}
-	if (link == "/bin/items.pl") {
-		console.log("items data="+data);
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))		
-		data = data.replace(/href=\/bin\/items.pl/img, 'onclick="changePage()"');		
-		data = data.replace(/\(<a name=.*?>back to top<\/a>\)/img, '');
-		data = data.replace(/Item Index:/img,'');
-		data = data.replace(/<a href='#.+?'>.*?<\/a>/img,'');
-		data = data.replace(/input name='resp' value="\/bin\/items.pl"/img, 'input name=\'resp\' value=\"/ia7/#_request=page&link=/bin/items.pl&'+coll_key+'\"');
-		
-	}
-	if (link == "/bin/iniedit.pl") {
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))	
-		data = data.replace(/<input type=submit name=\"Switch\" value=\"Switch\">/img, '');	
-		data = data.replace(/<input type=submit name=\"Reset Values\" value=\"Reset Values\">/img,'');
-		data = data.replace(/<a href=\"\/bin\/iniedit.pl\">Back<\/a>/img,'<a onclick=\"changePage()\">Back<\/a>');
-	
-		//replace the back button with a reload
-	}	
-	if (link == "/bin/triggers.pl") { //fix links in the triggers modules
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))
-		//data = data.replace(/href=\/bin\/triggers.pl/img, 'href=/ia7/#_request=page&link=/bin/triggers.pl&'+coll_key);
-		data = data.replace(/href=\/bin\/triggers.pl/img, 'onclick="changePage()"');
-		data = data.replace(/\(<a name=.*?>back to top<\/a>\)/img, '');
-		data = data.replace(/Trigger Index:/img,'');
-		data = data.replace(/<a href='#.+?'>.*?<\/a>/img,'');
-		//data = data.replace(/onChange=\'form.submit\(\)\'/img,'onChange=\'this\.form\.submit\(\)\'');
-		data = data.replace(/input name='resp' value="\/bin\/triggers.pl"/img, 'input name=\'resp\' value=\"/ia7/#_request=page&link=/bin/triggers.pl&'+coll_key+'\"');
-		//console.log(data);
-	}				
-	if (link == "/ia5/news/main.shtml") { //fix links in the email module 1
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))
-		data = data.replace(/<a href='\/email\/latest.html'>Latest emails<\/a>/img,'');
-		data = data.replace(/href=\/email\/(.*?)>/img, function (path,r1) {
-			return 'href=/ia7/#_request=page&link=/email/'+r1+'&'+coll_key+',>';
-		});
-		data = data.replace(/<a href=\"SET;&dir_index\(.*?\)\">(.*?)<\/a>/img, function (path,r1,r2) {
-			return r1;
-		});
-		data = data.replace(/href='RUN;\/ia5\/news\/main.shtml\?Check_for_e_mail'/img, 'class="btn-voice-cmd" voice_cmd="Check_for_e_mail"');				
-	}
-	if (link.indexOf('/email/') === 0) { //fix links in the email module 2
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))
-		data = data.replace(/<a href='#top'>Previous<\/a>.*?<br>/img, '');
-		data = data.replace(/<a name='.*?' href='#top'>Back to Index<\/a>.*?<b>/img,'<b>');
-		data = data.replace(/href='#\d+'/img,'');
-	}
-	if (link.indexOf('/comics/') === 0) { //fix links in the comics module
-		var coll_key = window.location.href.substr(window.location.href.indexOf('_collection_key'))				
-		data = data.replace(/<a href="(.*?)">(.*?)<\/a>/img,function (path,r1,r2) {
-			return '<a href=/ia7/#_request=page&link=/comics/'+r1+'&'+coll_key+',>'+r2+'</a>';
-		});	
-		data = data.replace(/<img src="(.*?)"/img,function (path,r1) {
-			return '<img src="/comics/'+r1+'"';
-		});							
-	}			
-	data = data.replace(/href="\/bin\/SET_PASSWORD"/img,'onclick=\'authorize_modal("0")\''); //Replace old password function
-	data = data.replace(/href="\/SET_PASSWORD"/img,'onclick=\'authorize_modal("0")\''); //Replace old password function 
-//TODO clean up this regex?
-	data = data.replace(/href=SET_PASSWORD/img,'onclick=\'authorize_modal("0")\''); //Special case, setup Mr.House without being logged in 
-
-
-	$('#row_page').html(data);
-	$('#mhresponse').submit( function (e) { //allow for forms with id=mhresponse to show data returned in modal
-		e.preventDefault();
-		var form = $(this);
-        var btn = $(this).find("input[type=submit]:focus" );
-        var form_data = $(this).serializeArray();
-  		if (btn.attr('name') !== undefined) {
-  			form_data.push({name : btn.attr('name'), value : btn.attr('value')});
-  		}		
-		console.log("MHResponse Custom submit function "+ form.attr('action'));
- 		console.log( $(this).serializeArray() );
-  		console.log( "btn: "+btn.attr('name')+"="+btn.attr('value'));
-//  		if (btn.attr('value') !== undefined) {
-//  			console.log("executing data!");
-// unless the btn attribute has a name, then don't push the data (prevent text fields
-			$.ajax({
-				type: "POST",
-				url: form.attr('action'),
-				data: form_data,
-				success: function(data){
-					console.log(data)
-					data = data.replace(/<link[^>]*>/img, ''); //Remove stylesheets
-					data = data.replace(/<title[^>]*>((\r|\n|.)*?)<\/title[^>]*>/img, ''); //Remove title
-					data = data.replace(/<meta[^>]*>/img, ''); //Remove meta refresh
-					data = data.replace(/<base[^>]*>/img, ''); //Remove base target tags
-
-					var start = data.toLowerCase().indexOf('<body>') + 6;
-					var end = data.toLowerCase().indexOf('</body>');
-
-					if (form.attr('action') === "/bin/triggers.pl?add" && ! data.match(/Not authorized to make updates/))  {
-						//location.reload();
-						changePage();
-					} else if (form.attr('action') === "/bin/iniedit.pl") {
-//						var pdata = parseLinkData("/bin/iniedit.pl",data);
-						parseLinkData("/bin/iniedit.pl",data);
-//						$('#row_page').html(pdata);
-//TODO parse data							 
-					} else {
-						$('#lastResponse').find('.modal-body').html(data.substring(start, end));
-						$('#lastResponse').modal({
-							show: true
-						});
-					}
-				}
-			});
-//		}
-	});
-	$('#mhresponse :input:not(:text)').change(function() {
-//TODO - don't submit when a text field changes
-	console.log("in input not text");
-		$('#mhresponse').submit();
- 	});			
-	$('#mhexec a').click( function (e) {
-		e.preventDefault();
-		var url = $(this).attr('href');
-		url = url.replace(/;(.*?)\?/,'?');
-//		console.log("MHExec " + url);
-		$.get( url, function(data) {
-//			var start = data.toLowerCase().indexOf('<body>') + 6;
-//			var end = data.toLowerCase().indexOf('</body>');
-//			$('#lastResponse').find('.modal-body').html(data.substring(start, end));
-//			$('#lastResponse').modal({
-//				show: true
-//			});
-		});
-		changePage();
-	});
-}
-
-
 function loadVars (){ //variables list
 	var URLHash = URLToHash();
 	$.ajax({
@@ -586,8 +352,6 @@ var loadList = function() {
 			
 			// Sort that list if a sort exists, probably exists a shorter way to
 			// write the sort
-			// Sorting code removed. Original design idea that buttons could be moved
-			// Around by the end user. Possible function for the future.
 //			if (sort_list !== undefined){
 //				entity_list = sortArrayByArray(entity_list, sort_list);
 //			}
@@ -598,7 +362,7 @@ var loadList = function() {
 					// This is not an entity, likely a value of the root obj
 					continue;
 				}
-				if (json_store.objects[entity].hidden !== undefined){
+				if (json_store.objects[entity].hidden != undefined){
 					// This is an entity with the hidden property, so skip it
 					continue;
 				}
@@ -620,8 +384,8 @@ var loadList = function() {
 						button_html += '<div class="leadcontainer">';
 						button_html += '<button type="button" class="btn btn-default dropdown-lead btn-lg btn-list btn-voice-cmd navbutton-padding">'+button_text_start + "<u>" + options[0] + "</u>" + button_text_end+'</button>';
 						button_html += '</div>';
-						button_html += '<button type="button" class="btn btn-default btn-lg dropdown-toggle pull-right btn-list-dropdown navbutton-padding" data-toggle="dropdown">';						
-						button_html += '<span class="caret dropdown-caret"></span>';
+						button_html += '<button type="button" class="btn btn-default btn-lg dropdown-toggle pull-right btn-list-dropdown navbutton-padding" data-toggle="dropdown">';
+						button_html += '<span class="caret"></span>';
 						button_html += '<span class="sr-only">Toggle Dropdown</span>';
 						button_html += '</button>';
 						button_html += '<ul class="dropdown-menu dropdown-voice-cmd" role="menu">';
@@ -673,6 +437,7 @@ var loadList = function() {
 					var dbl_btn = "";
 					if (json_store.ia7_config.prefs.always_double_buttons == "yes") {
 						if (name.length < 30) dbl_btn = "<br>"; 
+			//			if (json_store.objects[entity].state == undefined) dbl_btn += "<br>";
 					}
 					// direct control item, differentiate the button
 					var btn_direct = "";
@@ -729,14 +494,16 @@ var loadList = function() {
 				var entity = $(this).attr("entity");
 				if (json_store.ia7_config.objects !== undefined && json_store.ia7_config.objects[entity] !== undefined) {
                 	if (json_store.ia7_config.objects[entity].direct_control !== undefined && json_store.ia7_config.objects[entity].direct_control == "yes") {
+                         //console.log("This is a direct control object "+entity+" state="+json_store.objects[entity].state+" length="+json_store.objects[entity].states.length);
                          var new_state = "";
                          var possible_states = 0;
                          for (var i = 0; i < json_store.objects[entity].states.length; i++){
                          	if (filterSubstate(json_store.objects[entity].states[i]) == 1) continue;
+                         	//console.log("state "+i+" is "+json_store.objects[entity].states[i])
                          	possible_states++;
-				if (json_store.objects[entity].states[i] !== json_store.objects[entity].state) new_state = json_store.objects[entity].states[i];
-
+                         	if (json_store.objects[entity].states[i] !== json_store.objects[entity].state) new_state = json_store.objects[entity].states[i]
                          	}
+                        //console.log("End states = "+i+" new_state="+new_state)
 						if ((possible_states > 2) || (new_state == "")) alert("Check configuration of "+entity+". "+possible_states+" states detected for direct control object. State is "+new_state);
 						url= '/SET;none?select_item='+entity+'&select_state='+new_state;
 						$.get( url);
@@ -750,7 +517,7 @@ var loadList = function() {
 			$(".btn-state-cmd").mayTriggerLongClicks().on( 'longClick', function() {		
 				var entity = $(this).attr("entity");
 				create_state_modal(entity);
-			});						
+			});			
 			
 		}
 	});
@@ -761,31 +528,14 @@ var loadList = function() {
 
 var getButtonColor = function (state) {
 	var color = "default";
-	if (state == "on" || state == "open" || state == "disarmed" || state == "unarmed" || state == "ready" || state == "dry" || state == "up" || state == "100%" || state == "online" || state == "unlocked") {
+	if (state == "on" || state == "open" || state == "disarmed" || state == "unarmed" || state == "ready" || state == "dry" || state == "up" || state == "100%" || state == "online") {
 		 color = "success";
-	} else if (state == "motion" || state == "closed" || state == "armed" || state == "wet" || state == "fault" || state == "down" || state == "offline" || state == "locked") {
+	} else if (state == "motion" || state == "closed" || state == "armed" || state == "wet" || state == "fault" || state == "down" || state == "offline") {
 		 color = "danger";
 	} else if (state == undefined || state == "unknown" ) {
-		 color = "purple";
-	} else if (state == "low" || state == "med" || state.indexOf('%') >= 0 || state == "light" || state == "heating" || state == "heat") { 
-		 color = "warning";
-	} else if (state == "cooling" || state == "cool") {
 		 color = "info";
-	}
-	if (json_store.ia7_config.state_colors !== undefined
-            && json_store.ia7_config.state_colors[state] !== undefined) {
-		color = "purple";
-		if (json_store.ia7_config.state_colors[state] == "green") {
-			color = "success";
-		} else if (json_store.ia7_config.state_colors[state] == "red") {
-			color = "danger";
-		} else if (json_store.ia7_config.state_colors[state] == "blue") {
-			color = "info";
-		} else if (json_store.ia7_config.state_colors[state] == "orange") {
-			color = "warning";
-		} else if (json_store.ia7_config.state_colors[state] == "default") {
-			color = "default";
-		}
+	} else if (state == "low" || state == "med" || state.indexOf('%') >= 0 || state == "light") { 
+		 color = "warning";
 	}
 	return color;
 };
@@ -911,17 +661,19 @@ var updateItem = function(item,link,time) {
 	//URLHash.time = json_store.meta.time;
 	if (updateSocket !== undefined && updateSocket.readyState != 4){
 		// Only allow one update thread to run at once
-		//console.log("updateItem: Aborting update. updateSocket="+updateSocket.readyState);
 		updateSocket.abort();
 	}
 	if (time === undefined) {
 		time = "";
 	}
 	var path_str = "/objects"  // override, for now, would be good to add voice_cmds
+	//arg_str=link=%2Fia7%2Fhouse%2Fgarage.shtml&fields=state%2Ctype&long_poll=true&time=1426011733833.94
+	//arg_str = "fields=state,states,label&long_poll=true&time="+time;
 	var arg_str = "fields=state,states,label,state_log&long_poll=true&items="+item+"&time="+time;
+	//alert("path_str="+path_str+" arg_str="+arg_str)
 	updateSocket = $.ajax({
 		type: "GET",
-		url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",		
+		url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",
 		dataType: "json",
 		success: function( json, textStatus, jqXHR) {
 			var requestTime = time;
@@ -1023,29 +775,6 @@ var updateStaticPage = function(link,time) {
 	});  
 }
 
-function authDetails() {
-	if (json_store.collections[700] == undefined) {
-		alert("Warning, Collection ID 700: Authorize, is not defined in your collections.json!");
-	} else {
-		if (json_store.collections[700].user !== undefined) {
-//			console.log ("user found "+json_store.collections[700].user+".");
-   			if (json_store.collections[700].user == "0") {
-    			json_store.collections[700].name = "Log in";
-    			json_store.collections[700].icon = "fa-lock";
-    			authorized = false;
-   				$(".fa-gear").css("color", "red");
-   			} else {
-    			json_store.collections[700].name = "Log out "+json_store.collections[700].user+"...";
-    			json_store.collections[700].icon = "fa-unlock";   		   		
-    			authorized = true;
-    			$(".fa-gear").css("color", "green");
-    			if (json_store.collections[700].user == "admin") {
-        			$(".fa-gear").css("color", "purple");
-				}
-   			}
-   		}
-   	}
-}
 	
 //Prints all of the navigation items for Ia7
 var loadCollection = function(collection_keys) {
@@ -1058,18 +787,9 @@ var loadCollection = function(collection_keys) {
 	if (entity_sort.length <= 0){
 		entity_arr.push("Childless Collection");
 	}
-//	if (json_store.collections[700] == undefined) {
-//		alert("Warning, Collection ID 700: Authorize, is not defined in your collections.json!");
-//	} else {
-//		authDetails();
-//	}
-
 	for (var i = 0; i < entity_sort.length; i++){
 		var collection = entity_sort[i];
-//		console.log ("col="+collection);
 		if (!(collection in json_store.collections)) continue;
-//		console.log ("starting");
-
 		var link = json_store.collections[collection].link;
 		var icon = json_store.collections[collection].icon;
 		var name = json_store.collections[collection].name;
@@ -1122,17 +842,8 @@ var loadCollection = function(collection_keys) {
 				link = json_store.collections[collection].external;
 			}
 			var icon_set = "fa";
-			var button_html;
 			if (icon.indexOf("wi-") !=-1) icon_set = "wi";
-			if (json_store.collections[collection].response_modal !== undefined && json_store.collections[collection].response_modal == "true") {
-				var reload_modal = "false";
-				if (json_store.collections[collection].reload_modal !== undefined) {
-					reload_modal = json_store.collections[collection].reload_modal;
-				}
-				button_html = "<a link-type='collection' modal='"+link+"' reload_modal='"+reload_modal+"' class='btn btn-default btn-lg btn-block btn-list btn-resp-modal "+hidden+" navbutton-padding' role='button'><i class='"+icon_set+" "+icon+" icon-larger fa-2x fa-fw'></i>"+name+"</a>";
-			} else {			
-				button_html = "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list "+hidden+" navbutton-padding' role='button'><i class='"+icon_set+" "+icon+" icon-larger fa-2x fa-fw'></i>"+name+"</a>";
-			}
+			var button_html = "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list "+hidden+" navbutton-padding' role='button'><i class='"+icon_set+" "+icon+" icon-larger fa-2x fa-fw'></i>"+name+"</a>";
 			entity_arr.push(button_html);
 		}
 	}
@@ -1157,22 +868,12 @@ var loadCollection = function(collection_keys) {
 	// if any items present, then create modals and activate updateItem...
 	if (items !== "") {
 		items = items.slice(0,-1); //remove last comma
+		//console.log("items="+items);
 		$('.btn-state-cmd').click( function () {			
 			var entity = $(this).attr("entity");
+			//console.log("entity="+entity);
 			create_state_modal(entity);
 		});
-		$('.btn-resp-modal').click( function () {			
-			var url = $(this).attr('href');
-			alert("resp-model. opening url="+url);
-			$.get( url, function(data) {
-				var start = data.toLowerCase().indexOf('<body>') + 6;
-				var end = data.toLowerCase().indexOf('</body>');
-				$('#lastResponse').find('.modal-body').html(data.substring(start, end));
-				$('#lastResponse').modal({
-					show: true
-				});
-			});
-		});		
 // test multiple items at some point
 		updateItem(items);
 	}	
@@ -1194,19 +895,6 @@ function buildLink (link, collection_keys){
 	return link;
 }
 
-//Called froms static pages. Grabs collection key from URL to modify static href="/ia7" links
-function fixIA7Nav() {
-
-	var url = $(location).attr('href');
-	var collid = url.split("_collection_key=");
-	console.log("fixing nav..."+url+" "+collid[1]);
-	$('a').each(function() {
-		if ($(this).attr('href').match("^/ia7/")) {
-  			this.href += '&_collection_key='+collid[1]+',';
-  		}
-	});
-}
-
 //Outputs a constantly updating print log
 var print_log = function(type,time) {
 
@@ -1255,103 +943,6 @@ var print_log = function(type,time) {
 };
 
 
-var get_notifications = function(time) {
-	if (time === undefined) time = new Date().getTime();
-	if (updateSocketN !== undefined && updateSocketN.readyState != 4){
-		// Only allow one update thread to run at once
-		console.log ("Notify aborted "+updateSocketN.readyState);
-		updateSocketN.abort();
-	}
-	var arg_str = "long_poll=true&time="+time;	
-	var path_str = "/notifications";
-	updateSocketN = $.ajax({
-		type: "GET",
-		url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",		
-		dataType: "json",
-		success: function( json, statusText, jqXHR ) {
-			var requestTime = time;	
-			if (jqXHR.status == 200) {
-				if (json.data !== undefined) {
-					for (var i = 0; i < json.data.length; i++){
-						var url = String(json.data[i].url);
-						var mode = String(json.data[i].mode);
-						var text = String(json.data[i].text);
-						var type = String(json.data[i].type);
-						var color = String(json.data[i].color);
-
-						if ((type == "sound" ) || ((type == "speech") && (speech_sound == "yes"))) {
-							audio_play(document.getElementById('sound_element'),url)	
-						}
-						if (type == "banner" || ((type == "speech") && (speech_banner == "yes"))) {
-							var alert_type = "info";
-							if (color !== undefined) {
-								if (color == "green") {
-									alert_type = "success";
-								} else if (color == "red") {
-									alert_type = "danger";
-								} else if (color == "yellow") {
-									alert_type = "warning";
-								}
-							}
-							var mobile = "";
-							if ($(window).width() <= 768) { // override the responsive mobile top-buffer
-							  mobile = "mobile-alert";
-							  //console.log ("mobile notification");
-							}
-							$("#alert-area").append($("<div class='alert-message alert alerts "+mobile+" alert-" + alert_type + " fade in' data-alert><p><i class='fa fa-info-circle'></i><strong>  Notification:</strong> " + text + " </p></div>"));
-   	 						$(".alert-message").delay(4000).fadeOut("slow", function () { $(this).remove(); });
-						}
-						if (type == "alert") {
-							jAlert(text,'MH Notifications');
-						}
-					}
-				}
-				requestTime = json.meta.time;				
-			}
-			if (jqXHR.status == 200 || jqXHR.status == 204) {
-					get_notifications(requestTime);
-				}
-		}
-	});
-};
-
-var mobile_device = function() {
-	//placeholder to turn on webaudio in the future
-	var device = "no";
-	if (navigator.userAgent.match(/(iPod|iPhone|iPad)/))
-		device = "ios";
-	if (navigator.userAgent.match(/Android/))
-		device = "android";
-	return device;
-}
-
-function audio_play(audioElement,srcUrl)
-{
-  //console.log ("in audio_play:"+srcUrl);
-  audioElement.pause();
-  audioElement.src=''; //force playback to stop and quit buffering. Not sure if this is strictly necessary.
-  $("#sound_element2").attr("src", srcUrl);  //needed for mobile
-  audioElement.src=srcUrl;
-  audioElement.currentSrc=srcUrl;
-  audioElement.load();
-  playWhenReady();
-}
-
-function playWhenReady()
-{//wait for media element to be ready, then play
-  audioElement=document.getElementById('sound_element');
-  var audioReady=audioElement.readyState;
-  //console.log("playWhenReady = "+audioReady);
-  if(audioReady>2) {
-    audioElement.play();
-  } else if(audioElement.error) {
-      var errorText=['(no error)','User interrupted download','Network error caused interruption','Miscellaneous problem with media data','Cannot actually decode this media'];
-      console.log("Something went wrong!\n"+errorText[audioElement.error.code]);
-  } else { //check for media ready again in half a second
-      setTimeout(playWhenReady,500);
-  }
-}
-
 //Creates a table based on the $json_table data structure. desktop & mobile design
 var display_table = function(table,records,time) {
 
@@ -1409,6 +1000,7 @@ var display_table = function(table,records,time) {
 				$('#rtable').html(html);
 				if (json_store.ia7_config.prefs.enable_data_table_more !== undefined && json_store.ia7_config.prefs.enable_data_table_more === "yes") {
 					if (json.data.hook !== undefined && $('#more_row').length === 0) { //there is an option to pull more data
+						//console.log("More Data!"+$('#more_row').length);
 						$('#display_table').append("<div id='more_row' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-xs-11 col-xs-offset-0'>");
 						$('#more_row').append('<div class="table_more"><button class="btn btn-default toolbar-right-end right-end pull-right table_btn_more" type="button">');
 						$('.table_btn_more').append('next  <i class="fa fa-caret-right"></i>');
@@ -1434,6 +1026,7 @@ var display_table = function(table,records,time) {
 };
 
 
+//Creates a table based on the $json_table data structure. desktop & mobile design
 var graph_rrd = function(start,group,time) {
 
 	var URLHash = URLToHash();
@@ -1442,6 +1035,7 @@ var graph_rrd = function(start,group,time) {
 		$('#top-graph').append("<div id='rrd-periods' class='row'>");
 		$('#top-graph').append("<div id='rrd-graph' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-xs-11 col-xs-offset-0'>");
 		$('#top-graph').append("<div id='rrd-legend' class='rrd-legend-class'><br>");
+	//	$('#top-graph').append("<div id='legend class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2 col-xs-11 col-xs-offset-0'><br><br>");
 
 		time = 0;
 	}
@@ -1453,12 +1047,10 @@ var graph_rrd = function(start,group,time) {
 		updateSocket.abort();
 	}	
 	var path_str = "/rrd"  
-	//var arg_str = "start="+start+"&group="+group+"&long_poll=true&time="+time;
-	var arg_str = "start="+start+"&group="+group+"&time="+time;
+	var arg_str = "start="+start+"&group="+group+"&long_poll=true&time="+time;
 	updateSocket = $.ajax({
 		type: "GET",
-		//url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",
-		url: "/json"+path_str+"?"+arg_str,		
+		url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",
 		dataType: "json",
 		success: function( json, statusText, jqXHR ) {
 			var requestTime = time;
@@ -1475,10 +1067,12 @@ var graph_rrd = function(start,group,time) {
 				var dropdown_current = "Unknown  ";
 
 				$.each(json.data.periods, function(key, value) {
+    				//console.log(key, value);
     				if (start === value.split(",")[1]) {
     					dropdown_current = value.split(",")[0]+"  ";
     				} else {
     					dropdown_html_list += '<li><a href="javascript: void(0)" id="rrdperiod_'+key+'" ';
+    					//dropdown_html_list += 'onclick=graph_rrd('+value.split(",")[1]+','+group+','+time+');';
     					dropdown_html_list += '>'+value.split(",")[0]+'</a></li>';
  
     				}
@@ -1488,16 +1082,6 @@ var graph_rrd = function(start,group,time) {
 				dropdown_html += '</ul></div>';
 				
 				$('#rrd-periods').append(dropdown_html);
-				
-				var last_timestamp = "unavailable";
-				if (json.data.last_update !== undefined) {
-					last_timestamp = new Date(json.data.last_update);
-				}
-				//Update the footer database updated time
-				console.log ("Last Updated:"+last_timestamp);
-				$('#Last_updated').remove();		
-				$('#footer_stuff').prepend("<div id='Last_updated'>RRD Database Last Updated:"+last_timestamp+"</div>");
-				
 
 				$('.dropdown').on('click', '.dropdown-menu li a', function(e){
 					e.stopPropagation();
@@ -1516,6 +1100,7 @@ var graph_rrd = function(start,group,time) {
 
 					// put the selection list on the side.
 				for (var i = 0; i < json.data.data.length; i++){
+					//console.log("selection="+json.data.data[i].label);
 					var legli = $('<li style="list-style:none;"/>').appendTo('#rrd-legend');
 					$('<input name="' + json.data.data[i].label + '" id="' + json.data.data[i].label + '" type="checkbox" checked="checked" />').appendTo(legli);
 					$('<label>', {
@@ -1543,14 +1128,14 @@ var graph_rrd = function(start,group,time) {
 		
 				window.onresize = function(){
     				var base_width = $(window).width();
-   					//if (base_width > 990) base_width = 990;
-   					// styling changes @992, so then add a 30 right and left margin
+   					if (base_width > 990) base_width = 990;
    					var graph_width = base_width - 200; //give some room for the legend
 					if (base_width < 701) {
 						//put legend below graph
 						graph_width=base_width; // - 10;
 					} 
     				$('#rrd-graph').css("width",graph_width+"px");
+    				//console.log("base="+base_width+" graph="+graph_width);
     				$('#rrd-graph').text(''); 
     				$('#rrd-graph').show(); //check
     				plotAccordingToChoices();
@@ -1599,6 +1184,8 @@ var graph_rrd = function(start,group,time) {
 
 				$('.legendColorBox > div > div').each(function(i){
 					var color = $(this).css("border-left-color");
+					//console.log("color="+color);
+    				//$(this).clone().prependTo($('#rrd-legend').find("li").eq(i));
     				$('#rrd-legend').find("li").eq(i).prepend('<span style="width:4px;height:4px;border: 0px;background: '+color+';">&nbsp;&nbsp;&nbsp;</span>&nbsp');
 					});
 				requestTime = json.meta.time;
@@ -1617,601 +1204,247 @@ var graph_rrd = function(start,group,time) {
 	});
 };
 
-/////////////// Floorplan //////////////////////////////////////////////////////////
-var fp_display_width=0; // updated by fp_resize_floorplan_image
-var fp_display_height=0; // updated by fp_resize_floorplan_image
-var fp_scale = 100; // updated by fp_reposition_entities
-var fp_grabbed_entity = null; // store item for drag & drop
-var fp_icon_select_item_id = null; // store item id on right click for icon set selection
-
-var noDragDrop = function() {
-    return false;
-};
-
-var fp_getOrCreateIcon = function (json, entity, i, coords, show_pos){
-    var popover = 0;
-    if ((json.data[entity].type === "FPCamera_Item") || (json_store.ia7_config.prefs.fp_state_popovers === "yes"))
-        popover = 1;
-
-    var popover_html = "";
-    if (popover)
-        popover_html = 'data-toggle="popover" data-trigger="focus" tabindex="0"';
-
-    var entityId = 'entity_'+entity+'_'+i;
-    if ($('#' + entityId).length === 0) {
-        var html = '<span style="display: inline-block">'  + // this span somehow magically make resizing the icons work
-                '<a title="'+entity+'"><img '+popover_html+' ' +
-                'id="'+entityId+'"' +
-                'class="entity='+entityId+' floorplan_item coords='+coords+'" '+
-                '"></img></a>'+
-                '</span>';
-        if (coords !== ""){
-            $('#graphic').append(html);
-        }
-        else {
-            $('#fp_positionless_items').append(html);
-        }
-    }
-    var E = $('#'+entityId);
-    E.bind("dragstart", noDragDrop);
-    var image = get_fp_image(json.data[entity]);
-    E.attr('src',"/ia7/graphics/"+image);
-    if (show_pos)
-        E.css("border","1px solid black");
-
-    return E;
-};
-
-var fp_resize_floorplan_image = function(){
-    var floor_width = $("#fp_graphic").width();
-    $("#fp_graphic").attr("width", "1px");
-
-    fp_display_width = $("#graphic").width();
-    console.log("FP: resize "+ floor_width + " => " + fp_display_width);
-    $('#fp_graphic').attr("width",fp_display_width+"px");
-    fp_display_height = $("#fp_graphic").height();
-};
-
-var fp_reposition_entities = function(){
-    var t0 = performance.now();
-    var offset = $("#fp_graphic").offset();
-    var width = fp_display_width;
-    var hight = fp_display_height;
-    var onePercentWidthInPx = width/100;
-    var onePercentHeightInPx = hight/100;
-    var fp_get_offset_from_location = function(item) {
-        var y = item[0];
-        var x = item[1];
-        var newy = offset.top +  y * onePercentHeightInPx;
-        var newx = offset.left +  x * onePercentWidthInPx;
-        return {
-            "top": newy,
-            "left": newx
-        };
-    };
-    var nwidth = $("#fp_graphic").get(0).naturalWidth;
-    fp_scale = Math.round( width/nwidth * 100);
-
-    // update the location of all the objects...
-    $(".floorplan_item").each(function(index) {
-        var classstr = $(this).attr("class");
-        var coords = classstr.split(/coords=/)[1];
-        $(this).width(fp_scale + "%");
-
-        if (coords.length === 0){
-            return;
-        }
-        var fp_location = coords.split(/x/);
-        var fp_offset =  fp_get_offset_from_location(fp_location);
-
-        // this seems to make the repositioning slow
-        // ~ 300+ms on my nexus7 firefox-beta vs <100ms with this code commented out
-        // var baseimg_width = $("#fp_graphic").width();
-        // if (baseimg_width < 500) {
-        //     $(this).attr('src',$(this).attr('src').replace('48.png','32.png'));
-        // } else {
-        //     $(this).attr('src',$(this).attr('src').replace('32.png','48.png'));
-        // }
-
-        var adjust = $(this).width()/2;
-        var fp_off_center = {
-            "top":  fp_offset.top - adjust,
-            "left": fp_offset.left - adjust
-        };
-        fp_set_pos($(this).attr('id'), fp_off_center);
-    });
-
-	$('.icon_select img').each(function(){
-        $(this).width(fp_scale + "%");
-	});
-    var t1 = performance.now();
-    console.log("FP: reposition and scale: " +Math.round(t1 - t0) + "ms ");
-};
-
-var fp_set_pos = function(id, offset){
-    var item =  $('#' + id);
-    // do not move the span, this make the popup to narrow somehow
-    // item.closest("span").offset(offset);
-    item.offset(offset);
-};
-
-var fp_is_point_on_fp = function (p){
-    var offset = $("#fp_graphic").offset();
-    var width = $("#fp_graphic").width();
-    var height = $("#fp_graphic").height();
-    if (p.top < offset.top)
-        return false;
-    if (p.top > offset.top + height)
-        return false;
-    if (p.left < offset.left)
-        return false;
-    if (p.left > offset.left + width)
-        return false;
-
-    return true;
-};
-
 var floorplan = function(group,time) {
-    var URLHash = URLToHash();
-    var baseimg_width;
-    if (typeof time === 'undefined'){
-        //var window_width = $(window).width();
-        $('#list_content').html("<div id='floorplan' class='row top-buffer'>");
-        if (developer){
-            // add elememnts to show current position on floorplan
-            $('#floorplan').append("<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'><ol>" +
-                    "<li>grab icon and drop it on apropriate position on the flooplan</li>" +
-                    "<li>right click item to select another iconset</li>"+
-                    "<li>to remove the item from the perl code drop it besides the fp background image</li>"+
-                    "<li>repeat 1/2/3 for all items you'd like to change</li>"+
-                    "<li>copy the generated perl code into your usercode file</li>" +
-                    "</ol>" +
-                    "<center>y,x = <span id='debug_pos'></span>" +
-                    "</center></div>");
-        }
-        $('#floorplan').append("<div id='graphic' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>");
-        time = 0;
-        $('#graphic').prepend('<center><img id="fp_graphic" border="1"  /></center>');
-        if (URLHash.show_pos){
-            $('#fp_graphic').css("border","1px solid black");
-            $('#list_content').append("<div id='fp_positionless_items' />");
-            $('#list_content').append("<pre id='fp_pos_perl_code' />");
-        }
-        $('#fp_graphic').bind("load", function () {
-            console.log("FP: background loaded.");
-            fp_resize_floorplan_image();
-            floorplan(group, time);
-        });
-        var base_img_dir = '/ia7/graphics/floorplan';
-		if (json_store.ia7_config.prefs.floorplan_basedir !== undefined) base_img_dir = json_store.ia7_config.prefs.floorplan_basedir;
-        $('#fp_graphic').attr("src", base_img_dir+'-'+group+'.png');
-        return;
-    }
-
-    if (updateSocket !== undefined && updateSocket.readyState !== 4){
-        // Only allow one update thread to run at once
-        updateSocket.abort();
-    }
-
-    if (developer){
-        // update positon
-
-        $(document).mousemove(function(e){
-            var offset = $("#fp_graphic").offset();
-            var width = $("#fp_graphic").width();
-            var hight = $("#fp_graphic").height();
-            var  l = e.pageX - offset.left;
-            var  t = e.pageY - offset.top;
-
-            //var pos =   Math.round((t/hight) *100) +"," + Math.round((l/width)*100);
-            var pos =  (t/hight) *100 +"," + (l/width)*100;
-            //console.log("floorplanpos: " + pos );
-            $('#debug_pos').text(pos);
-            if (fp_grabbed_entity !== null){
-                //var itemCenterOffset = Math.round(fp_grabbed_entity.width/2);
-                var itemCenterOffset = fp_grabbed_entity.width/2;
-                var newPos = {
-                    "top": e.pageY - itemCenterOffset,
-                    "left": e.pageX - itemCenterOffset
-                };
-                fp_set_pos(fp_grabbed_entity.id, newPos);
-                //console.log(fp_grabbed_entity.id +" pos: " +newPos.top + " x " + newPos.left);
-                //fp_grabbed_entity.class.replace("coords=.*", "coords="+pos);
-            }
-        });
+	var URLHash = URLToHash();
+	var baseimg_width;
+	if (typeof time === 'undefined'){
+  		$('#list_content').html("<div id='floorplan' class='row top-buffer'>");
+  		$('#floorplan').append("<div id='graphic' class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>");
+  		time = 0;
+  		$('#graphic').prepend('<center><img id="fp_graphic" width="" src="/ia7/graphics/floorplan-'+group+'.png" /></center>');
+  		baseimg_width = $(window).width();
+    	if (baseimg_width > 990) baseimg_width = 800;
+    	$('#fp_graphic').attr("width",baseimg_width+"px");
+  	}
+  	
+ 	if (updateSocket !== undefined && updateSocket.readyState != 4){
+  		// Only allow one update thread to run at once
+  		updateSocket.abort();
+ 	} 
+	//resize window if changed
+	window.onresize = function(){
+    	baseimg_width = $(window).width();
+   		if (baseimg_width > 990) baseimg_width = 800;
+    	$('#fp_graphic').attr("width",baseimg_width+"px");
+    	// update the location of all the objects...
+    	$(".floorplan_item").each(function(index) {
+    		var classstr = $(this).attr("class");
+    		var coords = classstr.split(/coords=/)[1];
+    		var fp_location = coords.split(/x/);
+    		var location = get_fp_location(fp_location,0);
+    		//alert("fp_location="+fp_location+" location="+location); 
+    		$(this).attr("style",location);
+//iphone scale
+			var baseimg_width = $(window).width();
+			if (baseimg_width < 500) {
+      			$(this).attr('src',$(this).attr('src').replace('48.png','32.png'))
+			} else {
+			    $(this).attr('src',$(this).attr('src').replace('32.png','48.png'))
+			}
 
-        $(window).mousedown(function(e){
-            if (e.which === 1 && e.target.id.indexOf("entity_") >= 0){
-                fp_grabbed_entity = e.target;
-                e.stopPropagation();
-                return true;
-            }
-        });
+		});
+	}
 
-        $(window).mouseup(function(e){
-            if (fp_grabbed_entity === null)
-                return;
+ 	var path_str = "/objects";  
+ 	var arg_str = "parents="+group+"&fields=fp_location,state,states,state_log,fp_icons,fp_icon_set,img,link,label,type&long_poll=true&time="+time;
+
+ 	updateSocket = $.ajax({
+  		type: "GET",
+  		url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",
+  		dataType: "json",
+  		success: function( json, statusText, jqXHR ) {
+   			var requestTime = time;
+    		if (jqXHR.status == 200) {
+     			JSONStore(json);
+     			for (var entity in json.data) {
+					for (var i=0 ; i < json.data[entity].fp_location.length-1; i=i+2){ //allow for multiple graphics
+						//alert("length="+json.data[entity].fp_location.length+" i="+i+" x="+json.data[entity].fp_location[i]+" y="+json.data[entity].fp_location[i+1]+" ent_length="+$('#entity_'+entity).length);
+    					var location = get_fp_location(json.data[entity].fp_location,i);
+    					var popover = 0;
+    					if ((json.data[entity].type == "FPCamera_Item") ||
+    						(json_store.ia7_config.prefs.fp_state_popovers == "yes")) popover = 1 
+    					//console.log("popover="+popover+" config="+json_store.ia7_config.prefs.fp_state_popovers)
+    					var popover_html = "";
+    					if (popover) popover_html = 'data-toggle="popover" data-trigger="focus" tabindex="0"' 
+    					
+   						var image = get_fp_image(json.data[entity]);
+      					if ($('#entity_'+entity+'_'+i).length > 0) {
+      						$('#entity_'+entity+'_'+i).attr('src',"/ia7/graphics/"+image);
+      					} else {				   					
+							$('#graphic').append('<img '+popover_html+' id="entity_'+entity+'_'+i+'" class="entity='+entity+'_'+i+' floorplan_item coords='+json.data[entity].fp_location[i]+'x'+json.data[entity].fp_location[i+1]+'" style="'+location+'" src="/ia7/graphics/'+image+'" />');
+							//create_state_modal('#entity_'+entity+i,entity); 
+						}
+						// create unique popovers for Camera items
+						if (json.data[entity].type == "FPCamera_Item") {
+							var name = entity;
+							if (json.data[entity].label !== undefined) name = json.data[entity].label
+							var a_start = "";
+							var a_end = "";
+							if (json.data[entity].link !== undefined) {
+								a_start = '<a href="'+json.data[entity].link+'">'
+								a_end = '</a>';
+							}
+							//console.log("name="+entity+" label = "+json.data[entity].label);
+							//console.log("link = "+json.data[entity].get_img);
+							$('[data-toggle="popover"]').popover({
+								placement : 'auto bottom', //placement of the popover. also can use top, bottom, left or right
+      							title : name, 
+      							html: 'true', //needed to show html of course
+      							content : '<div id="popOverBox">'+a_start+'<img src="'+json.data[entity].img+'" width="251" height="201" />'+a_end+'</div>'
+							});
+						} else {
+							if (popover) {								
+								
+								$('[data-toggle="popover"]').popover({
+									placement : 'auto bottom', //placement of the popover. also can use top, bottom, left or right
+      								title : function() {
+      									var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
+      									var name = fp_entity;
+										if (json_store.objects[fp_entity].label !== undefined) name = json_store.objects[fp_entity].label;								
+      									return name+" - "+json_store.objects[fp_entity].state;
+      									}, 
+      								html: 'true', //needed to show html of course
+      								content : function() {
+      									var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
+										var po_states = json_store.objects[fp_entity].states;
+										var html = '<div id="popOverBox">';
+										// HP need to have at least 2 states to be a controllable object...
+										if (po_states.length > 1) {
+											html = '<div class="btn-group stategrp0 btn-block">';
+											var buttons = 0;
+											var stategrp = 0;
+											for (var i = 0; i < po_states.length; i++){
+												if (filterSubstate(po_states[i]) == 1) {
+													continue 
+												} else {
+													buttons++ 
+												//}
+												if (buttons > 2) {
+													stategrp++;
+													html += "</div><div class='btn-group btn-block stategrp"+stategrp+"'>";
+													buttons = 1;
+												}
+												//console.log ("name="+fp_entity+" buttons="+buttons)
+										
+												var color = getButtonColor(po_states[i])
+//TODO disabled override
+												var disabled = ""
+												if (po_states[i] == json_store.objects[fp_entity].state) {
+													disabled = "disabled";
+												}
+												html += "<button class='btn col-sm-6 col-xs-6 btn-"+color+" "+disabled+"'"
+												var url= '/SET;none?select_item='+fp_entity+'&select_state='+po_states[i];
+												html += ' onclick="$.get('
+												html += "'"+url+"')"
+												html += '">'+po_states[i]+'</button>';
+											}
+										}
+									}
+									html += "</div></div>"
+									//console.log("html="+html)
+									return html
+								}
 
-            set_set_coordinates_from_offset(fp_grabbed_entity.id);
-            fp_reposition_entities();
-            fp_grabbed_entity = null;
-        });
+								});
+							} else {
+								$('#entity_'+entity+'_'+i).click( function () {
+									//var fp_entity = $(this).attr("id").split(/entity_/)[1]; //
+									var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
+									//alert("entity="+fp_entity);
+									create_state_modal(fp_entity);
+								});	
+							}
+							$('#entity_'+entity+'_'+i).mayTriggerLongClicks().on( 'longClick', function() {		
+									var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
+									create_state_modal(fp_entity);
+							});	
+						}
+ 					}
+ 				}
+    			requestTime = json.meta.time;
+   			 }
+   			if (jqXHR.status == 200 || jqXHR.status == 204) {
+    		//Call update again, if page is still here
+    		//KRK best way to handle this is likely to check the URL hash
+    			if ($('#floorplan').length !== 0){
+     				//If the floorplan page is still active request more data
+     				floorplan(group,requestTime);
+    			}
+    		}
+   		}  
+ 	});
+};
 
-    }
+//have to figure out height, and the jumps at 991 and 1200
+var get_fp_location = function(item,index) {
+	var baseimg_width = $(window).width();
+	//var baseimg_height = $(window).height() - 60;
+	var baseimg_height = $('#fp_graphic').height();	
+	var tmargin = 0;
+	var lmargin = 0;
+  	//console.log("baseimg_width="+baseimg_width+"baseimg_height="+baseimg_height+" h2="+baseimg_height2); 
+  	if (baseimg_width > 990) {
+  		lmargin = (baseimg_width - 980) / 2;
+  		tmargin = 20;
+  		if (baseimg_width > 1200) {
+  			lmargin = (baseimg_width - 1180) / 2;
+  		}
+  		baseimg_width = 800;
 
-    var set_set_coordinates_from_offset = function (id)
-    {
-        var E = $('#'+id);
-        var offsetE = E.offset();
-        offsetE.top += E.width()/2;
-        offsetE.left += E.width()/2;
-        var offsetP = $("#fp_graphic").offset();
-        var width = fp_display_width;
-        var hight = fp_display_height;
-        var onePercentWidthInPx = width/100;
-        var onePercentHeightInPx = hight/100;
-
-        var newy =  (offsetE.top - offsetP.top) / onePercentHeightInPx;
-        var newx =  (offsetE.left - offsetP.left) / onePercentWidthInPx;
-        var coords = newy+"x"+newx;
-        var name = id.match(/entity_(.*)_(\d)+$/)[1];
-        var codeLines = $("#fp_pos_perl_code").text().split('\n');
-        var newCode = "";
-        if (fp_is_point_on_fp(offsetE) === false){
-            E.attr("class", "entity="+id+" floorplan_item coords=");
-            E.attr("src", "/ia7/graphics/fp_unknown_info_48.png");
-            for (var i = 0; i< codeLines.length; i++)
-            {
-                var line = codeLines[i];
-                if (line.startsWith("$"+name) === false && line !== "")
-                {
-                    newCode += line + "\n";
-                }
-            }
-        }
-        else{
-            E.attr("class", "entity="+id+" floorplan_item coords="+coords);
-            var coordIdx = id.match(/entity_(.*)_(\d)+$/)[2];
-
-            var itemUpdated = false;
-            for (var i = 0; i< codeLines.length; i++)
-            {
-                var line = codeLines[i];
-                if (line.startsWith("$"+name+"->set_fp_location"))
-                {
-                    var m = line.match(/.*\((.*)\).*/);
-                    oldCoords = m[1].split(",");
-                    oldCoords[+coordIdx] = newy;
-                    oldCoords[+coordIdx+1] = newx;
-                    var newline = "$" + name + "->set_fp_location("+ oldCoords.join(",") + ");\n";
-                    newCode += newline;
-                    itemUpdated = true;
-                }
-                else if (line !== "")
-                {
-                    newCode += line + "\n";
-                }
-            }
-            if (itemUpdated === false)
-            {
-                var newline = "$" + name + "->set_fp_location("+ newy +","+ newx + ");\n";
-                newCode += newline;
-            }
-        }
-        newCode = newCode.split('\n').sort().join('\n');
-        $("#fp_pos_perl_code").text(newCode);
-    };
-
-    // reposition on window size change
-    window.onresize = function(){
-        if ($('#floorplan').length === 0)
-        {
-            window.onresize = null;
-            return;
-        }
+  	}
+  	var location = "position: absolute; ";
+  	var top = parseInt((baseimg_height * item[index] / 100)+tmargin);
+  	var left = parseInt((baseimg_width * item[index+1] / 100)+lmargin);
+  	//console.log("baseimg_width="+baseimg_width+" top="+top+" left="+left); 
+  	location += "top: "+top+"px;";
+  	location += "left: "+left+"px";
+  	return location;
+}
 
-        console.log("FP: window resized");
-        fp_resize_floorplan_image();
-        fp_reposition_entities();
-    };
-
-    var path_str = "/objects";
-    var fields = "fields=fp_location,state,states,fp_icons,fp_icon_set,img,link,label,type";
-    if (json_store.ia7_config.prefs.state_log_show === "yes")
-        fields += ",state_log";
-
-    var arg_str = "parents="+group+"&"+fields+"&long_poll=true&time="+time;
-
-    updateSocket = $.ajax({
-        type: "GET",
-        url: "/LONG_POLL?json('GET','"+path_str+"','"+arg_str+"')",
-        dataType: "json",
-        error: function(xhr, textStatus, errorThrown){
-            //   console.log('FP: request failed: "' + textStatus + '" "'+JSON.stringify(errorThrown, undefined,2)+'"');
-        },
-        success: function( json, statusText, jqXHR ) {
-            //  console.log('FP: request succeeded: "' + statusText + '" "'+JSON.stringify(jqXHR, undefined,2)+'"');
-            var requestTime = time;
-            if (jqXHR.status === 200) {
-                var t0 = performance.now();
-                JSONStore(json);
-                for (var entity in json.data) {
-                    if (URLHash.show_pos && requestTime === 0){
-                        perl_pos_coords = "";
-                    }
-                    for (var i=0 ; i < json.data[entity].fp_location.length-1; i=i+2){ //allow for multiple graphics
-                        var popover = 0;
-                        if ((json.data[entity].type === "FPCamera_Item") || (json_store.ia7_config.prefs.fp_state_popovers === "yes"))
-                            popover = 1;
-
-                        if (URLHash.show_pos && requestTime === 0){
-                            if (perl_pos_coords.length !== 0){
-                                perl_pos_coords += ", ";
-                            }
-                            perl_pos_coords += "" + json.data[entity].fp_location[i]+','+json.data[entity].fp_location[i+1];
-                        }
-
-                        var coords= json.data[entity].fp_location[i]+'x'+json.data[entity].fp_location[i+1];
-                        var E = fp_getOrCreateIcon(json, entity, i, coords, URLHash.show_pos);
-
-                        if (URLHash.show_pos === undefined)
-                        {
-                            // create unique popovers for Camera items
-                            if (json.data[entity].type === "FPCamera_Item") {
-                                var name = entity;
-                                if (json.data[entity].label !== undefined)
-                                    name = json.data[entity].label;
-
-                                var a_start = "";
-                                var a_end = "";
-                                if (json.data[entity].link !== undefined) {
-                                    a_start = '<a href="'+json.data[entity].link+'">';
-                                    a_end = '</a>';
-                                }
-
-                                $('[data-toggle="popover"]').popover({
-                                    placement : 'auto bottom', //placement of the popover. also can use top, bottom, left or right
-                                    title : name,
-                                    html: 'true', //needed to show html of course
-                                    content : '<div id="popOverBox">'+a_start+'<img src="'+json.data[entity].img+'" width="251" height="201" />'+a_end+'</div>'
-                                });
-                            } else {
-                                if (popover) {
-
-                                    $('[data-toggle="popover"]').popover({
-                                        placement : 'auto bottom', //placement of the popover. also can use top, bottom, left or right
-                                        title : function() {
-                                            var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
-                                            var name = fp_entity;
-                                            if (json_store.objects[fp_entity].label !== undefined) name = json_store.objects[fp_entity].label;
-                                            var ackt = E.offset();
-                                            return name+ " - "+json_store.objects[fp_entity].state;
-                                        },
-                                        html: 'true', //needed to show html of course
-                                        content : function() {
-                                            var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
-                                            var po_states = json_store.objects[fp_entity].states;
-                                            var html = '<div id="popOverBox">';
-                                            // HP need to have at least 2 states to be a controllable object...
-                                            if (po_states.length > 1) {
-                                                html = '<div class="btn-group stategrp0 btn-block">';
-                                                var buttons = 0;
-                                                var stategrp = 0;
-                                                for (var i = 0; i < po_states.length; i++){
-                                                    if (filterSubstate(po_states[i]) !== 1) {
-                                                        buttons++;
-                                                        if (buttons > 2) {
-                                                            stategrp++;
-                                                            html += "</div><div class='btn-group btn-block stategrp"+stategrp+"'>";
-                                                            buttons = 1;
-                                                        }
-
-                                                        var color = getButtonColor(po_states[i]);
-                                                        //TODO disabled override
-                                                        var disabled = "";
-                                                        if (po_states[i] === json_store.objects[fp_entity].state) {
-                                                            disabled = "disabled";
-                                                        }
-                                                        html += "<button class='btn col-sm-6 col-xs-6 btn-"+color+" "+disabled+"'";
-                                                        var url= '/SET;none?select_item='+fp_entity+'&select_state='+po_states[i];
-                                                        html += ' onclick="$.get(';
-                                                        html += "'"+url+"')";
-                                                        html += '">'+po_states[i]+'</button>';
-                                                    }
-                                                }
-                                                html += "</div></div>";
-                                                //console.log("html="+html)
-                                            }
-                                            return html;
-                                        }
-                                    });
-                                } else {
-                                    E.click( function () {
-                                        //var fp_entity = $(this).attr("id").split(/entity_/)[1]; //
-                                        var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
-                                        //alert("entity="+fp_entity);
-                                        create_state_modal(fp_entity);
-                                    });
-                                }
-                                E.mayTriggerLongClicks().on( 'longClick', function() {
-                                    var fp_entity = $(this).attr("id").match(/entity_(.*)_\d+$/)[1]; //strip out entity_ and ending _X ... item names can have underscores in them.
-                                    create_state_modal(fp_entity);
-                                });
-                            }
-                        }
-                    }
-
-                    if (URLHash.show_pos && requestTime === 0){
-                        if (perl_pos_coords.length===0)
-                        {
-                            fp_getOrCreateIcon(json, entity, 0, "", URLHash.show_pos);
-                        }
-                        else{
-                            var oldCode = $('#fp_pos_perl_code').text();
-                            if (oldCode.length !== 0)
-                                oldCode += "\n";
-
-                            var perl_pos_code = "";
-                            var iconset = json.data[entity].fp_icon_set;
-                            if (iconset !== undefined){
-                                perl_pos_code += '$' + entity + '->set_fp_icon_set("';
-                                perl_pos_code += iconset + '");\n';
-                            }
-                            perl_pos_code += "$" + entity + "->set_fp_location(";
-                            perl_pos_code += perl_pos_coords + ");";
-                            perl_pos_code = oldCode  + perl_pos_code;
-                            perl_pos_code = perl_pos_code.split('\n').sort().join('\n');
-                            $('#fp_pos_perl_code').text(perl_pos_code);
-                        }
-                    }
-                }
-                fp_reposition_entities();
-                if (requestTime === 0 && URLHash.show_pos){
-                    $('#list_content').append("<p>&nbsp;</p>");
-                    $.ajax({
-                        type: "GET",
-                        url: "/LONG_POLL?json('GET','fp_icon_sets','px=48')",
-                        dataType: "json",
-                        error: function(xhr, textStatus, errorThrown){
-                            console.log('FP: request iconsets failed: "' + textStatus + '" "'+JSON.stringify(errorThrown, undefined,2)+'"');
-                        },
-                        success: function( json, statusText, jqXHR ) {
-                            console.log('FP: request iconsets: "' + statusText + '" "'+JSON.stringify(jqXHR, undefined,2)+'"');
-                            var requestTime = time;
-                            if (jqXHR.status === 200) {
-                                var iconlist = '<ul class="icon_select" style="display:none;z-index:1000;position:absolute;overflow:hidden;border:1px solid #CCC; background: #FFF; border-radius: 5px; padding: 0;">\n';
-                                var pathlist = jqXHR.responseJSON.data;
-                                for (var i = 0; i < pathlist.length; i++){
-                                    var path = pathlist[i];
-                                    iconlist += "<il  style='float:left;padding:1px;cursor:pointer;list-style-type:none;transition:all .3s ease;'>";
-                                    iconlist += "<img src='"+path+"' size='"+fp_scale+"%'/></il>\n";
-                                }
-                                iconlist += "<il  style='float:left;padding:1px;cursor:pointer;list-style-type:none;transition:all .3s ease;'>";
-                                iconlist += "</ul>\n";
-                                $('#list_content').append(iconlist);
-
-                                // Trigger action when the contexmenu is about to be shown
-                                $(".floorplan_item").bind("contextmenu", function (event) {
-
-                                    event.preventDefault();
-
-                                    fp_icon_select_item_id = $(this).attr('id');
-                                    $(".icon_select").finish().toggle(100);
-                                    $(".icon_select").offset({
-                                        top: event.pageY,
-                                        left: event.pageX
-                                    });
-                                });
-
-
-                                // If the document is clicked somewhere
-                                $(document).bind("mousedown", function (e) {
-                                    if ($(e.target).parents(".icon_select").length === 0) {
-                                        $(".icon_select").hide(100);
-                                        fp_icon_select_item_id = null;
-                                    }
-                                });
-
-
-                                // If the menu element is clicked
-                                $(".icon_select img").click(function(){
-                                    var img = $(this).attr("src");
-                                    $('#'+fp_icon_select_item_id).attr('src', img);
-                                    var name = fp_icon_select_item_id.match(/entity_(.*)_(\d)+$/)[1];
-
-                                    var codeLines = $("#fp_pos_perl_code").text().split('\n');
-                                    var newCode = "";
-
-                                    var icon_set_name = img.match(/.*fp_(.*)_(.*)_48.png/)[1];
-                                    var itemUpdated = false;
-                                    for (var i = 0; i< codeLines.length; i++)
-                                    {
-                                        var line = codeLines[i];
-                                        if (line.startsWith("$"+name+"->set_fp_icon_set"))
-                                        {
-                                            var newline = "$" + name + '->set_fp_icon_set("'+ icon_set_name+ '");\n';
-                                            newCode += newline;
-                                            itemUpdated = true;
-                                        }
-                                        else if (line !== "")
-                                        {
-                                            newCode += line + "\n";
-                                        }
-                                    }
-                                    if (itemUpdated === false)
-                                    {
-                                        var newline = "$" + name + '->set_fp_icon_set("'+ icon_set_name +'");\n';
-                                        newCode += newline;
-                                    }
-                                    newCode = newCode.split('\n').sort().join('\n');
-                                    $("#fp_pos_perl_code").text(newCode);
-                                    $(".icon_select").hide(100);
-                                    fp_icon_select_item_id = null;
-                                });
-                            }
-                        }
-                    });
-                }
-                requestTime = json.meta.time;
-                var t1 = performance.now();
-                console.log("FP: long poll " +Math.round(t1 - t0) + "ms");
-            }
-            if (jqXHR.status === 200 || jqXHR.status === 204) {
-                //Call update again, if page is still here
-                //KRK best way to handle this is likely to check the URL hash
-                if ($('#floorplan').length !== 0){
-                    //If the floorplan page is still active request more data
-                    // and we are not editing the fp
-                    if (URLHash.show_pos ===  undefined)
-                        floorplan(group,requestTime);
-                }
-            }
-        }
-    });
-};
 var get_fp_image = function(item,size,orientation) {
   	var image_name;
-	var image_color = getButtonColor(item.state);
+  	var image_color = getButtonColor(item.state)
 	var baseimg_width = $(window).width();
-	var image_size = "48";
-  //	if (baseimg_width < 500) image_size = "32" // iphone scaling
-  	//kvar image_size = "32"
+  	var image_size = "48"
+  	if (baseimg_width < 500) image_size = "32" // iphone scaling
  	if (item.fp_icons !== undefined) {
+ 		//alert("Has a button defined state="+item.fp_icons[item.state]);
  		if (item.fp_icons[item.state] !== undefined) return item.fp_icons[item.state];
  	}
  	if (item.fp_icon_set !== undefined) {
+ 		//alert("Has a button defined state="+item.fp_icons[item.state]);
   		return "fp_"+item.fp_icon_set+"_"+image_color+"_"+image_size+".png";
  	} 	
  	//	if item.fp_icons.return item.fp_icons[state];
-	if(item.type === "Light_Item" || item.type === "Fan_Light" ||
-		item.type === "Insteon_Device" || item.type === "UPB_Link" ||
-		item.type === "Insteon::SwitchLinc" || item.type === "Insteon::SwitchLincRelay" ||
-		item.type === "Insteon::KeyPadLinc" ||
-		item.type === "EIB_Item" || item.type === "EIB1_Item" ||
-		item.type === "EIB2_Item" || item.type === "EIO_Item" ||
-		item.type === "UIO_Item" || item.type === "X10_Item" ||
-		item.type === "xPL_Plugwise" || item.type === "X10_Appliance") {
+  	if(item.type == "Light_Item" || item.type == "Fan_Light" ||
+    		item.type == "Insteon_Device" || item.type == "UPB_Link" ||
+    		item.type == "Insteon::SwitchLinc" || item.type == "Insteon::SwitchLincRelay" ||    
+    		item.type == "Insteon::KeyPadLinc" ||   		    				
+    		item.type == "EIB_Item" || item.type == "EIB1_Item" ||
+    		item.type == "EIB2_Item" || item.type == "EIO_Item" ||
+    		item.type == "UIO_Item" || item.type == "X10_Item" ||    		
+    		item.type == "xPL_Plugwise" || item.type == "X10_Appliance") {
 
   			return "fp_light_"+image_color+"_"+image_size+".png";
   	}
   	
-	if(item.type === "Motion_Item" || item.type === "X10_Sensor" ||
-		item.type === "Insteon::MotionSensor" ) {
+  	if(item.type == "Motion_Item" || item.type == "X10_Sensor" ||
+    		item.type == "Insteon::MotionSensor" ) {
   			return "fp_motion_"+image_color+"_"+image_size+".png";
 
   	}
   	
-	if(item.type === "Door_Item" || item.type === "Insteon::IOLinc_door") {
+  	if(item.type == "Door_Item" || item.type == "Insteon::IOLinc_door") {
   			return "fp_door_"+image_color+"_"+image_size+".png";
 
   	}  	
 
-	if(item.type === "FPCamera_Item" ) {
+  	if(item.type == "FPCamera_Item" ) {
  			return "fp_camera_default_"+image_size+".png";
  		}
   	
   	return "fp_unknown_info_"+image_size+".png";
-};
+}
 
 var create_img_popover = function(entity) {
 }
@@ -2250,6 +1483,7 @@ var create_state_modal = function(entity) {
 				grid_buttons = 4;
 				group_buttons = 3;
 			}
+			//console.log("display buttons="+display_buttons+" grid_buttons="+grid_buttons+" group_buttons="+group_buttons); 
 			
 			for (var i = 0; i < modal_states.length; i++){
 				if (filterSubstate(modal_states[i]) == 1) {
@@ -2313,73 +1547,6 @@ var create_state_modal = function(entity) {
 		});
 }	
 
-var authorize_modal = function(user) {
-
-	//alert(user);
-	var changed = "false";
-	var af = "";
-	var html = '<div class="form-group">';
-	if (user !== "0") html += "<span id='currentuser'>Currently logged in as "+user+"<br><br></span>";
-    html += '<label for="login-password">Password</label>';
-    html += '<input type="password" class="form-control" name="password" id="password" placeholder="Password">';
-  	html += '</div>';
-  	html += '<b><span id="pwstatus" style="color:red"></span></b>';
-
-//create footer buttons
-	$('#loginModal').find('.modal-footer').html('<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>');  
-
-	if (user == "0") {			
-		$('#loginModal').find('.modal-footer').prepend('<button type="submit" value="logon" class="btn btn-default btn-login-login">Logon');      	
-	} else {  	
-		$('#loginModal').find('.modal-footer').prepend('<button type="submit" value="logon" class="btn btn-default btn-login-login">Change User</button>');      	
-		$('#loginModal').find('.modal-footer').prepend('<button type="button" class="btn btn-default btn-login-logoff">Logoff</button>');      	
-	}
-	$('#loginModal').find('.modal-body').html(html);
-	$('#loginModal').modal({
-		show: true
-	});	
-	$('#loginModal').on('shown.bs.modal', function () {
-		if (user == "0") $('#password').focus();
-	});
-	$('#loginModal').on('hide.bs.modal', function () {
-        if (changed == "true") location.reload();
-    });
-	$('.btn-login-logoff').click( function () {
-		$.get ("/UNSET_PASSWORD");
-		console.log("in logoff");
-		location.reload();
-		$('#loginModal').modal('hide');
-	});	
-	$('#LoginModalpw').submit( function (e) {
-		e.preventDefault();
-		//console.log("Custom submit function");
-		$.ajax({
-			type: "POST",
-			url: "/SET_PASSWORD_FORM",
-			data: $(this).serialize(),
-			success: function(data){
-				console.log(data) 
-				var status=data.match(/\<b\>(.*)\<\/b\>/gm);
-				//console.log("match="+status[2]); //3rd match is password status
-				if (status[2] == "<b>Password was incorrect</b>") {
-					//alert("Password was incorrect");
-					$('#loginModal').find('#pwstatus').html("Password was incorrect");
-					$("#loginModal").find('#password').val('');
-					if (user !== "0") {
-						user = "0";
-						authorized = "false";
-						changed = "true";
-						$("#currentuser").html("");
-						//location.reload();
-					}	
-				} else {
-					location.reload();
-					$('#loginModal').modal('hide');
-				}
-			}
-		});
-	});							
-}
 
 //Outputs the list of triggers
 var trigger = function() {
@@ -2450,27 +1617,14 @@ $(document).ready(function() {
 	$(window).bind('hashchange', function() {
 		changePage();
 	});
-	
 	$("#mhstatus").click( function () {
 		var link = json_store.collections[600].link;
 		link = buildLink (link, "0,600");
+	//    window.location.href = "/ia7/#path=/objects&parents=group1&_collection_key=0,1,17,$group1";
 	    window.location.href = link;
 	});
-	
-	// Load up 'globals' -- notification and the status
-	updateItem("ia7_status");	
-	get_notifications();	
-
+	updateItem("ia7_status");
 	$("#toolButton").click( function () {
-		// Need a 'click' event to turn on sound for mobile devices
-		if (mobile_device() == "ios" ) {
-			if (audio_init === undefined) {
-				audioElement = document.getElementById('sound_element');
-				audioElement.play();
-			}
-			audio_init = 1;
-		}
-		//
 		var entity = $("#toolButton").attr('entity');
 		$('#optionsModal').modal('show');
 		$('#optionsModal').find('.object-title').html("Mr.House Options");
@@ -2479,8 +1633,6 @@ $(document).ready(function() {
 		$('#optionsModal').find('.modal-body').html('<div class="btn-group btn-block" data-toggle="buttons"></div>');
 		var simple_active = "active";
 		var simple_checked = "checked";
-		var develop_active = "";
-		var develop_checked = "";
 		var advanced_active = "";
 		var advanced_checked = ""
 		if (display_mode == "advanced") {
@@ -2488,87 +1640,13 @@ $(document).ready(function() {
 			simple_checked = "";
 			advanced_active = "active";
 			advanced_checked = "checked"
-			develop_active = "";
-			develop_checked = "";
 		}
-		if (display_mode == "advanced" && developer == true)  {
-			simple_active = "";
-			simple_checked = "";
-			advanced_active = "";
-			advanced_checked = ""
-			develop_active = "active";
-			developed_checked = "checked"
-		}		
-		
-		$('#optionsModal').find('.modal-body').find('.btn-group').append("<label class='btn btn-default mhmode col-xs-4 col-sm-4 "+simple_active+"'><input type='radio' name='mhmode2' id='simple' autocomplete='off'"+simple_checked+">simple</label>");
-		$('#optionsModal').find('.modal-body').find('.btn-group').append("<label class='btn btn-default mhmode col-xs-4 col-sm-4 "+advanced_active+"'><input type='radio' name='mhmode2' id='advanced' autocomplete='off'"+advanced_checked+">expert</label>");
-		$('#optionsModal').find('.modal-body').find('.btn-group').append("<label class='btn btn-default mhmode col-xs-4 col-sm-4 "+develop_active+"'><input type='radio' name='mhmode2' id='developer' autocomplete='off'"+develop_checked+">developer</label>");
-
+		$('#optionsModal').find('.modal-body').find('.btn-group').append("<label class='btn btn-default mhmode col-xs-6 col-sm-6"+simple_active+"'><input type='radio' name='mhmode2' id='simple' autocomplete='off'"+simple_checked+">simple</label>");
+		$('#optionsModal').find('.modal-body').find('.btn-group').append("<label class='btn btn-default mhmode col-xs-6 col-sm-6"+advanced_active+"'><input type='radio' name='mhmode2' id='advanced' autocomplete='off'"+advanced_checked+">advanced</label>");
 		$('.mhmode').on('click', function(){
-			if ($(this).find('input').attr('id') == "developer") {
-				display_mode = "advanced";
-				developer = true;
-			} else {
-				display_mode = $(this).find('input').attr('id');
-				developer = false;
-			}	
+			display_mode = $(this).find('input').attr('id');	
 			changePage();
   		});
-  		
-  		var sound_active = "";
-  		var banner_active = "";
-  		var off_active = "active";
-  		var sound_label = "Sound";
-  		var banner_label = "Banner";
-  		if ($(window).width() <= 768) { // make icons for mobile
-			sound_label = "<i class='fa fa-volume-up'></i>";
-			banner_label = "<i class='fa fa-list-ul'></i>";
-		}
-  		if (speech_banner === "yes") {
-  			banner_active = "active";
-  			off_active = "";
-  		}
-   		if (speech_sound === "yes") {
-  			sound_active = "active";
-  			off_active = "";
-  		} 
-     	if (notifications === "disabled") {
-  			sound_active = "active";
-  			off_active = "active";
-  			banner_active = "active";
-  		}				
-  		// if notifications disabled then disable all the buttons
-   		$('#optionsModal').find('.modal-body').append('<div class="btn-group btn-block btn-notifications" data-toggle="buttons"></div>');
-		$('#optionsModal').find('.modal-body').find('.btn-notifications').append("<label class='btn btn-default mhnotify col-xs-6 col-sm-6 disabled'><input type='checkbox' name='mhnotify0' id='speech' autocomplete='off'>Speech</label>");
-		$('#optionsModal').find('.modal-body').find('.btn-notifications').append("<label class='btn btn-default mhnotify mhnotifyopt col-xs-2 col-sm-2 "+sound_active+" "+notifications+"'><input type='checkbox' name='mhnotify1' id='sound' autocomplete='off'>"+sound_label+"</label>");
-		$('#optionsModal').find('.modal-body').find('.btn-notifications').append("<label class='btn btn-default mhnotify mhnotifyopt col-xs-2 col-sm-2 "+banner_active+" "+notifications+"'><input type='checkbox' name='mhnotify2' id='banner' autocomplete='off'>"+banner_label+"</label>");
-		$('#optionsModal').find('.modal-body').find('.btn-notifications').append("<label class='btn btn-default mhnotify mhnotifyoff col-xs-2 col-sm-2 "+off_active+" "+notifications+"'><input type='checkbox' name='mhnotify3' id='off' autocomplete='off'>Off</label>");
- 		$('.mhnotify').on('click', function(){
-			var speech_mode = $(this).find('input').attr('id');
-			var button_active = $(this).hasClass('active');
-			if (speech_mode == "off") {
-				$('.mhnotifyopt').removeClass('active');
-				speech_sound = "no";
-				speech_banner = "no";
-			} else {
-				if (speech_mode === "sound") {
-					if (button_active === true) {
-						speech_sound = "no";
-					} else {
-						speech_sound = "yes";
-					}
-				} else if (speech_mode === "banner") {
-					if (button_active === true) {
-						speech_banner = "no";
-					} else {
-						speech_banner = "yes";
-					}
-				}
-				$('.mhnotifyoff').removeClass('active');
-				if ((speech_banner === "no") && (speech_sound === "no")) $('.mhnotifyoff').addClass('active');
-			}
-			//if off, then unselect others
-  		});  		
 		// parse the collection ID 500 and build a list of buttons
 		var opt_collection_keys = 0;
 		var opt_entity_html = "";
@@ -2590,42 +1668,14 @@ $(document).ready(function() {
 				if (json_store.collections[collection].external !== undefined) {
 					link = json_store.collections[collection].external;
 				}
-				//Check to see if this is the login button
-				if (json_store.collections[collection].user !== undefined) {
-//					if (name == undefined) {
-//						authDetails();
-//					} 
-					opt_entity_html += "<a link-type='collection' user='"+json_store.collections[collection].user+"' class='btn btn-default btn-lg btn-block btn-list btn-login-modal' role='button'><i class='fa "+icon+" fa-2x fa-fw'></i>"+name+"</a>";
-				} else {	
-					opt_entity_html += "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list' role='button'><i class='fa "+icon+" fa-2x fa-fw'></i>"+name+"</a>";
-				}
+				opt_entity_html += "<a link-type='collection' href='"+link+"' class='btn btn-default btn-lg btn-block btn-list' role='button'><i class='fa "+icon+" fa-2x fa-fw'></i>"+name+"</a>";
 			}
 		}
-		$('#optionsModal').find('.modal-body').append(opt_entity_html);	
-		$('.btn-login-modal').click( function () {
-			$('#optionsModal').modal('hide');			
-			var user = $(this).attr('user')
-			authorize_modal(user);
-		});						
+		$('#optionsModal').find('.modal-body').append(opt_entity_html);						
 		$('#optionsModal').find('.btn-list').click(function (){
 			$('#optionsModal').modal('hide');
 		});
 	});
-	
-//TODO remove me?	
-	$('#mhresponse').click( function (e) {
-		e.preventDefault();
-		$form = $(this);
-		console.log("MHResponse Custom submit function "+ form.attr('action'));
-		//$.ajax({
-		//	type: "POST",
-		//	url: "/SET_PASSWORD_FORM",
-		//	data: $(this).serialize(),
-		//	success: function(data){
-		//		console.log(data) 
-		//		}
-		//	});
-	});		
 });
 
 //
diff --git a/web/ia7/include/jquery.alerts.css b/web/ia7/include/jquery.alerts.css
deleted file mode 100755
index 98efe1e0b..000000000
--- a/web/ia7/include/jquery.alerts.css
+++ /dev/null
@@ -1,57 +0,0 @@
-#popup_container {
-	font-family: Arial, sans-serif;
-	font-size: 12px;
-	min-width: 300px; /* Dialog will be no smaller than this */
-	max-width: 600px; /* Dialog will wrap after this width */
-	background: #FFF;
-	border: solid 5px #999;
-	color: #000;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-}
-
-#popup_title {
-	font-size: 14px;
-	font-weight: bold;
-	text-align: center;
-	line-height: 1.75em;
-	color: #666;
-	background: #CCC url(/ia7/graphics/title.gif) top repeat-x;
-	border: solid 1px #FFF;
-	border-bottom: solid 1px #999;
-	cursor: default;
-	padding: 0em;
-	margin: 0em;
-}
-
-#popup_content {
-	background: 16px 16px no-repeat url(/ia7/graphics/info.gif);
-	padding: 1em 1.75em;
-	margin: 0em;
-}
-
-#popup_content.alert {
-	background-image: url(/ia7/graphics/info.gif);
-}
-
-#popup_content.confirm {
-	background-image: url(/ia7/graphics/important.gif);
-}
-
-#popup_content.prompt {
-	background-image: url(/ia7/graphics/help.gif);
-}
-
-#popup_message {
-	padding-left: 48px;
-}
-
-#popup_panel {
-	text-align: center;
-	margin: 1em 0em 0em 1em;
-}
-
-#popup_prompt {
-	margin: .5em 0em;
-}
diff --git a/web/ia7/include/jquery.alerts.js b/web/ia7/include/jquery.alerts.js
deleted file mode 100644
index efd1e7d3e..000000000
--- a/web/ia7/include/jquery.alerts.js
+++ /dev/null
@@ -1,237 +0,0 @@
-// jQuery Alert Dialogs Plugin
-//
-// Version 1.1
-//
-// Cory S.N. LaViska
-// A Beautiful Site (http://abeautifulsite.net/)
-// 14 May 2009
-//
-// Visit http://abeautifulsite.net/notebook/87 for more information
-//
-// Usage:
-//		jAlert( message, [title, callback] )
-//		jConfirm( message, [title, callback] )
-//		jPrompt( message, [value, title, callback] )
-// 
-// History:
-//
-//		1.00 - Released (29 December 2008)
-//
-//		1.01 - Fixed bug where unbinding would destroy all resize events
-//
-// License:
-// 
-// This plugin is dual-licensed under the GNU General Public License and the MIT License and
-// is copyright 2008 A Beautiful Site, LLC. 
-//
-(function($) {
-	
-	$.alerts = {
-		
-		// These properties can be read/written by accessing $.alerts.propertyName from your scripts at any time
-		
-		verticalOffset: -75,                // vertical offset of the dialog from center screen, in pixels
-		horizontalOffset: 0,                // horizontal offset of the dialog from center screen, in pixels/
-		repositionOnResize: true,           // re-centers the dialog on window resize
-		overlayOpacity: .01,                // transparency level of overlay
-		overlayColor: '#FFF',               // base color of overlay
-		draggable: true,                    // make the dialogs draggable (requires UI Draggables plugin)
-		okButton: '&nbsp;OK&nbsp;',         // text for the OK button
-		cancelButton: '&nbsp;Cancel&nbsp;', // text for the Cancel button
-		dialogClass: null,                  // if specified, this class will be applied to all dialogs
-		
-		// Public methods
-		
-		alert: function(message, title, callback) {
-			if( title == null ) title = 'Alert';
-			$.alerts._show(title, message, null, 'alert', function(result) {
-				if( callback ) callback(result);
-			});
-		},
-		
-		confirm: function(message, title, callback) {
-			if( title == null ) title = 'Confirm';
-			$.alerts._show(title, message, null, 'confirm', function(result) {
-				if( callback ) callback(result);
-			});
-		},
-			
-		prompt: function(message, value, title, callback) {
-			if( title == null ) title = 'Prompt';
-			$.alerts._show(title, message, value, 'prompt', function(result) {
-				if( callback ) callback(result);
-			});
-		},
-		
-		// Private methods
-		
-		_show: function(title, msg, value, type, callback) {
-			
-			$.alerts._hide();
-			$.alerts._overlay('show');
-			
-			$("BODY").append(
-			  '<div id="popup_container">' +
-			    '<h1 id="popup_title"></h1>' +
-			    '<div id="popup_content">' +
-			      '<div id="popup_message"></div>' +
-				'</div>' +
-			  '</div>');
-			
-			if( $.alerts.dialogClass ) $("#popup_container").addClass($.alerts.dialogClass);
-			
-			// IE6 Fix
-			//var pos = ($.browser.msie && parseInt($.browser.version) <= 6 ) ? 'absolute' : 'fixed'; 
-			var pos = 'fixed'; 
-			
-			$("#popup_container").css({
-				position: pos,
-				zIndex: 99999,
-				padding: 0,
-				margin: 0
-			});
-			
-			$("#popup_title").text(title);
-			$("#popup_content").addClass(type);
-			$("#popup_message").text(msg);
-			$("#popup_message").html( $("#popup_message").text().replace(/\n/g, '<br />') );
-			
-			$("#popup_container").css({
-				minWidth: $("#popup_container").outerWidth(),
-				maxWidth: $("#popup_container").outerWidth()
-			});
-			
-			$.alerts._reposition();
-			$.alerts._maintainPosition(true);
-			
-			switch( type ) {
-				case 'alert':
-					$("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /></div>');
-					$("#popup_ok").click( function() {
-						$.alerts._hide();
-						callback(true);
-					});
-					$("#popup_ok").focus().keypress( function(e) {
-						if( e.keyCode == 13 || e.keyCode == 27 ) $("#popup_ok").trigger('click');
-					});
-				break;
-				case 'confirm':
-					$("#popup_message").after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>');
-					$("#popup_ok").click( function() {
-						$.alerts._hide();
-						if( callback ) callback(true);
-					});
-					$("#popup_cancel").click( function() {
-						$.alerts._hide();
-						if( callback ) callback(false);
-					});
-					$("#popup_ok").focus();
-					$("#popup_ok, #popup_cancel").keypress( function(e) {
-						if( e.keyCode == 13 ) $("#popup_ok").trigger('click');
-						if( e.keyCode == 27 ) $("#popup_cancel").trigger('click');
-					});
-				break;
-				case 'prompt':
-					$("#popup_message").append('<br /><input type="text" size="30" id="popup_prompt" />').after('<div id="popup_panel"><input type="button" value="' + $.alerts.okButton + '" id="popup_ok" /> <input type="button" value="' + $.alerts.cancelButton + '" id="popup_cancel" /></div>');
-					$("#popup_prompt").width( $("#popup_message").width() );
-					$("#popup_ok").click( function() {
-						var val = $("#popup_prompt").val();
-						$.alerts._hide();
-						if( callback ) callback( val );
-					});
-					$("#popup_cancel").click( function() {
-						$.alerts._hide();
-						if( callback ) callback( null );
-					});
-					$("#popup_prompt, #popup_ok, #popup_cancel").keypress( function(e) {
-						if( e.keyCode == 13 ) $("#popup_ok").trigger('click');
-						if( e.keyCode == 27 ) $("#popup_cancel").trigger('click');
-					});
-					if( value ) $("#popup_prompt").val(value);
-					$("#popup_prompt").focus().select();
-				break;
-			}
-			
-			// Make draggable
-			if( $.alerts.draggable ) {
-				try {
-					$("#popup_container").draggable({ handle: $("#popup_title") });
-					$("#popup_title").css({ cursor: 'move' });
-				} catch(e) { /* requires jQuery UI draggables */ }
-			}
-		},
-		
-		_hide: function() {
-			$("#popup_container").remove();
-			$.alerts._overlay('hide');
-			$.alerts._maintainPosition(false);
-		},
-		
-		_overlay: function(status) {
-			switch( status ) {
-				case 'show':
-					$.alerts._overlay('hide');
-					$("BODY").append('<div id="popup_overlay"></div>');
-					$("#popup_overlay").css({
-						position: 'absolute',
-						zIndex: 99998,
-						top: '0px',
-						left: '0px',
-						width: '100%',
-						height: $(document).height(),
-						background: $.alerts.overlayColor,
-						opacity: $.alerts.overlayOpacity
-					});
-				break;
-				case 'hide':
-					$("#popup_overlay").remove();
-				break;
-			}
-		},
-		
-		_reposition: function() {
-			var top = (($(window).height() / 2) - ($("#popup_container").outerHeight() / 2)) + $.alerts.verticalOffset;
-			var left = (($(window).width() / 2) - ($("#popup_container").outerWidth() / 2)) + $.alerts.horizontalOffset;
-			if( top < 0 ) top = 0;
-			if( left < 0 ) left = 0;
-			
-			// IE6 fix
-			//if( $.browser.msie && parseInt($.browser.version) <= 6 ) top = top + $(window).scrollTop();
-			top = top + $(window).scrollTop();
-			
-			$("#popup_container").css({
-				top: top + 'px',
-				left: left + 'px'
-			});
-			$("#popup_overlay").height( $(document).height() );
-		},
-		
-		_maintainPosition: function(status) {
-			if( $.alerts.repositionOnResize ) {
-				switch(status) {
-					case true:
-						$(window).bind('resize', $.alerts._reposition);
-					break;
-					case false:
-						$(window).unbind('resize', $.alerts._reposition);
-					break;
-				}
-			}
-		}
-		
-	}
-	
-	// Shortuct functions
-	jAlert = function(message, title, callback) {
-		$.alerts.alert(message, title, callback);
-	}
-	
-	jConfirm = function(message, title, callback) {
-		$.alerts.confirm(message, title, callback);
-	};
-		
-	jPrompt = function(message, value, title, callback) {
-		$.alerts.prompt(message, value, title, callback);
-	};
-	
-})(jQuery);
diff --git a/web/ia7/include/tables.css b/web/ia7/include/tables.css
index 9ed17528e..29e0cf13b 100644
--- a/web/ia7/include/tables.css
+++ b/web/ia7/include/tables.css
@@ -29,13 +29,7 @@
     border-radius: 0 0 6px 0;
 }
 
-#prtable table {
-		width: 97%; 
-		margin-top: 8px;
-		margin-left: 15px;
-		margin-right: 15px;
-}
-	
+
 #rtable p {
 	margin: 20px 0; 
 }
diff --git a/web/ia7/index.shtml b/web/ia7/index.shtml
index f5fcfc9a8..f1e9b26b1 100644
--- a/web/ia7/index.shtml
+++ b/web/ia7/index.shtml
@@ -26,7 +26,6 @@
 	
 	<!--Bootstrap-->
 	<!-- Latest compiled and minified CSS -->
-	<link rel="stylesheet" href="/ia7/include/bootstrap-custom-button.3.3.5.css">
 	<link rel="stylesheet" href="/ia7/include/bootstrap.3.3.5.min.css">
 	
 	<!-- Optional theme -->
@@ -38,10 +37,6 @@
 	<!-- bootstrap editable -->
 	<link href="/ia7/include/bootstrap3-editable.1.5.0.css" rel="stylesheet"/>
     <script src="/ia7/include/bootstrap3-editable.1.5.0.min.js"></script>
-
-	<!-- Nicer Dialog Boxes -->
-	<link href="/ia7/include/jquery.alerts.css" rel="stylesheet"/>	
-    <script src="/ia7/include/jquery.alerts.js"></script>
 	
 	<!-- A custom jquery UI script to enable sortable items -->
 	<!-- <script src="include/jquery-ui-1.11.1.custom.min.js"></script> -->
@@ -137,7 +132,7 @@
 	}	
 	.rrd-period-dropdown
 	{
-		margin-left:45px;
+		margin-left:55px;
 	}
 	.rrd-legend-class
 	{	
@@ -155,18 +150,6 @@
     	float:left;
     	margin-left:-10px;
 	}
-	.alerts {
-  		position: absolute;
-  		top: 3px;
-  		left: 17px;
-  		right: 17px;
-	}
-	.mobile-alert {
-			margin-top:-22px !important;
-	}
-	.dropdown-caret {
-			margin-left:-5px !important;
-	}
 	</style>
 </head>
 <body>
@@ -184,26 +167,19 @@
 		  </h3>
 		<ol id='nav' class="breadcrumb">
 		</ol>
-			<div id="alert-area"></div>
-
 	</div>
-
 </div>
 
 <div id="list_content">
 </div>
 <div class='row top-buffer'>
-
         <div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
-                <div id="footer_stuff" class='col-sm-12 col-center'>
+                <div class='col-sm-12 col-center'>
                         <!-- Put Footer Stuff Here -->
                         <!--#include file="/bin/tagline.pl"--><br>
                         <!--#include file="/bin/uptime.pl"-->&nbsp;&nbsp;<!--#include file="$config_parms{web_href_counter}"-->
                 </div>
-                <div id="sound_stuff" class='col-sm-12 col-center'>                
-                		<audio id="sound_element" name="sound_element" preload="auto"><source id="sound_element2" name="sound_element2"></audio>
-                </div>
-        </div>
+        </d
 <!-- Voice Command Modal -->
 <div class="modal fade" id="lastResponse" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">
@@ -257,23 +233,5 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-<!-- Login Box Modal -->
-<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog login-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel">Authorize</h4>
-      </div>
-      <form name="pw" action="SET_PASSWORD_FORM" id="LoginModalpw" method="POST">
-        <div class="modal-body">
-    	</div>
-        <div class="modal-footer">
-        </div>
-      </form>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-<div id="dialog-confirm" title="Notification">
-</div>
+
 </body></html>
\ No newline at end of file
diff --git a/web/organizer/contacts.pl b/web/organizer/contacts.pl
index 844cc0ff7..c2ebfbc00 100644
--- a/web/organizer/contacts.pl
+++ b/web/organizer/contacts.pl
@@ -156,7 +156,7 @@ BEGIN
 my ($command)    = $objCGI->param('vsCOM') || "";
 my ($idNum)      = $objCGI->param('vsID')  || "";
 my ($scriptName) = $ENV{'SCRIPT_NAME'}     || "contacts.pl";
-$scriptName = $ia7_prefix . "/organizer/contacts.pl" if ( $web_mode eq "IA7" );
+$scriptName = $ia7_prefix . "/organizer/tasks.pl" if ( $web_mode eq "IA7" );
 my ($filePath) = $ENV{"CWD"} . "/" . $fileName;
 $filePath = "$config_parms{organizer_dir}/$fileName";
 my ($activePage)    = $objCGI->param('vsAP')          || "1";

From 2712cef0571886fd6ca8fc7129032db7557e7b14 Mon Sep 17 00:00:00 2001
From: jsiddall <jeff@siddall.name>
Date: Sat, 13 Aug 2016 13:36:38 -0400
Subject: [PATCH 21/21] Create MySensors.pm

Add MySensors controller implementation for Misterhouse
---
 lib/MySensors.pm | 987 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 987 insertions(+)
 create mode 100644 lib/MySensors.pm

diff --git a/lib/MySensors.pm b/lib/MySensors.pm
new file mode 100644
index 000000000..43b11c98a
--- /dev/null
+++ b/lib/MySensors.pm
@@ -0,0 +1,987 @@
+######################
+# Interface Package #
+######################
+
+=head1 B<MySensors::Interface>
+
+=head2 SYNOPSIS
+
+Usage
+
+The current version supports ethernet and serial gateways.
+
+The interface must be defined with 3 parameters: a type (serial or ethernet),
+an address (/dev/tty or an IP address:TCP port number) and a name used to
+easily identify the interface.
+
+Note that in MySensors terms the interface used here is an interface to a
+MySensors gateway.
+
+The node must be defined with 3 parameters: a node ID, name and gateway
+object.
+
+The sensors must also be defined with 3 parameters: a sensor ID, name and
+node object.
+
+Debugging information can be enabled by setting:
+debug=MySensors
+
+in a Misterhouse INI file.
+
+In user code:
+
+    $basement_gateway = new MySensors::Interface(serial, "/dev/ttyACM0", "Basement Gateway");
+    $media_room_gateway = new MySensors::Interface(ethernet, "192.168.0.22:5003", "Media Room Gateway");
+
+    $bedroom_node = new MySensors::Node(1, "Bedroom Node", $media_room_gateway);
+
+    $bedroom_motion = new MySensors::Motion(1, "Bedroom Motion", $bedroom_node);
+    if (state_now($bedroom_motion) eq ON) { print_log "Motion detected in the bedroom" };
+
+=head2 DESCRIPTION
+
+Class implementation of a MySensors interface.  For details see:
+https://mysensors.readthedocs.io/en/latest/protocol.html
+
+Gateway message format is:
+<node-id>;<child-sensor-id>;<message-type>;<ack>;<sub-type>;<payload>\n
+
+Maximum payload is 25 bytes
+
+Note that in MySensor terms the interface is known as a gateway, the sensor
+radio is known as a node and the sensors themselves are known as children. 
+
+Last updated for MySensors release 2.0
+Last modified: 2016-08-12
+
+Known Limitations:
+1. The current implementation does not distinguish SET/REQ and treats them all
+as SET
+2. The current implementaton handles only a small number of the most common
+sensor types.  More may be added in the future.
+3. The current implementation does not distinguish SET/REQ subtypes which
+means any sensor that sends multiple subtypes will behave unpredictably.
+4. The current implementation assumes all subtypes are read/write.  This may
+cause problems if an input is written to.  For example, writing to most input
+pins will enable/disable the internal pullup resistor.  While this may be
+desirable in some cases it could result in unexpected behavior. 
+5. Very little error trapping is done so errors in configuration or
+incompatible sensor implementations could cause unpredictable behavior or even
+crash Misterhouse.
+6. The current implementation does not use ACKs
+7. The current implementation does not handle units (or requests for units)
+8. The current implementation does not attempt to reconnect any port or socket
+disconnection
+
+=head2 INHERITS
+
+L<Generic_Item|Generic_Item>
+
+=head2 METHODS
+
+=over
+
+=cut
+
+package MySensors::Interface;
+
+use parent 'Generic_Item';
+
+use strict;
+
+# API details as of release 2.0
+# For more information see: https://www.mysensors.org/download/serial_api_20
+our @types = ( 'presentation', 'set', 'req', 'internal', 'stream' );
+
+# Define names of presentations
+our @presentations = (
+    'S_DOOR',                  'S_MOTION',
+    'S_SMOKE',                 'S_LIGHT',
+    'S_DIMMER',                'S_COVER',
+    'S_TEMP',                  'S_HUM',
+    'S_BARO',                  'S_WIND',
+    'S_RAIN',                  'S_UV',
+    'S_WEIGHT',                'S_POWER',
+    'S_HEATER',                'S_DISTANCE',
+    'S_LIGHT_LEVEL',           'S_ARDUINO_NODE',
+    'S_ARDUINO_REPEATER_NODE', 'S_LOCK',
+    'S_IR',                    'S_WATER',
+    'S_AIR_QUALITY',           'S_CUSTOM',
+    'S_DUST',                  'S_SCENE_CONTROLLER',
+    'S_RGB_LIGHT',             'S_RGBW_LIGHT',
+    'S_COLOR_SENSOR',          'S_HVAC',
+    'S_MULTIMETER',            'S_SPRINKLER',
+    'S_WATER_LEAK',            'S_SOUND',
+    'S_VIBRATION',             'S_MOISTURE',
+    'S_INFO',                  'S_GAS',
+    'S_GPS',                   'S_WATER_QUALITY'
+);
+
+# Define names for the set/req subtypes
+our @setreq = (
+    'V_TEMP',               'V_HUM',
+    'V_STATUS',             'V_PERCENTAGE',
+    'V_PRESSURE',           'V_FORECAST',
+    'V_RAIN',               'V_RAINRATE',
+    'V_WIND',               'V_GUST',
+    'V_DIRECTION',          'V_UV',
+    'V_WEIGHT',             'V_DISTANCE',
+    'V_IMPEDANCE',          'V_ARMED',
+    'V_TRIPPED',            'V_WATT',
+    'V_KWH',                'V_SCENE_ON',
+    'V_SCENE_OFF',          'V_HVAC_FLOW_STATE',
+    'V_HVAC_SPEED',         'V_LIGHT_LEVEL',
+    'V_VAR1',               'V_VAR2',
+    'V_VAR3',               'V_VAR4',
+    'V_VAR5',               'V_UP',
+    'V_DOWN',               'V_STOP',
+    'V_IR_SEND',            'V_IR_RECEIVE',
+    'V_FLOW',               'V_VOLUME',
+    'V_LOCK_STATUS',        'V_LEVEL',
+    'V_VOLTAGE',            'V_CURRENT',
+    'V_RGB',                'V_RGBW',
+    'V_ID',                 'V_UNIT_PREFIX',
+    'V_HVAC_SETPOINT_COOL', 'V_HVAC_SETPOINT_HEAT',
+    'V_HVAC_FLOW_MODE',     'V_TEXT',
+    'V_CUSTOM',             'V_POSITION',
+    'V_IR_RECORD',          'V_PH',
+    'V_ORP',                'V_EC',
+    'V_VAR',                'V_VA',
+    'V_POWER_FACTOR'
+);
+
+# Define names for the internals
+our @internals = (
+    'I_BATTERY_LEVEL',        'I_TIME',
+    'I_VERSION',              'I_ID_REQUEST',
+    'I_ID_RESPONSE',          'I_INCLUSION_MODE',
+    'I_CONFIG',               'I_FIND_PARENT',
+    'I_FIND_PARENT_RESPONSE', 'I_LOG_MESSAGE',
+    'I_CHILDREN',             'I_SKETCH_NAME',
+    'I_SKETCH_VERSION',       'I_REBOOT',
+    'I_GATEWAY_READY',        'I_REQUEST_SIGNING',
+    'I_GET_NONCE',            'I_GET_NONCE_RESPONSE',
+    'I_HEARTBEAT',            'I_PRESENTATION',
+    'I_DISCOVER',             'I_DISCOVER_RESPONSE',
+    'I_HEARTBEAT_RESPONSE',   'I_LOCKED',
+    'I_PING',                 'I_PONG',
+    'I_REGISTRATION_REQUEST', 'I_REGISTRATION_RESPONSE',
+    'I_DEBUG'
+);
+
+=item C<new()>
+
+Instantiates a new interface.
+
+=cut
+
+sub new {
+    my ( $class, $type, $address, $name ) = @_;
+    my $self = {};
+    bless $self, $class;
+
+    $$self{type}    = $type;
+    $$self{address} = $address;
+    $$self{name}    = $name;
+
+    # Also create the hash to store the node objects reachable from this gateway so we know what they are when we receive a message for them.
+    # Note that each sensor needs to be added to the sensors hash of the node also to track the sensors attached to that node.
+    $$self{nodes} = {};
+
+    if ( $type =~ /ethernet/i ) {
+
+        # Note that socket will contain a reference to the IO::Socket object
+        $$self{"socket"} = $self->create_socket( $address, $name );
+    }
+    elsif ( $type =~ /serial/i ) {
+
+        # Note that serial will contain the name of the MH serial object
+        $$self{"serial"} = $self->create_serial( $address, $name );
+    }
+
+    # Also add a hook to the main loop to check for gateway messages
+    &main::MainLoop_pre_add_hook( sub { $self->loop() }, 'persistent' );
+
+    return $self;
+}
+
+=item C<add_node()>
+
+Adds a new node to a gateway.
+
+Returns zero for success or the failed node_id otherwise.
+
+=cut
+
+sub add_node {
+    my ( $self, $node_id, $node ) = @_;
+
+    if ( exists $$self{nodes}{$node_id} ) {
+        &::print_log(
+            "[MySensors] ERROR: $$self{name} tried to add new node \"$$node{name}\" (ID: $node_id) but a node \"$$self{nodes}{$node_id}{name} (ID: $node_id) already exists!"
+        );
+        return $node_id;
+    }
+    else {
+        &::print_log(
+            "[MySensors] INFO: $$self{name} added node \"$$node{name}\" (ID: $node_id)"
+        );
+        $$self{nodes}{$node_id} = $node;
+    }
+
+    return 0;
+}
+
+=item C<create_socket()>
+
+Creates a socket to the Ethernet gateway.
+
+=cut
+
+sub create_socket {
+    my ( $self, $address, $name ) = @_;
+    print $name . "_socket\n";
+
+    # By default suport only TCP gateways.  UDP could be added in the future
+    my $socket =
+      new Socket_Item( undef, undef, $address, $name . "_socket", 'tcp',
+        'raw' );
+    start $socket;
+
+    return $socket;
+}
+
+=item C<create_serial()>
+
+Creates a serial port to the serial gateway.
+
+Returns the name of the serial port.
+
+=cut
+
+sub create_serial {
+    my ( $self, $address ) = @_;
+
+    # Setup the name and break character of the serial port
+    my $name  = $$self{name} . "_serial";
+    my $break = $name . "break";
+    $main::config_parms{$break} = '\n';
+
+    &main::serial_port_create( $name, $address, 115200, 'none' );
+    die "[MySensors] ERROR: $$self{name} can't open gateway port $address: $!\n"
+      unless $main::Serial_Ports{$name}{object};
+
+    return $name;
+}
+
+=item C<get_serial_data()>
+
+Gets new messages from the MySensors gateway.
+
+Returns the message (if available) or null if there is no data.
+
+=cut
+
+sub get_serial_data {
+    my ( $self, $serial ) = @_;
+
+    &::check_for_generic_serial_data($serial);
+    my $data = $::Serial_Ports{$serial}{data_record};
+    if ($data) {
+        $::Serial_Ports{$serial}{data_record} = undef;
+        &::print_log("[MySensors] DEBUG: $$self{name} received message: $data")
+          if $::Debug{mysensors};
+    }
+
+    return $data;
+}
+
+=item C<get_socket_data()>
+
+Gets new messages from the MySensors gateway.
+
+Returns the message (if available) or null if there is no data.
+
+=cut
+
+sub get_socket_data {
+    my ( $self, $socket ) = @_;
+
+    my $data = said $socket;
+
+    # Strip off the trailing newline
+    chomp $data;
+    if ($data) {
+        &::print_log("[MySensors] DEBUG: $$self{name} received message: $data")
+          if $::Debug{mysensors};
+    }
+
+    return $data;
+}
+
+=item C<loop()>
+
+Attaches to the main Misterhouse loop to check for gateway activity on each pass
+
+=cut
+
+sub loop {
+    my ($self) = @_;
+    my $data;
+
+    # On each pass check for new data
+    if ( $$self{type} =~ /ethernet/i ) {
+        $data = $self->get_socket_data( $$self{"socket"} );
+    }
+    elsif ( $$self{type} =~ /serial/i ) {
+        $data = $self->get_serial_data( $$self{"serial"} );
+    }
+
+    # If there is data then parse it
+    if ($data) {
+        $self->parse_message($data);
+    }
+
+    return 0;
+}
+
+=item C<parse_message()>
+
+Parse a MySensors message received from a gateway
+
+=cut
+
+sub parse_message {
+    my ( $self, $message ) = @_;
+
+    # Standard API messages are 6 values separated by semicolons
+
+    if ( $message =~ /(\d{1,3});(\d{1,3});(\d{1,3});([01]);(\d{1,3});*(.*)/ ) {
+        my ( $node_id, $child_id, $type, $ack, $subtype, $data ) =
+          ( $1, $2, $3, $4, $5, $6 );
+
+        # Handle presentation (type 0)  messages
+        if ( $type == 0 ) {
+            &::print_log(
+                "[MySensors] INFO: $$self{name} recieved presentation for $$self{nodes}{$node_id}{name} (ID: $node_id) $$self{nodes}{$node_id}{sensors}{$child_id}{name} (ID: $child_id) subtype $subtype ($presentations[$subtype]) data $data"
+            );
+
+            # Handle set/req (type 1, 2) messages
+            # Note: these two types are not currently distinguished and both are treated as SET requests!
+        }
+        elsif ( ( $type == 1 ) || ( $type == 2 ) ) {
+            if ( exists( $$self{nodes}{$node_id}{sensors}{$child_id} ) ) {
+                &::print_log(
+                    "[MySensors] INFO: $$self{name} received set message for $$self{nodes}{$node_id}{name} (ID: $node_id) $$self{nodes}{$node_id}{sensors}{$child_id}{name} (ID: $child_id) to "
+                      . $$self{nodes}{$node_id}{sensors}{$child_id}
+                      ->convert_data_to_state($data)
+                      . " ($data)" );
+                $$self{nodes}{$node_id}{sensors}{$child_id}->set_receive($data);
+            }
+            else {
+                &::print_log(
+                    "[MySensors] WARN: $$self{name} recieved unrecognized set/req: node=$node_id, child=$child_id, subtype=$subtype ($setreq[$subtype]), data=$data"
+                );
+            }
+
+            # Handle internal (type 3) messages
+        }
+        elsif ( $type == 3 ) {
+
+            # Handle gateway messages (node 0, child 255)
+            if ( ( $node_id == 0 ) && ( $child_id == 255 ) ) {
+
+                # Don't print SANCHK messages as they just clutter the logs
+                if ( $data ne 'TSP:SANCHK:OK' ) {
+                    &::print_log(
+                        "[MySensors] INFO: $$self{name} received $internals[$subtype]: $data"
+                    );
+                }
+
+                # Handle requests for node ID (subtype 3)
+            }
+            elsif (( $node_id == 255 )
+                && ( $child_id == 255 )
+                && ( $subtype == 3 ) )
+            {
+                if ( !exists $::Save{MySensors_next_node_id} ) {
+                    $::Save{MySensors_next_node_id} = 1;
+                }
+
+                my $next_id = $::Save{MySensors_next_node_id};
+                &::print_log(
+                    "[MySensors] INFO: $$self{name} recieved node ID request.  Assigned node ID $next_id."
+                );
+
+                $self->send_message( 255, 255, 3, 0, 4, $next_id );
+
+                # Increment the next node ID
+                $::Save{MySensors_next_node_id} = $next_id + 1;
+
+                # Otherwise we don't know about this type of internal message
+            }
+            else {
+                &::print_log(
+                    "[MySensors] WARN: $$self{name} recieved unrecognized internal: node=$node_id, child=$child_id, subtype=$subtype ($internals[$subtype]), data=$data"
+                );
+            }
+
+            # Handle stream (type 4) messages
+        }
+        elsif ( $type == 4 ) {
+            &::print_log(
+                "[MySensors] WARN: $$self{name} recieved stream message (unsupported): node=$node_id, child=$child_id, subtype=$subtype, data=$data"
+            );
+
+            # Any other message is unrecognized
+        }
+        else {
+            &::print_log(
+                "[MySensors] ERROR: $$self{name} recieved unrecognized message: node=$node_id, child=$child_id, type=$type, subtype=$subtype, data=$data"
+            );
+        }
+
+        # If gateway debug is enabled in the Arduino then other non-standard messages may be received
+    }
+    else {
+        &::print_log(
+            "[MySensors] DEBUG: $$self{name} received Arduino debug message: $message"
+        ) if $::Debug{mysensors};
+    }
+}
+
+=item C<send_message()>
+
+Send a MySensors message to the gateway
+
+=cut
+
+sub send_message {
+    my ( $self, $node_id, $child_id, $type, $ack, $subtype, $data ) = @_;
+
+    # Standard API messages are 6 values separated by semicolons
+    my $message = "$node_id;$child_id;$type;$ack;$subtype;$data\n";
+
+    if ( $$self{type} =~ /ethernet/i ) {
+
+        # Note that socket will contain a reference to the Misterhouse Socket_Item object
+        $$self{socket}->set($message);
+    }
+    elsif ( $$self{type} =~ /serial/i ) {
+
+        # Note that serial will contain the name of the Misterhouse serial object
+        $::Serial_Ports{ $$self{serial} }{object}->write($message);
+    }
+
+    &::print_log("[MySensors] DEBUG: $$self{name} sent message: $message")
+      if $::Debug{mysensors};
+
+    return 0;
+}
+
+################
+# Node Package #
+################
+
+# Note that the nodes are also Generic_Items not MySensors::Interfaces.  This
+# is similar to the Insteon design but not X10.
+
+package MySensors::Node;
+
+use strict;
+
+use parent 'Generic_Item';
+
+=item C<new()>
+
+Instantiates a new node.
+
+=cut
+
+sub new {
+    my $class = shift;
+    my ( $node_id, $name, $gateway ) = @_;
+
+    # Instantiate as a Generic_Item first
+    my $self = $class->SUPER::new(@_);
+
+    $$self{node_id} = $node_id;
+    $$self{name}    = $name;
+    $$self{gateway} = $gateway;
+
+    # Push this node information to the gateway
+    $gateway->MySensors::Interface::add_node( $node_id, $self );
+
+    # Also create the hash to store the sensor objects reachable from this node so we know what they are when we receive a message for them.
+    $$self{sensors} = {};
+    return $self;
+}
+
+=item C<add_sensor()>
+
+Adds a new child sensor to a node.
+
+Returns zero for success or the failed child_id otherwise.
+
+=cut
+
+sub add_sensor {
+    my ( $self, $child_id, $sensor ) = @_;
+
+    if ( exists $$self{sensor}{$child_id} ) {
+        &::print_log(
+            "[MySensors] ERROR: $$self{gateway}{name} tried to add new sensor $child_id to node $$self{name} (ID $$self{node_idname}) but a child $child_id already exists!"
+        );
+        return $child_id;
+    }
+    else {
+        &::print_log(
+            "[MySensors] INFO: $$self{gateway}{name} added $$sensor{name} (ID: $child_id) to $$self{name} (ID $$self{node_id})"
+        );
+        $$self{sensors}{$child_id} = $sensor;
+    }
+
+    return 0;
+}
+
+##################
+# Sensor Package #
+##################
+
+# All varieties of sensors are children of the MySensors::Sensor
+
+package MySensors::Sensor;
+
+use strict;
+
+use parent 'Generic_Item';
+
+=item C<new()>
+
+Instantiates a new sensor.
+
+=cut
+
+sub new {
+    my $class = shift;
+    my ( $child_id, $name, $node ) = @_;
+
+    # Instantiate as a Generic_Item first
+    my $self = $class->SUPER::new(@_);
+
+    $$self{name} = $name;
+
+    $$self{child_id} = $child_id;
+    $$self{node}     = $node;
+
+    # Push this sensor information to the node
+    $node->MySensors::Node::add_sensor( $child_id, $self );
+
+    return $self;
+}
+
+=item C<set_states()>
+
+Sets the appropriate states for the sensor item
+
+Returns 0.
+
+=cut
+
+sub set_states {
+    my ($self) = @_;
+
+    # Each sensor device should have valid states stored in the keys of the state_to_data hash
+    if ( keys %{ $$self{state_to_data} } ) {
+        $self->SUPER::set_states( keys %{ $$self{state_to_data} } );
+    }
+    else {
+        &::print_log(
+            "[MySensors] ERROR: $$self{gateway}{name} Could not find valid states for node $$self{node}{node_id} sensor $$self{child_id}!  This is likely a bug in the sensor package."
+        );
+    }
+
+    return 0;
+}
+
+=item C<convert_data_to_state([data])>
+
+Converts MySensors data into a Misterhouse state when receiving a message from
+the interface.
+
+Returns state or null if no conversion was found.
+
+=cut
+
+sub convert_data_to_state {
+    my ( $self, $data ) = @_;
+    my $state = '';
+
+    # Each sensor device with predefined states should have two hashes mapping misterhouse state to data and data to state
+    if ( exists $$self{data_to_state}{$data} ) {
+        $state = $$self{data_to_state}{$data};
+
+        # Some sensors return numerical values and for these the state and data are the same
+    }
+    elsif (( $$self{type} == 0 )
+        || ( $$self{type} == 1 )
+        || ( $$self{type} == 3 ) )
+    {
+        $state = $data;
+    }
+
+    return $state;
+}
+
+=item C<convert_state_to_data([state])>
+
+Converts a misterhouse state into MySensors data when sending a message to
+the interface.
+
+Returns data or null if no conversion was found.
+
+=cut
+
+sub convert_state_to_data {
+    my ( $self, $state ) = @_;
+    my $data = '';
+
+    # Each sensor device should have two hashes mapping misterhouse state to data and data to state
+    if ( exists $$self{state_to_data}{$state} ) {
+        $data = $$self{state_to_data}{$state};
+
+        # Some sensors return numerical values and for these the state and data are the same
+    }
+    elsif (( $$self{type} == 0 )
+        || ( $$self{type} == 1 )
+        || ( $$self{type} == 3 ) )
+    {
+        $data = $state;
+    }
+
+    return $data;
+}
+
+=item C<type([type])>
+
+Used to store and return the associated type of a sensor.
+
+Type is an 8 bit integer value defined in the API here:
+https://www.mysensors.org/download/serial_api_15
+
+Type is called by each individual child sensor
+
+If provided, stores type as the sensor's type.
+
+Returns type.
+
+=cut
+
+sub type {
+    my ( $self, $type ) = @_;
+
+    $$self{type} = $type;
+
+    return $type;
+}
+
+=item C<set([state], [set_by], [respond])>
+
+Used to update the state of an object when an update is received from the
+interface or update the state and send a message to the interface when set by
+anything else.
+
+Returns state.
+
+=cut
+
+sub set {
+    my ( $self, $state, $set_by, $respond ) = @_;
+
+    # Check if the set_by is not the interface, in which case the message needs to be sent first
+    if ( $$self{node}{gateway} != $set_by ) {
+
+        # Find the data that corresponds to the state for this device
+        my $data = $self->convert_state_to_data($state);
+
+        # Make sure $data isn't null.  Null means valid data isn't present for this state.
+        if ( $data ne '' ) {
+
+            # By default send the first (primary) subtype and use type 1 (SET) without ACK
+            $$self{node}{gateway}->send_message( $$self{node}{node_id},
+                $$self{child_id}, 1, 0, $$self{subtypes}[0], $data );
+        }
+        else {
+            &::print_log(
+                "[MySensors] ERROR: $$self{node}{gateway}{name} cannot find state \"$state\" for $$self{node}{name} (ID: $$self{node}{node_id}) $$self{name} (ID: $$self{child_id}).  Was the correct type of sensor used?"
+            );
+        }
+    }
+
+    # Now call the Generic_Item set method to update the object and trigger state_now etc.
+    $self->SUPER::set( $state, $set_by, $respond );
+
+    return $state;
+}
+
+=item C<set_receive([data])>
+
+Used to update the state of an object when a state update is received from the
+interface.
+
+Returns state
+
+=cut
+
+sub set_receive {
+    my ( $self, $data ) = @_;
+
+    # This is called only by the interface to update the state of a sensor based on a received message.
+    # Find the data that corresponds to the state for this device
+    my $state = $self->convert_data_to_state($data);
+
+    # Make sure $state isn't null.  Null means valid state isn't present for this data (ex: incorrect sensor type used).
+    if ( $state ne '' ) {
+        $self->set( $state, $$self{node}{gateway} );
+    }
+    else {
+        &::print_log(
+            "[MySensors] ERROR: $$self{node}{gateway}{name} cannot find state \"$state\" for data \"$data\" for $$self{node}{name} (ID: $$self{node}{node_id}) $$self{name} (ID: $$self{child_id}).  Was the correct type of sensor used?"
+        );
+    }
+
+    return $state;
+}
+
+################
+# Door Package #
+################
+
+package MySensors::Door;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new door/window sensor.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Door is presentation type 0
+    $$self{type} = 0;
+
+    # Door type sensors use the V_TRIPPED and V_ARMED subtypes
+    $$self{subtypes} = [ 16, 15 ];
+
+    # Also define the data to state and state to data mappings
+    $$self{data_to_state} = { 0        => 'closed', 1        => 'opened' };
+    $$self{state_to_data} = { 'closed' => 0,        'opened' => 1 };
+
+    # Add the states to the item
+    $self->set_states();
+
+    return $self;
+}
+
+#########################
+# Motion Sensor Package #
+#########################
+
+package MySensors::Motion;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new motion sensor.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Motion sensors are presentation type 1
+    $$self{type} = 1;
+
+    # Motion sensors use the V_TRIPPED and V_ARMED subtypes
+    $$self{subtypes} = [ 16, 15 ];
+
+    # Also define the data to state and state to data mappings
+    $$self{data_to_state} = { 0       => 'still', 1        => 'motion' };
+    $$self{state_to_data} = { 'still' => 0,       'motion' => 1 };
+
+    # Add the states to the item
+    $self->set_states();
+
+    return $self;
+}
+
+#################
+# Light Package #
+#################
+
+package MySensors::Light;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new light.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Lights and binary are presentation type 3
+    $$self{type} = 3;
+
+    # Light and binary type sensors use the V_STATUS and V_WATT subtypes
+    $$self{subtypes} = [ 2, 17 ];
+
+    # Also define the data to state and state to data mappings
+    $$self{data_to_state} = { 0     => 'off', 1    => 'on' };
+    $$self{state_to_data} = { 'off' => 0,     'on' => 1 };
+
+    # Add the states to the item
+    $self->set_states();
+
+    return $self;
+}
+
+##################
+# Binary Package #
+##################
+
+package MySensors::Binary;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new binary sensor.  This is an alias for a light.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Lights and binary are presentation type 3
+    $$self{type} = 3;
+
+    # Light and binary type sensors use the V_STATUS and V_WATT subtypes
+    $$self{subtypes} = [ 2, 17 ];
+
+    # Also define the data to state and state to data mappings
+    $$self{data_to_state} = { 0     => 'off', 1    => 'on' };
+    $$self{state_to_data} = { 'off' => 0,     'on' => 1 };
+
+    # Add the states to the item
+    $self->set_states();
+
+    return $self;
+}
+
+#######################
+# Temperature Package #
+#######################
+
+package MySensors::Temperature;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new temperature sensor.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Temperature are presentation type 6
+    $$self{type} = 6;
+
+    # Temperature type sensors use the V_TEMP and V_ID subtypes
+    $$self{subtypes} = [ 0, 42 ];
+
+    # Note: there are no predefined states or state mappings for temperature sensors
+
+    return $self;
+}
+
+####################
+# Humidity Package #
+####################
+
+package MySensors::Humidity;
+
+use strict;
+
+use parent-norequire, 'MySensors::Sensor';
+
+=item C<new()>
+
+Instantiates a new humidity sensor.
+
+=cut
+
+sub new {
+    my $class = shift;
+
+    # Instantiate as a MySensors::Sensor first
+    my $self = $class->SUPER::new(@_);
+
+    # Humidity are presentation type 7
+    $$self{type} = 7;
+
+    # Humidity type sensors use the V_HUM subtype
+    $$self{subtypes} = [1];
+
+    # Note: there are no predefined states or state mappings for temperature sensors
+
+    return $self;
+}
+
+=head2 AUTHOR
+
+Jeff Siddall (news@siddall.name)
+
+=head2 LICENSE
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+=cut
+