##// END OF EJS Templates
ui: changed status icons to <i> elements instead of div.
marcink -
r3883:698bb7ce default
parent child Browse files
Show More
@@ -227,11 +227,6 b' tr.inline-comments div {'
227 }
227 }
228 }
228 }
229
229
230 .flag_status {
231 display: inline-block;
232 margin: -2px .5em 0 .25em
233 }
234
235 .delete-comment {
230 .delete-comment {
236 display: inline-block;
231 display: inline-block;
237 color: @rcblue;
232 color: @rcblue;
@@ -983,9 +983,6 b' label {'
983 }
983 }
984
984
985 #graph {
985 #graph {
986 .flag_status {
987 margin: 0;
988 }
989
986
990 .pagination-left {
987 .pagination-left {
991 float: left;
988 float: left;
@@ -1090,23 +1087,6 b' label {'
1090 }
1087 }
1091 }
1088 }
1092
1089
1093 .flag_status {
1094 margin: 2px;
1095 &.under_review {
1096 .circle(5px, @alert3);
1097 }
1098 &.approved {
1099 .circle(5px, @alert1);
1100 }
1101 &.rejected,
1102 &.forced_closed{
1103 .circle(5px, @alert2);
1104 }
1105 &.not_reviewed {
1106 .circle(5px, @grey5);
1107 }
1108 }
1109
1110 .review-status {
1090 .review-status {
1111 &.under_review {
1091 &.under_review {
1112 color: @alert3;
1092 color: @alert3;
@@ -1153,9 +1133,6 b' label {'
1153 border-color: @grey5;
1133 border-color: @grey5;
1154 }
1134 }
1155
1135
1156 .flag_status_comment_box {
1157 margin: 5px 6px 0px 2px;
1158 }
1159 .test_pattern_preview {
1136 .test_pattern_preview {
1160 margin: @space 0;
1137 margin: @space 0;
1161
1138
@@ -1885,10 +1862,6 b' BIN_FILENODE = 7'
1885 line-height: 15px;
1862 line-height: 15px;
1886 }
1863 }
1887
1864
1888 .flag_status {
1889 margin: 0;
1890 }
1891
1892 .compare-radio-button {
1865 .compare-radio-button {
1893 position: relative;
1866 position: relative;
1894 top: -3px;
1867 top: -3px;
@@ -1930,10 +1903,6 b' BIN_FILENODE = 7'
1930 .table_disp {
1903 .table_disp {
1931 .status {
1904 .status {
1932 width: auto;
1905 width: auto;
1933
1934 .flag_status {
1935 float: left;
1936 }
1937 }
1906 }
1938 }
1907 }
1939
1908
@@ -108,10 +108,6 b' select.select2{height:28px;visibility:hi'
108
108
109 .drop-menu-dropdown {
109 .drop-menu-dropdown {
110 .drop-menu-core;
110 .drop-menu-core;
111
112 .flag_status {
113 margin-top: 0;
114 }
115 }
111 }
116
112
117 .drop-menu-base {
113 .drop-menu-base {
@@ -122,10 +118,6 b' select.select2{height:28px;visibility:hi'
122 z-index: 2;
118 z-index: 2;
123 cursor: pointer;
119 cursor: pointer;
124
120
125 .flag_status {
126 margin-top: 0;
127 }
128
129 a {
121 a {
130 display:block;
122 display:block;
131 padding: .7em;
123 padding: .7em;
@@ -368,8 +368,9 b' var initCommentBoxCodeMirror = function('
368 $(CommentForm.statusChange).select2("val", 'approved').trigger('change');
368 $(CommentForm.statusChange).select2("val", 'approved').trigger('change');
369 },
369 },
370 render: function(elt, data, completion) {
370 render: function(elt, data, completion) {
371 var el = document.createElement('div');
371 var el = document.createElement('i');
372 el.className = "flag_status flag_status_comment_box approved pull-left";
372
373 el.className = "icon-circle review-status-approved";
373 elt.appendChild(el);
374 elt.appendChild(el);
374
375
375 el = document.createElement('span');
376 el = document.createElement('span');
@@ -387,8 +388,8 b' var initCommentBoxCodeMirror = function('
387 $(CommentForm.statusChange).select2("val", 'rejected').trigger('change');
388 $(CommentForm.statusChange).select2("val", 'rejected').trigger('change');
388 },
389 },
389 render: function(elt, data, completion) {
390 render: function(elt, data, completion) {
390 var el = document.createElement('div');
391 var el = document.createElement('i');
391 el.className = "flag_status flag_status_comment_box rejected pull-left";
392 el.className = "icon-circle review-status-rejected";
392 elt.appendChild(el);
393 elt.appendChild(el);
393
394
394 el = document.createElement('span');
395 el = document.createElement('span');
@@ -708,8 +709,8 b' var fillCodeMirrorOptions = function(tar'
708 this.initStatusChangeSelector = function(){
709 this.initStatusChangeSelector = function(){
709 var formatChangeStatus = function(state, escapeMarkup) {
710 var formatChangeStatus = function(state, escapeMarkup) {
710 var originalOption = state.element;
711 var originalOption = state.element;
711 return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
712 var tmpl = '<i class="icon-circle review-status-{0}"></i><span>{1}</span>'.format($(originalOption).data('status'), escapeMarkup(state.text));
712 '<span>' + escapeMarkup(state.text) + '</span>';
713 return tmpl
713 };
714 };
714 var formatResult = function(result, container, query, escapeMarkup) {
715 var formatResult = function(result, container, query, escapeMarkup) {
715 return formatChangeStatus(result, escapeMarkup);
716 return formatChangeStatus(result, escapeMarkup);
@@ -218,8 +218,8 b' var _submitAjaxPOST = function(url, post'
218 this.initStatusChangeSelector = function(){
218 this.initStatusChangeSelector = function(){
219 var formatChangeStatus = function(state, escapeMarkup) {
219 var formatChangeStatus = function(state, escapeMarkup) {
220 var originalOption = state.element;
220 var originalOption = state.element;
221 return '<div class="flag_status ' + $(originalOption).data('status') + ' pull-left"></div>' +
221 var tmpl = '<i class="icon-circle review-status-{0}"></i><span>{1}</span>'.format($(originalOption).data('status'), escapeMarkup(state.text));
222 '<span>' + escapeMarkup(state.text) + '</span>';
222 return tmpl
223 };
223 };
224 var formatResult = function(result, container, query, escapeMarkup) {
224 var formatResult = function(result, container, query, escapeMarkup) {
225 return formatChangeStatus(result, escapeMarkup);
225 return formatChangeStatus(result, escapeMarkup);
@@ -79,7 +79,7 b''
79 % endif
79 % endif
80
80
81 % if comment.status_change:
81 % if comment.status_change:
82 <div class="${'flag_status %s' % comment.status_change[0].status}"></div>
82 <i class="icon-circle review-status-${comment.status_change[0].status}"></i>
83 <div title="${_('Commit status')}" class="changeset-status-lbl">
83 <div title="${_('Commit status')}" class="changeset-status-lbl">
84 ${comment.status_change[0].status_lbl}
84 ${comment.status_change[0].status_lbl}
85 </div>
85 </div>
@@ -33,16 +33,16 b''
33 <div class="changeset-status-ico">
33 <div class="changeset-status-ico">
34 %if c.statuses.get(commit.raw_id)[2]:
34 %if c.statuses.get(commit.raw_id)[2]:
35 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
35 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]), c.statuses.get(commit.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(commit.raw_id)[3],pull_request_id=c.statuses.get(commit.raw_id)[2])}">
36 <div class="${'flag_status {}'.format(c.statuses.get(commit.raw_id)[0])}"></div>
36 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
37 </a>
37 </a>
38 %else:
38 %else:
39 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
39 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(commit.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
40 <div class="${'flag_status {}'.format(c.statuses.get(commit.raw_id)[0])}"></div>
40 <i class="icon-circle review-status-${c.statuses.get(commit.raw_id)[0]}"></i>
41 </a>
41 </a>
42 %endif
42 %endif
43 </div>
43 </div>
44 %else:
44 %else:
45 <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
45 <i class="icon-circle review-status-not_reviewed" title="${_('Commit status: Not Reviewed')}"></i>
46 %endif
46 %endif
47 </td>
47 </td>
48
48
@@ -348,8 +348,9 b''
348 ${h.link_to(repo_name,h.route_path('repo_summary',repo_name=repo_name))}
348 ${h.link_to(repo_name,h.route_path('repo_summary',repo_name=repo_name))}
349 </div>
349 </div>
350 </%def>
350 </%def>
351
351 <%def name="pullrequest_status(status)">
352 <%def name="pullrequest_status(status)">
352 <div class="${'flag_status %s' % status} pull-left"></div>
353 <i class="icon-circle review-status-${status}"></i>
353 </%def>
354 </%def>
354
355
355 <%def name="pullrequest_title(title, description)">
356 <%def name="pullrequest_title(title, description)">
@@ -150,7 +150,7 b''
150 </div>
150 </div>
151 <div class="input">
151 <div class="input">
152 %if c.pull_request_review_status:
152 %if c.pull_request_review_status:
153 <div class="${'flag_status %s' % c.pull_request_review_status} tooltip pull-left"></div>
153 <i class="icon-circle review-status-${c.pull_request_review_status}"></i>
154 <span class="changeset-status-lbl tooltip">
154 <span class="changeset-status-lbl tooltip">
155 %if c.pull_request.is_closed():
155 %if c.pull_request.is_closed():
156 ${_('Closed')},
156 ${_('Closed')},
@@ -213,7 +213,7 b''
213 </td>
213 </td>
214 <td>
214 <td>
215 <% review_status = c.review_versions[ver_pr].status if ver_pr in c.review_versions else 'not_reviewed' %>
215 <% review_status = c.review_versions[ver_pr].status if ver_pr in c.review_versions else 'not_reviewed' %>
216 <div class="${'flag_status %s' % review_status} tooltip pull-left" title="${_('Your review status at this version')}">
216 <i class="tooltip icon-circle review-status-${review_status}" title="${_('Your review status at this version')}"></i>
217 </div>
217 </div>
218 </td>
218 </td>
219 <td>
219 <td>
@@ -25,16 +25,16 b''
25 <div class="changeset-status-ico shortlog">
25 <div class="changeset-status-ico shortlog">
26 %if c.statuses.get(cs.raw_id)[2]:
26 %if c.statuses.get(cs.raw_id)[2]:
27 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
27 <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.route_path('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
28 <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div>
28 <i class="icon-circle review-status-${c.statuses.get(cs.raw_id)[0]}"></i>
29 </a>
29 </a>
30 %else:
30 %else:
31 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(cs.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
31 <a class="tooltip" title="${_('Commit status: {}').format(h.commit_status_lbl(c.statuses.get(cs.raw_id)[0]))}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=cs.raw_id,_anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
32 <div class="${'flag_status {}'.format(c.statuses.get(cs.raw_id)[0])}"></div>
32 <i class="icon-circle review-status-${c.statuses.get(cs.raw_id)[0]}"></i>
33 </a>
33 </a>
34 %endif
34 %endif
35 </div>
35 </div>
36 %else:
36 %else:
37 <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
37 <i class="icon-circle review-status-not_reviewed" title="${_('Commit status: Not Reviewed')}"></i>
38 %endif
38 %endif
39 </td>
39 </td>
40 <td class="td-commit">
40 <td class="td-commit">
General Comments 0
You need to be logged in to leave comments. Login now