##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
ui: fixed commit range page
dan -
r3759:d422b6a5 new-ui
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -326,6 +326,9 b''
326 .commit-date {
326 .commit-date {
327 color: @grey4;
327 color: @grey4;
328 }
328 }
329 .fieldset-text-line {
330 line-height: 36px;
331 }
329 }
332 }
330
333
331 // expand commit message
334 // expand commit message
Show file before | Show file after | Hide comments
@@ -12,13 +12,7 b''
12 %endif
12 %endif
13 </%def>
13 </%def>
14
14
15 <%def name="breadcrumbs_links()">
15 <%def name="breadcrumbs_links()"></%def>
16 ${_('Commits')} -
17 r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
18 ...
19 r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
20 ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
21 </%def>
22
16
23 <%def name="menu_bar_nav()">
17 <%def name="menu_bar_nav()">
24 ${self.menu_items(active='repositories')}
18 ${self.menu_items(active='repositories')}
@@ -29,44 +23,65 b''
29 </%def>
23 </%def>
30
24
31 <%def name="main()">
25 <%def name="main()">
26 <div class="box">
27 <div class="summary changeset">
28 <div class="summary-detail">
29 <div class="summary-detail-header">
30 <span class="breadcrumbs files_location">
31 <h4>
32 ${_('Commit Range')}
33 </h4>
34 </span>
32
35
33 <div class="summary changeset">
36 <div class="clear-fix"></div>
34 <div class="summary-detail">
37 </div>
35 <div class="summary-detail-header">
36 <span class="breadcrumbs files_location">
37 <h4>
38 ${_('Commit Range')}
39 <code>
40 r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}...r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
41 </code>
42 </h4>
43 </span>
44 </div>
45
38
46 <div class="fieldset">
39 <div class="fieldset">
47 <div class="left-label">
40 <div class="left-label-summary">
48 ${_('Diff option')}:
41 <p class="spacing">${_('Range')}:</p>
49 </div>
42 <div class="right-label-summary">
50 <div class="right-content">
43 <div class="code-header" >
51 <div class="btn btn-primary">
44 <div class="compare_header">
52 <a href="${h.route_path('repo_compare',
45 <code class="fieldset-text-line">
53 repo_name=c.repo_name,
46 r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)}
54 source_ref_type='rev',
47 ...
55 source_ref=getattr(c.commit_ranges[0].parents[0] if c.commit_ranges[0].parents else h.EmptyCommit(), 'raw_id'),
48 r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)}
56 target_ref_type='rev',
49 ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)}
57 target_ref=c.commit_ranges[-1].raw_id)}"
50 </code>
58 >
51 </div>
59 ${_('Show combined compare')}
52 </div>
60 </a>
53 </div>
54 </div>
61 </div>
55 </div>
62 </div>
63 </div>
64
56
65 </div> <!-- end summary-detail -->
57 <div class="fieldset">
58 <div class="left-label-summary">
59 <p class="spacing">${_('Diff Option')}:</p>
60 <div class="right-label-summary">
61 <div class="code-header" >
62 <div class="compare_header">
63 <div class="btn btn-primary">
64 <a href="${h.route_path('repo_compare',
65 repo_name=c.repo_name,
66 source_ref_type='rev',
67 source_ref=getattr(c.commit_ranges[0].parents[0] if c.commit_ranges[0].parents else h.EmptyCommit(), 'raw_id'),
68 target_ref_type='rev',
69 target_ref=c.commit_ranges[-1].raw_id)}"
70 >
71 ${_('Show combined diff')}
72 </a>
73 </div>
74 </div>
75 </div>
76 </div>
77 </div>
78 </div>
66
79
67 </div> <!-- end summary -->
80 <div class="clear-fix"></div>
81 </div> <!-- end summary-detail -->
82 </div> <!-- end summary -->
68
83
69 <div id="changeset_compare_view_content">
84 <div id="changeset_compare_view_content">
70 <div class="pull-left">
85 <div class="pull-left">
71 <div class="btn-group">
86 <div class="btn-group">
72 <a
87 <a
@@ -99,4 +114,6 b''
99 %endfor
114 %endfor
100 </div>
115 </div>
101 </div>
116 </div>
117 </div>
118
102 </%def>
119 </%def>
Show file before | Show file after | Hide comments
@@ -279,8 +279,6 b''
279
279
280 ## table diff data
280 ## table diff data
281 <div class="table">
281 <div class="table">
282
283
284 % if not c.compare_home:
282 % if not c.compare_home:
285 <div id="changeset_compare_view_content">
283 <div id="changeset_compare_view_content">
286 <div class="pull-left">
284 <div class="pull-left">
General Comments 0
You need to be logged in to leave comments. Login now