From 2d00396157a044240ffe3ad407b578a1be76c784 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Thu, 14 Jun 2012 01:28:00 +0000
Subject: [PATCH]  * Code for task#693.

---
 module/bug/view/view.html.php        | 37 +++++++++++++++++-----------
 module/product/view/browse.html.php  |  2 +-
 module/story/view/view.html.php      | 32 +++++++++++++++---------
 module/task/view/view.html.php       | 32 +++++++++++++-----------
 module/testcase/view/browse.html.php | 10 +++++---
 module/testcase/view/view.html.php   | 27 +++++++++++---------
 www/theme/default/style.css          |  9 +++++++
 7 files changed, 94 insertions(+), 55 deletions(-)

diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 0aac32b154..b280eba648 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -21,14 +21,12 @@
     $convertParams = "productID=$productID&moduleID=0&from=bug&bugID=$bug->id";
     if(!$bug->deleted)
     {
+        common::printLink('bug', 'assignTo', $params, $lang->bug->buttonAssign);
         if(!($bug->status == 'active' and $bug->confirmed == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm))) echo $lang->bug->buttonConfirm . ' ';
         if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve)))   echo $lang->bug->buttonResolve . ' ';
-        common::printLink('bug', 'assignTo', $params, $lang->bug->buttonAssign);
-        common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
-        if(common::hasPriv('bug', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
         if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))       echo $lang->bug->buttonClose . ' ';
         if(!(($bug->status == 'closed' or $bug->status == 'resolved') and $bug->resolution != 'tostory' and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' ';
-        common::printLink('bug', 'create', $copyParams, $lang->bug->buttonCopy);
+
         if($bug->status == 'active' and common::hasPriv('story', 'create')) 
         {
             common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->toStory) . ' ';
@@ -38,16 +36,23 @@
             echo $lang->bug->toStory . ' ';
         }
         common::printLink('testcase', 'create', $convertParams, $lang->bug->buttonCreateTestcase);
-        common::printLink('bug', 'delete', $params, $lang->delete, 'hiddenwin');
+
+
+        common::printLink('bug', 'edit', $params, '&nbsp;', '', "class='icon-edit'");
+        if(common::hasPriv('bug', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+        common::printLink('bug', 'create', $copyParams, '&nbsp;', '', "class='icon-copy'");
+
+        common::printLink('bug', 'delete', $params, '&nbsp;', 'hiddenwin', "class='icon-delete'");
     }
-    echo html::a($browseLink, $lang->goback);
+    echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
     if($preAndNext->pre) 
     {
-        echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}"), '<') . "</abbr>&nbsp;&nbsp;";
+        echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}"), '&nbsp', '', "class='icon-pre'") . "</abbr>";
     }
     if($preAndNext->next) 
     {
-        echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}"), '>') . "</abbr>";
+        echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}"), '&nbsp;', '', "class='icon-next'") . "</abbr>";
     }
     ?>
   </div>
