Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
@@ -862,6 +862,7 @@ EOT;
|
||||
$jsConfig->router = $app->server->PHP_SELF;
|
||||
$jsConfig->timeout = $config->timeout;
|
||||
|
||||
$jsLang = new stdclass();
|
||||
$jsLang->submitting = $lang->submitting;
|
||||
$jsLang->save = $lang->save;
|
||||
$jsLang->timeout = $lang->timeout;
|
||||
|
||||
@@ -82,11 +82,13 @@ function toggleComment(actionID)
|
||||
$('.ke-container').css('width', '100%');
|
||||
}
|
||||
|
||||
$(function(){
|
||||
$(function()
|
||||
{
|
||||
var diffButton = "<a href='javascript:;' onclick='toggleStripTags(this)' class='hide changeDiff btn-icon' title='<?php echo $lang->action->original?>'><i class='icon- diff-all'></i></a>";
|
||||
var newBoxID = ''
|
||||
var oldBoxID = ''
|
||||
$('blockquote').each(function(){
|
||||
$('blockquote').each(function()
|
||||
{
|
||||
newBoxID = $(this).parent().attr('id');
|
||||
if(newBoxID != oldBoxID)
|
||||
{
|
||||
|
||||
@@ -140,4 +140,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user