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

module/common/view/footer.html.php

@@ -1,5 +1,8 @@
 </div><?php /* end '.outer' in 'header.html.php'. */ ?>
-<script>$.initSidebar()</script>
+<script>
+$.initSidebar();
+if(window.convertURL) window.convertURL();
+</script>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
 
 <iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin hidden'></iframe>

module/productplan/view/browse.html.php

@@ -130,11 +130,10 @@
               $disabled  = 'disabled';
               if($plan->parent >= 0)
               {
-                  $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=yes");
-                  $deleteURL = "javascript:ajaxDelete(\"$deleteURL\",\"productplanList\",confirmDelete)";
+                  $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=no");
                   $disabled  = '';
               }
-              echo html::a($deleteURL, '<i class="icon-trash"></i>', '', "class='btn {$disabled}' title='{$lang->productplan->delete}'");
+              echo html::a($deleteURL, '<i class="icon-trash"></i>', 'hiddenwin', "class='btn {$disabled}' title='{$lang->productplan->delete}'");
           }
           ?>
         </td>

module/task/js/recordestimate.js

@@ -16,7 +16,6 @@ $(function()
             var hasRecord = false;
             $('#recordForm').find('input[name^="consumed"], input[name^="left"], textarea[name^="work"]').each(function()
             {
-                console.log($(this).val());
                 if($(this).val() !== '')
                 {
                     hasRecord = true;