##// END OF EJS Templates
ui: fixed some missed icons during redesign phase
dan -
r3798:1f828f9a stable
parent child Browse files
Show More
@@ -53,7 +53,7 b' input[type="button"] {'
53 53 .border ( @border-thickness, @grey4 );
54 54 }
55 55
56 .icon-remove-sign {
56 .icon-remove {
57 57 display: none;
58 58 }
59 59
@@ -536,7 +536,7 b' th {'
536 536 .glyphicon-minus-sign:before {
537 537 content: "\e082";
538 538 }
539 .glyphicon-remove-sign:before {
539 .glyphicon-remove:before {
540 540 content: "\e083";
541 541 }
542 542 .glyphicon-ok-sign:before {
@@ -11,7 +11,7 b''
11 11 <div class="input">
12 12 ${h.text('repo_name', class_="medium")}
13 13 <div class="info-block">
14 <a id="remote_clone_toggle" href="#"><i class="icon-download-alt"></i> ${_('Import Existing Repository ?')}</a>
14 <a id="remote_clone_toggle" href="#">${_('Import Existing Repository ?')}</a>
15 15 </div>
16 16 %if not c.rhodecode_user.is_admin:
17 17 ${h.hidden('user_created',True)}
@@ -161,7 +161,7 b''
161 161 <div class="field">
162 162 <button class="btn btn-small btn-danger" type="submit"
163 163 onclick="return confirm('${_('Confirm to archive this repository: %s') % c.repo_name}');">
164 <i class="icon-remove-sign"></i>
164 <i class="icon-remove"></i>
165 165 ${_('Archive this repository')}
166 166 </button>
167 167 </div>
@@ -217,7 +217,7 b''
217 217 <div class="field">
218 218 <button class="btn btn-small btn-danger" type="submit"
219 219 onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">
220 <i class="icon-remove-sign"></i>
220 <i class="icon-remove"></i>
221 221 ${_('Delete this repository')}
222 222 </button>
223 223 </div>
@@ -57,7 +57,7 b''
57 57 % if not c.form['repo_clone_uri'].error:
58 58 <div id="clone_uri_hidden" class='text-as-placeholder'>
59 59 <span id="clone_uri_hidden_value">${c.rhodecode_db_repo.clone_uri_hidden}</span>
60 <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
60 <span class="link" id="edit_clone_uri">${_('edit')}</span>
61 61 </div>
62 62 % endif
63 63
@@ -99,7 +99,7 b''
99 99 % if not c.form['repo_push_uri'].error:
100 100 <div id="push_uri_hidden" class='text-as-placeholder'>
101 101 <span id="push_uri_hidden_value">${c.rhodecode_db_repo.push_uri_hidden}</span>
102 <span class="link" id="edit_push_uri"><i class="icon-edit"></i>${_('edit')}</span>
102 <span class="link" id="edit_push_uri">${_('edit')}</span>
103 103 </div>
104 104 % endif
105 105
@@ -27,7 +27,7 b''
27 27 <div class="field">
28 28 <button class="btn btn-small btn-danger" type="submit"
29 29 onclick="return confirm('${_('Confirm to delete this exception')}');">
30 <i class="icon-remove-sign"></i>
30 <i class="icon-remove"></i>
31 31 ${_('Delete This Exception')}
32 32 </button>
33 33 </div>
@@ -17,7 +17,7 b''
17 17 <div class="field">
18 18 <button class="btn btn-small btn-danger" type="submit"
19 19 onclick="return confirm('${_('Confirm to delete all exceptions')}');">
20 <i class="icon-remove-sign"></i>
20 <i class="icon-remove"></i>
21 21 % if c.type_filter:
22 22 ${_('Delete All `{}`').format(c.type_filter)}
23 23 % else:
@@ -77,7 +77,7 b''
77 77 ${h.hidden('force', 1)}
78 78 <button class="btn btn-small btn-danger" type="submit"
79 79 onclick="return confirm('${_('Confirm to delete user group `%(ugroup)s` with all permission assignments') % {'ugroup': c.user_group.users_group_name}}');">
80 <i class="icon-remove-sign"></i>
80 <i class="icon-remove"></i>
81 81 ${_('Delete This User Group')}
82 82 </button>
83 83 ${h.end_form()}
@@ -86,7 +86,7 b''
86 86 </td>
87 87 <td class="">
88 88 <div class="usergroup_member_remove action_button" onclick="removeUserGroupMember(${user.user_id}, true)" style="visibility: visible;">
89 <i class="icon-remove-sign"></i>
89 <i class="icon-remove"></i>
90 90 </div>
91 91 </td>
92 92 </tr>
@@ -155,7 +155,7 b''
155 155 '</td>'+
156 156 '<td class="td-author-new-entry">'+
157 157 '<div class="usergroup_member_remove action_button" onclick="removeUserGroupMember({5}, true)" style="visibility: visible;">'+
158 '<i class="icon-remove-sign"></i>'+
158 '<i class="icon-remove"></i>'+
159 159 '</div>'+
160 160 '</td>'+
161 161 '</tr>').format(gravatar, userLink, username,
@@ -556,7 +556,7 b' def get_comments_for(diff_type, comments'
556 556 %if line_old_comments:
557 557 <% has_outdated = any([x.outdated for x in line_old_comments]) %>
558 558 % if has_outdated:
559 <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
559 <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
560 560 % else:
561 561 <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
562 562 % endif
@@ -599,7 +599,7 b' def get_comments_for(diff_type, comments'
599 599 %if line_new_comments:
600 600 <% has_outdated = any([x.outdated for x in line_new_comments]) %>
601 601 % if has_outdated:
602 <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
602 <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
603 603 % else:
604 604 <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
605 605 % endif
@@ -655,7 +655,7 b' def get_comments_for(diff_type, comments'
655 655 % if comments:
656 656 <% has_outdated = any([x.outdated for x in comments]) %>
657 657 % if has_outdated:
658 <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment_toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
658 <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
659 659 % else:
660 660 <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i>
661 661 % endif
@@ -165,7 +165,8 b''
165 165 <div>
166 166 <div class="grid_edit">
167 167 <a href="${h.route_path('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
168 <i class="icon-pencil"></i>Edit</a>
168 Edit
169 </a>
169 170 </div>
170 171 <div class="grid_delete">
171 172 ${h.secure_form(h.route_path('edit_repo_advanced_delete', repo_name=repo_name), request=request)}
@@ -252,7 +253,8 b''
252 253 <%def name="user_actions(user_id, username)">
253 254 <div class="grid_edit">
254 255 <a href="${h.route_path('user_edit',user_id=user_id)}" title="${_('Edit')}">
255 <i class="icon-pencil"></i>${_('Edit')}</a>
256 ${_('Edit')}
257 </a>
256 258 </div>
257 259 <div class="grid_delete">
258 260 ${h.secure_form(h.route_path('user_delete', user_id=user_id), request=request)}
@@ -470,7 +470,7 b''
470 470 <a class="btn btn-mini" href="/example/annotate/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">annotation</a>
471 471 <a class="btn btn-mini" href="/example/raw/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">raw</a>
472 472 <a class="btn btn-mini" href="/example/rawfile/fc252256eb0fcb4f2613e66f0126ea27967ae28c/rhodecode/websetup.py">
473 <i class="icon-archive"></i> download
473 download
474 474 </a>
475 475
476 476 <a class="btn btn-mini disabled tooltip" href="#" title="Editing files allowed only when on branch head commit">edit</a>
@@ -648,7 +648,7 b' File Edit'
648 648 <a class="btn btn-mini" href="/example/files/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">source</a>
649 649 <a class="btn btn-mini" href="/example/raw/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">raw</a>
650 650 <a class="btn btn-mini" href="/example/rawfile/80ead1899f50a894889e19ffeb49c9cebf5bf045/rhodecode/websetup.py">
651 <i class="icon-archive"></i> download
651 download
652 652 </a>
653 653 </div>
654 654 </div>
@@ -150,7 +150,7 b''
150 150 </div>
151 151 <input id="reviewer_70_input" type="hidden" value="70" name="review_members">
152 152 <div class="reviewer_member_remove action_button" onclick="removeReviewMember(70, true)" style="visibility: hidden;">
153 <i class="icon-remove-sign"></i>
153 <i class="icon-remove"></i>
154 154 </div>
155 155 </li>
156 156 <li id="reviewer_33" class="collapsable-content" data-toggle="reviewers">
@@ -250,7 +250,7 b''
250 250 <div class='input'>
251 251 <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
252 252 <span class="btn action_button btn-x">
253 <i class="icon-remove-sign"></i>
253 <i class="icon-remove"></i>
254 254 delete
255 255 </span>
256 256 <span class="help-block">
@@ -42,7 +42,7 b''
42 42 <div class='input'>
43 43 <div class='text-as-placeholder'>
44 44 http://something.example.com
45 <span class="link" id="edit_clone_uri"><i class="icon-edit"></i>${_('edit')}</span>
45 <span class="link" id="edit_clone_uri">${_('edit')}</span>
46 46 </div>
47 47 <p class='help-block'>Help text in a paragraph.</p>
48 48 </div>
@@ -339,7 +339,7 b''
339 339 <div class='input'>
340 340 <input id="05_example_input" type="text" readonly="readonly" placeholder="Example input">
341 341 <span class="btn btn-x">
342 <i class="icon-remove-sign"></i>
342 <i class="icon-remove"></i>
343 343 delete
344 344 </span>
345 345 <button class='btn btn-primary'>Action</button>
@@ -47,7 +47,6 b''
47 47 <td>
48 48 <div class="grid_edit">
49 49 <a class="edit_issuetracker_entry" uid="4980baa2985b361e6e91b932f4a897d5" title="edit" href="#">
50 <i class="icon-pencil"></i>
51 50 <input type="submit" value="edit" class="btn btn-link">
52 51 </a>
53 52 </div>
@@ -59,7 +58,7 b''
59 58
60 59 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
61 60 <input type="hidden" value="4980baa2985b361e6e91b932f4a897d5" name="del_uid" id="del_uid">
62 <i class="icon-remove-sign"></i>
61 <i class="icon-remove"></i>
63 62 <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kjlakjlkjlkj;lkjl;kjl;kjl;kjl;kj;lkj');" id="remove_user_3" class="btn btn-link btn-danger">
64 63 </form>
65 64 </div>
@@ -74,7 +73,6 b''
74 73 <td>
75 74 <div class="grid_edit">
76 75 <a class="edit_issuetracker_entry" uid="98ac51a4ab43bb36a4feceed15ac5b21" title="edit" href="#">
77 <i class="icon-pencil"></i>
78 76 <input type="submit" value="edit" class="btn btn-link">
79 77 </a>
80 78 </div>
@@ -86,7 +84,7 b''
86 84
87 85 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
88 86 <input type="hidden" value="98ac51a4ab43bb36a4feceed15ac5b21" name="del_uid" id="del_uid">
89 <i class="icon-remove-sign"></i>
87 <i class="icon-remove"></i>
90 88 <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: kajls;kdjfal;skdjflaskdjflksjdlfksjdlfksjdlfkjsldkfjslkdjflskdjflkdsjf');" id="remove_user_3" class="btn btn-link btn-danger">
91 89 </form>
92 90 </div>
@@ -101,7 +99,6 b''
101 99 <td>
102 100 <div class="grid_edit">
103 101 <a class="edit_issuetracker_entry" uid="098f6bcd4621d373cade4e832627b4f6" title="edit" href="#">
104 <i class="icon-pencil"></i>
105 102 <input type="submit" value="edit" class="btn btn-link">
106 103 </a>
107 104 </div>
@@ -113,7 +110,7 b''
113 110
114 111 <div style="display: none;"><input type="hidden" value="05adf5bfb9be3766186f25db19b545134c6b0077" name="csrf_token" id="csrf_token"></div>
115 112 <input type="hidden" value="098f6bcd4621d373cade4e832627b4f6" name="del_uid" id="del_uid">
116 <i class="icon-remove-sign"></i>
113 <i class="icon-remove"></i>
117 114 <input type="submit" value="delete" onclick="return confirm('Confirm to remove this pattern: test');" id="remove_user_3" class="btn btn-link btn-danger">
118 115 </form>
119 116 </div>
@@ -236,11 +236,12 b''
236 236 <td class="td-action">
237 237 <div class="grid_edit">
238 238 <a href="/_admin/users/2/edit" title="edit">
239 <i class="icon-pencil"></i>Edit</a>
239 Edit
240 </a>
240 241 </div>
241 242 <div class="grid_delete">
242 243 <form action="/_admin/users/2" method="post">
243 <i class="icon-remove-sign"></i>
244 <i class="icon-remove"></i>
244 245 <input class="btn btn-danger btn-link" id="remove_user_2" name="remove_" type="submit" value="delete">
245 246 </form>
246 247 </div>
@@ -104,12 +104,12 b' var CG = new ColorGenerator();'
104 104
105 105 <% if (mandatory) { %>
106 106 <div class="reviewer_member_mandatory_remove" style="visibility: <%= edit_visibility %>;">
107 <i class="icon-remove-sign"></i>
107 <i class="icon-remove"></i>
108 108 </div>
109 109 <% } else { %>
110 110 <% if (allowed_to_update) { %>
111 111 <div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
112 <i class="icon-remove-sign" ></i>
112 <i class="icon-remove" ></i>
113 113 </div>
114 114 <% } %>
115 115 <% } %>
@@ -186,7 +186,7 b''
186 186 % else:
187 187 <span class="enabled">
188 188 <a id="archive_link" class="btn btn-small" href="${h.route_path('repo_archivefile',repo_name=c.rhodecode_db_repo.repo_name,fname='tip.zip')}">
189 <i class="icon-archive"></i> tip.zip
189 tip.zip
190 190 ## replaced by some JS on select
191 191 </a>
192 192 </span>
@@ -90,7 +90,7 b''
90 90 var fname = e.added.raw_id + ext;
91 91 var href = pyroutes.url('repo_archivefile', {'repo_name': templateContext.repo_name, 'fname':fname});
92 92 // set new label
93 $('#archive_link').html('<i class="icon-archive"></i> {0}{1}'.format(escapeHtml(e.added.text), ext));
93 $('#archive_link').html('{0}{1}'.format(escapeHtml(e.added.text), ext));
94 94
95 95 // set new url to button,
96 96 $('#archive_link').attr('href', href)
General Comments 0
You need to be logged in to leave comments. Login now