Commit @37030a6cee4fc799e5c7d3a37d253b8a9361f1c8

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

Wansoon Park 2013-10-28

pull-request-form: Change indentation(using space)

@37030a6cee4fc799e5c7d3a37d253b8a9361f1c8

6d008ee

37030a6

app/views/git/create.scala.html

--- app/views/git/create.scala.html

+++ app/views/git/create.scala.html


                 </div>
             </div>
             <div class="pull-request-wrap">
-	            <div class="option request-from">
-	                <div class="option-label">@Messages("pullRequest.from"):
+                <div class="option request-from">
+                    <div class="option-label">@Messages("pullRequest.from"):
                         <code>@project.owner/@project.name</code>
                     </div>
-	                <div class="option-desc mt5">
-	                    <div class="btn-group branches" data-name="fromBranch">
-	                        <button class="btn dropdown-toggle auto" data-toggle="dropdown">
-	                            <span class="d-label">@Messages("pullRequest.select.branch")</span>
-	                            <span class="d-caret"><span class="caret"></span></span>
-	                        </button>
-	                        <ul class="dropdown-menu">
-	                            @for(branch <- fromBranches) {
-	                                @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
-	                                    @makeBranchItem(branch, pullRequest.fromBranch)
-	                                }
-	                            }
-	                        </ul>
-	                    </div>
-	                </div>
-	            </div>
-
-                <div class="arrow">
-	               <i class="yobicon-right"></i>
+                    <div class="option-desc mt5">
+                        <div class="btn-group branches" data-name="fromBranch">
+                            <button class="btn dropdown-toggle auto" data-toggle="dropdown">
+                                <span class="d-label">@Messages("pullRequest.select.branch")</span>
+                                <span class="d-caret"><span class="caret"></span></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                @for(branch <- fromBranches) {
+                                    @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
+                                        @makeBranchItem(branch, pullRequest.fromBranch)
+                                    }
+                                }
+                            </ul>
+                        </div>
+                    </div>
                 </div>
 
-	            <div class="option request-to">
-	                <div class="option-label">@Messages("pullRequest.to"):
+                <div class="arrow">
+                   <i class="yobicon-right"></i>
+                </div>
+
+                <div class="option request-to">
+                    <div class="option-label">@Messages("pullRequest.to"):
                         <code>@project.originalProject.owner/@project.originalProject.name</code>
                     </div>
-	                <div class="option-desc mt5">
-	                    <div class="btn-group branches" data-name="toBranch">
-	                        <button class="btn dropdown-toggle auto" data-toggle="dropdown">
-	                            <span class="d-label">@Messages("pullRequest.select.branch")</span>
-	                            <span class="d-caret"><span class="caret"></span></span>
-	                        </button>
-	                        <ul class="dropdown-menu">
-	                            @for(branch <- toBranches) {
-	                                @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
-	                                    @makeBranchItem(branch, pullRequest.toBranch)
-	                                }
-	                            }
-	                        </ul>
-	                    </div>
-	                </div>
-	            </div>
+                    <div class="option-desc mt5">
+                        <div class="btn-group branches" data-name="toBranch">
+                            <button class="btn dropdown-toggle auto" data-toggle="dropdown">
+                                <span class="d-label">@Messages("pullRequest.select.branch")</span>
+                                <span class="d-caret"><span class="caret"></span></span>
+                            </button>
+                            <ul class="dropdown-menu">
+                                @for(branch <- toBranches) {
+                                    @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
+                                        @makeBranchItem(branch, pullRequest.toBranch)
+                                    }
+                                }
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             <div id="frmWrap">
-			@views.html.git.partial_diff(form, project, mergeResult, pullRequest)
-			</div>
-			<div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
-			    <h4 class="path">
-			        <span></span>
-			        <button type="button" class="ybtn pull-right" data-dismiss="modal" style="margin-right:20px;">@Messages("button.confirm")</button>
-			    </h4>
-			    <div class="row-fluid">
-			        <div class="span6 compare-from"></div>
-			        <div class="span6 compare-to"></div>
-			    </div>
-			    <div id="mergely" class="mergely-wrap"></div>
-			</div>
+            @views.html.git.partial_diff(form, project, mergeResult, pullRequest)
+            </div>
+            <div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
+                <h4 class="path">
+                    <span></span>
+                    <button type="button" class="ybtn pull-right" data-dismiss="modal" style="margin-right:20px;">@Messages("button.confirm")</button>
+                </h4>
+                <div class="row-fluid">
+                    <div class="span6 compare-from"></div>
+                    <div class="span6 compare-to"></div>
+                </div>
+                <div id="mergely" class="mergely-wrap"></div>
+            </div>
         }
     </div>
 </div>

