From 05f516fbb07eb7a2664693e07673c5de50757494 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 28 Apr 2014 10:42:49 +0800
Subject: [PATCH]  * removed icon form action button.  * removed
 debug.html.php.  * ajusted style of 'productplan/linkbug' and
 'productplan/linkstory'.

---
 module/common/view/debug.html.php        | 86 ------------------------
 module/common/view/footer.html.php       |  2 +-
 module/common/view/footer.lite.html.php  |  2 +-
 module/company/view/view.html.php        |  2 +-
 module/productplan/css/linkbug.css       |  4 ++
 module/productplan/css/linkstory.css     |  4 ++
 module/productplan/view/linkbug.html.php |  1 -
 7 files changed, 11 insertions(+), 90 deletions(-)
 delete mode 100644 module/common/view/debug.html.php
 create mode 100644 module/productplan/css/linkbug.css
 create mode 100644 module/productplan/css/linkstory.css

diff --git a/module/common/view/debug.html.php b/module/common/view/debug.html.php
deleted file mode 100644
index e6daddb106..0000000000
--- a/module/common/view/debug.html.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php if($config->debug):?>
-<div id='debugPanel'>
-  <header>
-    <div class='actions pull-right'><i id='debugHandle' class='icon-chevron-up'></i></div>
-    <i class='icon icon-terminal'></i> <strong id='debugTitle'><?php echo $lang->debug;?></strong>
-  </header>
-  <div id='debugContent'></div>
-  <div id='debugIframeTip' class='hidden'>#<strong id='debugIframeTipId'></strong> <span id='debugIframeTipTime'></span> The following content from iframe.</div>
-  <iframe style='width:580px; height: 400px ' frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin'></iframe>
-</div>
-<style>
-/* debug panel */
-#debugPanel {width: 160px; height: 40px; background: rgba(255,255,255,0.8); float: left; transition:all 0.3s;}
-#debugPanel.show {width: 600px; height: 540px; position: relative; top: -500px; box-shadow: 2px 2px 5px rgba(0,0,0,0.25); background: #fff}
-body > #debugPanel, body > #debugPanel.show {position: fixed; bottom: 0; top: inherit;} 
-#debugPanel > header {color: #fff; padding: 0 15px; background: rgba(0,0,0,0.8); cursor: pointer; transition: all 0.5s; line-height: 40px}
-#debugPanel.with-content > header {background: #D2322D}
-#debugPanel > header > .icon {display: inline-block; border-radius: 4px; background: #ddd; background: rgba(255,255,255,0.3); padding: 2px 5px; margin-right: 5px;}
-#debugHandle {color: #ddd}
-#debugHandle:hover {color: #fff}
-#debugContent, #debugIframeTip {padding: 10px; line-height: 20px; padding-bottom: 0;}
-#debugContent .cell {margin-bottom: 10px;}
-#debugContent .cell > header, #debugIframeTip {color: #ccc; font-size: 12px; line-height: 16px}
-#debugContent .cell > .content {border-radius: 4px; padding: 3px 5px}
-#debugIframeTip {padding-top: 0;}
-#debugPanel.with-iframe-content #hiddenwin {border: 1px solid #ddd; border-radius: 4px; margin: 0 10px}
-</style>
-<script>
-function debug(title)
-{
-    var id = 1;
-
-    this.setTitle = function(title)
-    {
-        $('#debugTitle').html(title);
-    };
-
-    this.setContent = function(content, silence)
-    {
-      $('#debugContent').append("<div class='cell'><header><strong>#" + (id++) + '</strong> ' + (new Date().toLocaleString()) + "</header><pre class='content'>" + content + '</pre></div>');
-      if(!silence) $('#debugPanel').addClass('with-content');
-    };
-
-    this.init = function()
-    {
-        var dp = $('#debugPanel'), dph = $('#debugHandle');
-        $('#debugPanel > header').click(function()
-        {
-            dp.toggleClass('show');
-            var showed = dp.hasClass('show');
-            dph.toggleClass('icon-chevron-up', !showed).toggleClass('icon-chevron-down', showed);
-        });
-
-        var frame = document.getElementById('hiddenwin');
-        frame.onload = frame.onreadystatechange = function()
-        {
-            if (this.readyState && this.readyState != 'complete') return;
-            try
-            {
-                var $frame = $(window.frames['hiddenwin'].document);
-                if($frame.find('body').html() != '')
-                {
-                    $('#debugIframeTipId').text(id++);
-                    $('#debugIframeTipTime').text(new Date().toLocaleString());
-                    $('#debugIframeTip').removeClass('hidden');
-
-                    dp.addClass('with-content').addClass('with-iframe-content');
-                }
-            }
-            catch(e){}
-        }
-    };
-
-    this.init();
-    this.setTitle(title);
-    this.setContent('debug ready.', true);
-}
-
-$(function()
-{
-    window.debug = new debug('Debug');
-});
-</script>
-<?php else:?>
-<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin hidden'></iframe>
-<?php endif;?>
diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index d3143a0799..038ea53919 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -6,7 +6,7 @@
 <?php if($onlybody != 'yes'):?>
 </div><?php /* end '#wrap' in 'header.html.php'. */ ?>
 <div id='footer'>
