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

2018-05-08 14:17:23 +08:00
parent bba8b0ed1d de33978595
commit 0aa7f60012
3 changed files with 20 additions and 18 deletions
@@ -564,7 +564,7 @@ class baseHTML
    static public function selectAll($scope = "", $type = "button", $checked = false, $class = '')
    {
        $string = <<<EOT
-<script type="text/javascript">
+<script>
 function selectAll(checker, scope, type)
 { 
    if(scope)
@@ -752,7 +752,7 @@ class baseJS

        $hasLimit = ($ieParam and stripos($ieParam, 'ie') !== false);
        if($hasLimit) echo "<!--[if $ieParam]>\n";
-        echo "<script src='$url{$mark}v={$config->version}' type='text/javascript'></script>\n";
+        echo "<script src='$url{$mark}v={$config->version}'></script>\n";
        if($hasLimit) echo "<![endif]-->\n";
    }

@@ -768,7 +768,7 @@ class baseJS
    static public function start($full = true)
    {
        if($full) return "<html><meta charset='utf-8'/><style>body{background:white}</style><script>";
-        return "<script language='Javascript'>";
+        return "<script>";
    }

    /**
@@ -1062,6 +1062,7 @@ EOT;
        $jsConfig->runMode        = $runMode;
        $jsConfig->timeout        = isset($config->timeout) ? $config->timeout : '';
        $jsConfig->pingInterval   = isset($config->pingInterval) ? $config->pingInterval : '';
+        $jsConfig->debug          = $config->debug;

        $jsLang = new stdclass();
        $jsLang->submitting = isset($lang->loading) ? $lang->loading : '';
@@ -1069,8 +1070,8 @@ EOT;
        $jsLang->timeout    = isset($lang->timeout) ? $lang->timeout : '';

        $js  = self::start(false);
-        $js .= 'var config=' . json_encode($jsConfig) . ";\n";
-        $js .= 'var lang=' . json_encode($jsLang) . ";\n";
+        $js .= 'window.config=' . json_encode($jsConfig) . ";\n";
+        $js .= 'window.lang=' . json_encode($jsLang) . ";\n";
        $js .= self::end();
        echo $js;
    }
@@ -10,12 +10,13 @@
 * @link        http://www.zentao.net
 */
 ?>
-<style>
-#formSetting {min-width: 300px;}
-#formSettingForm .checkboxes {padding: 10px 3px;}
-#formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
-</style>
 <div class="dropdown">
+  <style>
+  #formSetting {min-width: 300px;}
+  #formSettingForm .checkboxes {padding: 10px 3px;}
+  #formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
+  #formSetting .btn[type="submit"] {margin-right: 8px;}
+  </style>
  <button type="button" title="<?php echo $lang->customField;?>" class="btn btn-link" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
  <div class="dropdown-menu pull-right" id="formSetting">
    <form class='with-padding load-indicator' id='formSettingForm' method='post' target='hiddenwin' action='<?php echo $customLink?>'>
@@ -29,11 +30,11 @@
      </div>
    </form>
  </div>
+  <script>
+  var $formSetting = $('#formSetting');
+  $formSetting.on('click', '.close-dropdown', function()
+  {
+      $formSetting.parent().removeClass('open');
+  }).on('click', function(e){e.stopPropagation()});
+  </script>
 </div>
-<script>
-var $formSetting = $('#formSetting');
-$formSetting.on('click', '.close-dropdown', function()
-{
-    $formSetting.parent().removeClass('open');
-}).on('click', function(e){e.stopPropagation()});
-</script>