extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove inline-scripts from egw_tail. Additionally, add a new library to jsapi related to egw_tail

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-27 14:29:24 +00:00
parent 2e9b753292
commit ea20648d39
3 changed files with 93 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
phpgwapi/inc/class.egw_tail.inc.php
View File

@ -148,11 +148,10 @@ class egw_tail
* Return html & javascript for logviewer
*
* @param string $header=null default $this->filename
* @param string $id='log'
* @return string
* @throws egw_exception_wrong_parameter
*/
public function show($header=null, $id='log')
public function show($header=null)
{
if (!isset($this->filename))
{
@ -161,73 +160,19 @@ class egw_tail
if (is_null($header)) $header = $this->filename;
return '
<script type="text/javascript">
var '.$id.'_tail_start = 0;
function button_'.$id.'(button)
{
if (button.id != "clear_'.$id.'")
{
var ajax = new egw_json_request("home.egw_tail.ajax_delete",["'.$this->filename.'",button.id=="empty_'.$id.'"]);
ajax.sendRequest(true);
}
$j("#'.$id.'").text("");
}
function refresh_'.$id.'()
{
var ajax = new egw_json_request("home.egw_tail.ajax_chunk",["'.$this->filename.'",'.$id.'_tail_start]);
ajax.sendRequest(true,function(_data) {
if (_data.length) {
'.$id.'_tail_start = _data.next;
var log = $j("#'.$id.'").append(_data.content.replace(/</g,"&lt;"));
log.animate({ scrollTop: log.prop("scrollHeight") - log.height() + 20 }, 500);
}
if (_data.size === false)
{
$j("#download_'.$id.'").hide();
}
else
{
$j("#download_'.$id.'").show().attr("title","'.lang('Size').': "+_data.size);
}
if (_data.writable === false)
{
$j("#delete_'.$id.'").hide();
$j("#empty_'.$id.'").hide();
}
else
{
$j("#delete_'.$id.'").show();
$j("#empty_'.$id.'").show();
}
window.setTimeout(refresh_'.$id.',_data.length?200:2000);
});
}
function resize_'.$id.'()
{
$j("#'.$id.'").width(egw_getWindowInnerWidth()-20).height(egw_getWindowInnerHeight()-33);
}
egw_LAB.wait(function() {
$j(document).ready(function()
{
resize_'.$id.'();
refresh_'.$id.'();
});
$j(window).resize(resize_'.$id.');
});
</script>
<p style="float: left; margin: 5px"><b>'.htmlspecialchars($header).'</b></p>
<div style="float: right; margin: 2px; margin-right: 5px">
'.html::form(
html::input('clear_'.$id,lang('Clear window'),'button','id="clear_'.$id.'" onClick="button_'.$id.'(this)"')."\n".
html::input('delete_'.$id,lang('Delete file'),'button','id="delete_'.$id.'" onClick="button_'.$id.'(this)"')."\n".
html::input('empty_'.$id,lang('Empty file'),'button','id="empty_'.$id.'" onClick="button_'.$id.'(this)"')."\n".
html::input('download_'.$id,lang('Download'),'submit','id="download_'.$id.'"'),
html::input('clear_log',lang('Clear window'),'button','id="clear_log"')."\n".
html::input('delete_log',lang('Delete file'),'button','id="delete_log"')."\n".
html::input('empty_log',lang('Empty file'),'button','id="empty_log"')."\n".
html::input('download_log',lang('Download'),'submit','id="download_log"'),
'','/index.php',array(
'menuaction' => 'phpgwapi.egw_tail.download',
'filename' => $this->filename,
)).'
</div>
<pre class="tail" id="'.$id.'" style="clear: both; width: 99.5%; border: 2px groove silver; margin-bottom: 0; overflow: auto;"></pre>';
<pre class="tail" id="log" data-filename="'.$this->filename.'" style="clear: both; width: 99.5%; border: 2px groove silver; margin-bottom: 0; overflow: auto;"></pre>';
}
/**

1
phpgwapi/js/jsapi/egw.js
View File

@ -31,6 +31,7 @@
egw_calendar;
egw_ready;
egw_data;
egw_tail;
egw_inheritance;
// egw_jquery;
app_base;

86
phpgwapi/js/jsapi/egw_tail.js Normal file
View File

@ -0,0 +1,86 @@
/**
* EGroupware clientside egw tail
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package api
* @subpackage jsapi
* @link http://www.egroupware.org
* @author Hadi Nategh (as AT stylite.de)
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id:
*/
$j(function(){
var that = this;
var log_tail_start=0;
var filename = $j('pre[id^="log"]');
if (typeof filename !='undefined' && filename.length > 0)
{
filename = filename.attr('data-filename');
}
function button_log(buttonId)
{
if (buttonId != "clear_log")
{
var ajax = new egw_json_request("home.egw_tail.ajax_delete",[filename,buttonId=="empty_log"]);
ajax.sendRequest(true);
}
$j("#log").text("");
}
function refresh_log()
{
var ajax = new egw_json_request("home.egw_tail.ajax_chunk",[filename,log_tail_start]);
ajax.sendRequest(true,function(_data) {
if (_data.length) {
log_tail_start = _data.next;
var log = $j("#log").append(_data.content.replace(/</g,"&lt;"));
log.animate({ scrollTop: log.prop("scrollHeight") - log.height() + 20 }, 500);
}
if (_data.size === false)
{
$j("#download_log").hide();
}
else
{
$j("#download_log").show().attr("title",this.egw.lang('Size')+_data.size);
}
if (_data.writable === false)
{
$j("#delete_log").hide();
$j("#empty_log").hide();
}
else
{
$j("#delete_log").show();
$j("#empty_log").show();
}
window.setTimeout(refresh_log,_data.length?200:2000);
});
}
function resize_log()
{
$j("#log").width(egw_getWindowInnerWidth()-20).height(egw_getWindowInnerHeight()-33);
}
jQuery('input[id^="clear_log"]').on('click',function(){
button_log(this.getAttribute('id'));
});
jQuery('input[id^="delete_log"]').on('click',function(){
button_log(this.getAttribute('id'));
});
jQuery('input[id^="empty_log"]').on('click',function(){
button_log(this.getAttribute('id'));
});
egw_LAB.wait(function() {
$j(document).ready(function()
{
if (typeof filename !='undefined' && filename.length > 0)
{
resize_log();
refresh_log();
}
});
$j(window).resize(resize_log);
});
});