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

module/project/js/story.js

@@ -20,8 +20,6 @@ $(function()
     $(document).on('click', "#storyList tbody tr, .table-footer .check-all, #storyList thead .check-all", function(){showCheckedSummary();});
     $(document).on('change', "#storyList :checkbox", function(){showCheckedSummary();});
 
-    $("a[data-toggle='linkStoryByPlan']").click(function(){$('#linkStoryByPlan').modal('show')})
-
     $('#toTaskButton').on('click', function ()
     {
         var planID = $('#plan').val();

module/project/view/linkstory.html.php

@@ -11,6 +11,9 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<style>
+#searchForm .form-actions {padding-bottom: 10px!important;}
+</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->linkStory;?></span></span>
@@ -19,8 +22,10 @@
     <?php common::printBack($this->server->http_referer, 'btn btn-link');?>
   </div>
 </div>
-<div id="mainContent" class="main-content">
-  <div id='queryBox' class='show'></div>
+<div id="mainContent">
+  <div class="cell space-sm">
+    <div id='queryBox' class='show no-margin'></div>
+  </div>
   <form class='main-table table-story' method='post' data-ride='table' id='linkStoryForm'>
     <table class='table table-fixed' id='linkStoryList'> 
       <thead>
@@ -72,22 +77,18 @@
       <?php endforeach;?>
       </tbody>
     </table>
+    <?php if($storyCount):?>
     <div class='table-footer'>
-      <?php if($storyCount):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class='table-actions btn-toolbar'>
         <?php echo html::submitButton('', '', 'btn');?>
       </div>
-      <?php else:?>
-      <div class='text'><?php echo $lang->project->whyNoStories;?></div>
-      <?php endif;?>
     </div>
+    <?php else:?>
+    <div class="table-empty-tip">
+      <p><span class="text-muted"><?php echo $lang->project->whyNoStories;?></p>
+    </div>
+    <?php endif;?>
   </form>
 </div>
-<script type='text/javascript'>
-$(function()
-{
-    ajaxGetSearchForm();
-});
-</script>
 <?php include '../../common/view/footer.html.php';?>

module/project/view/story.html.php

@@ -36,7 +36,7 @@
   </div>
   <div class="btn-toolbar pull-right">
     <?php
-    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", "<i class='icon icon-export'> </i>" . $lang->story->export, '', "class='btn btn-link export'");
+    common::printLink('story', 'export', "productID=$productID&orderBy=id_desc", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export'");
 
     if(commonModel::isTutorialMode())
     {
@@ -45,15 +45,15 @@
     }
     else
     {
-        echo "<div class='btn-group' id='createActionMenu'>";
-        common::printIcon('project', 'linkStory', "project=$project->id", '', 'button', 'link', '', 'link-story-btn');
+        echo "<div class='btn-group dropdown-hover' id='createActionMenu'>";
         if(common::hasPriv('project', 'importPlanStories'))
         {
-            echo "<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>";
-            echo "<span class='caret'></span>";
+            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 '</button>';
             echo "<ul class='dropdown-menu pull-right'>";
-            echo "<li>" . html::a('###', $lang->project->linkStoryByPlan, '', 'data-toggle="linkStoryByPlan"') . "</li>";
+            echo "<li>" . html::a($this->createLink('project', 'linkStory', "project=$project->id"), $lang->project->linkStory). "</li>";
+            echo "<li>" . html::a('#linkStoryByPlan', $lang->project->linkStoryByPlan, '', 'data-toggle="modal"') . "</li>";
             echo '</ul>';
         }
         echo '</div>';
@@ -247,16 +247,16 @@
 </div>
 
 <div class="modal fade" id="linkStoryByPlan">
-  <div class="modal-dialog">
+  <div class="modal-dialog mw-500px">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-        <h4 class="modal-title"><i class="icon-file-text"></i> <?php echo $lang->project->linkStoryByPlan;?></h4>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
+        <h4 class="modal-title"><?php echo $lang->project->linkStoryByPlan;?></h4>
       </div>
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'");?>
-          <span class='input-group-btn'><?php echo html::commonButton($lang->project->linkStory, "id='toTaskButton'");?></span>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->project->linkStory, "id='toTaskButton'", 'btn btn-primary');?></span>
         </div>
       </div>
     </div>