Skip to content

Commit

Permalink
IA7 v1.5.830 - minor improvements to email, mobile tables
Browse files Browse the repository at this point in the history
  • Loading branch information
@hplato
hplato committed Aug 25, 2017
1 parent 1ce3d41 commit 7730a04
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 23 deletions.
1 change: 0 additions & 1 deletion lib/json_server.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,6 @@ sub json_page {
$output .= "Server: MisterHouse\r\n";
$output .= "Connection: close\r\n";
$output .= "Content-type: application/json\r\n";
$output .= "Connection: close\r\n";
if ($options =~ m/compress/) {
print_log("json_server.pl: DEBUG: Compressing Data as requested by client") if $Debug{json};
my $json;
Expand Down
2 changes: 1 addition & 1 deletion web/ia7/house/main.shtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,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
designed the IA7 web prototype, updates by H.Plato. IA7 v1.5.810 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
designed the IA7 web prototype, updates by H.Plato. IA7 v1.5.830 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
</div>
</div>
</div>
Expand Down
33 changes: 17 additions & 16 deletions web/ia7/include/javascript.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// v1.5.810
// v1.5.830

var entity_store = {}; //global storage of entities
var json_store = {};
Expand Down Expand Up @@ -151,7 +151,7 @@ function changePage (){
$("#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;
//TODO if (json_store.ia7_config.prefs.developer !== undefined) developer = json_store.ia7_config.prefs.developer;
if (json_store.ia7_config.prefs.tooltips !== undefined) show_tooltips = json_store.ia7_config.prefs.tooltips;
// First time loading, set the default speech notifications
if (speech_sound === undefined) {
Expand Down Expand Up @@ -195,7 +195,7 @@ function changePage (){
display_mode = c.substring(13, c.length);
}
if (c.indexOf("developer") == 0) {
developer = c.substring(10, c.length);
//TODO developer = c.substring(10, c.length);
}
}
}
Expand Down Expand Up @@ -415,7 +415,9 @@ function parseLinkData (link,data) {
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"');
data = data.replace(/<a href='RUN;\/ia5\/news\/main.shtml\?Check_for_e_mail'>Check for new e mail<\/a>/img, '<button type="button" class="btn btn-default btn-voice-cmd" voice_cmd="Check_for_e_mail" onclick="\$.get(\'/RUN;last_response?select_cmd=Check_for_e_mail\')">Check for new email<\/button>');
data = data.replace(/<td>\+ Sort by /img,'<td>');

}
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'))
Expand Down Expand Up @@ -1873,7 +1875,7 @@ var object_history = function(items,start,days,time) {
var URLHash = URLToHash();
var graph = 0;
var data_timeout = 0;
if (developer) graph = 1; //right now only show the graph if in developer mode
if (developer == true) graph = 1; //right now only show the graph if in developer mode
if (typeof time === 'undefined'){
if (graph) {
$('#list_content').html("<div id='top-graph' class='row top-buffer'>");
Expand Down Expand Up @@ -2125,7 +2127,7 @@ var fp_getOrCreateIcon = function (json, entity, i, coords){
E.bind("dragstart", noDragDrop);
var image = get_fp_image(json.data[entity]);
E.attr('src',"/ia7/graphics/"+image);
if (developer)
if (developer == true)
E.css("border","1px solid black");

return E;
Expand Down Expand Up @@ -2240,7 +2242,7 @@ var floorplan = function(group,time) {
if (typeof time === 'undefined'){
//var window_width = $(window).width();
$('#list_content').html("<div id='floorplan' class='row top-buffer'>");
if (developer){
if (developer === true){
// 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>" +
Expand All @@ -2255,7 +2257,7 @@ var floorplan = function(group,time) {
$('#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 (developer){
if (developer === true){
$('#fp_graphic').css("border","1px solid black");
$('#list_content').append("<div id='fp_positionless_items' />");
$('#list_content').append("<pre id='fp_pos_perl_code' />");
Expand All @@ -2274,9 +2276,8 @@ var floorplan = function(group,time) {
updateSocket.abort();
}

if (developer){
if (developer === true){
// update positon

$(document).mousemove(function(e){
var offset = $("#fp_graphic").offset();
var width = $("#fp_graphic").width();
Expand Down Expand Up @@ -2413,15 +2414,15 @@ var floorplan = function(group,time) {
//var t0 = performance.now();
JSONStore(json);
for (var entity in json.data) {
if (developer && requestTime === 0){
if (developer === true && 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 (developer && requestTime === 0){
if (developer === true && requestTime === 0){
if (perl_pos_coords.length !== 0){
perl_pos_coords += ", ";
}
Expand Down Expand Up @@ -2618,7 +2619,7 @@ var floorplan = function(group,time) {
}
}

if (developer && requestTime === 0){
if (developer === true && requestTime === 0){
if (perl_pos_coords.length===0)
{
fp_getOrCreateIcon(json, entity, 0, "");
Expand All @@ -2643,7 +2644,7 @@ var floorplan = function(group,time) {
}
}
fp_reposition_entities();
if (requestTime === 0 && developer){
if (requestTime === 0 && developer === true){
$('#list_content').append("<p>&nbsp;</p>");
$.ajax({
type: "GET",
Expand Down Expand Up @@ -3102,7 +3103,7 @@ var create_state_modal = function(entity) {
}
}

if (developer)
if (developer === true)
$('.mhstatemode').show();
else
$('.mhstatemode').hide();
Expand Down Expand Up @@ -3310,7 +3311,7 @@ $(document).ready(function() {
develop_active = "";
develop_checked = "";
}
if (display_mode == "advanced" && developer == true) {
if (display_mode == "advanced" && developer === true) {
simple_active = "";
simple_checked = "";
advanced_active = "";
Expand Down
6 changes: 3 additions & 3 deletions web/ia7/include/tables.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
#rtable table {
width: 97%;
margin-top: 8px;
margin-left: 15px;
margin-right: 15px;
margin-left: 5px;
margin-right: 5px;
}
/* Zebra striping */
#rtable tr:nth-of-type(even) {
Expand Down Expand Up @@ -119,7 +119,7 @@
border: none;
border-bottom: 1px solid #eee;
position: relative;
padding-left: 50%;
padding-left: 40%;
}

#rtable td:before {
Expand Down
5 changes: 3 additions & 2 deletions web/ia7/index.shtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,11 @@
margin-left: 10px;
}
#hist-table {
margin-left: 10px;
margin-left: 5px;
}
.hist-table-margin {
padding-right: 35px;
padding-right: 0px !important;
padding-left: 0px !important;
}
#rrd-graph {
width:700px;
Expand Down

0 comments on commit 7730a04

Please sign in to comment.