6d008ee

37030a6

app/views/git/edit.scala.html

--- app/views/git/edit.scala.html

+++ app/views/git/edit.scala.html


                 </div>
             </div>
             <div class="pull-request-wrap">
-	            <div class="option request-from">
-	                <div class="option-label">@Messages("pullRequest.from"):
+                <div class="option request-from">
+                    <div class="option-label">@Messages("pullRequest.from"):
                         <code>@project.owner/@project.name</code>
                     </div>
-	                <div class="option-desc">
-	                    <div class="btn-group branches" data-name="fromBranch">
-	                        <button class="btn dropdown-toggle auto" data-toggle="dropdown">
-	                            <span class="d-label">@Messages("pullRequest.select.branch")</span>
-	                            <span class="d-caret"><span class="caret"></span></span>
-	                        </button>
-	                        <ul class="dropdown-menu">
+                    <div class="option-desc">
+                        <div class="btn-group branches" data-name="fromBranch">
+                            <button class="btn dropdown-toggle auto" data-toggle="dropdown">
+                                <span class="d-label">@Messages("pullRequest.select.branch")</span>
+                                <span class="d-caret"><span class="caret"></span></span>
+                            </button>
+                            <ul class="dropdown-menu">
                                 @makeBranchItem(form("fromBranch").value())
-	                        </ul>
-	                    </div>
-	                </div>
-	            </div>
-
-                <div class="arrow">
-	               <i class="yobicon-right"></i>
+                            </ul>
+                        </div>
+                    </div>
                 </div>
 
-	            <div class="option request-to">
-	                <div class="option-label">@Messages("pullRequest.to"):
+                <div class="arrow">
+                   <i class="yobicon-right"></i>
+                </div>
+
+                <div class="option request-to">
+                    <div class="option-label">@Messages("pullRequest.to"):
                         <code>@project.originalProject.owner/@project.originalProject.name</code>
                     </div>
-	                <div class="option-desc">
-	                    <div class="btn-group branches" data-name="toBranch">
-	                        <button class="btn dropdown-toggle auto" data-toggle="dropdown">
-	                            <span class="d-label">@Messages("pullRequest.select.branch")</span>
-	                            <span class="d-caret"><span class="caret"></span></span>
-	                        </button>
-	                        <ul class="dropdown-menu">
+                    <div class="option-desc">
+                        <div class="btn-group branches" data-name="toBranch">
+                            <button class="btn dropdown-toggle auto" data-toggle="dropdown">
+                                <span class="d-label">@Messages("pullRequest.select.branch")</span>
+                                <span class="d-caret"><span class="caret"></span></span>
+                            </button>
+                            <ul class="dropdown-menu">
                                 @makeBranchItem(form("toBranch").value())
-	                        </ul>
-	                    </div>
-	                </div>
-	            </div>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
             </div>
 
             @helper.inputText(form("title"), 'class->"text title", 'maxlength -> "250", 'tabindex -> 1, 'placeholder->"Title")

Add a comment

Open 0
Closed 0

List

...	...	@@ -57,67 +57,67 @@
57	57	</div>
58	58	</div>
59	59	<div class="pull-request-wrap">
60		- <div class="option request-from">
61		- <div class="option-label">@Messages("pullRequest.from"):
	60	+ <div class="option request-from">
	61	+ <div class="option-label">@Messages("pullRequest.from"):
