##// END OF EJS Templates
fixed compare view layout
Liviu -
r3703:e020c50f new-ui
parent child Browse files
Show More
@@ -17,7 +17,7 b''
17 .summary-detail-header {
17 .summary-detail-header {
18 display: block;
18 display: block;
19 width: 100%;
19 width: 100%;
20 margin-bottom: @textmargin;
20 margin-bottom: 10px;
21 padding: 0 0 .5em 0;
21 padding: 0 0 .5em 0;
22 border-bottom: @border-thickness solid @border-default-color;
22 border-bottom: @border-thickness solid @border-default-color;
23
23
@@ -29,7 +29,7 b''
29
29
30 h4 {
30 h4 {
31 margin: 0 1em 0 0;
31 margin: 0 1em 0 0;
32 padding: 0;
32 padding: 10px 0 5px 20px;
33 line-height: 1.2em;
33 line-height: 1.2em;
34 font-size: @basefontsize;
34 font-size: @basefontsize;
35 }
35 }
@@ -49,7 +49,7 b''
49 position: relative;
49 position: relative;
50 width: 100%;
50 width: 100%;
51 margin: 0;
51 margin: 0;
52 padding: 0;
52 padding: 0 0 20px 0;
53
53
54 .file_diff_buttons {
54 .file_diff_buttons {
55 margin-top: @space;
55 margin-top: @space;
@@ -220,6 +220,10 b''
220 color: @grey1;
220 color: @grey1;
221 float: left;
221 float: left;
222 width: 130px;
222 width: 130px;
223
224 &.spacing {
225 margin-top: 10px;
226 }
223 }
227 }
224
228
225 .right-label-summary {
229 .right-label-summary {
@@ -238,6 +242,10 b''
238 color: @grey1;
242 color: @grey1;
239 float: left;
243 float: left;
240 width: 130px;
244 width: 130px;
245
246 &.spacing {
247 margin-top: 10px;
248 }
241 }
249 }
242
250
243 .right-label-summary {
251 .right-label-summary {
@@ -47,14 +47,13 b''
47 % endif
47 % endif
48 </h4>
48 </h4>
49 </span>
49 </span>
50 <div class="clear-fix"></div>
50 </div>
51 </div>
51
52
52 <div class="fieldset">
53 <div class="fieldset">
53 <div class="left-label">
54 <div class="left-label-summary">
54 ${_('Target')}:
55 <p class="spacing">${_('Target')}:</p>
55 </div>
56 <div class="right-label-summary">
56 <div class="right-content">
57 <div>
58 <div class="code-header" >
57 <div class="code-header" >
59 <div class="compare_header">
58 <div class="compare_header">
60 ## The hidden elements are replaced with a select2 widget
59 ## The hidden elements are replaced with a select2 widget
@@ -66,11 +65,9 b''
66 </div>
65 </div>
67
66
68 <div class="fieldset">
67 <div class="fieldset">
69 <div class="left-label">
68 <div class="left-label-summary">
70 ${_('Source')}:
69 <p class="spacing">${_('Source')}:</p>
71 </div>
70 <div class="right-label-summary">
72 <div class="right-content">
73 <div>
74 <div class="code-header" >
71 <div class="code-header" >
75 <div class="compare_header">
72 <div class="compare_header">
76 ## The hidden elements are replaced with a select2 widget
73 ## The hidden elements are replaced with a select2 widget
@@ -82,14 +79,11 b''
82 </div>
79 </div>
83
80
84 <div class="fieldset">
81 <div class="fieldset">
85 <div class="left-label">
82 <div class="left-label-summary">
86 ${_('Actions')}:
83 <p class="spacing">${_('Actions')}:</p>
87 </div>
84 <div class="right-label-summary">
88 <div class="right-content">
89 <div>
90 <div class="code-header" >
85 <div class="code-header" >
91 <div class="compare_header">
86 <div class="compare_header">
92
93 <div class="compare-buttons">
87 <div class="compare-buttons">
94 % if c.compare_home:
88 % if c.compare_home:
95 <a id="compare_revs" class="btn btn-primary"> ${_('Compare Commits')}</a>
89 <a id="compare_revs" class="btn btn-primary"> ${_('Compare Commits')}</a>
@@ -120,31 +114,31 b''
120 </div>
114 </div>
121 </div>
115 </div>
122 </div>
116 </div>
123 </div>
117 </div>
124 </div>
118 </div>
125
119
126 ## commit status form
120 ## commit status form
127 <div class="fieldset" id="compare_changeset_status" style="display: none; margin-bottom: -80px;">
121 <div class="fieldset" id="compare_changeset_status" style="display: none; margin-bottom: -80px;">
128 <div class="left-label">
122 <div class="left-label-summary">
129 ${_('Commit status')}:
123 <p class="spacing">${_('Commit status')}:</p>
130 </div>
124 <div class="right-label-summary">
131 <div class="right-content">
125 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
132 <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
126 ## main comment form and it status
133 ## main comment form and it status
127 <%
134 <%
128 def revs(_revs):
135 def revs(_revs):
129 form_inputs = []
136 form_inputs = []
130 for cs in _revs:
137 for cs in _revs:
131 tmpl = '<input type="hidden" data-commit-id="%(cid)s" name="commit_ids" value="%(cid)s">' % {'cid': cs.raw_id}
138 tmpl = '<input type="hidden" data-commit-id="%(cid)s" name="commit_ids" value="%(cid)s">' % {'cid': cs.raw_id}
132 form_inputs.append(tmpl)
139 form_inputs.append(tmpl)
133 return form_inputs
140 return form_inputs
134 %>
141 %>
135 <div>
142 <div>
136 ${comment.comments(h.route_path('repo_commit_comment_create', repo_name=c.repo_name, commit_id='0'*16), None, is_compare=True, form_extras=revs(c.commit_ranges))}
143 ${comment.comments(h.route_path('repo_commit_comment_create', repo_name=c.repo_name, commit_id='0'*16), None, is_compare=True, form_extras=revs(c.commit_ranges))}
137 </div>
144 </div>
138 </div>
145 </div>
139 </div>
146 </div>
140 </div>
147
141 <div class="clear-fix"></div>
148 </div> <!-- end summary-detail -->
142 </div> <!-- end summary-detail -->
149 </div> <!-- end summary -->
143 </div> <!-- end summary -->
150
144
General Comments 0
You need to be logged in to leave comments. Login now