Commit @1a32856c214c9c5bff7acc97118ad31853dc1743

a432335

1a32856

app/views/common/twoColumnModeCheckboxArea.scala.html

--- app/views/common/twoColumnModeCheckboxArea.scala.html

+++ app/views/common/twoColumnModeCheckboxArea.scala.html


 **@
 @(requireLeftMargin: Boolean = true)
 
-@additionalCssForLeftMargin = @{
-    if(requireLeftMargin) {
-        "pull-left absoluteAndLeftMargin"
-    } else {
-        ""
-    }
-}
-<div class="@additionalCssForLeftMargin two-column-icon mr10 hide-in-mobile" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.two.column.mode.desc")'>
+<div class="two-column-icon mr10 hide-in-mobile" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.two.column.mode.desc")'>
     <label class="checkbox">
         <input id="two-column-mode" type="checkbox"> <i class="yobicon-explorerwindow"></i>
     </label>

a432335

1a32856

app/views/git/partial_search.scala.html

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

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


           @partial_recently_pushed_branches(PushedBranch.findByOwnerAndOriginalProject(UserApp.currentUser, project))
         }
       }
-      @common.twoColumnModeCheckboxArea()
       <div class="pull-right">
         <a href="@routes.PullRequestApp.newPullRequestForm(project.owner, project.name)" class="ybtn ybtn-success">
             @Messages("pullRequest.new")

           </a>
         </li>
         }
+          <li>@common.twoColumnModeCheckboxArea()</li>
     </ul>
     <div class="tab-content" style="clear:both;padding-top:15px;">
       <div id="list" class="row-fluid tab-pane active">

a432335

1a32856

app/views/issue/my_partial_search.scala.html

--- app/views/issue/my_partial_search.scala.html

+++ app/views/issue/my_partial_search.scala.html


         </div>
     </div>
     <div class="span10 span-hard-wrap" id="span10">
-        @common.twoColumnModeCheckboxArea()
         <ul class="nav nav-tabs nm">
         @for(state <- Array(State.OPEN, State.CLOSED)) {
             <li @if(param.state == state.state) { class="active" } data-pjax>

                 </a>
             </li>
         }
+            <li>@common.twoColumnModeCheckboxArea()</li>
         </ul>
         @if(!currentPage.getList.isEmpty){
             <div class="filter-wrap small-heights">

a432335

1a32856

app/views/issue/partial_list_wrap.scala.html

--- app/views/issue/partial_list_wrap.scala.html

+++ app/views/issue/partial_list_wrap.scala.html


         <div class="pull-right">
             <a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" class="ybtn ybtn-success">@Messages("issue.menu.new")</a>
         </div>
-        @common.twoColumnModeCheckboxArea()
         <ul class="nav nav-tabs nm">
         @for(state <- Array(State.OPEN, State.CLOSED)) {
             <li @if(param.state == state.state) { class="active" } data-pjax>

                 </a>
             </li>
         }
+            <li>@common.twoColumnModeCheckboxArea()</li>
         </ul>
 
         @if(currentPage.getList.isEmpty){

a432335

1a32856

app/views/organization/group_issue_search_partial.scala.html

--- app/views/organization/group_issue_search_partial.scala.html

+++ app/views/organization/group_issue_search_partial.scala.html


         </div>
     </div>
     <div class="span10 span-hard-wrap" id="span10">
-        @common.twoColumnModeCheckboxArea()
         <ul class="nav nav-tabs nm">
         @for(state <- Array(State.OPEN, State.CLOSED)) {
             <li @if(param.state == state.state) { class="active" }>

                 </a>
             </li>
         }
+            <li>@common.twoColumnModeCheckboxArea()</li>
         </ul>
         @if(!currentPage.getList.isEmpty){
             <div class="filter-wrap small-heights">

...	...	@@ -88,7 +88,6 @@
88	88	@partial_recently_pushed_branches(PushedBranch.findByOwnerAndOriginalProject(UserApp.currentUser, project))
89	89	}
90	90	}
91		- @common.twoColumnModeCheckboxArea()
92	91	<div class="pull-right">
93	92	<a href="@routes.PullRequestApp.newPullRequestForm(project.owner, project.name)" class="ybtn ybtn-success">
94	93	@Messages("pullRequest.new")
...	...	@@ -115,6 +114,7 @@
115	114	</a>
116	115	</li>
117	116	}
	117	+ <li>@common.twoColumnModeCheckboxArea()</li>
118	118	</ul>
119	119	<div class="tab-content" style="clear:both;padding-top:15px;">
120	120	<div id="list" class="row-fluid tab-pane active">

...	...	@@ -55,7 +55,6 @@
55	55	</div>
56	56	</div>
57	57	<div class="span10 span-hard-wrap" id="span10">
58		- @common.twoColumnModeCheckboxArea()
59	58	<ul class="nav nav-tabs nm">
60	59	@for(state <- Array(State.OPEN, State.CLOSED)) {
61	60	<li @if(param.state == state.state) { class="active" } data-pjax>
...	...	@@ -65,6 +64,7 @@
65	64	</a>
66	65	</li>
67	66	}
	67	+ <li>@common.twoColumnModeCheckboxArea()</li>
68	68	</ul>
69	69	@if(!currentPage.getList.isEmpty){
70	70	<div class="filter-wrap small-heights">

...	...	@@ -45,7 +45,6 @@
45	45	<div class="pull-right">
46	46	<a href="@routes.IssueApp.newIssueForm(project.owner, project.name)" class="ybtn ybtn-success">@Messages("issue.menu.new")</a>
47	47	</div>
48		- @common.twoColumnModeCheckboxArea()
49	48	<ul class="nav nav-tabs nm">
50	49	@for(state <- Array(State.OPEN, State.CLOSED)) {
51	50	<li @if(param.state == state.state) { class="active" } data-pjax>
...	...	@@ -55,6 +54,7 @@
55	54	</a>
56	55	</li>
57	56	}
	57	+ <li>@common.twoColumnModeCheckboxArea()</li>
58	58	</ul>
59	59
60	60	@if(currentPage.getList.isEmpty){

...	...	@@ -64,7 +64,6 @@
64	64	</div>
65	65	</div>
66	66	<div class="span10 span-hard-wrap" id="span10">
67		- @common.twoColumnModeCheckboxArea()
68	67	<ul class="nav nav-tabs nm">
69	68	@for(state <- Array(State.OPEN, State.CLOSED)) {
70	69	<li @if(param.state == state.state) { class="active" }>
...	...	@@ -74,6 +73,7 @@
74	73	</a>
75	74	</li>
76	75	}
	76	+ <li>@common.twoColumnModeCheckboxArea()</li>
77	77	</ul>
78	78	@if(!currentPage.getList.isEmpty){
79	79	<div class="filter-wrap small-heights">

...	...	@@ -6,14 +6,7 @@
6	6	**@
7	7	@(requireLeftMargin: Boolean = true)
8	8
9		-@additionalCssForLeftMargin = @{
10		- if(requireLeftMargin) {
11		- "pull-left absoluteAndLeftMargin"
12		- } else {
13		- ""
14		- }
15		-}
16		-<div class="@additionalCssForLeftMargin two-column-icon mr10 hide-in-mobile" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.two.column.mode.desc")'>
	9	+<div class="two-column-icon mr10 hide-in-mobile" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.two.column.mode.desc")'>
17	10	<label class="checkbox">
18	11	<input id="two-column-mode" type="checkbox"> <i class="yobicon-explorerwindow"></i>
19	12	</label>

Delete comment