Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2014-08-26 09:23:04 +00:00
3 changed files with 6 additions and 3 deletions

View File

@@ -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;

View File

@@ -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)
{

View File

@@ -140,4 +140,4 @@
</div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
<?php include '../../common/view/footer.html.php';?>