-  <?php include 'debug.html.php';?>
+  <iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin hidden'></iframe>
   <div id="crumbs">
     <?php commonModel::printBreadMenu($this->moduleName, isset($position) ? $position : ''); ?>
   </div>
diff --git a/module/common/view/footer.lite.html.php b/module/common/view/footer.lite.html.php
index 57dafda87f..456b04cc74 100755
--- a/module/common/view/footer.lite.html.php
+++ b/module/common/view/footer.lite.html.php
@@ -1,5 +1,5 @@
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
-<?php include 'debug.html.php';?>
+<iframe frameborder='0' name='hiddenwin' id='hiddenwin' scrolling='no' class='debugwin hidden'></iframe>
 <script laguage='Javascript'>
 <?php if(isset($pageJS)) echo $pageJS;?>
 </script>
diff --git a/module/company/view/view.html.php b/module/company/view/view.html.php
index 4df4bdf15e..0bdb7bcf65 100644
--- a/module/company/view/view.html.php
+++ b/module/company/view/view.html.php
@@ -15,7 +15,7 @@
   <div id='titlebar'>
     <div class='heading'><?php echo html::icon($lang->icons['company']);?> <?php echo $lang->company->view;?></div>
     <div class='actions'>
-      <?php common::printLink('company', 'edit', '', '<i class="icon-pencil"></i> ' . $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?>
+      <?php common::printLink('company', 'edit', '', $lang->edit, '', 'id="editCompany" class="btn btn-primary iframe" data-width="580"', true, true);?>
     </div>
   </div>
   <table class='table table-borderless table-data'> 
diff --git a/module/productplan/css/linkbug.css b/module/productplan/css/linkbug.css
new file mode 100644
index 0000000000..5176460b53
--- /dev/null
+++ b/module/productplan/css/linkbug.css
@@ -0,0 +1,4 @@
+#titlebar > .heading {margin-bottom: 15px;}
+#bugList  .table {margin-bottom: 20px;}
+.table > caption {border:1px solid #ddd; border-bottom: none;}
+#linkedBugsForm .table caption {border-top: none}
diff --git a/module/productplan/css/linkstory.css b/module/productplan/css/linkstory.css
new file mode 100644
index 0000000000..f019c61e89
--- /dev/null
+++ b/module/productplan/css/linkstory.css
@@ -0,0 +1,4 @@
+#titlebar > .heading {margin-bottom: 15px;}
+#storyList  .table {margin-bottom: 20px;}
+.table > caption {border:1px solid #ddd; border-bottom: none;}
+#linkedStoriesForm .table caption {border-top: none}
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 95e871b38c..e908f1b211 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -21,7 +21,6 @@
   </div>
   <div id='querybox' class='show'></div>
 </div>
-
 <div id='querybox'></div>
 <div id='bugList'>
   <form method='post' id='unlinkedBugsForm'>