Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'

* Finish task #74148.

See merge request easycorp/zentaopms!5966

module/story/js/common.js

@@ -121,6 +121,8 @@ function relieve(index)
                 $('[href="#legendSiblings"]').parent('li').remove();
                 $('#legendSiblings').next('div').addClass('active');
                 $('#legendSiblings').remove();
+                $('#siblingTitle').remove();
+                $('#siblingList').remove();
             }
         }
     }, 'json');

module/story/view/change.html.php

@@ -83,12 +83,7 @@
         <tr id='siblingList'>
           <td colspan='2'>
             <ul class='list-unstyled'>
-              <?php foreach($siblings as $siblingID => $sibling):?>
-              <li>
-                <span class='label label-outline label-badge'><?php echo $branches[$sibling->branch];?></span>
-                <?php echo $siblingID . ' ' . $sibling->title;?>
-              </li>
-              <?php endforeach;?>
+                <?php include './blocksibling.html.php';?>
             </ul>
           </td>
         </tr>

module/story/view/edit.html.php

@@ -99,7 +99,7 @@
           <?php endif;?>
           <?php $this->printExtendFields($story, 'div', 'position=left');?>
           <?php if(!empty($siblings)):?>
-          <div class='detail' id='siblingList'>
+          <div class='detail' id='legendSiblings'>
             <div class='detail-title'>
               <?php echo $lang->story->changeSyncTip;?>
               <span data-toggle='tooltip' data-placement='right' title='<?php echo $lang->story->syncTip;?>'><i class='icon-help'></i></span>
@@ -107,12 +107,8 @@
             <div class='form-group'>
               <div>
                 <ul class='list-unstyled'>
-                  <?php foreach($siblings as $siblingID => $sibling):?>
-                  <li>
-                    <span class='label label-outline label-badge'><?php echo $branchTagOption[$sibling->branch];?></span>
-                    <?php echo $siblingID . ' ' . $sibling->title;?>
-                  </li>
-                  <?php endforeach;?>
+                  <?php $branches = $branchTagOption;?>
+                  <?php include './blocksibling.html.php';?>
                 </ul>
               </div>
             </div>