From 031c0370d151fdeef2f12cb993dba642e34e46d8 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 17 Jul 2015 16:08:26 +0800
Subject: [PATCH]  * fix bug.

---
 module/productplan/view/browse.html.php | 6 +++---
 module/productplan/view/view.html.php   | 4 ++--
 module/release/view/browse.html.php     | 6 +++---
 module/release/view/view.html.php       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 0c88133815..efb1cc0950 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -27,7 +27,7 @@
     <th class='w-p50'>   <?php common::printOrderLink('desc',  $orderBy, $vars, $lang->productplan->desc);?></th>
     <th class='w-100px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
     <th class='w-100px'> <?php common::printOrderLink('end',   $orderBy, $vars, $lang->productplan->end);?></th>
-    <th class="w-100px {sorter: false}"><?php echo $lang->actions;?></th>
+    <th class="w-110px {sorter: false}"><?php echo $lang->actions;?></th>
   </tr>
   </thead>
   <tbody>
@@ -40,8 +40,8 @@
     <td><?php echo $plan->end;?></td>
     <td class='text-center'>
       <?php
-      common::printIcon('productplan', 'view', "planID=$plan->id&type=story&orderBy=id_desc&link=true", '', 'list', 'link');
-      common::printIcon('productplan', 'view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true", '', 'list', 'bug');
+      if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i>', '', "class='btn-icon' title='{$lang->productplan->linkStory}'");
+      if(common::hasPriv('productplan', 'linkBug'))   echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i>', '', "class='btn-icon' title='{$lang->productplan->linkBug}'");
       common::printIcon('productplan', 'edit', "planID=$plan->id", '', 'list');
 
       if(common::hasPriv('productplan', 'delete'))
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 7ddf3c6861..7639d0f5db 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -28,8 +28,8 @@
    {
       ob_start();
       echo "<div class='btn-group'>";
-      common::printIcon('productplan', 'linkStory',"planID=$plan->id", '', 'button', $lang->icons['link']);
-      common::printIcon('productplan', 'linkBug',  "planID=$plan->id", '', 'button', $lang->icons['bug']);
+      if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn'");
+      if(common::hasPriv('productplan', 'linkBug'))   echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn'");
       echo '</div>';
       echo "<div class='btn-group'>";
       common::printIcon('productplan', 'edit',     "planID=$plan->id");
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index 19d07b3780..1d0869e6d3 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -27,7 +27,7 @@
       <th><?php echo $lang->release->name;?></th>
       <th><?php echo $lang->release->build;?></th>
       <th class='w-100px'><?php echo $lang->release->date;?></th>
-      <th class='w-100px'><?php echo $lang->actions;?></th>
+      <th class='w-110px'><?php echo $lang->actions;?></th>
     </tr>
     </thead>
     <tbody>
@@ -39,8 +39,8 @@
       <td class='text-center'><?php echo $release->date;?></td>
       <td class='text-center'>
         <?php
-        common::printIcon('release', 'view', "releaseID=$release->id&type=story&link=true", '', 'list', 'link');
-        common::printIcon('release', 'view', "releaseID=$release->id&type=bug&link=true", '', 'list', 'bug');
+        if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ', '', "class='btn-icon' title='{$lang->release->linkStory}'");
+        if(common::hasPriv('release', 'linkBug'))   echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> ',  '', "class='btn-icon' title='{$lang->release->linkBug}'");
         common::printIcon('release', 'edit',   "release=$release->id", '', 'list');
         if(common::hasPriv('release', 'delete'))
         {
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 5e232a5794..c3c83c4fdc 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -29,8 +29,8 @@
         ob_start();
 
         echo "<div class='btn-group'>";
-        common::printIcon('release', 'linkStory',"releaseID=$release->id", '', 'button', $lang->icons['link']);
-        common::printIcon('release', 'linkBug',  "releaseID=$release->id", '', 'button', $lang->icons['bug']);
+        if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), '<i class="icon-link"></i> ' . $lang->release->linkStory, '', "class='btn'");
+        if(common::hasPriv('release', 'linkBug'))   echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"),   '<i class="icon-bug"></i> '  . $lang->release->linkBug,   '', "class='btn'");
         echo '</div>';
 
         echo "<div class='btn-group'>";