##// END OF EJS Templates
Fix a lot of casings - use standard casing in most places
Mads Kiilerich -
r3654:ec635494 beta
parent child Browse files
Show More
@@ -67,11 +67,11 b' class PermissionsController(BaseControll'
67 67 ('group.admin', _('Admin'),)]
68 68 self.register_choices = [
69 69 ('hg.register.none',
70 _('disabled')),
70 _('Disabled')),
71 71 ('hg.register.manual_activate',
72 _('allowed with manual account activation')),
72 _('Allowed with manual account activation')),
73 73 ('hg.register.auto_activate',
74 _('allowed with automatic account activation')), ]
74 _('Allowed with automatic account activation')), ]
75 75
76 76 self.create_choices = [('hg.create.none', _('Disabled')),
77 77 ('hg.create.repository', _('Enabled'))]
@@ -194,7 +194,7 b' class ReposController(BaseRepoController'
194 194
195 195 except Exception:
196 196 log.error(traceback.format_exc())
197 msg = _('error occurred during creation of repository %s') \
197 msg = _('Error creating repository %s') \
198 198 % form_result.get('repo_name')
199 199 h.flash(msg, category='error')
200 200 if c.rhodecode_user.is_admin:
@@ -362,7 +362,7 b' class ReposController(BaseRepoController'
362 362 #action_logger(self.rhodecode_user, 'admin_changed_repo_permissions',
363 363 # repo_name, self.ip_addr, self.sa)
364 364 Session().commit()
365 h.flash(_('updated repository permissions'), category='success')
365 h.flash(_('Repository permissions updated'), category='success')
366 366 return redirect(url('edit_repo', repo_name=repo_name))
367 367
368 368 @HasRepoPermissionAllDecorator('repository.admin')
@@ -473,10 +473,10 b' class ReposController(BaseRepoController'
473 473 if repo.enable_locking:
474 474 if repo.locked[0]:
475 475 Repository.unlock(repo)
476 action = _('unlocked')
476 action = _('Unlocked')
477 477 else:
478 478 Repository.lock(repo, c.rhodecode_user.user_id)
479 action = _('locked')
479 action = _('Locked')
480 480
481 481 h.flash(_('Repository has been %s') % action,
482 482 category='success')
@@ -80,21 +80,21 b' def _ignorews_url(GET, fileid=None):'
80 80 fileid = str(fileid) if fileid else None
81 81 params = defaultdict(list)
82 82 _update_with_GET(params, GET)
83 lbl = _('show white space')
83 lbl = _('Show white space')
84 84 ig_ws = get_ignore_ws(fileid, GET)
85 85 ln_ctx = get_line_ctx(fileid, GET)
86 86 # global option
87 87 if fileid is None:
88 88 if ig_ws is None:
89 89 params['ignorews'] += [1]
90 lbl = _('ignore white space')
90 lbl = _('Ignore white space')
91 91 ctx_key = 'context'
92 92 ctx_val = ln_ctx
93 93 # per file options
94 94 else:
95 95 if ig_ws is None:
96 96 params[fileid] += ['WS:1']
97 lbl = _('ignore white space')
97 lbl = _('Ignore white space')
98 98
99 99 ctx_key = fileid
100 100 ctx_val = 'C:%s' % ln_ctx
@@ -88,9 +88,8 b' class FeedController(BaseRepoController)'
88 88
89 89 def __get_desc(self, cs):
90 90 desc_msg = []
91 desc_msg.append('%s %s %s<br/>' % (h.person(cs.author),
92 _('commited on'),
93 h.fmt_date(cs.date)))
91 desc_msg.append((_('%s committed on %s')
92 % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>')
94 93 #branches, tags, bookmarks
95 94 if cs.branch:
96 95 desc_msg.append('branch: %s<br/>' % cs.branch)
@@ -103,7 +102,7 b' class FeedController(BaseRepoController)'
103 102 # rev link
104 103 _url = url('changeset_home', repo_name=cs.repository.name,
105 104 revision=cs.raw_id, qualified=True)
106 desc_msg.append('changesest: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
105 desc_msg.append('changeset: <a href="%s">%s</a>' % (_url, cs.raw_id[:8]))
107 106
108 107 desc_msg.append('<pre>')
109 108 desc_msg.append(cs.message)
@@ -85,7 +85,7 b' class FilesController(BaseRepoController'
85 85 url_ = url('files_add_home',
86 86 repo_name=c.repo_name,
87 87 revision=0, f_path='')
88 add_new = h.link_to(_('click here to add new file'), url_)
88 add_new = h.link_to(_('Click here to add new file'), url_)
89 89 h.flash(h.literal(_('There are no files yet %s') % add_new),
90 90 category='warning')
91 91 redirect(h.url('summary_home', repo_name=repo_name))
@@ -369,7 +369,7 b' class FilesController(BaseRepoController'
369 369 return redirect(url('changeset_home', repo_name=c.repo_name,
370 370 revision='tip'))
371 371 if location.startswith('/') or location.startswith('.') or '../' in location:
372 h.flash(_('location must be relative path and must not '
372 h.flash(_('Location must be relative path and must not '
373 373 'contain .. in path'), category='warning')
374 374 return redirect(url('changeset_home', repo_name=c.repo_name,
375 375 revision='tip'))
@@ -417,7 +417,7 b' class FilesController(BaseRepoController'
417 417 try:
418 418 dbrepo = RepoModel().get_by_repo_name(repo_name)
419 419 if not dbrepo.enable_downloads:
420 return _('downloads disabled')
420 return _('Downloads disabled')
421 421
422 422 if c.rhodecode_repo.alias == 'hg':
423 423 # patch and reset hooks section of UI config to not run any
@@ -215,7 +215,7 b' class PullrequestsController(BaseRepoCon'
215 215 elif errors.error_dict.get('pullrequest_title'):
216 216 msg = _('Pull request requires a title with min. 3 chars')
217 217 else:
218 msg = _('error during creation of pull request')
218 msg = _('Error creating pull request')
219 219
220 220 h.flash(msg, 'error')
221 221 return redirect(url('pullrequest_home', repo_name=repo_name))
@@ -423,7 +423,7 b' class PullrequestsController(BaseRepoCon'
423 423
424 424 allowed_to_change_status = self._get_is_allowed_change_status(pull_request)
425 425 if status and change_status and allowed_to_change_status:
426 _def = (_('status change -> %s')
426 _def = (_('Status change -> %s')
427 427 % ChangesetStatus.get_status_lbl(status))
428 428 if close_pr:
429 429 _def = _('Closing with') + ' ' + _def
@@ -63,7 +63,7 b' def wrapped_diff(filenode_old, filenode_'
63 63 filenode_old = FileNode(filenode_new.path, '', EmptyChangeset())
64 64
65 65 if filenode_old.is_binary or filenode_new.is_binary:
66 diff = wrap_to_table(_('binary file'))
66 diff = wrap_to_table(_('Binary file'))
67 67 stats = (0, 0)
68 68 size = 0
69 69
@@ -221,26 +221,24 b' class NotificationModel(BaseModel):'
221 221 #alias
222 222 _n = notification
223 223 _map = {
224 _n.TYPE_CHANGESET_COMMENT: _('commented on changeset at %(when)s'),
225 _n.TYPE_MESSAGE: _('sent message at %(when)s'),
226 _n.TYPE_MENTION: _('mentioned you at %(when)s'),
227 _n.TYPE_REGISTRATION: _('registered in RhodeCode at %(when)s'),
228 _n.TYPE_PULL_REQUEST: _('opened new pull request at %(when)s'),
229 _n.TYPE_PULL_REQUEST_COMMENT: _('commented on pull request at %(when)s')
224 _n.TYPE_CHANGESET_COMMENT: _('%(user)s commented on changeset at %(when)s'),
225 _n.TYPE_MESSAGE: _('%(user)s sent message at %(when)s'),
226 _n.TYPE_MENTION: _('%(user)s mentioned you at %(when)s'),
227 _n.TYPE_REGISTRATION: _('%(user)s registered in RhodeCode at %(when)s'),
228 _n.TYPE_PULL_REQUEST: _('%(user)s opened new pull request at %(when)s'),
229 _n.TYPE_PULL_REQUEST_COMMENT: _('%(user)s commented on pull request at %(when)s')
230 230 }
231 tmpl = _map[notification.type_]
231 232
232 # action == _map string
233 tmpl = "%(user)s %(action)s "
234 233 if show_age:
235 234 when = h.age(notification.created_on)
236 235 else:
237 236 when = h.fmt_date(notification.created_on)
238 237
239 data = dict(
238 return tmpl % dict(
240 239 user=notification.created_by_user.username,
241 action=_map[notification.type_] % {'when': when},
242 )
243 return tmpl % data
240 when=when,
241 )
244 242
245 243
246 244 class EmailNotificationModel(BaseModel):
@@ -229,7 +229,7 b' class UserModel(BaseModel):'
229 229 self.sa.flush()
230 230
231 231 # notification to admins
232 subject = _('new user registration')
232 subject = _('New user registration')
233 233 body = ('New user registration\n'
234 234 '---------------------\n'
235 235 '- Username: %s\n'
@@ -331,7 +331,7 b' class UserModel(BaseModel):'
331 331 'reset_url': link})
332 332 log.debug('sending email')
333 333 run_task(tasks.send_email, user_email,
334 _("password reset link"), body, body)
334 _("Password reset link"), body, body)
335 335 log.info('send new password mail to %s' % user_email)
336 336 else:
337 337 log.debug("password reset email %s not found" % user_email)
@@ -8,7 +8,7 b''
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 ${_('defaults')}
11 ${_('Defaults')}
12 12 </%def>
13 13
14 14 <%def name="page_nav()">
@@ -8,7 +8,7 b''
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 ${_('ldap')}
11 ${_('LDAP')}
12 12 </%def>
13 13
14 14 <%def name="page_nav()">
@@ -8,7 +8,7 b''
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 ${_('permissions')}
11 ${_('Permissions')}
12 12 </%def>
13 13
14 14 <%def name="page_nav()">
@@ -47,7 +47,7 b''
47 47 <label for="overwrite_default_repo">
48 48 <span class="tooltip"
49 49 title="${h.tooltip(_('All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost'))}">
50 ${_('overwrite existing settings')}</span> </label>
50 ${_('Overwrite existing settings')}</span> </label>
51 51 </div>
52 52 </div>
53 53 <div class="field">
@@ -60,7 +60,7 b''
60 60 <label for="overwrite_default_group">
61 61 <span class="tooltip"
62 62 title="${h.tooltip(_('All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost'))}">
63 ${_('overwrite existing settings')}</span> </label>
63 ${_('Overwrite existing settings')}</span> </label>
64 64
65 65 </div>
66 66 </div>
@@ -180,7 +180,7 b''
180 180 ${h.hidden('del_ip',ip.ip_id)}
181 181 ${h.hidden('default_user', 'True')}
182 182 ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id,
183 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
183 class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")}
184 184 ${h.end_form()}
185 185 </td>
186 186 </tr>
@@ -16,7 +16,7 b''
16 16 ${_('Repositories')}
17 17 %endif
18 18 &raquo;
19 ${_('add new')}
19 ${_('Add new')}
20 20 </%def>
21 21
22 22 <%def name="page_nav()">
@@ -70,7 +70,7 b''
70 70 </div>
71 71 </div>
72 72 <div class="buttons">
73 ${h.submit('add',_('add'),class_="ui-btn large")}
73 ${h.submit('add',_('Add'),class_="ui-btn large")}
74 74 </div>
75 75 </div>
76 76 </div>
@@ -10,7 +10,7 b''
10 10 &raquo;
11 11 ${h.link_to(_('Repository groups'),h.url('repos_groups'))}
12 12 &raquo;
13 ${_('Edit repository group')} "${c.repos_group.name}"
13 ${_('Edit repository group %s') % c.repos_group.name}"
14 14 </%def>
15 15
16 16 <%def name="page_nav()">
@@ -9,7 +9,7 b''
9 9 <%def name="breadcrumbs_links()">
10 10 ${h.link_to(_('Admin'),h.url('admin_home'))}
11 11 &raquo;
12 ${_('repository groups')}
12 ${_('Repository groups')}
13 13 </%def>
14 14
15 15 <%def name="page_nav()">
@@ -39,7 +39,7 b''
39 39 <th class="left"><a href="#">${_('Group name')}</a></th>
40 40 <th class="left"><a href="#">${_('Description')}</a></th>
41 41 <th class="left"><a href="#">${_('Number of toplevel repositories')}</a></th>
42 <th class="left" colspan="2">${_('action')}</th>
42 <th class="left" colspan="2">${_('Action')}</th>
43 43 </tr>
44 44 </thead>
45 45
@@ -57,7 +57,7 b''
57 57 <td>${gr.group_description}</td>
58 58 <td><b>${gr_cn}</b></td>
59 59 <td>
60 <a href="${h.url('edit_repos_group',group_name=gr.group_name)}" title="${_('edit')}">
60 <a href="${h.url('edit_repos_group',group_name=gr.group_name)}" title="${_('Edit')}">
61 61 ${h.submit('edit_%s' % gr.group_name,_('edit'),class_="edit_icon action_button")}
62 62 </a>
63 63 </td>
@@ -8,7 +8,7 b''
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 ${_('settings')}
11 ${_('Settings')}
12 12 </%def>
13 13
14 14 <%def name="page_nav()">
@@ -267,7 +267,7 b''
267 267 ${h.text('paths_root_path',size=30,readonly="readonly")}
268 268 <span id="path_unlock" class="tooltip"
269 269 title="${h.tooltip(_('This a crucial application setting. If you are really sure you need to change this, you must restart application in order to make this setting take effect. Click this label to unlock.'))}">
270 ${_('unlock')}
270 ${_('Unlock')}
271 271 </span>
272 272 <span class="help-block">${_('Location where repositories are stored. After changing this value a restart, and rescan is required')}</span>
273 273 </div>
@@ -9,7 +9,7 b''
9 9 &raquo;
10 10 ${h.link_to(_('Users'),h.url('users'))}
11 11 &raquo;
12 ${_('add new user')}
12 ${_('Add new user')}
13 13 </%def>
14 14
15 15 <%def name="page_nav()">
@@ -91,7 +91,7 b''
91 91 </div>
92 92
93 93 <div class="buttons">
94 ${h.submit('save',_('save'),class_="ui-btn large")}
94 ${h.submit('save',_('Save'),class_="ui-btn large")}
95 95 </div>
96 96 </div>
97 97 </div>
@@ -10,7 +10,7 b''
10 10 &raquo;
11 11 ${h.link_to(_('Users'),h.url('users'))}
12 12 &raquo;
13 ${_('edit')} "${c.user.username}"
13 ${_('Edit %s') % c.user.username}
14 14 </%def>
15 15
16 16 <%def name="page_nav()">
@@ -74,17 +74,17 b''
74 74 // main table sorting
75 75 var myColumnDefs = [
76 76 {key:"gravatar",label:"",sortable:false,},
77 {key:"username",label:"${_('username')}",sortable:true,
77 {key:"username",label:"${_('Username')}",sortable:true,
78 78 sortOptions: { sortFunction: usernamelinkSort }
79 79 },
80 {key:"firstname",label:"${_('firstname')}",sortable:true,},
81 {key:"lastname",label:"${_('lastname')}",sortable:true,},
82 {key:"last_login",label:"${_('last login')}",sortable:true,
80 {key:"firstname",label:"${_('Firstname')}",sortable:true,},
81 {key:"lastname",label:"${_('Lastname')}",sortable:true,},
82 {key:"last_login",label:"${_('Last login')}",sortable:true,
83 83 sortOptions: { sortFunction: lastLoginSort }},
84 {key:"active",label:"${_('active')}",sortable:true,},
85 {key:"admin",label:"${_('admin')}",sortable:true,},
86 {key:"ldap",label:"${_('ldap')}",sortable:true,},
87 {key:"action",label:"${_('action')}",sortable:false},
84 {key:"active",label:"${_('Active')}",sortable:true,},
85 {key:"admin",label:"${_('Admin')}",sortable:true,},
86 {key:"ldap",label:"${_('LDAP')}",sortable:true,},
87 {key:"action",label:"${_('Action')}",sortable:false},
88 88 ];
89 89
90 90 var myDataTable = new YAHOO.widget.DataTable("users_list_wrap", myColumnDefs, myDataSource,{
@@ -9,7 +9,7 b''
9 9 &raquo;
10 10 ${h.link_to(_('User groups'),h.url('users_groups'))}
11 11 &raquo;
12 ${_('add new user group')}
12 ${_('Add new user group')}
13 13 </%def>
14 14
15 15 <%def name="page_nav()">
@@ -46,7 +46,7 b''
46 46 </div>
47 47
48 48 <div class="buttons">
49 ${h.submit('save',_('save'),class_="ui-btn large")}
49 ${h.submit('save',_('Save'),class_="ui-btn large")}
50 50 </div>
51 51 </div>
52 52 </div>
@@ -10,7 +10,7 b''
10 10 &raquo;
11 11 ${h.link_to(_('UserGroups'),h.url('users_groups'))}
12 12 &raquo;
13 ${_('edit')} "${c.users_group.users_group_name}"
13 ${_('Edit %s') % c.users_group.users_group_name}
14 14 </%def>
15 15
16 16 <%def name="page_nav()">
@@ -87,7 +87,7 b''
87 87
88 88 </div>
89 89 <div class="buttons">
90 ${h.submit('Save',_('save'),class_="ui-btn large")}
90 ${h.submit('Save',_('Save'),class_="ui-btn large")}
91 91 </div>
92 92 </div>
93 93 </div>
@@ -8,7 +8,7 b''
8 8 <%def name="breadcrumbs_links()">
9 9 ${h.link_to(_('Admin'),h.url('admin_home'))}
10 10 &raquo;
11 ${_('user groups')}
11 ${_('User groups')}
12 12 </%def>
13 13
14 14 <%def name="page_nav()">
@@ -31,10 +31,10 b''
31 31 <div class="table">
32 32 <table class="table_disp">
33 33 <tr class="header">
34 <th class="left">${_('group name')}</th>
35 <th class="left">${_('members')}</th>
36 <th class="left">${_('active')}</th>
37 <th class="left">${_('action')}</th>
34 <th class="left">${_('Group name')}</th>
35 <th class="left">${_('Members')}</th>
36 <th class="left">${_('Active')}</th>
37 <th class="left">${_('Action')}</th>
38 38 </tr>
39 39 %for cnt,u_group in enumerate(c.users_groups_list):
40 40 <tr class="parity${cnt%2}">
@@ -63,21 +63,21 b''
63 63
64 64 <%def name="admin_menu()">
65 65 <ul class="admin_menu">
66 <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
67 <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>
68 <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
69 <li>${h.link_to(_('users'),h.url('users'),class_='users')}</li>
70 <li>${h.link_to(_('user groups'),h.url('users_groups'),class_='groups')}</li>
71 <li>${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
72 <li>${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}</li>
73 <li>${h.link_to(_('defaults'),h.url('defaults'),class_='defaults')}</li>
74 <li class="last">${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}</li>
66 <li>${h.link_to(_('Admin journal'),h.url('admin_home'),class_='journal ')}</li>
67 <li>${h.link_to(_('Repositories'),h.url('repos'),class_='repos')}</li>
68 <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
69 <li>${h.link_to(_('Users'),h.url('users'),class_='users')}</li>
70 <li>${h.link_to(_('User groups'),h.url('users_groups'),class_='groups')}</li>
71 <li>${h.link_to(_('Permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
72 <li>${h.link_to(_('LDAP'),h.url('ldap_home'),class_='ldap')}</li>
73 <li>${h.link_to(_('Defaults'),h.url('defaults'),class_='defaults')}</li>
74 <li class="last">${h.link_to(_('Settings'),h.url('admin_settings'),class_='settings')}</li>
75 75 </ul>
76 76 </%def>
77 77
78 78 <%def name="admin_menu_simple()">
79 79 <ul>
80 <li>${h.link_to(_('repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
80 <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
81 81 </ul>
82 82 </%def>
83 83
@@ -86,18 +86,18 b''
86 86 %endif
87 87 %if h.is_hg(c.rhodecode_repo):
88 88 %for book in cs.bookmarks:
89 <div class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
89 <div class="bookbook" title="${_('Bookmark %s') % book}">
90 90 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
91 91 </div>
92 92 %endfor
93 93 %endif
94 94 %for tag in cs.tags:
95 <div class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
95 <div class="tagtag" title="${_('Tag %s') % tag}">
96 96 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
97 97 </div>
98 98 %endfor
99 99 %if (not c.branch_name) and cs.branch:
100 <div class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
100 <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
101 101 ${h.link_to(h.shorter(cs.branch),h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
102 102 </div>
103 103 %endif
@@ -1,11 +1,11 b''
1 1 ## small box that displays changed/added/removed details fetched by AJAX
2 2
3 3 % if len(c.cs.affected_files) <= c.affected_files_cut_off:
4 <span class="removed tooltip" title="<b>${h.tooltip(_('removed'))}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span>
5 <span class="changed tooltip" title="<b>${h.tooltip(_('changed'))}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span>
6 <span class="added tooltip" title="<b>${h.tooltip(_('added'))}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span>
4 <span class="removed tooltip" title="<b>${h.tooltip(_('Removed'))}</b>${h.changed_tooltip(c.cs.removed)}">${len(c.cs.removed)}</span>
5 <span class="changed tooltip" title="<b>${h.tooltip(_('Changed'))}</b>${h.changed_tooltip(c.cs.changed)}">${len(c.cs.changed)}</span>
6 <span class="added tooltip" title="<b>${h.tooltip(_('Added'))}</b>${h.changed_tooltip(c.cs.added)}">${len(c.cs.added)}</span>
7 7 % else:
8 <span class="removed tooltip" title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
9 <span class="changed tooltip" title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
10 <span class="added tooltip" title="${h.tooltip(_('affected %s files') % len(c.cs.affected_files))}">!</span>
8 <span class="removed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
9 <span class="changed tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
10 <span class="added tooltip" title="${h.tooltip(_('Affected %s files') % len(c.cs.affected_files))}">!</span>
11 11 % endif
@@ -64,9 +64,9 b''
64 64 %endif
65 65 </div>
66 66 <div class="diff-actions">
67 <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
68 <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a>
69 <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
67 <a href="${h.url('changeset_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
68 <a href="${h.url('changeset_patch_home',repo_name=c.repo_name,revision=c.changeset.raw_id)}" class="tooltip" title="${h.tooltip(_('Patch diff'))}"><img class="icon" src="${h.url('/images/icons/page_add.png')}"/></a>
69 <a href="${h.url('changeset_download_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
70 70 ${c.ignorews_url(request.GET)}
71 71 ${c.context_url(request.GET)}
72 72 </div>
@@ -88,13 +88,13 b''
88 88 <div class="right">
89 89 <div class="changes">
90 90 % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff:
91 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
92 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
93 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
91 <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span>
92 <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span>
93 <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span>
94 94 % else:
95 <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
96 <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
97 <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
95 <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
96 <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
97 <span class="added" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span>
98 98 % endif
99 99 </div>
100 100
@@ -103,12 +103,12 b''
103 103 <span class="merge">${_('merge')}</span>
104 104 %endif
105 105 %if c.changeset.branch:
106 <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
106 <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
107 107 ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
108 108 </span>
109 109 %endif
110 110 %for tag in c.changeset.tags:
111 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
111 <span class="tagtag" title="${_('Tag %s') % tag}">
112 112 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
113 113 %endfor
114 114 </span>
@@ -131,7 +131,7 b''
131 131 </div>
132 132 %endfor
133 133 % if c.limited_diff:
134 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
134 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>
135 135 % endif
136 136 </div>
137 137 </div>
@@ -143,7 +143,7 b''
143 143 ${diff_block.diff_block(c.changes[c.changeset.raw_id])}
144 144
145 145 % if c.limited_diff:
146 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
146 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>
147 147 % endif
148 148
149 149 ## template for inline comment form
@@ -77,19 +77,19 b''
77 77 <span class="merge">${_('merge')}</span>
78 78 %endif
79 79 %if cs.branch:
80 <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
80 <span class="branchtag" title="${_('Branch %s') % cs.branch}">
81 81 ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
82 82 </span>
83 83 %endif
84 84 %if h.is_hg(c.rhodecode_repo):
85 85 %for book in cs.bookmarks:
86 <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
86 <span class="bookbook" title="${_('Bookmark %s') % book}">
87 87 ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
88 88 </span>
89 89 %endfor
90 90 %endif
91 91 %for tag in cs.tags:
92 <span class="tagtag" title="${'%s %s' % (_('tag'),tag)}">
92 <span class="tagtag" title="${_('Tag %s') % tag}">
93 93 ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
94 94 %endfor
95 95 </span>
@@ -5,7 +5,7 b''
5 5 ##
6 6 <%def name="diff_block(change)">
7 7 <div class="diff-collapse">
8 <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('collapse diff')} &uarr;</span>
8 <span target="${'diff-container-%s' % (id(change))}" class="diff-collapse-button">&uarr; ${_('Collapse diff')} &uarr;</span>
9 9 </div>
10 10 <div class="diff-container" id="${'diff-container-%s' % (id(change))}">
11 11 %for FID,(cs1, cs2, change, path, diff, stats) in change.iteritems():
@@ -19,15 +19,15 b''
19 19 revision=cs2,f_path=h.safe_unicode(path)))}
20 20 </div>
21 21 <div class="diff-actions">
22 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
23 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
24 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
22 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
23 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='raw')}" class="tooltip" title="${h.tooltip(_('Raw diff'))}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
24 <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(path),diff2=cs2,diff1=cs1,diff='download')}" class="tooltip" title="${h.tooltip(_('Download diff'))}"><img class="icon" src="${h.url('/images/icons/page_save.png')}"/></a>
25 25 ${c.ignorews_url(request.GET, h.FID(cs2,path))}
26 26 ${c.context_url(request.GET, h.FID(cs2,path))}
27 27 </div>
28 28 <span style="float:right;margin-top:-3px">
29 29 <label>
30 ${_('show inline comments')}
30 ${_('Show inline comments')}
31 31 ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(cs2,path))}
32 32 </label>
33 33 </span>
@@ -52,8 +52,8 b''
52 52 <div class="changeset_header">
53 53 <div class="changeset_file">
54 54 ${h.safe_unicode(filenode_path)} |
55 <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -&gt;
56 <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
55 <a class="spantag" href="${h.url('files_home', repo_name=c.other_repo.repo_name, f_path=filenode_path, revision=c.org_ref)}" title="${_('Show file at latest version in this repo')}">${c.org_ref_type}@${h.short_id(c.org_ref) if c.org_ref_type=='rev' else c.org_ref}</a> -&gt;
56 <a class="spantag" href="${h.url('files_home', repo_name=c.repo_name, f_path=filenode_path, revision=c.other_ref)}" title="${_('Show file at initial version in this repo')}">${c.other_ref_type}@${h.short_id(c.other_ref) if c.other_ref_type=='rev' else c.other_ref}</a>
57 57 </div>
58 58 </div>
59 59 </div>
@@ -58,9 +58,9 b''
58 58
59 59 ##PRIVATE/PUBLIC
60 60 %if private and c.visual.show_private_icon:
61 <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
61 <img class="icon" title="${_('Private repository')}" alt="${_('Private repository')}" src="${h.url('/images/icons/lock.png')}"/>
62 62 %elif not private and c.visual.show_public_icon:
63 <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
63 <img class="icon" title="${_('Public repository')}" alt="${_('Public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
64 64 %endif
65 65
66 66 ##NAME
@@ -71,7 +71,7 b''
71 71 %endif
72 72 %if fork_of:
73 73 <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}">
74 <img class="icon" alt="${_('fork')}" title="${_('Fork of')} ${fork_of.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
74 <img class="icon" alt="${_('Fork')}" title="${_('Fork of %s') % fork_of.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/></a>
75 75 %endif
76 76 </div>
77 77 </%def>
@@ -27,7 +27,7 b''
27 27 ${self.breadcrumbs()}
28 28 <ul class="links">
29 29 <li>
30 <span style="text-transform: uppercase;"><a href="#">${_('branch')}: ${c.changeset.branch}</a></span>
30 <span style="text-transform: uppercase;"><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>
31 31 </li>
32 32 </ul>
33 33 </div>
@@ -28,7 +28,7 b''
28 28 <ul class="links">
29 29 <li>
30 30 <span style="text-transform: uppercase;">
31 <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
31 <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
32 32 </li>
33 33 </ul>
34 34 </div>
@@ -72,7 +72,7 b''
72 72 <pre id="editor_pre"></pre>
73 73 <textarea id="editor" name="content" style="display:none"></textarea>
74 74 </div>
75 <div style="padding: 10px;color:#666666">${_('commit message')}</div>
75 <div style="padding: 10px;color:#666666">${_('Commit message')}</div>
76 76 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
77 77 </div>
78 78 <div style="text-align: l;padding-top: 5px">
@@ -10,25 +10,25 b''
10 10 <div class="browser-nav">
11 11 ${h.form(h.url.current())}
12 12 <div class="info_box">
13 <span class="rev">${_('view')}@rev</span>
14 <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('previous revision')}">&laquo;</a>
13 <span class="rev">${_('View')}@rev</span>
14 <a class="ui-btn ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}">&laquo;</a>
15 15 ${h.text('at_rev',value=c.changeset.revision,size=5)}
16 <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('next revision')}">&raquo;</a>
17 ## ${h.submit('view',_('view'),class_="ui-btn")}
16 <a class="ui-btn ypjax-link" href="${c.url_next}" title="${_('Next revision')}">&raquo;</a>
17 ## ${h.submit('view',_('View'),class_="ui-btn")}
18 18 </div>
19 19 ${h.end_form()}
20 20 </div>
21 21 <div class="browser-branch">
22 22 ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
23 <label>${_('follow current branch')}</label>
23 <label>${_('Follow current branch')}</label>
24 24 </div>
25 25 <div class="browser-search">
26 26 <div id="search_activate_id" class="search_activate">
27 <a class="ui-btn" id="filter_activate" href="#">${_('search file list')}</a>
27 <a class="ui-btn" id="filter_activate" href="#">${_('Search file list')}</a>
28 28 </div>
29 29 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
30 30 <div id="add_node_id" class="add_node">
31 <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('add new file')}</a>
31 <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}">${_('Add new file')}</a>
32 32 </div>
33 33 % endif
34 34 <div>
@@ -28,7 +28,7 b''
28 28 <ul class="links">
29 29 <li>
30 30 <span style="text-transform: uppercase;">
31 <a href="#">${_('branch')}: ${c.cs.branch}</a></span>
31 <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
32 32 </li>
33 33 </ul>
34 34 </div>
@@ -44,12 +44,12 b''
44 44 <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
45 45 <div class="left item last">${c.file.mimetype}</div>
46 46 <div class="buttons">
47 ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
48 ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
49 ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
47 ${h.link_to(_('Show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
48 ${h.link_to(_('Show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
49 ${h.link_to(_('Download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
50 50 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
51 51 % if not c.file.is_binary:
52 ${h.link_to(_('source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
52 ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
53 53 % endif
54 54 % endif
55 55 </div>
@@ -58,7 +58,7 b''
58 58 </div>
59 59 <pre id="editor_pre"></pre>
60 60 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
61 <div style="padding: 10px;color:#666666">${_('commit message')}</div>
61 <div style="padding: 10px;color:#666666">${_('Commit message')}</div>
62 62 <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
63 63 </div>
64 64 <div style="text-align: left;padding-top: 5px">
@@ -6,9 +6,9 b''
6 6 ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
7 7 ${h.hidden('diff2',c.file_changeset.raw_id)}
8 8 ${h.select('diff1',c.file_changeset.raw_id,c.file_history)}
9 ${h.submit('diff',_('diff to revision'),class_="ui-btn")}
10 ${h.submit('show_rev',_('show at revision'),class_="ui-btn")}
11 ${h.link_to(_('show full history'),h.url('shortlog_file_home',repo_name=c.repo_name, revision=c.file_changeset.raw_id, f_path=c.f_path),class_="ui-btn")}
9 ${h.submit('diff',_('Diff to revision'),class_="ui-btn")}
10 ${h.submit('show_rev',_('Show at revision'),class_="ui-btn")}
11 ${h.link_to(_('Show full history'),h.url('shortlog_file_home',repo_name=c.repo_name, revision=c.file_changeset.raw_id, f_path=c.f_path),class_="ui-btn")}
12 12 ${h.hidden('annotate', c.annotate)}
13 13 ${h.end_form()}
14 14 </div>
@@ -18,17 +18,17 b''
18 18 <div class="left item last"><pre>${c.file.mimetype}</pre></div>
19 19 <div class="buttons">
20 20 %if c.annotate:
21 ${h.link_to(_('show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
21 ${h.link_to(_('Show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
22 22 %else:
23 ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
23 ${h.link_to(_('Show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
24 24 %endif
25 ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
26 ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
25 ${h.link_to(_('Show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
26 ${h.link_to(_('Download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
27 27 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
28 28 % if c.on_branch_head and c.changeset.branch and not c.file.is_binary:
29 ${h.link_to(_('edit on branch:%s') % c.changeset.branch,h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path),class_="ui-btn")}
29 ${h.link_to(_('Edit on branch:%s') % c.changeset.branch,h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.branch,f_path=c.f_path),class_="ui-btn")}
30 30 %else:
31 ${h.link_to(_('edit on branch:?'), '#', class_="ui-btn disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
31 ${h.link_to(_('Edit on branch:?'), '#', class_="ui-btn disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
32 32 % endif
33 33 % endif
34 34 </div>
@@ -52,7 +52,7 b''
52 52 ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
53 53 %endif
54 54 %else:
55 ${_('File is too big to display')} ${h.link_to(_('show as raw'),
55 ${_('File is too big to display')} ${h.link_to(_('Show as raw'),
56 56 h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))}
57 57 %endif
58 58 %endif
@@ -14,9 +14,9 b''
14 14 <div style="padding:5px 3px 3px 42px;">${f.description}</div>
15 15 </div>
16 16 <div style="clear:both;padding-top: 10px"></div>
17 <div class="follower_date">${_('forked')} -
17 <div class="follower_date">${_('Forked')} -
18 18 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
19 <a title="${_('compare fork with %s' % c.repo_name)}"
19 <a title="${_('Compare fork with %s' % c.repo_name)}"
20 20 href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref='default',other_repo=f.repo_name,other_ref_type='branch',other_ref='default')}"
21 21 class="ui-btn small">${_('Compare fork')}</a>
22 22 </div>
@@ -56,7 +56,7 b''
56 56 % if len(c.pull_request_pending_reviewers) > 0:
57 57 <div class="tooltip" title="${h.tooltip(','.join([x.username for x in c.pull_request_pending_reviewers]))}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
58 58 %else:
59 <div>${_('pull request was reviewed by all reviewers')}</div>
59 <div>${_('Pull request was reviewed by all reviewers')}</div>
60 60 %endif
61 61 </div>
62 62 </div>
@@ -128,7 +128,7 b''
128 128 %endfor
129 129 </div>
130 130 % if c.limited_diff:
131 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h5>
131 <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>
132 132 % endif
133 133 </div>
134 134 </div>
@@ -192,7 +192,7 b''
192 192 ${diff_block.diff_block_simple([c.changes[fid]])}
193 193 %endfor
194 194 % if c.limited_diff:
195 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("confirm to show potentially huge diff")}')">${_('Show full diff')}</a></h4>
195 <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>
196 196 % endif
197 197
198 198
@@ -2,12 +2,12 b''
2 2 %if c.repo_changesets:
3 3 <table class="table_disp">
4 4 <tr>
5 <th class="left">${_('revision')}</th>
6 <th class="left">${_('commit message')}</th>
7 <th class="left">${_('age')}</th>
8 <th class="left">${_('author')}</th>
9 <th class="left">${_('branch')}</th>
10 <th class="left">${_('tags')}</th>
5 <th class="left">${_('Revision')}</th>
6 <th class="left">${_('Commit message')}</th>
7 <th class="left">${_('Age')}</th>
8 <th class="left">${_('Author')}</th>
9 <th class="left">${_('Branch')}</th>
10 <th class="left">${_('Tags')}</th>
11 11 </tr>
12 12 %for cnt,cs in enumerate(c.repo_changesets):
13 13 <tr class="parity${cnt%2}">
@@ -75,7 +75,7 b''
75 75 <h4>${_('Add or upload files directly via RhodeCode')}</h4>
76 76 <div style="margin: 20px 30px;">
77 77 <div id="add_node_id" class="add_node">
78 <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('add new file')}</a>
78 <a class="ui-btn" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='')}">${_('Add new file')}</a>
79 79 </div>
80 80 </div>
81 81 %endif
@@ -13,8 +13,8 b''
13 13 </%def>
14 14
15 15 <%def name="head_extra()">
16 <link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s ATOM feed') % c.repo_name}" type="application/atom+xml" />
17 <link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('repo %s RSS feed') % c.repo_name}" type="application/rss+xml" />
16 <link href="${h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('%s ATOM feed') % c.repo_name}" type="application/atom+xml" />
17 <link href="${h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key)}" rel="alternate" title="${_('%s RSS feed') % c.repo_name}" type="application/rss+xml" />
18 18 </%def>
19 19
20 20 <%def name="main()">
@@ -59,9 +59,9 b''
59 59
60 60 ##PUBLIC/PRIVATE
61 61 %if c.dbrepo.private:
62 <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
62 <img style="margin-bottom:2px" class="icon" title="${_('Private repository')}" alt="${_('Private repository')}" src="${h.url('/images/icons/lock.png')}"/>
63 63 %else:
64 <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
64 <img style="margin-bottom:2px" class="icon" title="${_('Public repository')}" alt="${_('Public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
65 65 %endif
66 66
67 67 ##REPO NAME
@@ -70,7 +70,7 b''
70 70 ##FORK
71 71 %if c.dbrepo.fork:
72 72 <div style="margin-top:5px;clear:both">
73 <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/>
73 <a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('Public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/>
74 74 ${_('Fork of')} ${c.dbrepo.fork.repo_name}
75 75 </a>
76 76 </div>
@@ -78,7 +78,7 b''
78 78 ##REMOTE
79 79 %if c.dbrepo.clone_uri:
80 80 <div style="margin-top:5px;clear:both">
81 <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/>
81 <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('Remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/>
82 82 ${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}
83 83 </a>
84 84 </div>
@@ -386,7 +386,7 b' for (var i=0;i<data.length;i++){'
386 386 lnk = document.createElement('a');
387 387
388 388 lnk.href='#';
389 lnk.innerHTML = "${_('show more')}";
389 lnk.innerHTML = "${_('Show more')}";
390 390 lnk.id='code_stats_show_more';
391 391 td.appendChild(lnk);
392 392
@@ -677,7 +677,6 b' function SummaryPlot(from,to,dataset,ove'
677 677 var changed_suffix = " ${_('files changed')} ";
678 678 var removed_suffix = " ${_('files removed')} ";
679 679
680
681 680 if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";}
682 681 if(added==1){added_suffix=" ${_('file added')} ";}
683 682 if(changed==1){changed_suffix=" ${_('file changed')} ";}
@@ -1,6 +1,6 b''
1 1 ## -*- coding: utf-8 -*-
2 2 <li>
3 ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
3 ${h.link_to('%s (%s)' % (_('Branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
4 4 <ul>
5 5 %if c.rhodecode_repo.branches.values():
6 6 %for cnt,branch in enumerate(c.rhodecode_repo.branches.items()):
@@ -12,7 +12,7 b''
12 12 </ul>
13 13 </li>
14 14 <li>
15 ${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
15 ${h.link_to('%s (%s)' % (_('Tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
16 16 <ul>
17 17 %if c.rhodecode_repo.tags.values():
18 18 %for cnt,tag in enumerate(c.rhodecode_repo.tags.items()):
@@ -25,7 +25,7 b''
25 25 </li>
26 26 %if c.rhodecode_repo.alias == 'hg':
27 27 <li>
28 ${h.link_to('%s (%s)' % (_('bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')}
28 ${h.link_to('%s (%s)' % (_('Bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')}
29 29 <ul>
30 30 %if c.rhodecode_repo.bookmarks.values():
31 31 %for cnt,book in enumerate(c.rhodecode_repo.bookmarks.items()):
@@ -57,7 +57,7 b' class TestFilesController(TestController'
57 57 revision='97e8b885c04894463c51898e14387d80c30ed1ee',
58 58 f_path='/'))
59 59
60 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: git</a></span>""")
60 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: git</a></span>""")
61 61
62 62 def test_index_paging(self):
63 63 self.log_user()
@@ -89,7 +89,7 b' Improved test to clone into uniq reposit'
89 89 removed extra unicode conversion in diff.</div>
90 90 """)
91 91
92 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
92 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: default</a></span>""")
93 93
94 94 def test_file_source_history(self):
95 95 self.log_user()
@@ -156,7 +156,7 b' removed extra unicode conversion in diff'
156 156 f_path='vcs/nodes.py',
157 157 annotate=True))
158 158
159 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">branch: default</a></span>""")
159 response.mustcontain("""<span style="text-transform: uppercase;"><a href="#">Branch: default</a></span>""")
160 160
161 161 def test_file_annotation_history(self):
162 162 self.log_user()
@@ -22,8 +22,8 b' class TestHomeController(TestController)'
22 22 response.mustcontain("""<img class="icon" title="Mercurial repository" """
23 23 """alt="Mercurial repository" src="/images/icons/hg"""
24 24 """icon.png"/>""")
25 response.mustcontain("""<img class="icon" title="public repository" """
26 """alt="public repository" src="/images/icons/lock_"""
25 response.mustcontain("""<img class="icon" title="Public repository" """
26 """alt="Public repository" src="/images/icons/lock_"""
27 27 """open.png"/>""")
28 28
29 29 response.mustcontain(
@@ -25,7 +25,7 b' class TestSummaryController(TestControll'
25 25 )
26 26 response.mustcontain(
27 27 """<img style="margin-bottom:2px" class="icon" """
28 """title="public repository" alt="public """
28 """title="Public repository" alt="Public """
29 29 """repository" src="/images/icons/lock_open.png"/>"""
30 30 )
31 31
@@ -64,7 +64,7 b' class TestSummaryController(TestControll'
64 64 )
65 65 response.mustcontain(
66 66 """<img style="margin-bottom:2px" class="icon" """
67 """title="public repository" alt="public """
67 """title="Public repository" alt="Public """
68 68 """repository" src="/images/icons/lock_open.png"/>"""
69 69 )
70 70
@@ -84,7 +84,7 b' class TestSummaryController(TestControll'
84 84 """title="Mercurial repository" alt="Mercurial """
85 85 """repository" src="/images/icons/hgicon.png"/>""")
86 86 response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
87 """title="public repository" alt="public """
87 """title="Public repository" alt="Public """
88 88 """repository" src="/images/icons/lock_open.png"/>""")
89 89
90 90 def test_index_by_repo_having_id_path_in_name_hg(self):
@@ -112,7 +112,7 b' class TestSummaryController(TestControll'
112 112 """title="Git repository" alt="Git """
113 113 """repository" src="/images/icons/giticon.png"/>""")
114 114 response.mustcontain("""<img style="margin-bottom:2px" class="icon" """
115 """title="public repository" alt="public """
115 """title="Public repository" alt="Public """
116 116 """repository" src="/images/icons/lock_open.png"/>""")
117 117
118 118 def _enable_stats(self):
General Comments 0
You need to be logged in to leave comments. Login now