* Finish task #9028.

module/common/lang/zh-cn.php

@@ -293,8 +293,8 @@ $lang->my->menu->contacts    = '联系人|my|managecontacts|';
 
 $lang->my->workMenu = new stdclass();
 $lang->my->workMenu->task        = '任务|my|work|mode=task';
-$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement";
+$lang->my->workMenu->story       = "$lang->SRCommon|my|work|mode=story";
 $lang->my->workMenu->bug         = 'Bug|my|work|mode=bug';
 $lang->my->workMenu->testtask    = '测试|my|work|mode=testtask&type=wait';
 $lang->my->workMenu->issue       = '问题|my|work|mode=issue';
@@ -302,8 +302,8 @@ $lang->my->workMenu->risk        = '风险|my|work|mode=risk';
 
 $lang->my->contributeMenu = new stdclass();
 $lang->my->contributeMenu->task        = '任务|my|contribute|mode=task';
-$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement";
+$lang->my->contributeMenu->story       = "$lang->SRCommon|my|contribute|mode=story";
 $lang->my->contributeMenu->bug         = 'Bug|my|contribute|mode=bug';
 $lang->my->contributeMenu->testtask    = '用例|my|contribute|mode=testtask&type=done';
 $lang->my->contributeMenu->issue       = '问题|my|contribute|mode=issue';

module/custom/control.php

@@ -534,7 +534,7 @@ class custom extends control
                     ->exec();
             }
 
-            die(js::reload('parent'));
+            die(js::locate(inlink('browseStoryConcept'), 'parent'));
         }
     }
 

module/custom/view/browsestoryconcept.html.php

@@ -41,7 +41,7 @@
               <?php $disabled = $URSR['system'] ? "disabled=disabled" : '';?>
               <?php if(common::hasPriv('custom', 'setDefaultConcept'))  echo html::a($this->createLink('custom', 'setDefaultConcept', "id=$key"), "<i class='icon icon-hand-right'></i>", 'hiddenwin', "class='btn' title={$lang->custom->setDefaultConcept}");?>
               <?php if(common::hasPriv('custom', 'editStoryConcept'))   echo html::a($this->createLink('custom', 'editStoryConcept', "id=$key", '', true), "<i class='icon icon-edit'></i>", '', "class='btn iframe' title={$lang->edit}");?>
-              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete}");?>
+              <?php if(common::hasPriv('custom', 'deleteStoryConcept')) echo html::a($this->createLink('custom', 'deleteStoryConcept', "id=$key"), "<i class='icon icon-trash'></i>", 'hiddenwin', "class='btn' $disabled title={$lang->delete} data-group='system'");?>
             </td>
           </tr>
         <?php endforeach;?>

module/my/view/preference.html.php

@@ -11,7 +11,7 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<style> #submit{margin-top: 40px} </style>
+<style> #submit{margin-top: 45px} </style>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <h2><i class='icon-key'></i> <?php echo $lang->my->preference;?></h2>