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

module/bug/view/activate.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+        <?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
 
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->bug->activate;?></small>

module/bug/view/assignto.html.php

@@ -21,7 +21,7 @@ js::set('page', 'assignedto');
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+        <?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
 
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->bug->assignBug;?></small>

module/bug/view/close.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+        <?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
 
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->bug->close;?></small>

module/bug/view/confirmbug.html.php

@@ -21,7 +21,7 @@ js::set('page', 'confirmbug');
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+        <?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
 
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->bug->confirmBug;?></small>

module/bug/view/edit.html.php

@@ -31,7 +31,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', 'class="bug-title"');?>
+        <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', "class='bug-title' title='$bug->title'");?>
         <small><?php echo $lang->arrow . ' ' . $lang->bug->edit;?></small>
       </h2>
       <div class="pull-right btn-toolbar">

module/bug/view/linkbugs.html.php

@@ -15,7 +15,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $bug->id;?></span>
-      <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank');?>
+      <?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '_blank', "title='$bug->title'");?>
       <small class='text-muted'> <?php echo $lang->arrow . $lang->bug->linkBugs;?></small>
     </h2>
   </div>

module/bug/view/resolve.html.php

@@ -22,7 +22,7 @@ js::set('productID' , $bug->product);
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $bug->id;?></span>
-        <?php echo isonlybody() ? $bug->title : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
+        <?php echo isonlybody() ? ('<span title="' . $bug->title . '">' . $bug->title . '</span>') : html::a($this->createLink('bug', 'view', 'bug=' . $bug->id), $bug->title);?>
 
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->bug->resolve;?></small>

module/build/view/edit.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label-id'><?php echo $build->id;?></span>
-        <?php echo html::a($this->createLink('build', 'view', 'build=' . $build->id), $build->name);?>
+        <?php echo html::a($this->createLink('build', 'view', 'build=' . $build->id), $build->name, '', "title='$build->name'");?>
         <small><?php echo $lang->arrow . $lang->build->edit;?></small>
       </h2>
     </div>

module/doc/view/edit.html.php

@@ -18,7 +18,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $doc->id;?></span>
-        <?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title);?>
+        <?php echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='$doc->title'");?>
         <small> <?php echo $lang->arrow . ' ' . $lang->doc->edit;?></small>
       </h2>
     </div>

module/entry/view/log.html.php

@@ -23,7 +23,7 @@
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <div class='heading'>
-      <h2>
+      <h2 title='<?php echo $entry->name;?>'>
         <?php echo $entry->name;?>
         <span class='label label-info'><?php echo $lang->entry->log;?></span>
       </h2>

module/extension/view/uninstall.html.php

@@ -16,7 +16,7 @@
     <div class='main-header'>
       <h2>
         <span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
-        <strong><?php echo $title;?></strong>
+        <strong title='<?php echo $title;?>'><?php echo $title;?></strong>
         <small class='text-danger'><?php echo html::icon('cog');?> <?php echo $lang->extension->uninstall;?></small>
       </h2>
     </div>

module/extension/view/waring.htm.php

@@ -16,7 +16,7 @@
     <div class='main-header'>
       <h2>
         <span class='prefix' title='EXTENSION'><?php echo html::icon($lang->icons['extension']);?></span>
-        <strong><?php echo $title;?></strong>
+        <strong title='<?php echo $title;?>'><?php echo $title;?></strong>
       </h2>
     </div>
     <?php if($error):?>

module/group/view/edit.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-content'> 
   <div class='main-header'>
-    <h2>
+    <h2 title='<?php echo $group->name;?>'>
       <span class='label label-id'><?php echo $group->id;?></span>
       <?php echo $group->name;?>
       <small><?php echo $lang->arrow . $lang->group->edit;?></small>

module/group/view/managemember.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
-    <h2>
+    <h2 title='<?php echo $group->name;?>'>
       <span class='label label-id'><?php echo $group->id;?></span>
       <?php echo $group->name;?>
     </h2>

module/group/view/manageview.html.php

@@ -13,9 +13,8 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
-    <h2>
+    <h2 title='<?php echo $group->name;?>'>
       <span class='label-id'><?php echo $group->id;?></span>
-      <?php echo $group->name;?>
       <small> <?php echo $lang->arrow . $lang->group->manageView;?></small>
     </h2>
   </div>

module/product/view/close.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix'><?php echo html::icon($lang->icons['product']);?> <strong><?php echo $product->id;?></strong></span>
-      <?php echo isonlybody() ? $product->name : html::a($this->createLink('product', 'view', "productID=$product->id"), $product->name);?>
+      <?php echo isonlybody() ? ("<span title='$product->name'>" . $product->name . '</span>') : html::a($this->createLink('product', 'view', "productID=$product->id"), $product->name);?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->product->close;?></small>
       <?php endif;?>

module/product/view/edit.html.php

@@ -18,7 +18,7 @@
     <div class="main-header">
       <h2>
         <span class='label label-id'><?php echo $product->id;?></span>
-        <?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name);?>
+        <?php echo html::a($this->createLink('product', 'view', 'product=' . $product->id), $product->name, '', "title='$product->name'");?>
         <small><?php echo $lang->arrow . ' ' . $lang->product->edit;?></small>
       </h2>
     </div>

module/productplan/view/edit.html.php

@@ -17,7 +17,7 @@
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
-      <h2><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title);?></strong></h2>
+      <h2><?php echo html::a(inlink('view', "id=$plan->id"), $plan->title, '', "title='$plan->title'");?></strong></h2>
     </div>
     <form class='load-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>

