* Change program and project acl list.

module/program/js/pgmcreate.js

@@ -0,0 +1,13 @@
+$(function(){$('#parent').change();})
+
+function setAclList(programID)
+{
+    if(programID != 0)
+    {
+        $('.aclBox').html($('#subPGMAcl').html());
+    }
+    else
+    {
+        $('.aclBox').html($('#PGMAcl').html());
+    }
+}

module/program/js/prjcreate.js

@@ -19,3 +19,15 @@ function setCopyProject(copyProjectID)
 {
     location.href = createLink('program', 'PRJCreate', 'template=' + template + '&programID=' + programID + '&from=' + from + '&copyProjectID=' + copyProjectID);
 }
+
+function setAclList(programID)
+{
+    if(programID != 0)
+    {
+        $('.aclBox').html($('#PGMAcl').html());
+    }
+    else
+    {
+        $('.aclBox').html($('#PRJAcl').html());
+    }
+}

module/program/lang/en.php

@@ -95,9 +95,8 @@ $lang->program->featureBar['wait']      = 'Waiting';
 $lang->program->featureBar['suspended'] = 'Suspended';
 $lang->program->featureBar['closed']    = 'Closed';
 
-$lang->program->PRJAclList['open']    = "Default (Users who can visit {$lang->projectCommon} can access it)";
-$lang->program->PRJAclList['private'] = 'Private (For team members only)';
-$lang->program->PRJAclList['custom']  = 'Custom (Team members and the whitelist users can access it)';
+$lang->program->PRJAclList['open']    = "Open(Users who can visit {$lang->projectCommon} can access it)";
+$lang->program->PRJAclList['private'] = 'Private (For team members and stakeholders only)';
 
 $lang->program->PRJPrivwayList['extend'] = 'Inherit (program privilege and company privilege)';
 $lang->program->PRJPrivwayList['reset']  = 'Reset (program privilege only)';

module/program/lang/zh-cn.php

@@ -96,9 +96,12 @@ $lang->program->featureBar['wait']      = '未开始';
 $lang->program->featureBar['suspended'] = '已挂起';
 $lang->program->featureBar['closed']    = '已关闭';
 
-$lang->program->PRJAclList['open']    = "默认设置(有项目视图权限，即可访问)";
-$lang->program->PRJAclList['private'] = "私有项目(只有项目团队成员才能访问)";
-$lang->program->PRJAclList['custom']  = "自定义白名单(团队成员和白名单的成员可以访问)";
+$lang->program->PRJAclList['open']    = "公开(有项目视图权限，即可访问)";
+$lang->program->PRJAclList['private'] = "私有(项目团队成员和干系人可访问)";
+
+$lang->program->PGMPRJAclList['open']       = "全部公开（有项目视图权限，即可访问）";
+$lang->program->PGMPRJAclList['openinside'] = "项目集内公开（项目集负责人和干系人，即可访问）";
+$lang->program->PGMPRJAclList['private']    = "私有(项目团队成员和干系人可访问)";
 
 $lang->program->PRJAuthList['extend'] = '继承(取项目权限与组织权限的并集)';
 $lang->program->PRJAuthList['reset']  = '重新定义(只取项目权限)';
@@ -205,9 +208,12 @@ $lang->program->PGMLongTime  = '长期项目';
 $lang->program->noPGM         = '暂时没有项目集';
 $lang->program->PGMShowClosed = '显示已关闭';
 
-$lang->program->PGMAclList['open']    = "默认设置(有项目视图权限，即可访问)";
-$lang->program->PGMAclList['private'] = "私有项目(只有项目团队成员才能访问)";
-$lang->program->PGMAclList['custom']  = "自定义白名单(团队成员和白名单的成员可以访问)";
+$lang->program->PGMAclList['open']    = "公开（有项目集视图权限，即可访问）";
+$lang->program->PGMAclList['private'] = "私有（项目集负责人和干系人可访问）";
+
+$lang->program->subPGMAclList['open']       = "全部公开（有项目集视图权限，即可访问）";
+$lang->program->subPGMAclList['openinside'] = "项目集内公开 (所有上级项目集干系人，即可访问）";
+$lang->program->subPGMAclList['private']    = "私有（本项目集负责人和干系人可访问）";
 
 $lang->program->PGMAuthList['extend'] = '继承(取项目权限与组织权限的并集)';
 $lang->program->PGMAuthList['reset']  = '重新定义(只取项目权限)';

