From 83c91c5a69ec45436f603fcc56de79d56c765505 Mon Sep 17 00:00:00 2001
From: liugang <liugang@cnezsoft.com>
Date: Thu, 5 Jul 2018 10:57:40 +0800
Subject: [PATCH] * Finish task #4626

---
 module/project/css/story.css       |  3 ++-
 module/project/view/story.html.php | 33 ++++++++++++++++++------------
 module/project/view/task.html.php  |  8 ++++----
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/module/project/css/story.css b/module/project/css/story.css
index bc4f55afb1..cc5ec96e9a 100644
--- a/module/project/css/story.css
+++ b/module/project/css/story.css
@@ -1,4 +1,5 @@
+#linkButton {border-radius: 4px !important;}
 tbody > tr > td > .btn-icon {margin-right: 4px}
 @media (max-width: 1200px) {#storyList .c-user, #storyList .c-estimate {display: none!important;}}
 @media (max-width: 1000px) {#storyList .c-status, #storyList .c-pri {display: none!important;}}
-@media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none!important;}}
\ No newline at end of file
+@media (max-width: 820px) {#storyList .c-sort, #storyList .c-stage {display: none!important;}}
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index 3e66d14f2d..48f0d57290 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -38,6 +38,20 @@
     <?php
     common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export'");
 
+    $this->lang->story->create = $this->lang->project->createStory;
+    if($productID and !$this->loadModel('story')->checkForceReview())
+    {
+        echo "<div class='btn-group dropdown-hover'>";
+        echo "<button type='button' class='btn btn-link'>";
+        echo "<i class='icon-plus'></i> {$lang->story->create} <span class='caret'></span>";
+        echo '</button>';
+        echo "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
+        if(common::hasPriv('story', 'create')) echo '<li>' . html::a($this->createLink('story', 'create',  "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id"), $lang->story->create) . '</li>';
+        if(common::hasPriv('story', 'batchCreate')) echo '<li>' . html::a($this->createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id"), $lang->story->batchCreate) . '</li>';
+        echo '</ul>';
+        echo '</div>';
+    }
+
     if(commonModel::isTutorialMode())
     {
         $wizardParams = helper::safe64Encode("project=$project->id");
@@ -45,23 +59,16 @@
     }
     else
     {
-        echo "<div class='btn-group dropdown-hover' id='createActionMenu'>";
-        echo "<button type='button' class='btn btn-link dropdown-toggle btn-icon'>";
-        echo "<i class='icon-link muted'></i> {$lang->project->linkStory} <span class='caret'></span>";
+        echo "<div class='btn-group dropdown-hover'>";
+        echo "<button type='button' class='btn btn-primary' id='linkButton'>";
+        echo "<i class='icon-link'></i> {$lang->project->linkStory} <span class='caret'></span>";
         echo '</button>';
-        echo "<ul class='dropdown-menu pull-right'>";
-        if(common::hasPriv('project', 'linkStory')) echo "<li>" . html::a($this->createLink('project', 'linkStory', "project=$project->id"), $lang->project->linkStory). "</li>";
-        if(common::hasPriv('project', 'importPlanStories')) echo "<li>" . html::a('#linkStoryByPlan', $lang->project->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
+        echo "<ul class='dropdown-menu pull-right' id='linkActionMenu'>";
+        if(common::hasPriv('project', 'linkStory')) echo '<li>' . html::a(inlink('linkStory', "project=$project->id"), $lang->project->linkStory). "</li>";
+        if(common::hasPriv('project', 'importPlanStories')) echo '<li>' . html::a('#linkStoryByPlan', $lang->project->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
         echo '</ul>';
         echo '</div>';
     }
-
-    $this->lang->story->create = $this->lang->project->createStory;
-    if($productID and !$this->loadModel('story')->checkForceReview())
-    {
-        common::printLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->batchCreate, '', "class='btn btn-secondary'");
-        common::printLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&project=$project->id", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary'");
-    }
     ?>
   </div>
 </div>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index d3ca0e0fa3..752203ac97 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -118,9 +118,9 @@ js::set('browseType', $browseType);
     common::printIcon('task', 'report', "project=$projectID&browseType=$browseType", '', 'button', 'bar-chart muted');
     ?>
 
-    <div class="btn-group">
+    <div class="btn-group dropdown-hover">
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export;?></span> <span class="caret"></span></button>
-      <ul class="dropdown-menu" id='exportActionMenu'>
+      <ul class="dropdown-menu pull-right" id='exportActionMenu'>
         <?php
         $misc = common::hasPriv('task', 'export') ? "class='export'" : "class=disabled";
         $link = common::hasPriv('task', 'export') ? $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType") : '#';
@@ -129,9 +129,9 @@ js::set('browseType', $browseType);
       </ul>
     </div>
 
-    <div class="btn-group">
+    <div class="btn-group dropdown-hover">
       <button class="btn btn-link" data-toggle="dropdown"><i class="icon icon-import muted"></i> <span class="text"><?php echo $lang->import;?></span> <span class="caret"></span></button>
-      <ul class="dropdown-menu" id='importActionMenu'>
+      <ul class="dropdown-menu pull-right" id='importActionMenu'>
         <?php
         $misc = common::hasPriv('project', 'importTask') ? "class='import'" : "class=disabled";
         $link = common::hasPriv('project', 'importTask') ? $this->createLink('project', 'importTask', "project=$project->id") : '#';