module/project/view/activate.html.php

@@ -18,7 +18,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
-      <?php echo isonlybody() ? $project->name : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->project->activate;?></small>
       <?php endif;?>

module/project/view/close.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
-      <?php echo isonlybody() ? $project->name : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
       <small> <?php echo $lang->arrow . $lang->project->close;?></small>
       <?php endif;?>

module/project/view/fixfirst.html.php

@@ -13,7 +13,7 @@
 <?php include '../../common/view/header.lite.html.php';?>
 <div id='mainContent' class='main-content'>
 <div class='main-header'>
-<h2><?php echo $lang->project->fixFirst;?></h2>
+  <h2><?php echo $lang->project->fixFirst;?></h2>
 </div>
   <form target='hiddenwin' method='post'>
     <table class='table table-form'>

module/project/view/putoff.html.php

@@ -17,7 +17,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
-      <?php echo isonlybody() ? $project->name : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->project->putoff;?></small>
       <?php endif;?>

module/project/view/start.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
-      <?php echo isonlybody() ? $project->name : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->project->start;?></small>
       <?php endif;?>

module/project/view/suspend.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='prefix label-id'><strong><?php echo $project->id;?></strong></span>
-      <?php echo isonlybody() ? $project->name : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
+      <?php echo isonlybody() ? ("<span title='$project->name'>" . $project->name . '</span>') : html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->project->suspend;?></small>
       <?php endif;?>

module/story/model.php

@@ -2362,7 +2362,7 @@ class storyModel extends model
                 echo $story->estimate;
                 break;
             case 'stage':
-                echo "<div" . (isset($storyStages[$story->id]) ? " class='popoverStage' data-toggle='popover' data-placement='bottom' data-target='\$next'" : '') . "'>";
+                echo "<div" . (isset($storyStages[$story->id]) ? " class='popoverStage' data-toggle='popover' data-placement='bottom' data-target='\$next'" : '') . ">";
                 echo $this->lang->story->stageList[$story->stage];
                 if(isset($storyStages[$story->id])) echo "<span><i class='icon icon-caret-down'></i></span>";
                 echo '</div>';

module/story/view/activate.html.php

@@ -16,7 +16,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $story->id;?></span>
-        <?php echo isonlybody() ? $story->title : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
+        <?php echo isonlybody() ? ("<span title='$story->title'>" . $story->title . '</span>') : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->story->activate;?></small>
         <?php endif;?>

module/story/view/close.html.php

@@ -16,7 +16,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $story->id;?></span>
-        <?php echo isonlybody() ? $story->title : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
+        <?php echo isonlybody() ? ("<span title='$story->title'>" . $story->title . '</span>') : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->story->close;?></small>
         <?php endif;?>

module/story/view/linkstory.html.php

@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $story->id;?></span>
-      <?php echo isonlybody() ? $story->title : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
+      <?php echo isonlybody() ? ("<span title='$story->title'>" . $story->title . '</span>') : html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title);?>
       <?php if(!isonlybody()):?>
       <small><?php echo $lang->arrow . $lang->story->linkStory;?></small>
       <?php endif;?>

module/task/view/activate.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small> <?php echo $lang->arrow . $lang->task->activate;?></small>
         <?php endif;?>

module/task/view/assignto.html.php

@@ -25,7 +25,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small> <?php echo $lang->arrow . (empty($task->team) ? $lang->task->assign : $lang->task->transfer);?></small>
         <?php endif;?>

module/task/view/cancel.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small> <?php echo $lang->arrow . $lang->task->cancel;?></small>
         <?php endif;?>

module/task/view/close.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->task->close;?></small>
         <?php endif;?>

module/task/view/finish.html.php

@@ -26,7 +26,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small> <?php echo $lang->arrow . $lang->task->finish;?></small>
         <?php endif;?>

module/task/view/pause.html.php

@@ -25,7 +25,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->task->pause;?></small>
         <?php endif;?>

module/task/view/recordestimate.html.php

@@ -28,7 +28,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->task->logEfforts;?></small>
         <?php endif;?>

module/task/view/start.html.php

@@ -30,7 +30,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $task->id;?></span>
-        <?php echo isonlybody() ? $task->name : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
+        <?php echo isonlybody() ? ("<span title='$task->name'>" . $task->name . '</span>') : html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name);?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->task->start;?></small>
         <?php endif;?>

module/testcase/view/batchcreate.html.php

@@ -20,7 +20,7 @@
       <?php echo $lang->testcase->batchCreate;?>
       <?php if($this->session->currentProductType !== 'normal') echo '<span class="label label-info">' . $branches[$branch] . '</span>';?>
       <?php if($story):?>
-      <small class='text'><?php echo $lang->arrow . $story->title ?></small>
+      <small class='text' title='<?php echo $story->title ?>'><?php echo $lang->arrow . $story->title ?></small>
       <?php endif;?>
     </h2>
     <div class="pull-right btn-toolbar">

module/testtask/view/start.html.php

@@ -17,7 +17,7 @@
     <div class='main-header'>
       <h2>
         <span class='label label-id'><?php echo $testtask->id;?></span>
-        <?php echo isonlybody() ? $testtask->name : html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?>
+        <?php echo isonlybody() ? ("<span title='$testtask->name'>" . $testtask->name . '</span>') : html::a($this->createLink('testtask', 'view', 'taskID=' . $testtask->id), $testtask->name, '_blank');?>
         <?php if(!isonlybody()):?>
         <small><?php echo $lang->arrow . $lang->testtask->start;?></small>
         <?php endif;?>