62	62	<code>@project.owner/@project.name</code>
63	63	</div>
64		- <div class="option-desc mt5">
65		- <div class="btn-group branches" data-name="fromBranch">
66		- <button class="btn dropdown-toggle auto" data-toggle="dropdown">
67		- <span class="d-label">@Messages("pullRequest.select.branch")</span>
68		- <span class="d-caret"><span class="caret"></span></span>
69		- </button>
70		- <ul class="dropdown-menu">
71		- @for(branch <- fromBranches) {
72		- @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
73		- @makeBranchItem(branch, pullRequest.fromBranch)
74		- }
75		- }
76		- </ul>
77		- </div>
78		- </div>
79		- </div>
80		-
81		- <div class="arrow">
82		- <i class="yobicon-right"></i>
	64	+ <div class="option-desc mt5">
	65	+ <div class="btn-group branches" data-name="fromBranch">
	66	+ <button class="btn dropdown-toggle auto" data-toggle="dropdown">
	67	+ <span class="d-label">@Messages("pullRequest.select.branch")</span>
	68	+ <span class="d-caret"><span class="caret"></span></span>
	69	+ </button>
	70	+ <ul class="dropdown-menu">
	71	+ @for(branch <- fromBranches) {
	72	+ @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
	73	+ @makeBranchItem(branch, pullRequest.fromBranch)
	74	+ }
	75	+ }
	76	+ </ul>
	77	+ </div>
	78	+ </div>
83	79	</div>
84	80
85		- <div class="option request-to">
86		- <div class="option-label">@Messages("pullRequest.to"):
	81	+ <div class="arrow">
	82	+ <i class="yobicon-right"></i>
	83	+ </div>
	84	+
	85	+ <div class="option request-to">
	86	+ <div class="option-label">@Messages("pullRequest.to"):
87	87	<code>@project.originalProject.owner/@project.originalProject.name</code>
88	88	</div>
89		- <div class="option-desc mt5">
90		- <div class="btn-group branches" data-name="toBranch">
91		- <button class="btn dropdown-toggle auto" data-toggle="dropdown">
92		- <span class="d-label">@Messages("pullRequest.select.branch")</span>
93		- <span class="d-caret"><span class="caret"></span></span>
94		- </button>
95		- <ul class="dropdown-menu">
96		- @for(branch <- toBranches) {
97		- @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
98		- @makeBranchItem(branch, pullRequest.toBranch)
99		- }
100		- }
101		- </ul>
102		- </div>
103		- </div>
104		- </div>
	89	+ <div class="option-desc mt5">
	90	+ <div class="btn-group branches" data-name="toBranch">
	91	+ <button class="btn dropdown-toggle auto" data-toggle="dropdown">
	92	+ <span class="d-label">@Messages("pullRequest.select.branch")</span>
	93	+ <span class="d-caret"><span class="caret"></span></span>
	94	+ </button>
	95	+ <ul class="dropdown-menu">
	96	+ @for(branch <- toBranches) {
	97	+ @if(!branch.equals("HEAD") && !branch.contains("refs/remotes/")) {
	98	+ @makeBranchItem(branch, pullRequest.toBranch)
	99	+ }
	100	+ }
	101	+ </ul>
	102	+ </div>
	103	+ </div>
	104	+ </div>