@@ -66,14 +71,12 @@
         <?php
         if(!$bug->deleted)
         {
+            common::printLink('bug', 'assignTo', $params, $lang->bug->buttonAssign);
             if(!($bug->status == 'active'  and $bug->confirmed == 0 and common::printLink('bug', 'confirmBug', $params, $lang->bug->buttonConfirm)))   echo $lang->bug->buttonConfirm . ' ';
             if(!($bug->status == 'active'   and common::printLink('bug', 'resolve', $params, $lang->bug->buttonResolve)))   echo $lang->bug->buttonResolve . ' ';
-            common::printLink('bug', 'assignTo', $params, $lang->bug->buttonAssign);
-            common::printLink('bug', 'edit', $params, $lang->bug->buttonEdit);
-            if(common::hasPriv('bug', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
             if(!($bug->status == 'resolved' and common::printLink('bug', 'close', $params, $lang->bug->buttonClose)))       echo $lang->bug->buttonClose . ' ';
             if(!(($bug->status == 'closed' or $bug->status == 'resolved') and $bug->resolution != 'tostory' and common::printLink('bug', 'activate', $params, $lang->bug->buttonActivate))) echo $lang->bug->buttonActivate . ' ';
-            common::printLink('bug', 'create', $copyParams, $lang->bug->buttonCopy);
+
             if($bug->status == 'active' and common::hasPriv('bug', 'resolve')) 
             {
                 common::printLink('story', 'create', "product=$bug->product&module=0&story=0&project=0&bugID=$bug->id", $lang->bug->toStory) . ' ';
@@ -83,9 +86,15 @@
                 echo $lang->bug->toStory . ' ';
             }
             common::printLink('testcase', 'create', $convertParams, $lang->bug->buttonCreateTestcase);
-            common::printLink('bug', 'delete', $params, $lang->delete, 'hiddenwin');
+
+
+            common::printLink('bug', 'edit', $params, '&nbsp;', '', "class='icon-edit'");
+            if(common::hasPriv('bug', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='comment' onclick='setComment()'"). ' ';
+
+            common::printLink('bug', 'create', $copyParams, '&nbsp;', '', "class='icon-copy'");
+            common::printLink('bug', 'delete', $params, '&nbsp;', 'hiddenwin', "class='icon-delete'");
         }
-        echo html::a($browseLink, $lang->goback);
+        echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
         ?>
       </div>
       <div id='comment' class='hidden'>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index c491a238d9..d206761197 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -96,10 +96,10 @@ var browseType = '<?php echo $browseType;?>';
             <td>
               <?php 
               $vars = "story={$story->id}";
-              if(!common::printLink('testcase', 'create', "productID=$story->product&module=0&from=&param=0&$vars", $lang->story->createCase)) echo $lang->story->createCase . ' ';
               if(!($story->status != 'closed' and common::printLink('story', 'change', $vars, $lang->story->change))) echo $lang->story->change . ' ';
               if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', $vars, $lang->story->review))) echo $lang->story->review . ' ';
               if(!common::printLink('story', 'edit',   $vars, $lang->edit)) echo $lang->edit;
+              if(!common::printLink('testcase', 'create', "productID=$story->product&module=0&from=&param=0&$vars", $lang->story->createCase)) echo $lang->story->createCase . ' ';
               ?>
             </td>
           </tr>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index f5e3638884..917cd4b0be 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -20,22 +20,26 @@
   {
       if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
       if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
-      if(common::hasPriv('story', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
       if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
       if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
-      if(!common::printLink('story', 'edit', "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
+
       if(!common::printLink('testcase', 'create', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", $lang->story->createCase)) echo $lang->story->createCase . ' ';
-      common::printLink('story', 'create', "productID=$story->product&moduleID=$story->module&storyID=$story->id", $lang->copy);
-      common::printLink('story', 'delete', "storyID=$story->id", $lang->delete, 'hiddenwin');
+
+      if(!common::printLink('story', 'edit', "storyID=$story->id", '&nbsp;', '', "class='icon-edit'")) echo "<span class='icon-edit'></span>";
+      if(common::hasPriv('story', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+      common::printLink('story', 'create', "productID=$story->product&moduleID=$story->module&storyID=$story->id", '&nbsp;', '', "class='icon-copy'");
+
+      common::printLink('story', 'delete', "storyID=$story->id", '&nbsp;', 'hiddenwin', "class='icon-delete'");
   }
-  echo html::a($browseLink, $lang->goback);
+  echo html::a($browseLink, ' ', '', "class='icon-goback'");
   if($preAndNext->pre) 
   {
-      echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}&version={$preAndNext->pre->version}"), '<') . "</abbr>&nbsp;&nbsp;";
+      echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}&version={$preAndNext->pre->version}"), '&nbsp;', '', "class='icon-pre'") . "</abbr>";
   }
   if($preAndNext->next) 
   {
-      echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}&version={$preAndNext->next->version}"), '>') . "</abbr>";
+      echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}&version={$preAndNext->next->version}"), '&nbsp;', '', "class='icon-next'") . "</abbr>";
   }
   ?>
   </div>
@@ -60,15 +64,19 @@
       {
           if(!($story->status != 'closed' and common::printLink('story', 'change', "storyID=$story->id", $lang->story->change))) echo $lang->story->change . ' ';
           if(!(($story->status == 'draft' or $story->status == 'changed') and common::printLink('story', 'review', "storyID=$story->id", $lang->story->review))) echo $lang->story->review . ' ';
-          if(common::hasPriv('story', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
+
           if(!($story->status != 'closed' and common::printLink('story', 'close', "storyID=$story->id", $lang->story->close))) echo $lang->story->close . ' ';
           if(!($story->status == 'closed' and $story->closedReason == 'postponed' and common::printLink('story', 'activate', "storyID=$story->id", $lang->story->activate))) echo $lang->story->activate . ' ';
+
           if(!common::printLink('testcase', 'create', "productID=$story->product&moduleID=0&from=&param=0&storyID=$story->id", $lang->story->createCase)) echo $lang->story->createCase . ' ';
-          if(!common::printLink('story', 'edit',    "storyID=$story->id", $lang->edit)) echo $lang->edit . ' ';
-          common::printLink('story', 'delete', "storyID=$story->id", $lang->delete, 'hiddenwin');
+
+          if(!common::printLink('story', 'edit', "storyID=$story->id", '&nbsp;', '', "class='icon-edit'")) echo "<span class='icon-edit'></span>";
+          if(common::hasPriv('story', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+          common::printLink('story', 'delete', "storyID=$story->id", '&nbsp;', 'hiddenwin', "class='icon-delete'");
       }
-      echo html::a($browseLink, $lang->goback);
-      ?>
+      echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
+     ?>
       </div>
       <div id='comment' class='hidden'>
         <fieldset>
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index e9ade04a43..ef688a6e3c 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -23,24 +23,26 @@
   if(!$task->deleted)
   {
       //if(!($task->status != 'closed' and $task->status != 'cancel' and common::printLink('task', 'logEfforts', "taskID=$task->id", $lang->task->buttonLogEfforts))) echo $lang->task->buttonLogEfforts . ' ';
+      if(!common::printLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $lang->task->assign)) echo $lang->task->assign . ' ';
       if(!(($task->status == 'wait') and common::printLink('task', 'start',  "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
       if(!(($task->status == 'wait'   or $task->status == 'doing')  and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
       if(!(($task->status == 'done'   or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
-      if(!(($task->status == 'wait'   or $task->status == 'doing')  and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';
       if(!(($task->status == 'closed' or $task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'activate',   "taskID=$task->id", $lang->task->buttonActivate)))   echo $lang->task->buttonActivate . ' ';
-      if(!common::printLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $lang->task->assign)) echo $lang->task->assign . ' ';
-      if(!common::printLink('task', 'edit',  "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
-      if(common::hasPriv('task', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
-      if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", $lang->task->buttonDelete, 'hiddenwin')) echo $lang->task->buttonDelete . ' ';
+      if(!(($task->status == 'wait'   or $task->status == 'doing')  and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';
+
+      if(!common::printLink('task', 'edit',  "taskID=$task->id", '&nbsp;', '', "class='icon-edit'")) echo "<span class='icon-edit'></span>";
+      if(common::hasPriv('task', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'"). ' ';
+
+      if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", '&nbsp;', 'hiddenwin', "class='icon-delete'")) echo "<span class='icon-delete'></span>";
   }
-  echo html::a($browseLink,  $lang->goback);
+  echo html::a($browseLink, '&nbsp', '', "class='icon-goback'");
   if($preAndNext->pre) 
   {
-      echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->name}'>" . html::a($this->inLink('view', "taskID={$preAndNext->pre->id}"), '<') . "</abbr>&nbsp;&nbsp;";
+      echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->name}'>" . html::a($this->inLink('view', "taskID={$preAndNext->pre->id}"), '&nbsp;', '', "class='icon-pre'") . "</abbr>";
   }
   if($preAndNext->next) 
   {
-      echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->name}>" . html::a($this->inLink('view', "taskID={$preAndNext->next->id}"), '>') . "</abbr>";
+      echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->name}>" . html::a($this->inLink('view', "taskID={$preAndNext->next->id}"), '&nbsp;', '', "class='icon-next'") . "</abbr>";
   }
   ?>
   </div>
@@ -59,17 +61,19 @@
         <?php
         if(!$task->deleted)
         {
+            if(!common::printLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $lang->task->assign)) echo $lang->task->assign . ' ';
             if(!(($task->status == 'wait') and common::printLink('task', 'start',  "taskID=$task->id", $lang->task->buttonStart))) echo $lang->task->buttonStart . ' ';
             if(!(($task->status == 'wait'  or $task->status == 'doing')  and common::printLink('task', 'finish', "taskID=$task->id", $lang->task->buttonDone))) echo $lang->task->buttonDone . ' ';
             if(!(($task->status == 'done'   or $task->status == 'cancel') and common::printLink('task', 'close', "taskID=$task->id", $lang->task->buttonClose))) echo $lang->task->buttonClose . ' ';
-            if(!(($task->status == 'wait'  or $task->status == 'doing')  and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';
             if(!(($task->status == 'closed' or $task->status == 'done' or $task->status == 'cancel') and common::printLink('task', 'activate',   "taskID=$task->id", $lang->task->buttonActivate)))   echo $lang->task->buttonActivate . ' ';
-            if(!common::printLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", $lang->task->assign)) echo $lang->task->assign . ' ';
-            if(!common::printLink('task', 'edit',  "taskID=$task->id", $lang->task->buttonEdit)) echo $lang->task->buttonEdit . ' ';
-            if(common::hasPriv('task', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
-            if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", $lang->task->buttonDelete, 'hiddenwin')) echo $lang->task->buttonDelete . ' ';
+            if(!(($task->status == 'wait'  or $task->status == 'doing')  and common::printLink('task', 'cancel', "taskID=$task->id", $lang->task->buttonCancel))) echo $lang->task->buttonCancel . ' ';
+
+            if(!common::printLink('task', 'edit',  "taskID=$task->id", '&nbsp;', '', "class='icon-edit'")) echo "<span class='icon-edit'></span>";
+            if(common::hasPriv('task', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+            if(!common::printLink('task', 'delete',"projectID=$task->project&taskID=$task->id", '&nbsp;', 'hiddenwin')) echo "<span class='icon-delete'></span>";
         }
-        echo html::a($browseLink,  $lang->goback);
+        echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
         ?>
       </div>
       <div id='comment' class='hidden'>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 651294fbc9..2cb2b59e6e 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -87,11 +87,15 @@ var moduleID   = '<?php echo $moduleID;?>';
               <td><?php echo $lang->testcase->statusList[$case->status];?></td>
               <td class='a-right'>
                 <?php
-                common::printLink('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $lang->copy);
-                common::printLink('testcase', 'edit',    "caseID=$case->id", $lang->testcase->buttonEdit);
-                common::printLink('testcase', 'delete',  "caseID=$case->id", $lang->delete, 'hiddenwin');
                 common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"');
                 common::printLink('testtask', 'results', "runID=0&caseID=$case->id", $lang->testtask->results, '', 'class="results"');
+
+                common::printLink('testcase', 'edit',    "caseID=$case->id", $lang->testcase->buttonEdit);
+
+                common::printLink('testcase', 'create',  "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $lang->copy);
+
+                common::printLink('testcase', 'delete',  "caseID=$case->id", $lang->delete, 'hiddenwin');
+
                 if(!($case->lastRunResult == 'fail' and common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug))) echo $lang->testtask->createBug;
                 ?>
               </td>
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index a15ad7daa4..0996643531 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -21,20 +21,24 @@
     {
         common::printLink('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->currentVersion", $this->app->loadLang('testtask')->testtask->runCase, '', 'class="runcase"');
         common::printLink('testtask', 'results', "runID=0&caseID=$case->id&version=$case->version", $lang->testtask->results, '', 'class="results"');
+
         if($case->lastRunResult == 'fail') common::printLink('bug', 'create', "product=$case->product&extra=caseID=$case->id,version=$case->version,runID=", $lang->testtask->createBug);
-        if(common::hasPriv('testcase', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
-        common::printLink('testcase', 'edit',   "caseID=$case->id", $lang->testcase->buttonEdit);
-        common::printLink('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", $lang->copy);
-        common::printLink('testcase', 'delete', "caseID=$case->id", $lang->delete, 'hiddenwin');
+
+        common::printLink('testcase', 'edit',   "caseID=$case->id", '&nbsp;', '', "class='icon-edit'");
+        if(common::hasPriv('testcase', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+        common::printLink('testcase', 'create', "productID=$case->product&moduleID=$case->module&from=testcase&param=$case->id", '&nbsp;', '', "class='icon-copy'");
+
+        common::printLink('testcase', 'delete', "caseID=$case->id", '&nbsp;', 'hiddenwin', "class='icon-delete'");
     }
-    echo html::a($browseLink, $lang->goback);
+    echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
     if($preAndNext->pre) 
     {
-        echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}&version={$preAndNext->pre->version}"), '<') . "</abbr>&nbsp;&nbsp;";
+        echo "<abbr id='pre' title='{$preAndNext->pre->id}{$lang->colon}{$preAndNext->pre->title}'>" . html::a($this->inLink('view', "storyID={$preAndNext->pre->id}&version={$preAndNext->pre->version}"), '&nbsp;', '', "class='icon-pre'") . "</abbr>";
     }
     if($preAndNext->next) 
     {
-        echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}&version={$preAndNext->next->version}"), '>') . "</abbr>";
+        echo "<abbr id='next' title={$preAndNext->next->id}{$lang->colon}{$preAndNext->next->title}>" . html::a($this->inLink('view', "storyID={$preAndNext->next->id}&version={$preAndNext->next->version}"), '&nbsp;', '', "class='icon-next'") . "</abbr>";
     }
     ?>
   </div>
@@ -70,11 +74,12 @@
        <?php
         if(!$case->deleted)
         {
-            if(common::hasPriv('testcase', 'edit')) echo html::a('#comment', $lang->comment, '', 'onclick=setComment()'). ' ';
-            common::printLink('testcase', 'edit',   "caseID=$case->id", $lang->testcase->buttonEdit);
-            common::printLink('testcase', 'delete', "caseID=$case->id", $lang->delete, 'hiddenwin');
+            common::printLink('testcase', 'edit',   "caseID=$case->id", '&nbsp;', '', "class='icon-edit'");
+            if(common::hasPriv('testcase', 'edit')) echo html::a('#comment', '&nbsp;', '', "class='icon-comment' onclick='setComment()'");
+
+            common::printLink('testcase', 'delete', "caseID=$case->id", '&nbsp;', 'hiddenwin', "class='icon-delete'");
         }
-        echo html::a($browseLink, $lang->goback);
+        echo html::a($browseLink, '&nbsp;', '', "class='icon-goback'");
        ?>
       </div>
       <div id='comment' class='hidden'>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 694bb36ea4..d5038d4d29 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -397,3 +397,12 @@ table.tablesorter thead tr .headerSortDown {background-image: url(./images/table
 .icon-notice { padding-left:16px;  background:url(images/main/ui-gray.png) -18px 96px;}
 .icon-file   { padding-left:16px;  background:url(images/main/ui-gray.png) -32px 144px;}
 .icon-arrow  { padding-left:10px;  background:url(images/main/ui-gray.png) -32px 0px;}
+
+.icon-edit    { padding-left:16px; background:url(images/main/ui-green.png) -64px -112px;} 
+.icon-comment { padding-left:15px; background:url(images/main/ui-green.png) -128px -96px;}
+.icon-copy    { padding-left:15px; background:url(images/main/ui-green.png) -176px -128px;}
+.icon-delete  { padding-left:16px; background:url(images/main/ui-green.png) -80px -128px;}
+.icon-goback  { padding-left:16px; background:url(images/main/ui-green.png) 0px   -64px;}
+.icon-pre     { padding-left:16px; background:url(images/main/ui-green.png) -96px 0;}
+.icon-next    { padding-left:16px; background:url(images/main/ui-green.png) -32px 0;}
+