Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

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

Browse Source
This commit is contained in:
daitingting
2018-05-21 17:07:21 +08:00
parent dc60a11e93 e7c3b4c99c
commit faf2ef0a34
12 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+1 -1
View File
@@ -196,7 +196,7 @@ class commonModel extends model
if(strpos($this->server->http_user_agent, 'Trident') !== false)
{
echo "<a href='$denyLink' id='denylink' style='display:none'>deny</a>";
echo "<script language='javascript'>document.getElementById('denylink').click();</script>";
echo "<script>document.getElementById('denylink').click();</script>";
}
else
{
module/common/view/kindeditor.html.php
+1 -1
View File
@@ -16,7 +16,7 @@ js::set('kuid', $uid);
<link rel="stylesheet" href="<?php echo $jsRoot;?>kindeditor/themes/default/default.css" />
<script src='<?php echo $jsRoot;?>kindeditor/kindeditor-min.js' type='text/javascript'></script>
<script src='<?php echo $jsRoot;?>kindeditor/lang/<?php echo $editorLang;?>.js' type='text/javascript'></script>
<script language='javascript'>
<script>
var editor = <?php echo json_encode($editor);?>;
var bugTools =
module/common/view/treetable.html.php
+1 -1
View File
@@ -3,4 +3,4 @@
css::import($defaultTheme . 'treetable.css');
js::import($jsRoot . 'jquery/treetable/min.js');
?>
<script language='javascript'>$(function() { $("#treetable").treeTable({clickableNodeNames:true,initialState:"expanded"})})</script>
<script>$(function() { $("#treetable").treeTable({clickableNodeNames:true,initialState:"expanded"})})</script>
module/common/view/ueditor.html.php
+3 -3
View File
@@ -13,9 +13,9 @@ $editorLang = isset($editorLangs[$app->getClientLang()]) ? $editorLangs[$app->
$uid = uniqid('');
js::set('kuid', $uid);
?>
<script type="text/javascript" charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.all.min.js"> </script>
<script language='javascript'>
<script charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.config.js"></script>
<script charset="utf-8" src="<?php echo $this->app->getWebRoot() . "js/"?>ueditor/ueditor.all.min.js"> </script>
<script>
var editor = <?php echo json_encode($editor);?>;
var toolbars = [[
module/file/view/printfiles.html.php
+1 -1
View File
@@ -11,7 +11,7 @@ $sessionString .= session_name() . '=' . session_id();
<style>
.files-list>li>a {display: inline;}
</style>
<script language='Javascript'>
<script>
$(function(){
$(".edit").modalTrigger({width:350, type:'iframe'});
})
module/misc/view/checkupdate.html.php
+1 -1
View File
@@ -4,7 +4,7 @@
<body <?php if($browser != 'opera') echo "bgcolor='transparent'";?> style='color:white; font-size:13px; text-align:center'>
<?php if($note):?>
<?php echo $note;?>
<script language='javascript'>window.parent.document.getElementById('updater').className=''</script>
<script>window.parent.document.getElementById('updater').className=''</script>
<?php endif;?>
</body>
</html>
module/product/view/browse.html.php
+1 -1
View File
@@ -328,7 +328,7 @@
</div>
</div>
<?php js::set('checkedSummary', $lang->product->checkedSummary);?>
<script language='javascript'>
<script>
var moduleID = <?php echo $moduleID?>;
$('#module<?php echo $moduleID;?>').addClass('active');
<?php if($browseType == 'bysearch'):?>
module/project/view/preview.html.php
+1 -1
View File
@@ -228,7 +228,7 @@ $dataType = '';
<canvas id='burnChart' data-bezier-curve='false' data-responsive='true'></canvas>
</div>
</body>
<script language='Javascript'>
<script>
function initBurnChar()
{
var data =
module/story/view/header.html.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<script language='Javascript'>
<script>
function loadProduct(productID)
{
loadProductBranches(productID)
module/story/view/review.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include './header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<script language='Javascript'>
<script>
var assignedTo = '<?php $story->lastEditedBy ? print($story->lastEditedBy) : print($story->openedBy);?>';
</script>
<div class='main-content' id='mainContent'>
module/todo/view/create.html.php
+1 -1
View File
@@ -140,7 +140,7 @@
</div>
</div>
<script language='Javascript'>
<script>
var nowTime = '<?php echo $time?>';
var today = '<?php echo date('Y-m-d')?>';
var start = '<?php echo key($times)?>';
module/todo/view/edit.html.php
+1 -1
View File
@@ -144,4 +144,4 @@
</form>
</div>
<?php include './footer.html.php';?>
<script language='Javascript'>switchDateFeature(document.getElementById('dateSwitcher'));</script>
<script>switchDateFeature(document.getElementById('dateSwitcher'));</script>