module/program/view/pgmcreate.html.php

@@ -43,7 +43,7 @@
       <table class='table table-form'>
         <tr>
           <th><?php echo $lang->program->PGMParent;?></th>
-          <td><?php echo html::select('parent', $parents, isset($parentProgram->id) ? $parentProgram->id : '', "class='form-control chosen'");?>
+          <td><?php echo html::select('parent', $parents, isset($parentProgram->id) ? $parentProgram->id : '', "class='form-control chosen' onchange=setAclList(this.value)");?>
           <td></td>
         </tr>
         <tr>
@@ -101,7 +101,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
-          <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->program->PGMAclList, 'open', "onclick='setWhite(this.value);'", 'block'));?></td>
+          <td colspan='3' class='aclBox'><?php echo nl2br(html::radio('acl', $lang->program->PGMAclList, 'open', '', 'block'));?></td>
         </tr>
         <tr id='whitelistBox' class='hidden'>
           <th><?php echo $lang->project->whitelist;?></th>
@@ -145,5 +145,11 @@
     </div>
   </div>
 </div>
+<div id='PGMAcl' class='hidden'>
+  <?php echo nl2br(html::radio('acl', $lang->program->PGMAclList, 'open', '', 'block'));?>
+</div>
+<div id='subPGMAcl' class='hidden'>
+  <?php echo nl2br(html::radio('acl', $lang->program->subPGMAclList, 'open', '', 'block'));?>
+</div>
 <?php js::set('parentProgramID', isset($parentProgram->id) ? $parentProgram->id : 0);?>
 <?php include '../../common/view/footer.html.php';?>

module/program/view/prjcreate.html.php

@@ -34,7 +34,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->program->PGMParent;?></th>
-          <td><?php echo html::select('parent', $programList, $programID, "class='form-control chosen'");?></td><td></td><td></td>
+          <td><?php echo html::select('parent', $programList, $programID, "class='form-control chosen' onchange='setAclList(this.value)'");?></td><td></td><td></td>
         </tr>
         <tr>
           <th><?php echo $lang->program->PRJName;?></th>
@@ -117,11 +117,7 @@
         </tr>
         <tr>
           <th><?php echo $lang->project->acl;?></th>
-          <td colspan='3'><?php echo nl2br(html::radio('acl', $lang->program->PRJAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?></td>
-        </tr>
-        <tr id='whitelistBox' class='hidden'>
-          <th><?php echo $lang->project->whitelist;?></th>
-          <td colspan='3'><?php echo html::checkbox('whitelist', $groups, $whitelist, '', '', 'inline');?></td>
+          <td colspan='3' class='aclBox'><?php echo nl2br(html::radio('acl', $lang->program->PRJAclList, $acl, '', 'block'));?></td>
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>
@@ -164,4 +160,10 @@
     </div>
   </div>
 </div>
+<div id='PRJAcl' class='hidden'>
+  <?php echo nl2br(html::radio('acl', $lang->program->PRJAclList, $acl, '', 'block'));?>
+</div>
+<div id='PGMAcl' class='hidden'>
+  <?php echo nl2br(html::radio('acl', $lang->program->PGMPRJAclList, $acl, '', 'block'));?>
+</div>
 <?php include '../../common/view/footer.html.php';?>

module/project/lang/zh-cn.php

@@ -115,9 +115,8 @@ $lang->project->statusList['doing']     = '进行中';
 $lang->project->statusList['suspended'] = '已挂起';
 $lang->project->statusList['closed']    = '已关闭';
 
-$lang->project->aclList['open']    = "默认设置(有{$lang->projectCommon}视图权限，即可访问)";
-$lang->project->aclList['private'] = "私有{$lang->projectCommon}(只有{$lang->projectCommon}团队成员才能访问)";
-$lang->project->aclList['custom']  = "自定义白名单(团队成员和白名单的成员可以访问)";
+$lang->project->aclList['open']    = "继承项目访问权限（能访问当前项目，即可访问）";
+$lang->project->aclList['private'] = "私有（团队成员和项目干系人可访问）";
 
 $lang->project->storyPoint = '故事点';