Commit @c94733463db73bfc4e4e3343f24b34cacd91bb55

[Notice] Announcing the End of Demo Server [Read me]

채수원 2015-01-13

Merge branch 'issue-1901' of dlab/hive

from pull-request 1370

* refs/heads/issue-1901:
  add function that is visibility of code related options

Reviewed-by: 채수원

@c94733463db73bfc4e4e3343f24b34cacd91bb55

3811b29

c947334

app/views/project/partial_settingmenu.scala.html

--- app/views/project/partial_settingmenu.scala.html

+++ app/views/project/partial_settingmenu.scala.html


 **@
 @(project:Project)
 
-@makeSubMenu(call:Call, name:String, count:Integer) = {
-    <li class="@isActiveSubMenu(call)"><a href="@call">@name@if(count>0){<span class="num-badge">@count</span>}</a></li>
-}
-
 @isActiveSubMenu(calls: Call*) = @{
     var menuState = ""
     for(call <- calls) {

 }
 
 <ul class="nav nav-tabs">
-    @makeSubMenu(routes.ProjectApp.settingForm(project.owner, project.name),  Messages("project.setting"), 0)
-    @makeSubMenu(routes.ProjectApp.members(project.owner, project.name),      Messages("project.member"), project.enrolledUsers.size)
-    @makeSubMenu(routes.IssueLabelApp.labelsForm(project.owner, project.name),    Messages("issue.label"), 0)
-    @makeSubMenu(routes.ProjectApp.transferForm(project.owner, project.name), Messages("project.transfer"), 0)
-    @makeSubMenu(routes.ProjectApp.deleteForm(project.owner, project.name),   Messages("project.delete"), 0)
-    @makeSubMenu(routes.ProjectApp.changeVCS(project.owner, project.name),   Messages("project.changeVCS"), 0)
+    <li id="subMenuProjectSetting" class="@isActiveSubMenu(routes.ProjectApp.settingForm(project.owner, project.name))">
+        <a href="@routes.ProjectApp.settingForm(project.owner, project.name)">@Messages("project.setting")</a></li>
+    <li id="subMenuProjectMember" class="@isActiveSubMenu(routes.ProjectApp.members(project.owner, project.name))">
+        <a href="@routes.ProjectApp.members(project.owner, project.name)">@Messages("project.member")@if(project.enrolledUsers.size>0){<span class="num-badge">@project.enrolledUsers.size</span>}</a></li>
+    <li id="subMenuIssueLabel" class="@isActiveSubMenu(routes.IssueLabelApp.labelsForm(project.owner, project.name))">
+        <a href="@routes.IssueLabelApp.labelsForm(project.owner, project.name)">@Messages("issue.label")</a></li>
+    <li id="subMenuProjectTransfer" class="@isActiveSubMenu(routes.ProjectApp.transferForm(project.owner, project.name))">
+        <a href="@routes.ProjectApp.transferForm(project.owner, project.name)">@Messages("project.transfer")</a></li>
+    <li id="subMenuProjectDelete" class="@isActiveSubMenu(routes.ProjectApp.deleteForm(project.owner, project.name))">
+        <a href="@routes.ProjectApp.deleteForm(project.owner, project.name)">@Messages("project.delete")</a></li>
+    <li id="subMenuProjectChangeVCS" class="@isActiveSubMenu(routes.ProjectApp.changeVCS(project.owner, project.name))" style="@if(!project.menuSetting.code){display:none;}">
+        <a href="@routes.ProjectApp.changeVCS(project.owner, project.name)">@Messages("project.changeVCS")</a></li>
 </ul>

3811b29

c947334

app/views/project/setting.scala.html

--- app/views/project/setting.scala.html

+++ app/views/project/setting.scala.html


                 <div class="box-wrap middle">
                     <div class="cu-label">@Messages("project.shareOption")</div>
                     <div class="cu-desc">
-                        <input name="projectScope" type="radio" @if(project.isPublic){checked="checked"} id="public" value="PUBLIC" class="radio-btn"><label for="public" class="bg-radiobtn label-public">@Messages("project.public")</label>
+                        <input name="projectScope" type="radio" class="radio-btn" id="public" value="PUBLIC" @if(project.isPublic){checked="checked"}><label for="public" class="bg-radiobtn label-public">@Messages("project.public")</label>
                         @if(project.hasGroup){
-                        <input name="projectScope" type="radio" @if(project.isProtected){checked="checked"} id="protected" value="PROTECTED" class="radio-btn"><label for="protected" class="bg-radiobtn label-protected">@Messages("project.protected")</label>
+                        <input name="projectScope" type="radio" class="radio-btn" id="protected" value="PROTECTED" @if(project.isProtected){checked="checked"}><label for="protected" class="bg-radiobtn label-protected">@Messages("project.protected")</label>
                         }
-                        <input name="projectScope" type="radio" @if(project.isPrivate){checked="checked"} id="private" value="PRIVATE" class="radio-btn"><label for="private" class="bg-radiobtn label-private">@Messages("project.private")</label>
+                        <input name="projectScope" type="radio" class="radio-btn" id="private" value="PRIVATE" @if(project.isPrivate){checked="checked"}><label for="private" class="bg-radiobtn label-private">@Messages("project.private")</label>
                         <span class="note">@Messages("project.private.notice")</span>
                     </div>
                 </div>
 
                 @if(project.vcs.equals("GIT")){
-                <div class="box-wrap middle reviewer-count-wrap">
+                <div class="box-wrap middle reviewer-count-wrap" id="reviewerCountSettingPanel" style="@if(!project.menuSetting.code){display:none;}">
                     <div class="cu-label vmiddle">@Messages("project.reviewer.count")</div>
                     <div class="cu-desc">
-                        <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="show" type="radio" @if(project.isUsingReviewerCount){checked="checked"} id="reviewerCountEnable" value="true" class="radio-btn">
+                        <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="show" type="radio" class="radio-btn" id="reviewerCountEnable" value="true" @if(project.isUsingReviewerCount){checked="checked"}>
                         <label for="reviewerCountEnable" class="bg-radiobtn label-public">@Messages("project.reviewer.count.enable")</label>
-                        <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="hide" type="radio" @if(!project.isUsingReviewerCount){checked="checked"} id="reviewerCountDisable" value="false" class="radio-btn">
+                        <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="hide" type="radio" class="radio-btn" id="reviewerCountDisable" value="false" @if(!project.isUsingReviewerCount){checked="checked"}>
                         <label for="reviewerCountDisable" class="bg-radiobtn label-private">@Messages("project.reviewer.count.disable")</label>
 
                         <div id="welReviewerCount" data-value="@project.isUsingReviewerCount" class="hide">

                     </div>
                 </div>
 
-                <div class="box-wrap middle">
+                <div class="box-wrap middle" id="defaultBranceSettingPanel" style="@if(!project.menuSetting.code){display:none;}">
                     <div class="cu-label vmiddle">@Messages("code.branches.defaultBranch")</div>
                     <div class="cu-desc">
                         <select id="project-default-branch" name="defaultBranch"

3811b29

c947334

public/javascripts/service/yobi.project.Setting.js

--- public/javascripts/service/yobi.project.Setting.js

+++ public/javascripts/service/yobi.project.Setting.js


             htElement.welInputName = $("input#project-name");
             htElement.welBtnSave   = $("#save");
             htElement.welReviewerCount = $("#welReviewerCount");
+            htElement.welMenuSettingCode = $("#menuSettingCode");
+            htElement.welMenuSettingPullRequest = $("#menuSettingPullRequest");
+            htElement.welMenuSettingReview = $("#menuSettingReview");
+            htElement.welReviewerCountSettingPanel = $("#reviewerCountSettingPanel");
+            htElement.welDefaultBranceSettingPanel = $("#defaultBranceSettingPanel");
+            htElement.welSubMenuProjectChangeVCS = $("#subMenuProjectChangeVCS");
         }
 
         /**

         function _attachEvent(){
             htElement.welInputLogo.change(_onChangeLogoPath);
             htElement.welBtnSave.click(_onClickBtnSave);
+            htElement.welMenuSettingCode.click(_onClickMenuSettingCode);
+            htElement.welMenuSettingPullRequest.click(_onClickMenuSettingCode);
+            htElement.welMenuSettingReview.click(_onClickMenuSettingCode);
 
             if(htElement.welReviewerCount.data("value") === true) {
                 htElement.welReviewerCount.show();

             return true;
         }
 
+        function _onClickMenuSettingCode() {
+            var isChecked = $(this).prop("checked");
+            htElement.welMenuSettingCode.prop("checked", isChecked);
+            htElement.welMenuSettingPullRequest.prop("checked", isChecked);
+            htElement.welMenuSettingReview.prop("checked", isChecked);
+            if (isChecked) {
+                htElement.welReviewerCountSettingPanel.show();
+                htElement.welDefaultBranceSettingPanel.show();
+                htElement.welSubMenuProjectChangeVCS.show();
+            } else {
+                htElement.welReviewerCountSettingPanel.hide();
+                htElement.welDefaultBranceSettingPanel.hide();
+                htElement.welSubMenuProjectChangeVCS.hide();
+            }
+        }
+
         _init(htOptions);
     };
 

Add a comment

Open 0
Closed 0

List

...	...	@@ -72,22 +72,22 @@
72	72	<div class="box-wrap middle">
73	73	<div class="cu-label">@Messages("project.shareOption")</div>
74	74	<div class="cu-desc">
75		- <input name="projectScope" type="radio" @if(project.isPublic){checked="checked"} id="public" value="PUBLIC" class="radio-btn"><label for="public" class="bg-radiobtn label-public">@Messages("project.public")</label>
	75	+ <input name="projectScope" type="radio" class="radio-btn" id="public" value="PUBLIC" @if(project.isPublic){checked="checked"}><label for="public" class="bg-radiobtn label-public">@Messages("project.public")</label>
76	76	@if(project.hasGroup){
77		- <input name="projectScope" type="radio" @if(project.isProtected){checked="checked"} id="protected" value="PROTECTED" class="radio-btn"><label for="protected" class="bg-radiobtn label-protected">@Messages("project.protected")</label>
	77	+ <input name="projectScope" type="radio" class="radio-btn" id="protected" value="PROTECTED" @if(project.isProtected){checked="checked"}><label for="protected" class="bg-radiobtn label-protected">@Messages("project.protected")</label>
78	78	}
79		- <input name="projectScope" type="radio" @if(project.isPrivate){checked="checked"} id="private" value="PRIVATE" class="radio-btn"><label for="private" class="bg-radiobtn label-private">@Messages("project.private")</label>
	79	+ <input name="projectScope" type="radio" class="radio-btn" id="private" value="PRIVATE" @if(project.isPrivate){checked="checked"}><label for="private" class="bg-radiobtn label-private">@Messages("project.private")</label>
80	80	<span class="note">@Messages("project.private.notice")</span>
81	81	</div>
82	82	</div>
83	83
84	84	@if(project.vcs.equals("GIT")){
85		- <div class="box-wrap middle reviewer-count-wrap">
	85	+ <div class="box-wrap middle reviewer-count-wrap" id="reviewerCountSettingPanel" style="@if(!project.menuSetting.code){display:none;}">
86	86	<div class="cu-label vmiddle">@Messages("project.reviewer.count")</div>
87	87	<div class="cu-desc">
88		- <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="show" type="radio" @if(project.isUsingReviewerCount){checked="checked"} id="reviewerCountEnable" value="true" class="radio-btn">
	88	+ <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="show" type="radio" class="radio-btn" id="reviewerCountEnable" value="true" @if(project.isUsingReviewerCount){checked="checked"}>
89	89	<label for="reviewerCountEnable" class="bg-radiobtn label-public">@Messages("project.reviewer.count.enable")</label>
90		- <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="hide" type="radio" @if(!project.isUsingReviewerCount){checked="checked"} id="reviewerCountDisable" value="false" class="radio-btn">
	90	+ <input name="isUsingReviewerCount" data-toggle="reviewer-count" data-action="hide" type="radio" class="radio-btn" id="reviewerCountDisable" value="false" @if(!project.isUsingReviewerCount){checked="checked"}>
91	91	<label for="reviewerCountDisable" class="bg-radiobtn label-private">@Messages("project.reviewer.count.disable")</label>
92	92
93	93	<div id="welReviewerCount" data-value="@project.isUsingReviewerCount" class="hide">
...	...	@@ -107,7 +107,7 @@
107	107	</div>
108	108	</div>
109	109
110		- <div class="box-wrap middle">
	110	+ <div class="box-wrap middle" id="defaultBranceSettingPanel" style="@if(!project.menuSetting.code){display:none;}">
111	111	<div class="cu-label vmiddle">@Messages("code.branches.defaultBranch")</div>
112	112	<div class="cu-desc">
113	113	<select id="project-default-branch" name="defaultBranch"

...	...	@@ -54,6 +54,12 @@
54	54	htElement.welInputName = $("input#project-name");
55	55	htElement.welBtnSave = $("#save");
56	56	htElement.welReviewerCount = $("#welReviewerCount");
	57	+ htElement.welMenuSettingCode = $("#menuSettingCode");
	58	+ htElement.welMenuSettingPullRequest = $("#menuSettingPullRequest");
	59	+ htElement.welMenuSettingReview = $("#menuSettingReview");
	60	+ htElement.welReviewerCountSettingPanel = $("#reviewerCountSettingPanel");
	61	+ htElement.welDefaultBranceSettingPanel = $("#defaultBranceSettingPanel");
	62	+ htElement.welSubMenuProjectChangeVCS = $("#subMenuProjectChangeVCS");
57	63	}
58	64
59	65	/**
...	...	@@ -62,6 +68,9 @@
62	68	function _attachEvent(){
63	69	htElement.welInputLogo.change(_onChangeLogoPath);
64	70	htElement.welBtnSave.click(_onClickBtnSave);
	71	+ htElement.welMenuSettingCode.click(_onClickMenuSettingCode);
	72	+ htElement.welMenuSettingPullRequest.click(_onClickMenuSettingCode);
	73	+ htElement.welMenuSettingReview.click(_onClickMenuSettingCode);
65	74
66	75	if(htElement.welReviewerCount.data("value") === true) {
67	76	htElement.welReviewerCount.show();
...	...	@@ -101,6 +110,22 @@
101	110	return true;
102	111	}
103	112
	113	+ function _onClickMenuSettingCode() {
	114	+ var isChecked = $(this).prop("checked");
	115	+ htElement.welMenuSettingCode.prop("checked", isChecked);
	116	+ htElement.welMenuSettingPullRequest.prop("checked", isChecked);
	117	+ htElement.welMenuSettingReview.prop("checked", isChecked);
	118	+ if (isChecked) {
	119	+ htElement.welReviewerCountSettingPanel.show();
	120	+ htElement.welDefaultBranceSettingPanel.show();
	121	+ htElement.welSubMenuProjectChangeVCS.show();
	122	+ } else {
	123	+ htElement.welReviewerCountSettingPanel.hide();
	124	+ htElement.welDefaultBranceSettingPanel.hide();
	125	+ htElement.welSubMenuProjectChangeVCS.hide();
	126	+ }
	127	+ }
	128	+
104	129	_init(htOptions);
105	130	};
106	131

...	...	@@ -20,10 +20,6 @@
20	20	**@
21	21	@(project:Project)
22	22
23		-@makeSubMenu(call:Call, name:String, count:Integer) = {
24		- <li class="@isActiveSubMenu(call)"><a href="@call">@name@if(count>0){<span class="num-badge">@count</span>}</a></li>
25		-}
26		-
27	23	@isActiveSubMenu(calls: Call*) = @{
28	24	var menuState = ""
29	25	for(call <- calls) {
...	...	@@ -35,10 +31,16 @@
35	31	}
36	32
37	33	<ul class="nav nav-tabs">
38		- @makeSubMenu(routes.ProjectApp.settingForm(project.owner, project.name), Messages("project.setting"), 0)
39		- @makeSubMenu(routes.ProjectApp.members(project.owner, project.name), Messages("project.member"), project.enrolledUsers.size)
40		- @makeSubMenu(routes.IssueLabelApp.labelsForm(project.owner, project.name), Messages("issue.label"), 0)
41		- @makeSubMenu(routes.ProjectApp.transferForm(project.owner, project.name), Messages("project.transfer"), 0)
42		- @makeSubMenu(routes.ProjectApp.deleteForm(project.owner, project.name), Messages("project.delete"), 0)
43		- @makeSubMenu(routes.ProjectApp.changeVCS(project.owner, project.name), Messages("project.changeVCS"), 0)
	34	+ <li id="subMenuProjectSetting" class="@isActiveSubMenu(routes.ProjectApp.settingForm(project.owner, project.name))">
	35	+ <a href="@routes.ProjectApp.settingForm(project.owner, project.name)">@Messages("project.setting")</a></li>
	36	+ <li id="subMenuProjectMember" class="@isActiveSubMenu(routes.ProjectApp.members(project.owner, project.name))">
	37	+ <a href="@routes.ProjectApp.members(project.owner, project.name)">@Messages("project.member")@if(project.enrolledUsers.size>0){<span class="num-badge">@project.enrolledUsers.size</span>}</a></li>
	38	+ <li id="subMenuIssueLabel" class="@isActiveSubMenu(routes.IssueLabelApp.labelsForm(project.owner, project.name))">
	39	+ <a href="@routes.IssueLabelApp.labelsForm(project.owner, project.name)">@Messages("issue.label")</a></li>
	40	+ <li id="subMenuProjectTransfer" class="@isActiveSubMenu(routes.ProjectApp.transferForm(project.owner, project.name))">
	41	+ <a href="@routes.ProjectApp.transferForm(project.owner, project.name)">@Messages("project.transfer")</a></li>
	42	+ <li id="subMenuProjectDelete" class="@isActiveSubMenu(routes.ProjectApp.deleteForm(project.owner, project.name))">
	43	+ <a href="@routes.ProjectApp.deleteForm(project.owner, project.name)">@Messages("project.delete")</a></li>
	44	+ <li id="subMenuProjectChangeVCS" class="@isActiveSubMenu(routes.ProjectApp.changeVCS(project.owner, project.name))" style="@if(!project.menuSetting.code){display:none;}">
	45	+ <a href="@routes.ProjectApp.changeVCS(project.owner, project.name)">@Messages("project.changeVCS")</a></li>
44	46	</ul>

Delete comment