105	105	</div>
106	106
107	107	<div id="frmWrap">
108		- @views.html.git.partial_diff(form, project, mergeResult, pullRequest)
109		- </div>
110		- <div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
111		- <h4 class="path">
112		- <span></span>
113		- <button type="button" class="ybtn pull-right" data-dismiss="modal" style="margin-right:20px;">@Messages("button.confirm")</button>
114		- </h4>
115		- <div class="row-fluid">
116		- <div class="span6 compare-from"></div>
117		- <div class="span6 compare-to"></div>
118		- </div>
119		- <div id="mergely" class="mergely-wrap"></div>
120		- </div>
	108	+ @views.html.git.partial_diff(form, project, mergeResult, pullRequest)
	109	+ </div>
	110	+ <div id="compare" class="modal hide compare-wrap" tabindex="-1" role="dialog">
	111	+ <h4 class="path">
	112	+ <span></span>
	113	+ <button type="button" class="ybtn pull-right" data-dismiss="modal" style="margin-right:20px;">@Messages("button.confirm")</button>
	114	+ </h4>
	115	+ <div class="row-fluid">
	116	+ <div class="span6 compare-from"></div>
	117	+ <div class="span6 compare-to"></div>
	118	+ </div>
	119	+ <div id="mergely" class="mergely-wrap"></div>
	120	+ </div>
121	121	}
122	122	</div>
123	123	</div>

...	...	@@ -55,43 +55,43 @@
55	55	</div>
56	56	</div>
57	57	<div class="pull-request-wrap">
58		- <div class="option request-from">
59		- <div class="option-label">@Messages("pullRequest.from"):
	58	+ <div class="option request-from">
	59	+ <div class="option-label">@Messages("pullRequest.from"):
60	60	<code>@project.owner/@project.name</code>
61	61	</div>
62		- <div class="option-desc">
63		- <div class="btn-group branches" data-name="fromBranch">
64		- <button class="btn dropdown-toggle auto" data-toggle="dropdown">
65		- <span class="d-label">@Messages("pullRequest.select.branch")</span>
66		- <span class="d-caret"><span class="caret"></span></span>
67		- </button>
68		- <ul class="dropdown-menu">
	62	+ <div class="option-desc">
	63	+ <div class="btn-group branches" data-name="fromBranch">
	64	+ <button class="btn dropdown-toggle auto" data-toggle="dropdown">
	65	+ <span class="d-label">@Messages("pullRequest.select.branch")</span>
	66	+ <span class="d-caret"><span class="caret"></span></span>
	67	+ </button>
	68	+ <ul class="dropdown-menu">
69	69	@makeBranchItem(form("fromBranch").value())
70		- </ul>
71		- </div>
72		- </div>
73		- </div>
74		-
75		- <div class="arrow">
76		- <i class="yobicon-right"></i>
	70	+ </ul>
	71	+ </div>
	72	+ </div>
77	73	</div>
78	74
79		- <div class="option request-to">
80		- <div class="option-label">@Messages("pullRequest.to"):
	75	+ <div class="arrow">
	76	+ <i class="yobicon-right"></i>
	77	+ </div>
	78	+
	79	+ <div class="option request-to">
	80	+ <div class="option-label">@Messages("pullRequest.to"):
81	81	<code>@project.originalProject.owner/@project.originalProject.name</code>
82	82	</div>
83		- <div class="option-desc">
84		- <div class="btn-group branches" data-name="toBranch">
85		- <button class="btn dropdown-toggle auto" data-toggle="dropdown">
86		- <span class="d-label">@Messages("pullRequest.select.branch")</span>
87		- <span class="d-caret"><span class="caret"></span></span>
88		- </button>
89		- <ul class="dropdown-menu">
	83	+ <div class="option-desc">
	84	+ <div class="btn-group branches" data-name="toBranch">
	85	+ <button class="btn dropdown-toggle auto" data-toggle="dropdown">
	86	+ <span class="d-label">@Messages("pullRequest.select.branch")</span>
	87	+ <span class="d-caret"><span class="caret"></span></span>
	88	+ </button>
	89	+ <ul class="dropdown-menu">
90	90	@makeBranchItem(form("toBranch").value())
91		- </ul>
92		- </div>
93		- </div>
94		- </div>
	91	+ </ul>
	92	+ </div>
	93	+ </div>
	94	+ </div>
95	95	</div>
96	96
97	97	@helper.inputText(form("title"), 'class->"text title", 'maxlength -> "250", 'tabindex -> 1, 'placeholder->"Title")

Delete comment