bike
/
Yellow-Bike-Database-Mirror
mirror of https://github.com/fspc/Yellow-Bike-Database.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

This partially addresses #43.

devel
Jonathan Rosenbaum 7 years ago
parent
49157e3341
commit
8aae19686b
2 changed files with 24 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Connections/database_functions.php
  2. 39
      shop_log.php

4
Connections/database_functions.php
View File

@ -281,9 +281,9 @@ define('SHOW_SHOP_ID',0);
**************/ **************/
// Allow comments/feedback/notes to be added per individual_history_log in reports, // Allow comments/feedback/notes to be added per individual_history_log in reports,
// and globally in shop_log. An etherpad host has to be defined for this to work. // and globally in shop_log. An etherpad host has to be defined for this to work.
// See wiki for instructions on how to setup an etherpad docker instance.r // See wiki for instructions on how to setup an etherpad docker instance.
// //
// prefix allows you to set a prefix to the name of the autogenerated padID: // prefix allows you to set a prefix to the name of the autogenerated padId:
// etherpad = prefix + "pad_contact_id_" + contact_id; // etherpad = prefix + "pad_contact_id_" + contact_id;
// etherpad_global = prefix_ + "global_pad" // etherpad_global = prefix_ + "global_pad"
// See https://github.com/ether/etherpad-lite-jquery-plugin for information about other configurations. // See https://github.com/ether/etherpad-lite-jquery-plugin for information about other configurations.

39
shop_log.php
View File

@ -76,28 +76,33 @@ if($_GET['new_user_id']>0){
$( window ).on( "load", function() { $( window ).on( "load", function() {
var body_margin = $("#shop_log_iframe").contents().find("body").css("margin"); if ( $("#epframeshop_log_pad").length ) {
body_margin = body_margin.replace("px","");
body_margin = body_margin * 4;
var shop_log_height = $("#shop_log_iframe").contents().find("#shop_height").height() +
$("#shop_log_iframe").contents().find("#header_height").height() + body_margin;
$("#shop_log_iframe").css({"height": shop_log_height});
$("#shop_log_iframe").contents().find("#shop_log_link").attr("href","/shop_log_iframe.php");
// does this work?
$("#shop_log_iframe").contents().find("#sign_in_button").on("click keypress", function(e){
var body_margin = $("#shop_log_iframe").contents().find("body").css("margin"); var body_margin = $("#shop_log_iframe").contents().find("body").css("margin");
body_margin = body_margin.replace("px",""); body_margin = body_margin.replace("px","");
body_margin = body_margin * 4; body_margin = body_margin * 4;
var shop_log_height = $("#shop_log_iframe").contents().find("#shop_height").height() + var shop_log_height = $("#shop_log_iframe").contents().find("#shop_height").height() +
$("#shop_log_iframe").contents().find("#header_height").height() + body_margin; $("#shop_log_iframe").contents().find("#header_height").height() + body_margin;
$("#shop_log_iframe").css({"height": shop_log_height}); $("#shop_log_iframe").css({"height": shop_log_height});
}); $("#shop_log_iframe").contents().find("#shop_log_link").attr("href","/shop_log_iframe.php");
// does this work?
$("#shop_log_iframe").contents().find("#sign_in_button").on("click keypress", function(e){
var body_margin = $("#shop_log_iframe").contents().find("body").css("margin");
body_margin = body_margin.replace("px","");
body_margin = body_margin * 4;
var shop_log_height = $("#shop_log_iframe").contents().find("#shop_height").height() +
$("#shop_log_iframe").contents().find("#header_height").height() + body_margin;
$("#shop_log_iframe").css({"height": shop_log_height});
});
} // if etherpad
}); // end $( window ).on }); // end $( window ).on

Write Preview
Loading…
Cancel
Save