diff --git a/docs/LICENSE.txt b/docs/LICENSE.txt index 9851ca0c..b5a9d9d5 100644 --- a/docs/LICENSE.txt +++ b/docs/LICENSE.txt @@ -294,6 +294,7 @@ The above AGPLv2 license is what the entire VICIdial codebase is released under. We have also incorporated another small open-soruce project's code into VICIdial , pure-knob, that is under the Apache 2.0 License, which is shown below: +Andre Plötze, © 2018 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -499,3 +500,41 @@ We have also incorporated another small open-soruce project's code into VICIdial WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + + + + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + + + +We have also incorporated another small open-soruce project's code into VICIdial +, Chart.js, that is under the MIT License, which is shown below: + + + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +The MIT License (MIT) + +Copyright (c) 2018 Chart.js Contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 2ed55f01..c78b8c11 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -41741,14 +41741,19 @@ if ($ADD==999995) } echo "

"._QXZ("Other integrated software disclaimers").":

\n"; + echo "
\n"; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; - - echo "\n"; - - echo "\n"; + echo ""; + echo ""; + echo "\n"; + echo "\n"; + echo "\n"; echo "
"._QXZ("Pure-knob").": "._QXZ("Copyright").":   "._QXZ("The pure-knob javascript library was written by Andre Plötze").", © 2018
"._QXZ("License").":   "._QXZ("Pure-knob is licensed under the")." Apache 2.0 "._QXZ("open source license")."
"._QXZ("Source Code").":   "._QXZ("Pure-knob original source code is available at")." "._QXZ("this link").".
"._QXZ("Pure-knob Copyright").":   "._QXZ("The pure-knob javascript library was written by Andre Plötze").", © 2018
"._QXZ("Pure-knob License").":   "._QXZ("Pure-knob is licensed under the")." Apache 2.0 "._QXZ("open source license")."
"._QXZ("Pure-knob Source Code").":   "._QXZ("Pure-knob source code is available at")." "._QXZ("this link").".
 
"._QXZ("Chart.js").": "._QXZ("Copyright").":   "._QXZ("The Chart.js javascript library was written by Chart.js Contributors").", © 2018
"._QXZ("License").":   "._QXZ("Chart.js is licensed under the")." MIT "._QXZ("open source license")."
"._QXZ("Source Code").":   "._QXZ("Chart.js original source code is available at")." "._QXZ("this link").".
\n"; } ##### END copyright trademark license page ##### diff --git a/www/vicidial/vicidial_whiteboard_functions.php b/www/vicidial/vicidial_whiteboard_functions.php index 3d0d7d1d..7eeeb54b 100644 --- a/www/vicidial/vicidial_whiteboard_functions.php +++ b/www/vicidial/vicidial_whiteboard_functions.php @@ -8,12 +8,13 @@ if (isset($_GET["mobile"])) {$mobile=$_GET["mobile"];} ?> // vicidial_whiteboard_functions.php // -// Copyright (C) 2019 Matt Florell , Joe Johnson LICENSE: AGPLv2 +// Copyright (C) 2017 Matt Florell , Joe Johnson LICENSE: AGPLv2 // // Javascript file used in AST_rt_whiteboard_reports.php and AST_rt_whiteboard_report_mobile.php // // 171027-2352 - First build // 190226-1645 - Added mobile variable for mobile versions of reports +// 190307-0142 - Change auto-resize on load if device is mobile, removed debug // var main_canvas = document.getElementById("MainReportCanvas"); @@ -21,8 +22,13 @@ var size = { width: window.innerWidth || document.body.clientWidth, height: window.innerHeight || document.body.clientHeight } + main_canvas.width=size.width-220; main_canvas.height=size.height-220; + +main_canvas.width=size.width-220; +main_canvas.height=size.height-300; + // global chart names var MainGraph=null; @@ -352,7 +358,7 @@ function RefreshReportWindow() { var Top10HTMLChart="
"; Top10HTMLChart+=""; - Top10HTMLChart+=""; + Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+="";
"+"
"+alert_text+"