bike/Yellow-Bike-Database-Mirror
1
0
Fork 0
mirror of https://github.com/fspc/Yellow-Bike-Database.git synced 2025-04-04 09:33:24 -04:00
Code Issues Projects Releases Wiki Activity

This partially addresses #43.

Browse Source
This commit is contained in:
Jonathan Rosenbaum 2017-12-11 06:38:56 +00:00
parent 49157e3341
commit 8aae19686b
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

5
shop_log.php
View File

@ -76,6 +76,9 @@ if($_GET['new_user_id']>0){
$( window ).on( "load", function() { $( window ).on( "load", function() {
if ( $("#epframeshop_log_pad").length ) {
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;
@ -99,6 +102,8 @@ if($_GET['new_user_id']>0){
}); });
} // if etherpad
}); // end $( window ).on }); // end $( window ).on