Show More
@@ -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 |
@@ -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,25 +23,43 b'' | |||||
29 | </%def> |
|
23 | </%def> | |
30 |
|
24 | |||
31 | <%def name="main()"> |
|
25 | <%def name="main()"> | |
32 |
|
26 | <div class="box"> | ||
33 | <div class="summary changeset"> |
|
27 | <div class="summary changeset"> | |
34 | <div class="summary-detail"> |
|
28 | <div class="summary-detail"> | |
35 | <div class="summary-detail-header"> |
|
29 | <div class="summary-detail-header"> | |
36 | <span class="breadcrumbs files_location"> |
|
30 | <span class="breadcrumbs files_location"> | |
37 | <h4> |
|
31 | <h4> | |
38 | ${_('Commit Range')} |
|
32 | ${_('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> |
|
33 | </h4> | |
43 | </span> |
|
34 | </span> | |
|
35 | ||||
|
36 | <div class="clear-fix"></div> | |||
44 | </div> |
|
37 | </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> | |
|
42 | <div class="right-label-summary"> | |||
|
43 | <div class="code-header" > | |||
|
44 | <div class="compare_header"> | |||
|
45 | <code class="fieldset-text-line"> | |||
|
46 | r${c.commit_ranges[0].idx}:${h.short_id(c.commit_ranges[0].raw_id)} | |||
|
47 | ... | |||
|
48 | r${c.commit_ranges[-1].idx}:${h.short_id(c.commit_ranges[-1].raw_id)} | |||
|
49 | ${_ungettext('(%s commit)','(%s commits)', len(c.commit_ranges)) % len(c.commit_ranges)} | |||
|
50 | </code> | |||
49 | </div> |
|
51 | </div> | |
50 | <div class="right-content"> |
|
52 | </div> | |
|
53 | </div> | |||
|
54 | </div> | |||
|
55 | </div> | |||
|
56 | ||||
|
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"> | |||
51 | <div class="btn btn-primary"> |
|
63 | <div class="btn btn-primary"> | |
52 | <a href="${h.route_path('repo_compare', |
|
64 | <a href="${h.route_path('repo_compare', | |
53 | repo_name=c.repo_name, |
|
65 | repo_name=c.repo_name, | |
@@ -56,14 +68,17 b'' | |||||
56 | target_ref_type='rev', |
|
68 | target_ref_type='rev', | |
57 | target_ref=c.commit_ranges[-1].raw_id)}" |
|
69 | target_ref=c.commit_ranges[-1].raw_id)}" | |
58 | > |
|
70 | > | |
59 |
${_('Show combined |
|
71 | ${_('Show combined diff')} | |
60 | </a> |
|
72 | </a> | |
61 | </div> |
|
73 | </div> | |
62 | </div> |
|
74 | </div> | |
63 | </div> |
|
75 | </div> | |
|
76 | </div> | |||
|
77 | </div> | |||
|
78 | </div> | |||
64 |
|
79 | |||
|
80 | <div class="clear-fix"></div> | |||
65 | </div> <!-- end summary-detail --> |
|
81 | </div> <!-- end summary-detail --> | |
66 |
|
||||
67 | </div> <!-- end summary --> |
|
82 | </div> <!-- end summary --> | |
68 |
|
83 | |||
69 | <div id="changeset_compare_view_content"> |
|
84 | <div id="changeset_compare_view_content"> | |
@@ -99,4 +114,6 b'' | |||||
99 | %endfor |
|
114 | %endfor | |
100 | </div> |
|
115 | </div> | |
101 | </div> |
|
116 | </div> | |
|
117 | </div> | |||
|
118 | ||||
102 | </%def> |
|
119 | </%def> |
@@ -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