Merge pull request #527 from hplato/ia7

Ia7

data/web/ia7_config.json

@@ -1,8 +1,18 @@
-{
+{ 
   "prefs" : {
      "header_button" : "yes",
      "state_log_show" : "yes",
      "state_log_entries" : "4",
-     "always_double_buttons" : "no"
+     "always_double_buttons" : "yes",
+     "fp_icon_size" : "32",
+     "fp_state_popovers" : "yes",
+     "substate_percentages" : "20",
+     "disable_current_state" : "yes"
+  },
+  "objects" : {
+  	  "example_object" : {
+  	  	  "disable_current_state" : "no"
+  	  }
   }
-}
+
+}

lib/FPCamera_Item.pm

@@ -0,0 +1,66 @@
+
+package FPCamera_Item;
+
+use warnings;
+
+@FPCamera_Item::ISA = ('Generic_Item');
+#  $backyard_cam = FPCamera_Item;
+#  $backyard_cam -> set_img("http://127.0.0.1/image.cgi");
+#  $backyard_cam -> set_link("http://zm/monitors");
+
+sub new {
+   my ($class) = @_;
+   my $self = {};
+   bless $self, $class;
+# States active/inactive?
+   return $self;
+}
+
+sub set_img {
+   my ($self, $addr)= @_;
+   $self->{img} = $addr;
+}
+
+sub get_img {
+  my ($self) = @_;
+  my $img = "";
+  $img = $self->{img} if (defined $self->{img});
+  return $img;
+}
+
+sub set_video {
+   my ($self, $addr)= @_;
+   $self->{video} = $addr;
+}
+
+sub get_video {
+  my ($self) = @_;
+  my $video = "";
+  $video = $self->{video} if (defined $self->{video});
+  return $video;
+}
+
+sub set_thumbnail {
+   my ($self, $addr)= @_;
+   $self->{tn} = $addr;
+}
+
+sub get_thumbnail {
+  my ($self) = @_;
+  my $tn = "";
+  $tn = $self->{tn} if (defined $self->{tn});
+  return $tn;
+}
+
+sub set_link {
+# just return a link to a source. Used by IA7 floorplan interface if the image is clicked
+   my ($self, $addr)= @_;
+   $self->{link} = $addr;
+}
+
+sub get_link {
+  my ($self) = @_;
+  my $link = "";
+  $link = $self->{link} if (defined $self->{link});
+  return $link;
+}

lib/Generic_Item.pm

@@ -957,6 +957,37 @@ sub get_fp_icons {
     }
 }
 
+=item C<set_fp_icons_set(name)>
+
+Sets the icons group used by the IA7 floorplan web interface.  The name contains the 
+group name of icons that can be found in /web/ia7/graphics.
+Can only be run at startup or reload.
+
+=cut
+
+sub set_fp_icon_set {
+    return unless $main::Reload;
+    my ($self, $icons) = @_;
+    $$self{fp_icon_set}=$icons;
+}
+
+=item C<get_fp_icons()>
+
+Returns the name of the icon set used by the floorplan IA7 web interface that were set 
+by C<set_fp_icon_set>.
+
+=cut
+
+sub get_fp_icon_set {
+    my ($self) = @_;
+    if ($$self{fp_icon_set}) {
+        return $$self{fp_icon_set};
+    } else {
+        return undef;
+    }
+}
+
+
 =item C<set_states(states)>
 
 Sets valid states to states, which is a list or array.  Can only be run at startup or reload.  TODO

lib/json_server.pl

@@ -579,7 +579,7 @@ sub json_object_detail {
 	my %json_complete_object;
 	my @f = qw( category filename measurement rf_id set_by members
 	  state states state_log type label sort_order groups hidden parents
-	  idle_time text html seconds_remaining fp_location fp_icons level);
+	  idle_time text html seconds_remaining fp_location fp_icons fp_icon_set img link level);
 
 	# Build list of fields based on those requested.
 	foreach my $f ( sort @f ) {

web/ia7/house/main.shtml

@@ -72,7 +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 IA7 web interface, updates by H.Plato. IA7 v1.0.300</small></p>
+			developed the v4 web interface, updates by H.Plato. IA7 v1.0.700 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
 		</div>
 	</div>
 </div>