diff --git a/docs/theme/nature/layout.html b/docs/theme/nature/layout.html --- a/docs/theme/nature/layout.html +++ b/docs/theme/nature/layout.html @@ -6,7 +6,7 @@ diff --git a/rhodecode/templates/_data_table/_dt_elements.html b/rhodecode/templates/_data_table/_dt_elements.html --- a/rhodecode/templates/_data_table/_dt_elements.html +++ b/rhodecode/templates/_data_table/_dt_elements.html @@ -10,33 +10,33 @@ $${_('Summary')}$ - ${_('Summary')} - + ${_('Summary')} +

$${_('Changelog')}$ - ${_('Changelog')} - + ${_('Changelog')} +

$${_('Files')}$ - ${_('Files')} - + ${_('Files')} +

$${_('Fork')}$ - ${_('Fork')} - -

${c.users_log.pager('$link_previous ~2~ $link_next')}

-%else: - ${_('No actions yet')} -%endif \ No newline at end of file +%else: + ${_('No actions yet')} +%endif diff --git a/rhodecode/templates/admin/ldap/ldap.html b/rhodecode/templates/admin/ldap/ldap.html --- a/rhodecode/templates/admin/ldap/ldap.html +++ b/rhodecode/templates/admin/ldap/ldap.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('Ldap')} + ${_('Ldap')} <%def name="page_nav()"> @@ -19,7 +19,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('ldap_settings'))}

@@ -84,20 +84,12 @@

${_('E-mail Attribute')}

${h.text('ldap_attr_email',class_='small')}

- +

${h.submit('save',_('Save'),class_="ui-button")} -

- - ${h.end_form()} + + ${h.end_form()} - - - - - - - - - + diff --git a/rhodecode/templates/admin/notifications/notifications.html b/rhodecode/templates/admin/notifications/notifications.html --- a/rhodecode/templates/admin/notifications/notifications.html +++ b/rhodecode/templates/admin/notifications/notifications.html @@ -17,12 +17,12 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${_('Compose message')} -

+ +

%if c.notifications:

@@ -46,8 +46,8 @@ YUE.on(YUQ('.delete-notification'),'clic YUE.on(YUQ('.delete-notification'),'click',function(e){ var notification_id = e.currentTarget.id; deleteNotification(url_del,notification_id) - }) + }) }); }) - + diff --git a/rhodecode/templates/admin/notifications/notifications_data.html b/rhodecode/templates/admin/notifications/notifications_data.html --- a/rhodecode/templates/admin/notifications/notifications_data.html +++ b/rhodecode/templates/admin/notifications/notifications_data.html @@ -25,4 +25,4 @@ unread = lambda n:{False:'unread'}.get(n

%else:

${_('No notifications here yet')}

-%endif \ No newline at end of file +%endif diff --git a/rhodecode/templates/admin/notifications/show_notification.html b/rhodecode/templates/admin/notifications/show_notification.html --- a/rhodecode/templates/admin/notifications/show_notification.html +++ b/rhodecode/templates/admin/notifications/show_notification.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(_('Notifications'),h.url('notifications'))} - » + » ${_('Show notification')} @@ -19,12 +19,12 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${_('Compose message')} -

+ +

@@ -51,4 +51,4 @@ var main = "${url('notifications')}"; deleteNotification(url,notification_id,[function(){window.location=main}]) }) - + diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html --- a/rhodecode/templates/admin/permissions/permissions.html +++ b/rhodecode/templates/admin/permissions/permissions.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} » - ${_('Permissions')} + ${_('Permissions')} <%def name="page_nav()"> @@ -19,7 +19,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${_('Default permissions')}

${h.form(url('permission', id='default'),method='put')} @@ -35,21 +35,21 @@ ${h.checkbox('anonymous',True)}

${_('Repository permission')}:

${h.select('default_perm','',c.perms_choices)} - + ${h.checkbox('overwrite_default','true')} - -

${_('Registration')}: @@ -57,7 +57,7 @@

${h.select('default_register','',c.register_choices)}

${_('Repository creation')}: @@ -65,20 +65,13 @@

${h.select('default_create','',c.create_choices)}

- +

${h.submit('set',_('set'),class_="ui-button")} -

+ - + ${h.end_form()} - - - - - - - - + diff --git a/rhodecode/templates/admin/repos/repo_add.html b/rhodecode/templates/admin/repos/repo_add.html --- a/rhodecode/templates/admin/repos/repo_add.html +++ b/rhodecode/templates/admin/repos/repo_add.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repositories'),h.url('repos'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repositories'),h.url('repos'))} » ${_('add new')} @@ -21,8 +21,8 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

<%include file="repo_add_base.html"/> -

- \ No newline at end of file + + diff --git a/rhodecode/templates/admin/repos/repo_add_base.html b/rhodecode/templates/admin/repos/repo_add_base.html --- a/rhodecode/templates/admin/repos/repo_add_base.html +++ b/rhodecode/templates/admin/repos/repo_add_base.html @@ -22,7 +22,7 @@ ${h.form(url('repos'))}

${h.text('clone_uri',class_="small")}

- +

${_('Repository group')}: @@ -30,7 +30,7 @@ ${h.form(url('repos'))}

${h.select('repo_group','',c.repo_groups,class_="medium")}

${_('Type')}: @@ -38,7 +38,7 @@ ${h.form(url('repos'))}

${h.select('repo_type','hg',c.backends,class_="small")}

${_('Description')}: @@ -57,7 +57,7 @@ ${h.form(url('repos'))}

${h.submit('add',_('add'),class_="ui-button")} -

- -${h.end_form()} + +${h.end_form()} diff --git a/rhodecode/templates/admin/repos/repo_add_create_repository.html b/rhodecode/templates/admin/repos/repo_add_create_repository.html --- a/rhodecode/templates/admin/repos/repo_add_create_repository.html +++ b/rhodecode/templates/admin/repos/repo_add_create_repository.html @@ -17,8 +17,8 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

<%include file="repo_add_base.html"/> -

- \ No newline at end of file + + diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html --- a/rhodecode/templates/admin/repos/repo_edit.html +++ b/rhodecode/templates/admin/repos/repo_edit.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repositories'),h.url('repos'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repositories'),h.url('repos'))} » ${_('edit')} » ${h.link_to(c.repo_info.just_name,h.url('summary_home',repo_name=c.repo_name))} @@ -21,7 +21,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}

@@ -42,7 +42,7 @@

${h.text('clone_uri',class_="medium")}

${_('Repository group')}: @@ -50,7 +50,7 @@

${h.select('repo_group','',c.repo_groups,class_="medium")}

${_('Type')}: @@ -58,7 +58,7 @@

${h.select('repo_type','hg',c.backends,class_="medium")}

${_('Description')}: @@ -67,7 +67,7 @@ ${h.textarea('description',cols=23,rows=5)}

- +

${_('Private')}: @@ -83,7 +83,7 @@

${h.checkbox('enable_statistics',value="True")}

${_('Enable downloads')}: @@ -91,7 +91,7 @@

${h.checkbox('enable_downloads',value="True")}

${_('Owner')}: @@ -102,8 +102,8 @@

- - + +

${_('Permissions')}: @@ -111,22 +111,22 @@

<%include file="repo_edit_perms.html"/>

- +

${h.submit('save','Save',class_="ui-button")} ${h.reset('reset','Reset',class_="ui-button")} -

- + ${h.end_form()}

${_('Administration')}

- +

${_('Statistics')}

${h.form(url('repo_stats', repo_name=c.repo_info.repo_name),method='delete')}

@@ -139,9 +139,9 @@

- + ${h.end_form()} - + %if c.repo_info.clone_uri:

${_('Remote')}

${h.form(url('repo_pull', repo_name=c.repo_info.repo_name),method='put')} @@ -151,22 +151,22 @@

${c.repo_info.clone_uri}

+ + - + ${h.end_form()} %endif - +

${_('Cache')}

${h.form(url('repo_cache', repo_name=c.repo_info.repo_name),method='delete')}

${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate repository cache'),class_="ui-btn",onclick="return confirm('"+_('Confirm to invalidate repository cache')+"');")}

+ ${h.end_form()} - +

${_('Public journal')}

${h.form(url('repo_public_journal', repo_name=c.repo_info.repo_name),method='put')}

@@ -183,10 +183,10 @@

${_('''All actions made on this repository will be accessible to everyone in public journal''')}

+ ${h.end_form()} - +

${_('Delete')}

${h.form(url('repo', repo_name=c.repo_info.repo_name),method='delete')}

@@ -195,12 +195,12 @@

${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. +
${_('''This repository will be renamed in a special way in order to be unaccesible for RhodeCode and VCS systems. If you need fully delete it from filesystem please do it manually''')}

- + + ${h.end_form()}

${_('Set as fork')}

@@ -214,11 +214,11 @@

${_('''Manually set this repository as a fork of another''')}

- - + + ${h.end_form()} - + - + diff --git a/rhodecode/templates/admin/repos/repo_edit_perms.html b/rhodecode/templates/admin/repos/repo_edit_perms.html --- a/rhodecode/templates/admin/repos/repo_edit_perms.html +++ b/rhodecode/templates/admin/repos/repo_edit_perms.html @@ -7,7 +7,7 @@ ${_('member')} - ## USERS + ## USERS %for r2p in c.repo_info.repo_to_perm: %if r2p.user.username =='default' and c.repo_info.private: @@ -32,13 +32,13 @@ ${_('revoke')} - %endif + %endif %endif %endfor - - ## USERS GROUPS + + ## USERS GROUPS %for g2p in c.repo_info.users_group_to_perm: ${h.radio('g_perm_%s' % g2p.users_group.users_group_name,'repository.none')} @@ -92,10 +92,10 @@ function ajaxActionUser(user_id, field_i var postData = '_method=delete&user_id=' + user_id; var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; - + function ajaxActionUsersGroup(users_group_id,field_id){ var sUrl = "${h.url('delete_repo_users_group',repo_name=c.repo_name)}"; - var callback = { + var callback = { success:function(o){ var tr = YUD.get(String(field_id)); tr.parentNode.removeChild(tr); @@ -104,7 +104,7 @@ function ajaxActionUsersGroup(users_grou alert("${_('Failed to remove users group')}"); }, }; - var postData = '_method=delete&users_group_id='+users_group_id; + var postData = '_method=delete&users_group_id='+users_group_id; var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; @@ -267,7 +267,7 @@ YAHOO.example.FnMultipleFields = functio membersAC.itemSelectEvent.subscribe(myHandler); if(ownerAC.itemSelectEvent){ - ownerAC.itemSelectEvent.subscribe(myHandler); + ownerAC.itemSelectEvent.subscribe(myHandler); } return { @@ -277,5 +277,5 @@ YAHOO.example.FnMultipleFields = functio ownerAC: ownerAC, }; }(); - - \ No newline at end of file + + diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html --- a/rhodecode/templates/admin/repos/repos.html +++ b/rhodecode/templates/admin/repos/repos.html @@ -20,15 +20,15 @@

${h.link_to(_(u'ADD REPOSITORY'),h.url('new_repo'))} -

+ +

<%cnt=0%> <%namespace name="dt" file="/_data_table/_dt_elements.html"/> - + @@ -41,7 +41,7 @@ - + %for cnt,repo in enumerate(c.repos_list,1): ##LAST REVISION

${_('Action')}
@@ -60,7 +60,7 @@	- ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}	${h.person(repo['contact'])}	@@ -73,9 +73,9 @@

- + - + }); + + diff --git a/rhodecode/templates/admin/repos_groups/repos_groups.html b/rhodecode/templates/admin/repos_groups/repos_groups.html --- a/rhodecode/templates/admin/repos_groups/repos_groups.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups.html @@ -5,12 +5,12 @@ <%def name="breadcrumbs()"> - ${_('Groups')} + ${_('Groups')} %if c.group.parent_group: » ${h.link_to(c.group.parent_group.name,h.url('repos_group_home',group_name=c.group.parent_group.group_name))} %endif » "${c.group.name}" ${_('with')} - + <%def name="page_nav()"> @@ -18,4 +18,4 @@ <%def name="main()"> <%include file="/index_base.html" args="parent=self"/> - + diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_add.html b/rhodecode/templates/admin/repos_groups/repos_groups_add.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_add.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_add.html @@ -5,9 +5,9 @@ ${_('Add repos group')} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repos groups'),h.url('repos_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repos groups'),h.url('repos_groups'))} » ${_('add new repos group')} @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('repos_groups'))} @@ -35,7 +35,7 @@ ${h.text('group_name',class_='medium')}

- +

${_('Description')}: @@ -44,7 +44,7 @@ ${h.textarea('group_description',cols=23,rows=5,class_="medium")}

- +

${_('Group parent')}: @@ -52,13 +52,13 @@

${h.select('group_parent_id','',c.repo_groups,class_="medium")}

- +

${h.submit('save',_('save'),class_="ui-button")} -

+ ${h.end_form()} - - + + diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html @@ -5,9 +5,9 @@ ${_('Edit repos group')} ${c.repos_group.name} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Repos groups'),h.url('repos_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Repos groups'),h.url('repos_groups'))} » ${_('edit repos group')} "${c.repos_group.name}" @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('repos_group',id=c.repos_group.group_id),method='put')} @@ -35,7 +35,7 @@ ${h.text('group_name',class_='medium')}

- +

${_('Description')}: @@ -44,7 +44,7 @@ ${h.textarea('group_description',cols=23,rows=5,class_="medium")}

- +

${_('Group parent')}: @@ -52,13 +52,13 @@

${h.select('group_parent_id','',c.repo_groups,class_="medium")}

- +

${h.submit('save',_('save'),class_="ui-button")} -

+ ${h.end_form()} - - + + diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_show.html b/rhodecode/templates/admin/repos_groups/repos_groups_show.html --- a/rhodecode/templates/admin/repos_groups/repos_groups_show.html +++ b/rhodecode/templates/admin/repos_groups/repos_groups_show.html @@ -20,14 +20,14 @@

${h.link_to(_(u'ADD NEW GROUP'),h.url('new_repos_group'))} -

+ +

% if c.groups: - + @@ -36,9 +36,9 @@ - + ## REPO GROUPS - + % for gr in c.groups: + % endfor - +

${_('Group name')}	${_('action')}
@@ -53,16 +53,16 @@ ${h.form(url('repos_group', id=gr.group_id),method='delete')} ${h.submit('remove_%s' % gr.name,'delete',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this group: %s') % gr.name+"');")} ${h.end_form()} -

% else: ${_('There are no repositories groups yet')} % endif - +

- - - + + + diff --git a/rhodecode/templates/admin/settings/hooks.html b/rhodecode/templates/admin/settings/hooks.html --- a/rhodecode/templates/admin/settings/hooks.html +++ b/rhodecode/templates/admin/settings/hooks.html @@ -17,10 +17,10 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

- +

${_('Built in hooks - read only')}

@@ -36,29 +36,29 @@ % endfor

- +

${_('Custom hooks')}

${h.form(url('admin_setting', setting_id='hooks'),method='put')}

- + % for hook in c.custom_hooks:

${hook.ui_key}

${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)} ${h.text('hook_ui_value_new',hook.ui_value,size=60)} - ${_('remove')}

- % endfor - + % endfor +

@@ -71,7 +71,7 @@

${h.submit('save',_('Save'),class_="ui-button")} -

${h.end_form()} @@ -92,5 +92,5 @@ function ajaxActionHook(hook_id,field_id var request = YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); }; - - + + diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html +++ b/rhodecode/templates/admin/settings/settings.html @@ -17,15 +17,15 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

- +

${_('Remap and rescan repositories')}

${h.form(url('admin_setting', setting_id='mapping'),method='put')}

- +

@@ -40,19 +40,19 @@

- +

${h.submit('rescan',_('Rescan repositories'),class_="ui-button")} -

${h.end_form()} - +

${_('Whoosh indexing')}

${h.form(url('admin_setting', setting_id='whoosh'),method='put')}

- +

@@ -65,21 +65,21 @@

- +

${h.submit('reindex',_('Reindex'),class_="ui-button")} -

- + ${h.end_form()} - -

${_('Global application settings')}

+ +

${_('Global application settings')}

${h.form(url('admin_setting', setting_id='global'),method='put')}

- +

${_('Application name')}: @@ -88,7 +88,7 @@ ${h.text('rhodecode_title',size=30)}

- +

${_('Realm text')}: @@ -97,7 +97,7 @@ ${h.text('rhodecode_realm',size=30)}

- +

${_('GA code')}: @@ -106,22 +106,22 @@ ${h.text('rhodecode_ga_code',size=30)}

- +

${h.submit('save',_('Save settings'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

- + ${h.end_form()} -

${_('Mercurial settings')}

${h.form(url('admin_setting', setting_id='mercurial'),method='put')}

- +

${_('Web')}: @@ -132,7 +132,7 @@ ${_('require ssl for pushing')}

@@ -154,32 +154,32 @@

${h.checkbox('hooks_preoutgoing_pull_logger','True')} ${_('Log user pull commands')} -

${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")} -

- + +

${_('Repositories location')}:

- ${h.text('paths_root_path',size=30,readonly="readonly")} -

- +

${h.submit('save',_('Save settings'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

+ - + ${h.end_form()} - + - +

${_('Test Email')}

${h.form(url('admin_setting', setting_id='email'),method='put')}

- +

@@ -202,13 +202,13 @@ ${h.text('test_email',size=30)}

- +

${h.submit('send',_('Send'),class_="ui-button")} -

- - ${h.end_form()} - + + ${h.end_form()} + - + diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html --- a/rhodecode/templates/admin/users/user_add.html +++ b/rhodecode/templates/admin/users/user_add.html @@ -5,9 +5,9 @@ ${_('Add user')} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users'),h.url('users'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users'),h.url('users'))} » ${_('add new user')} @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('users'))} @@ -35,7 +35,7 @@ ${h.text('username',class_='small')}

- +

${_('Password')}: @@ -44,7 +44,7 @@ ${h.password('password',class_='small')}

- +

${_('Password confirmation')}: @@ -52,8 +52,8 @@

${h.password('password_confirmation',class_="small",autocomplete="off")}

- +

${_('First Name')}: @@ -62,7 +62,7 @@ ${h.text('name',class_='small')}

- +

${_('Last Name')}: @@ -71,7 +71,7 @@ ${h.text('lastname',class_='small')}

- +

${_('Email')}: @@ -80,7 +80,7 @@ ${h.text('email',class_='small')}

- +

${_('Active')}: @@ -89,12 +89,12 @@ ${h.checkbox('active',value=True)}

- +

${h.submit('save',_('save'),class_="ui-button")} -

+ ${h.end_form()} - - + + diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users'),h.url('users'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users'),h.url('users'))} » ${_('edit')} "${c.user.username}" @@ -21,7 +21,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('update_user', id=c.user.user_id),method='put')} @@ -35,7 +35,7 @@
${_('Using')} ${c.user.email} %else:
${c.user.email} - %endif + %endif

@@ -43,7 +43,7 @@ ${_('API key')} ${c.user.api_key}

- +

@@ -53,7 +53,7 @@ ${h.text('username',class_='medium')}

- +

${_('LDAP DN')}: @@ -62,7 +62,7 @@ ${h.text('ldap_dn',class_='medium')}

- +

${_('New password')}: @@ -71,7 +71,7 @@ ${h.password('new_password',class_='medium',autocomplete="off")}

- +

${_('New password confirmation')}: @@ -80,7 +80,7 @@ ${h.password('password_confirmation',class_="medium",autocomplete="off")}

- +

${_('First Name')}: @@ -89,7 +89,7 @@ ${h.text('name',class_='medium')}

- +

${_('Last Name')}: @@ -98,7 +98,7 @@ ${h.text('lastname',class_='medium')}

- +

${_('Email')}: @@ -107,7 +107,7 @@ ${h.text('email',class_='medium')}

- +

${_('Active')}: @@ -116,7 +116,7 @@ ${h.checkbox('active',value=True)}

- +

${_('Admin')}: @@ -124,19 +124,19 @@

${h.checkbox('admin',value=True)}

${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

+ + ${h.end_form()}

${_('Permissions')}

${h.form(url('user_perm', id=c.user.user_id),method='put')}

@@ -153,9 +153,9 @@

${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

+ - ${h.end_form()} + ${h.end_form()} diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html --- a/rhodecode/templates/admin/users/user_edit_my_account.html +++ b/rhodecode/templates/admin/users/user_edit_my_account.html @@ -18,13 +18,13 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('admin_settings_my_account_update'),method='put')}

- +

@@ -34,15 +34,15 @@
${_('Using')} ${c.user.email} %else:
${c.user.email} - %endif + %endif

${_('API key')} ${c.user.api_key}

@@ -52,7 +52,7 @@ ${h.text('username',class_="medium")}

- +

${_('New password')}: @@ -61,7 +61,7 @@ ${h.password('new_password',class_="medium",autocomplete="off")}

- +

${_('New password confirmation')}: @@ -70,7 +70,7 @@ ${h.password('password_confirmation',class_="medium",autocomplete="off")}

- +

${_('First Name')}: @@ -79,7 +79,7 @@ ${h.text('name',class_="medium")}

- +

${_('Last Name')}: @@ -88,7 +88,7 @@ ${h.text('lastname',class_="medium")}

- +

${_('Email')}: @@ -97,31 +97,31 @@ ${h.text('email',class_="medium")}

- +

${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

- + ${h.end_form()} - +

- +

+ ${_('My repositories')}

%if h.HasPermissionAny('hg.admin','hg.create.repository')():

${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))} -

- %endif + + + %endif

@@ -130,7 +130,7 @@ ${_('Name')} ${_('revision')} - ${_('action')} + ${_('action')} %if c.user_repos: @@ -142,34 +142,34 @@ %elif repo['dbrepo']['repo_type'] =='git': $${_('Git repository')}$ %else: - - %endif + + %endif %if repo['dbrepo']['private']: $${_('private')}$ %else: $${_('public')}$ %endif - + ${h.link_to(repo['name'], h.url('summary_home',repo_name=repo['name']),class_="repo_name")} %if repo['dbrepo_fork']: $${_('public')}$ - %endif - + %endif + $${_('private')}$ ${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo['name']+"');")} - ${h.end_form()} + ${h.end_form()} %endfor %else:

- ${_('No repositories yet')} + ${_('No repositories yet')} %if h.HasPermissionAny('hg.admin','hg.create.repository')(): ${h.link_to(_('create one now'),h.url('admin_settings_create_repository'),class_="ui-btn")} %endif @@ -187,4 +187,4 @@ var func = function(node){ } q_filter(target,nodes,func); - + diff --git a/rhodecode/templates/admin/users/users.html b/rhodecode/templates/admin/users/users.html --- a/rhodecode/templates/admin/users/users.html +++ b/rhodecode/templates/admin/users/users.html @@ -22,8 +22,8 @@

${h.link_to(_(u'ADD NEW USER'),h.url('new_user'))}

- - + +

diff --git a/rhodecode/templates/admin/users_groups/users_group_add.html b/rhodecode/templates/admin/users_groups/users_group_add.html --- a/rhodecode/templates/admin/users_groups/users_group_add.html +++ b/rhodecode/templates/admin/users_groups/users_group_add.html @@ -5,9 +5,9 @@ ${_('Add users group')} - ${c.rhodecode_name} <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('Users groups'),h.url('users_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('Users groups'),h.url('users_groups'))} » ${_('add new users group')} @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('users_groups'))} @@ -35,7 +35,7 @@ ${h.text('users_group_name',class_='small')}

- +

${_('Active')}: @@ -44,12 +44,12 @@ ${h.checkbox('users_group_active',value=True)}

- +

${h.submit('save',_('save'),class_="ui-button")} -

${h.end_form()} - - + + diff --git a/rhodecode/templates/admin/users_groups/users_group_edit.html b/rhodecode/templates/admin/users_groups/users_group_edit.html --- a/rhodecode/templates/admin/users_groups/users_group_edit.html +++ b/rhodecode/templates/admin/users_groups/users_group_edit.html @@ -6,9 +6,9 @@ <%def name="breadcrumbs_links()"> - ${h.link_to(_('Admin'),h.url('admin_home'))} - » - ${h.link_to(_('UsersGroups'),h.url('users_groups'))} + ${h.link_to(_('Admin'),h.url('admin_home'))} + » + ${h.link_to(_('UsersGroups'),h.url('users_groups'))} » ${_('edit')} "${c.users_group.users_group_name}" @@ -21,7 +21,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('users_group', id=c.users_group.users_group_id),method='put', id='edit_users_group')} @@ -36,7 +36,7 @@ ${h.text('users_group_name',class_='small')}

- +

${_('Active')}: @@ -50,7 +50,7 @@ ${_('Members')}:

- +

- -

@@ -63,12 +63,12 @@

@@ -77,41 +77,41 @@

${_('Add all elements')} -

+ + + +

- +

${h.submit('save',_('save'),class_="ui-button")} -

- - -${h.end_form()} + + + +${h.end_form()} - + +

${_('Permissions')}

${h.form(url('users_group_perm', id=c.users_group.users_group_id), method='put')}

@@ -262,9 +262,9 @@ ${h.end_form()}

${h.submit('save',_('Save'),class_="ui-button")} ${h.reset('reset',_('Reset'),class_="ui-button")} -

+ - ${h.end_form()} + ${h.end_form()} - + diff --git a/rhodecode/templates/admin/users_groups/users_groups.html b/rhodecode/templates/admin/users_groups/users_groups.html --- a/rhodecode/templates/admin/users_groups/users_groups.html +++ b/rhodecode/templates/admin/users_groups/users_groups.html @@ -22,8 +22,8 @@

${h.link_to(_(u'ADD NEW USER GROUP'),h.url('new_users_group'))}

- - + +

diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -17,8 +17,8 @@

${h.text('username',class_='focus',size=40)}

- -

+ +

${_('Password')}: @@ -26,29 +26,29 @@

${h.password('password',class_='focus',size=40)}

- +

${h.link_to(_('Forgot password ?'),h.url('reset_password'))}

%if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): ${h.link_to(_("Don't have an account ?"),h.url('register'))} - %endif + %endif

${h.submit('sign_in',_('Sign In'),class_="ui-button")}

${h.end_form()} - - + +

%if c.rhodecode_user.username == 'default': - ${_('Public journal')} - %else: + ${_('Public journal')} + %else:

${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))}

@@ -56,7 +56,7 @@ ${c.unread_notifications}

%endif - +

${_('Home')} @@ -82,11 +82,11 @@ ${self.body()} - + - + -

<% messages = h.flash.pop_messages() %> % if messages: @@ -96,11 +96,11 @@ % endfor % endif -

${next.main()}

@@ -111,7 +111,7 @@ ${_('Submit a bug')}

@@ -132,13 +132,13 @@ <%def name="menu(current=None)"> - <% + <% def is_current(selected): if selected == current: return h.literal('class="current"') %> - %if current not in ['home','admin']: - ##REGULAR MENU + %if current not in ['home','admin']: + ##REGULAR MENU

@@ -146,7 +146,7 @@ $${_('Products')}$ - ↓ + ↓
- @@ -154,58 +154,58 @@
$${_('Summary')}$ - ${_('Summary')} - + ${_('Summary')} +
## ## ## $${_('Shortlog')}$ ## - ## ${_('Shortlog')} - ## - ##

${_('Shortlog')}

$${_('Changelog')}$ - ${_('Changelog')} - -

${_('Changelog')}

$${_('Switch to')}$ - ${_('Switch to')} - + ${_('Switch to')} +
- ${_('loading...')}
+

$${_('Files')}$ - ${_('Files')} - -

- + ${_('Files')} + + +

$${_('Admin')}$ - ${_('Options')} + ${_('Options')}

${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}
${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}
- ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} + ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} <%def name="admin_menu()">
- ${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}
- ${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}
- ${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}
- ${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}
- ${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}
- ${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}
- + ${admin_menu()}

- +

@@ -255,7 +255,7 @@ ${c.repository_forks} -

+ + %else: ##ROOT MENU

$${_('Home')}$

${_('Home')}

@@ -307,8 +307,8 @@ $${_('Journal')}$ - ${_('Journal')} - + ${_('Journal')} +
@@ -316,17 +316,17 @@ $${_('Search')}$ - ${_('Search')} - + ${_('Search')} +
$${_('Admin')}$ - ${_('Admin')} + ${_('Admin')} ${admin_menu()}

@@ -10,24 +10,24 @@ %for cnt,book in enumerate(c.repo_bookmarks.items()): - + - + + %endfor

${h.link_to(book[0], h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))}	${book[1].date}	${book[1].date}	${h.person(book[1].author)}	r${book[1].revision}:${h.short_id(book[1].raw_id)} -

%else: ${_('There are no bookmarks yet')} -%endif \ No newline at end of file +%endif diff --git a/rhodecode/templates/branches/branches.html b/rhodecode/templates/branches/branches.html --- a/rhodecode/templates/branches/branches.html +++ b/rhodecode/templates/branches/branches.html @@ -8,14 +8,14 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('branches')} <%def name="page_nav()"> - ${self.menu('branches')} + ${self.menu('branches')} <%def name="main()"> @@ -61,7 +61,7 @@ var myDataTable = new YAHOO.widget.DataT MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -69,9 +69,9 @@ myDataTable.subscribe('postRenderEvent', var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func); -}); + q_filter('q_filter_branches',YUQ('div.table tr td .logtags .branchtag a'),func); +}); - \ No newline at end of file + diff --git a/rhodecode/templates/branches/branches_data.html b/rhodecode/templates/branches/branches_data.html --- a/rhodecode/templates/branches/branches_data.html +++ b/rhodecode/templates/branches/branches_data.html @@ -1,5 +1,5 @@ %if c.repo_branches: -

@@ -15,14 +15,14 @@ ${h.link_to(branch[0], h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - + - + %endfor @@ -33,9 +33,9 @@ ${h.link_to(branch[0]+' [closed]', h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} - + - + - + ## REPO GROUPS % for gr in c.groups: @@ -41,7 +41,7 @@ ## % endfor - +

${h.person(branch[1].author)}

r${branch[1].revision}:${h.short_id(branch[1].raw_id)}

${h.person(branch[1].author)}

@@ -49,4 +49,4 @@

%else: ${_('There are no branches yet')} -%endif \ No newline at end of file +%endif diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -11,11 +11,11 @@ ${c.repo_name} ${_('Changelog')} - ${c.r » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » - ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} + ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')} <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} <%def name="main()"> @@ -42,7 +42,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

${h.select('branch_filter',c.branch_name,c.branch_filters)}

- + %for cnt,cs in enumerate(c.pagination):

@@ -61,7 +61,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

${h.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

↓ ${_('show more')} ↓

@@ -73,7 +73,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

- %endif + %endif

%if cs.parents: @@ -83,10 +83,10 @@ ${c.repo_name} ${_('Changelog')} - ${c.r h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} %endfor - %else: -

${_('No parents')}

- %endif - + %else: +

${_('No parents')}

+ %endif + %if len(cs.parents)>1: ${_('merge')} @@ -99,26 +99,26 @@ ${c.repo_name} ${_('Changelog')} - ${c.r ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} %endfor - - + + - + %endfor

${c.pagination.pager('$link_previous ~2~ $link_next')} -

+ - + %else: ${_('There are no changes yet')} - %endif + %endif - + diff --git a/rhodecode/templates/changelog/changelog_details.html b/rhodecode/templates/changelog/changelog_details.html --- a/rhodecode/templates/changelog/changelog_details.html +++ b/rhodecode/templates/changelog/changelog_details.html @@ -1,9 +1,9 @@ -% if len(c.cs.affected_files) <= c.affected_files_cut_off: +% if len(c.cs.affected_files) <= c.affected_files_cut_off: % else: - -% endif \ No newline at end of file + +% endif diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -15,7 +15,7 @@ <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} <%def name="main()"> @@ -53,17 +53,17 @@

- % if len(c.changeset.affected_files) <= c.affected_files_cut_off: + % if len(c.changeset.affected_files) <= c.affected_files_cut_off: ${len(c.changeset.removed)} ${len(c.changeset.changed)} ${len(c.changeset.added)} % else: ! ! - ! - % endif -

- + ! + % endif +

+ %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents):

${_('Parent')} @@ -71,9 +71,9 @@ h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}

%endfor - %else: -

${_('No parents')}

- %endif + %else: +

${_('No parents')}

+ %endif %if len(c.changeset.parents)>1: ${_('merge')} @@ -84,8 +84,8 @@ ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endfor - - + + ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)} @@ -106,21 +106,21 @@ % if c.cut_off: ${_('Changeset was too big and was cut off...')} % endif - + - + - - ## diff block + + ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> ${diff_block.diff_block(c.changes)} - + ## template for inline comment form <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> ${comment.comment_inline_form(c.changeset)} - + ${comment.comments(c.changeset)} - + - + + + diff --git a/rhodecode/templates/changeset/changeset_file_comment.html b/rhodecode/templates/changeset/changeset_file_comment.html --- a/rhodecode/templates/changeset/changeset_file_comment.html +++ b/rhodecode/templates/changeset/changeset_file_comment.html @@ -1,105 +1,105 @@ -## -*- coding: utf-8 -*- -## usage: -## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> -## ${comment.comment_block(co)} -## -<%def name="comment_block(co)"> -

- -

- ${co.author.username} - - - ${h.age(co.modified_at)} - - %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id: - - ${_('Delete')} - - %endif -

- ${h.rst_w_mentions(co.text)|n} -

- - - -<%def name="comment_inline_form(changeset)"> - - - - -<%def name="comments(changeset)"> - -

${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})

- - %for path, lines in c.inline_comments: - - %endfor - - %for co in c.comments: - ${comment_block(co)} - %endfor - %if c.rhodecode_user.username != 'default': -

- ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))} - ${_('Leave a comment')} -

- ${_('Comments parsed using')} RST ${_('syntax')} - ${_('with')} ${_('support')} -

- ${h.textarea('text')} -

- ${h.submit('save', _('Comment'), class_='ui-button')} -

- ${h.end_form()} -

- %endif -

- +## -*- coding: utf-8 -*- +## usage: +## <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> +## ${comment.comment_block(co)} +## +<%def name="comment_block(co)"> +

+ +

+ ${co.author.username} + + + ${h.age(co.modified_at)} + + %if h.HasPermissionAny('hg.admin', 'repository.admin')() or co.author.user_id == c.rhodecode_user.user_id: + + ${_('Delete')} + + %endif +

+ ${h.rst_w_mentions(co.text)|n} +

+ + + +<%def name="comment_inline_form(changeset)"> + + + + +<%def name="comments(changeset)"> + +

${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})

+ + %for path, lines in c.inline_comments: + + %endfor + + %for co in c.comments: + ${comment_block(co)} + %endfor + %if c.rhodecode_user.username != 'default': +

+ ${h.form(h.url('changeset_comment', repo_name=c.repo_name, revision=changeset.raw_id))} + ${_('Leave a comment')} +

+ ${_('Comments parsed using')} RST ${_('syntax')} + ${_('with')} ${_('support')} +

+ ${h.textarea('text')} +

+ ${h.submit('save', _('Comment'), class_='ui-button')} +

+ ${h.end_form()} +

+ %endif +

+ diff --git a/rhodecode/templates/changeset/changeset_range.html b/rhodecode/templates/changeset/changeset_range.html --- a/rhodecode/templates/changeset/changeset_range.html +++ b/rhodecode/templates/changeset/changeset_range.html @@ -14,7 +14,7 @@ <%def name="page_nav()"> - ${self.menu('changelog')} + ${self.menu('changelog')} <%def name="main()"> @@ -26,7 +26,7 @@

${_('Compare View')}

${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

@@ -53,28 +53,28 @@ %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:

${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}

%endfor - %endfor -

+ %endfor +

- + <%namespace name="comment" file="/changeset/changeset_file_comment.html"/> <%namespace name="diff_block" file="/changeset/diff_block.html"/> %for cs in c.cs_ranges: - ##${comment.comment_inline_form(cs)} + ##${comment.comment_inline_form(cs)} ## diff block

${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}

${diff_block.diff_block(c.changes[cs.raw_id])} ##${comment.comments(cs)} - %endfor + %endfor + - \ No newline at end of file + diff --git a/rhodecode/templates/changeset/diff_block.html b/rhodecode/templates/changeset/diff_block.html --- a/rhodecode/templates/changeset/diff_block.html +++ b/rhodecode/templates/changeset/diff_block.html @@ -31,11 +31,11 @@

%endif %endfor - \ No newline at end of file + diff --git a/rhodecode/templates/changeset/raw_changeset.html b/rhodecode/templates/changeset/raw_changeset.html --- a/rhodecode/templates/changeset/raw_changeset.html +++ b/rhodecode/templates/changeset/raw_changeset.html @@ -5,4 +5,4 @@ ${c.parent_tmpl} ${c.changeset.message} -${c.diffs|n} \ No newline at end of file +${c.diffs|n} diff --git a/rhodecode/templates/email_templates/changeset_comment.html b/rhodecode/templates/email_templates/changeset_comment.html --- a/rhodecode/templates/email_templates/changeset_comment.html +++ b/rhodecode/templates/email_templates/changeset_comment.html @@ -3,4 +3,4 @@

${subject}

-${body} \ No newline at end of file +${body} diff --git a/rhodecode/templates/email_templates/default.html b/rhodecode/templates/email_templates/default.html --- a/rhodecode/templates/email_templates/default.html +++ b/rhodecode/templates/email_templates/default.html @@ -1,4 +1,4 @@ ## -*- coding: utf-8 -*- <%inherit file="main.html"/> -${body} \ No newline at end of file +${body} diff --git a/rhodecode/templates/email_templates/main.html b/rhodecode/templates/email_templates/main.html --- a/rhodecode/templates/email_templates/main.html +++ b/rhodecode/templates/email_templates/main.html @@ -6,4 +6,4 @@ ${self.body()}

${_('This is an notification from RhodeCode.')} - \ No newline at end of file + diff --git a/rhodecode/templates/email_templates/password_reset.html b/rhodecode/templates/email_templates/password_reset.html --- a/rhodecode/templates/email_templates/password_reset.html +++ b/rhodecode/templates/email_templates/password_reset.html @@ -9,4 +9,4 @@ You can generate it by clicking followin ${reset_url} -If you didn't request new password please ignore this email. \ No newline at end of file +If you didn't request new password please ignore this email. diff --git a/rhodecode/templates/email_templates/registration.html b/rhodecode/templates/email_templates/registration.html --- a/rhodecode/templates/email_templates/registration.html +++ b/rhodecode/templates/email_templates/registration.html @@ -6,4 +6,4 @@ A new user have registered in RhodeCode ${body} -View this user here :${registered_user_url} \ No newline at end of file +View this user here :${registered_user_url} diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -6,10 +6,10 @@ %if c.redirect_time: - %endif + %endif - + - +

${c.rhodecode_name}

${c.error_message}

- +

${c.error_explanation}

- + %if c.redirect_time:

${_('You will be redirected to %s in %s seconds') % (c.redirect_module,c.redirect_time)}

- %endif - + %endif +

- + - diff --git a/rhodecode/templates/files/file_diff.html b/rhodecode/templates/files/file_diff.html --- a/rhodecode/templates/files/file_diff.html +++ b/rhodecode/templates/files/file_diff.html @@ -13,7 +13,7 @@ <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} <%def name="main()">

@@ -22,17 +22,17 @@ ${self.breadcrumbs()}

- ## diff block + ## diff block <%namespace name="diff_block" file="/changeset/diff_block.html"/> - ${diff_block.diff_block(c.changes)} + ${diff_block.diff_block(c.changes)}

+ - - - \ No newline at end of file + diff --git a/rhodecode/templates/files/files.html b/rhodecode/templates/files/files.html --- a/rhodecode/templates/files/files.html +++ b/rhodecode/templates/files/files.html @@ -12,11 +12,11 @@ ${_('files')} %if c.file: @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - %endif + %endif <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} <%def name="main()"> @@ -27,15 +27,15 @@

${_('branch')}: ${c.changeset.branch} -

+ +

<%include file='files_ypjax.html'/> -

- + - \ No newline at end of file + diff --git a/rhodecode/templates/files/files_add.html b/rhodecode/templates/files/files_add.html --- a/rhodecode/templates/files/files_add.html +++ b/rhodecode/templates/files/files_add.html @@ -20,7 +20,7 @@ <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} <%def name="main()">

@@ -31,8 +31,8 @@

${_('branch')}: ${c.cs.branch} -

- + +

@@ -48,14 +48,14 @@ ${_('or')} ${_('Upload file')}

@@ -66,11 +66,11 @@ ${_('use / to separate directories')}

- + - +

-			        
+			    
                     
@@ -84,9 +84,9 @@
 			${h.end_form()}
 			
-		
    
+

- - \ No newline at end of file + + diff --git a/rhodecode/templates/files/files_annotate.html b/rhodecode/templates/files/files_annotate.html --- a/rhodecode/templates/files/files_annotate.html +++ b/rhodecode/templates/files/files_annotate.html @@ -13,7 +13,7 @@ <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} <%def name="main()">

@@ -23,8 +23,8 @@

${_('branch')}: ${c.cs.branch} -

+ +

@@ -40,24 +40,24 @@ ${h.submit('show_rev','show at revision',class_="ui-btn")} ${h.end_form()}

- +

${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}

${h.format_byte_size(c.file.size,binary=True)}

${c.file.mimetype}

${h.link_to(_('show source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} - ${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")} + ${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")} ${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")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")} % endif - % endif + % endif

@@ -71,7 +71,7 @@

 			       %if c.file.is_binary:
 			           ${_('Binary file (%s)') % c.file.mimetype}
-			       %else:				
+			       %else:
 					% if c.file.size < c.cut_off_limit:
 						${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 					%else:
@@ -81,13 +81,13 @@
 			       					
-				   %endif				
+			       
+				   %endif
 				

+ +

- - + + diff --git a/rhodecode/templates/files/files_browser.html b/rhodecode/templates/files/files_browser.html --- a/rhodecode/templates/files/files_browser.html +++ b/rhodecode/templates/files/files_browser.html @@ -10,12 +10,12 @@

${h.form(h.url.current())}

- ${_('view')}@rev + ${_('view')}@rev « ${h.text('at_rev',value=c.changeset.revision,size=5)} » ## ${h.submit('view',_('view'),class_="ui-btn")} -

${h.end_form()}

@@ -26,20 +26,20 @@

${_('search file list')}

- % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

${_('add new file')}

- % endif + % endif

- - +

@@ -52,11 +52,11 @@ - + %if c.file.parent: - @@ -66,7 +66,7 @@ %endif - + %for cnt,node in enumerate(c.file): %endfor - +

${_('Last commiter')}
+	${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
@@ -75,7 +75,7 @@	%if node.is_file(): ${h.format_byte_size(node.size,binary=True)} - %endif + %endif	%if node.is_file(): @@ -100,13 +100,13 @@ ${h.person(node.last_changeset.author)} - %endif + %endif

- \ No newline at end of file + diff --git a/rhodecode/templates/files/files_edit.html b/rhodecode/templates/files/files_edit.html --- a/rhodecode/templates/files/files_edit.html +++ b/rhodecode/templates/files/files_edit.html @@ -20,7 +20,7 @@ <%def name="page_nav()"> - ${self.menu('files')} + ${self.menu('files')} <%def name="main()">

@@ -31,8 +31,8 @@

${_('branch')}: ${c.cs.branch} -

- + +

@@ -42,22 +42,22 @@

${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}

${h.format_byte_size(c.file.size,binary=True)}

${c.file.mimetype}

${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")} - ${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")} + ${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")} ${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")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${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")} % endif - % endif + % endif

${_('Editing file')}: ${c.file.path}

${_('commit message')}

@@ -72,7 +72,7 @@ var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.file.path)}"; initCodeMirror('editor',reset_url); -

+ - - \ No newline at end of file + + diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html +++ b/rhodecode/templates/files/files_source.html @@ -11,23 +11,23 @@ - +

${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}

${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}

${h.format_byte_size(c.file.size,binary=True)}

${c.file.mimetype}

${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} - ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} - % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): + % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} % endif - % endif + % endif

@@ -51,9 +51,9 @@ - %endif + %endif

diff --git a/rhodecode/templates/files/files_ypjax.html b/rhodecode/templates/files/files_ypjax.html --- a/rhodecode/templates/files/files_ypjax.html +++ b/rhodecode/templates/files/files_ypjax.html @@ -5,11 +5,11 @@ %if c.file.is_dir(): <%include file='files_browser.html'/> %else: - <%include file='files_source.html'/> - %endif + <%include file='files_source.html'/> + %endif %else:

- ${_('Go back')} - ${_('No files at given path')}: "${c.f_path or "/"}" + ${_('Go back')} + ${_('No files at given path')}: "${c.f_path or "/"}"

%endif diff --git a/rhodecode/templates/followers/followers.html b/rhodecode/templates/followers/followers.html --- a/rhodecode/templates/followers/followers.html +++ b/rhodecode/templates/followers/followers.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('followers')} @@ -26,7 +26,7 @@

${c.followers_data} -

- - \ No newline at end of file + + diff --git a/rhodecode/templates/followers/followers_data.html b/rhodecode/templates/followers/followers_data.html --- a/rhodecode/templates/followers/followers_data.html +++ b/rhodecode/templates/followers/followers_data.html @@ -9,11 +9,11 @@ ${f.user.username} (${f.user.name} ${f.user.lastname})

${_('Started following')} - +

${_('Started following')} -

-% endfor + +% endfor

${c.followers_pager.pager('$link_previous ~2~ $link_next')} -

\ No newline at end of file + diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html --- a/rhodecode/templates/forks/fork.html +++ b/rhodecode/templates/forks/fork.html @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} » - ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} + ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} » ${_('fork')} @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}

@@ -43,7 +43,7 @@

${h.select('repo_group','',c.repo_groups,class_="medium")}

${_('Description')}: @@ -67,7 +67,7 @@

${h.checkbox('copy_permissions',value="True")}

${_('Update after clone')}: @@ -75,12 +75,12 @@

${h.checkbox('update_after_clone',value="True")}

${h.submit('',_('fork this repository'),class_="ui-button")} -

+ - - ${h.end_form()} + + ${h.end_form()} - + diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html --- a/rhodecode/templates/forks/forks.html +++ b/rhodecode/templates/forks/forks.html @@ -7,7 +7,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('forks')} @@ -26,7 +26,7 @@

${c.forks_data} -

- - \ No newline at end of file + + diff --git a/rhodecode/templates/forks/forks_data.html b/rhodecode/templates/forks/forks_data.html --- a/rhodecode/templates/forks/forks_data.html +++ b/rhodecode/templates/forks/forks_data.html @@ -8,15 +8,15 @@ gravatar

- ${f.user.username} (${f.user.name} ${f.user.lastname}) / + ${f.user.username} (${f.user.name} ${f.user.lastname}) / ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}

${f.description}

${_('forked')} - +

${_('forked')} -

% endfor

@@ -29,7 +29,7 @@ }); ${c.forks_pager.pager('$link_previous ~2~ $link_next')} -

+ % else: - ${_('There are no forks yet')} -% endif \ No newline at end of file + ${_('There are no forks yet')} +% endif diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html --- a/rhodecode/templates/index.html +++ b/rhodecode/templates/index.html @@ -5,4 +5,4 @@ <%def name="page_nav()">${self.menu('home')} <%def name="main()"> <%include file="index_base.html" args="parent=self"/> - + diff --git a/rhodecode/templates/index_base.html b/rhodecode/templates/index_base.html --- a/rhodecode/templates/index_base.html +++ b/rhodecode/templates/index_base.html @@ -1,17 +1,17 @@ -<%page args="parent" /> +<%page args="parent" />

- ${parent.breadcrumbs()} 0 ${_('repositories')} + ${parent.breadcrumbs()} 0 ${_('repositories')}

%if c.rhodecode_user.username != 'default': %if h.HasPermissionAny('hg.admin','hg.create.repository')():

${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))} -

+ + %endif %endif

@@ -27,7 +27,7 @@ ##

${_('Number of repositories')}

${gr.repositories.count()}

@@ -52,7 +52,7 @@

<%cnt=0%> <%namespace name="dt" file="/_data_table/_dt_elements.html"/> - + @@ -87,7 +87,7 @@ ##LAST REVISION ## @@ -96,8 +96,8 @@ %else: - %endif: - + %endif: + - + <%namespace name="dt" file="/_data_table/_dt_elements.html"/> @@ -66,14 +66,14 @@ ##LAST REVISION ## %endfor @@ -82,14 +82,14 @@ %else:

- %endif + %endif - +

- ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}	${h.person(repo['contact'])}	%if c.rhodecode_user.username != 'default': @@ -113,7 +113,7 @@ \ No newline at end of file + q_filter('q_filter',YUQ('div.table tr td a.repo_name'),func); + }); + + diff --git a/rhodecode/templates/journal/journal.html b/rhodecode/templates/journal/journal.html --- a/rhodecode/templates/journal/journal.html +++ b/rhodecode/templates/journal/journal.html @@ -10,7 +10,7 @@ ${self.menu('home')} <%def name="main()"> - + @@ -19,25 +19,25 @@ $${_('Refresh')}$ - - - + + + ${c.journal_data} - - + + ${_('My repos')} / ${_('Watched')} %if h.HasPermissionAny('hg.admin','hg.create.repository')(): ${h.link_to(_('ADD'),h.url('admin_settings_create_repository'))} - - - %endif + + + %endif @@ -50,7 +50,7 @@	${_('Name')}	${_('Tip')}	${_('Action')}	${_('Action')}	${_('Action')}
- ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])} + ${dt.revision(repo['name'],repo['rev'],repo['tip'],repo['author'],repo['last_msg'])}	$${_('private')}$	${h.form(url('repo_settings_delete', repo_name=repo['name']),method='delete')} ${h.submit('remove_%s' % repo['name'],'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")} - ${h.end_form()} + ${h.end_form()}

@@ -105,20 +105,20 @@ $${_('user')}$ ${entry.follows_user.full_contact} %endif - + %if entry.follows_repo_id:

- +

- + %if entry.follows_repository.repo_type == 'hg': $${_('Mercurial repository')}$ %elif entry.follows_repository.repo_type == 'git': $${_('Git repository')}$ - %endif - + %endif + %if entry.follows_repository.private: $${_('private repository')}$ %else: @@ -137,12 +137,12 @@

${_('You are not following any users or repositories')}

- %endif - + %endif + - + - + }); + + + + diff --git a/rhodecode/templates/journal/journal_data.html b/rhodecode/templates/journal/journal_data.html --- a/rhodecode/templates/journal/journal_data.html +++ b/rhodecode/templates/journal/journal_data.html @@ -20,7 +20,7 @@ h.url('summary_home',repo_name=entry.repository.repo_name))} %else: ${entry.repository_name} - %endif + %endif

${h.literal(h.action_parser(entry)[1]())}

@@ -30,7 +30,7 @@ %endfor %endfor - +

${c.journal_data}

- - + + diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -15,12 +15,12 @@ % endfor % endif - +

${_('Sign In to')} ${c.rhodecode_name}

${h.form(h.url.current(came_from=c.came_from))}

@@ -33,8 +33,8 @@

${h.text('username',class_='focus',size=40)}

- -

+ +

${_('Password')}: @@ -42,7 +42,7 @@

${h.password('password',class_='focus',size=40)}

- +

@@ -59,7 +59,7 @@

${h.link_to(_('Forgot your password ?'),h.url('reset_password'))} %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): - / + / ${h.link_to(_("Don't have an account ?"),h.url('register'))} %endif

diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -6,7 +6,7 @@

- +

${_('Reset your password to')} ${c.rhodecode_name}

@@ -15,7 +15,7 @@

- +

${_('Email address')}: @@ -24,13 +24,13 @@ ${h.text('email')}

- +

${h.submit('send',_('Reset my password'),class_="ui-button")}

${_('Password reset link will be send to matching email address')}

${h.end_form()} @@ -38,7 +38,6 @@ YUE.onDOMReady(function(){ YUD.get('email').focus(); }) - -

+ +

- diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -4,9 +4,9 @@ <%def name="title()"> ${_('Sign Up')} - ${c.rhodecode_name} - +

- +

${_('Sign Up to')} ${c.rhodecode_name}

@@ -23,7 +23,7 @@ ${h.text('username',class_="medium")}

- +

${_('Password')}: @@ -32,7 +32,7 @@ ${h.password('password',class_="medium")}

- +

${_('Re-enter password')}: @@ -41,7 +41,7 @@ ${h.password('password_confirmation',class_="medium")}

- +

${_('First Name')}: @@ -50,7 +50,7 @@ ${h.text('name',class_="medium")}

- +

${_('Last Name')}: @@ -59,7 +59,7 @@ ${h.text('lastname',class_="medium")}

- +

${_('Email')}: @@ -68,7 +68,7 @@ ${h.text('email',class_="medium")}

- +

${h.submit('sign_up',_('Sign Up'),class_="ui-button")} @@ -78,7 +78,7 @@

${_('Your account must wait for activation by administrator')}

%endif

+ ${h.end_form()} @@ -86,7 +86,6 @@ YUE.onDOMReady(function(){ YUD.get('username').focus(); }) - - + + - diff --git a/rhodecode/templates/repo_switcher_list.html b/rhodecode/templates/repo_switcher_list.html --- a/rhodecode/templates/repo_switcher_list.html +++ b/rhodecode/templates/repo_switcher_list.html @@ -3,9 +3,9 @@

- + %for repo in c.repos_list: - + %if repo['dbrepo']['private']:

$${_('Private repository')}$ @@ -16,5 +16,5 @@ $${_('Public repository')}$ ${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']),class_="repo_name %s" % repo['dbrepo']['repo_type'])}

- %endif -%endfor \ No newline at end of file + %endif +%endfor diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html --- a/rhodecode/templates/search/search.html +++ b/rhodecode/templates/search/search.html @@ -2,11 +2,11 @@ <%inherit file="/base/base.html"/> <%def name="title()"> ${_('Search')} - ${'"%s"' % c.cur_query if c.cur_query else None} + ${'"%s"' % c.cur_query if c.cur_query else None} %if c.repo_name: ${_('in repository: ') + c.repo_name} %else: - ${_('in all repositories')} + ${_('in all repositories')} %endif - ${c.rhodecode_name} @@ -26,12 +26,12 @@ ${_('in repository: ') + c.repo_name} %else: ${_('in all repositories')} - %endif + %endif %if c.repo_name: - ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} + ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')} %else: ${h.form(h.url('search'),method='get')} %endif @@ -40,13 +40,13 @@

${_('Search term')} -

${h.text('q',c.cur_query,class_="small")}

${c.runtime}

@@ -58,14 +58,14 @@ ##('commit',_('Commit messages')), ('path',_('File names')), ##('repository',_('Repository names')), - ])} + ])}

- + ${h.end_form()} - + %if c.cur_search == 'content': <%include file='search_content.html'/> %elif c.cur_search == 'path': @@ -74,7 +74,7 @@ <%include file='search_commit.html'/> %elif c.cur_search == 'repository': <%include file='search_repository.html'/> - %endif + %endif - + diff --git a/rhodecode/templates/search/search_content.html b/rhodecode/templates/search/search_content.html --- a/rhodecode/templates/search/search_content.html +++ b/rhodecode/templates/search/search_content.html @@ -19,13 +19,13 @@

${_('Permission denied')}

- + %endif - - %endif + + %endif %endfor %if c.cur_query and c.formated_results:

${c.formated_results.pager('$link_previous ~2~ $link_next')} -

-%endif \ No newline at end of file + +%endif diff --git a/rhodecode/templates/search/search_path.html b/rhodecode/templates/search/search_path.html --- a/rhodecode/templates/search/search_path.html +++ b/rhodecode/templates/search/search_path.html @@ -5,22 +5,22 @@

${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), - h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))} + h.url('files_home',repo_name=sr['repository'],revision='tip',f_path=sr['f_path']))}

%else: %if cnt == 0:

- ${_('Permission denied')} + ${_('Permission denied')}

+ %endif - - %endif + + %endif %endfor %if c.cur_query and c.formated_results:

${c.formated_results.pager('$link_previous ~2~ $link_next')} -

+ %endif diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html --- a/rhodecode/templates/settings/repo_settings.html +++ b/rhodecode/templates/settings/repo_settings.html @@ -8,9 +8,9 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} » - ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} - » - ${_('Settings')} + ${h.link_to(c.repo_info.repo_name,h.url('summary_home',repo_name=c.repo_info.repo_name))} + » + ${_('Settings')} <%def name="page_nav()"> @@ -20,7 +20,7 @@

- ${self.breadcrumbs()} + ${self.breadcrumbs()}

${h.form(url('repo_settings_update', repo_name=c.repo_info.repo_name),method='put')}

@@ -41,7 +41,7 @@

${h.select('repo_group','',c.repo_groups,class_="medium")}

${_('Description')}: @@ -50,7 +50,7 @@ ${h.textarea('description',cols=23,rows=5)}

- +

${_('Private')}: @@ -59,7 +59,7 @@ ${h.checkbox('private',value="True")}

- +

${_('Permissions')}: @@ -67,16 +67,14 @@

<%include file="../admin/repos/repo_edit_perms.html"/>

- +

${h.submit('save','Save',class_="ui-button")} ${h.reset('reset','Reset',class_="ui-button")} -

- + ${h.end_form()} - - - + diff --git a/rhodecode/templates/shortlog/shortlog.html b/rhodecode/templates/shortlog/shortlog.html --- a/rhodecode/templates/shortlog/shortlog.html +++ b/rhodecode/templates/shortlog/shortlog.html @@ -8,7 +8,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('shortlog')} @@ -29,5 +29,5 @@ ${c.shortlog_data} - - \ No newline at end of file + + diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html --- a/rhodecode/templates/shortlog/shortlog_data.html +++ b/rhodecode/templates/shortlog/shortlog_data.html @@ -2,7 +2,7 @@ %if c.repo_changesets:

- + @@ -13,7 +13,7 @@ + +

${_('revision')}

${_('commit message')}

${_('age')}

${_('author')}

r${cs.revision}:${h.short_id(cs.raw_id)}

${h.link_to(h.truncate(cs.message,50), h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), @@ -21,7 +21,7 @@

${h.person(cs.author)}

@@ -45,7 +45,7 @@ YUE.delegate("shortlog_data","click",function(e, matchedEl, container){ ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();}); YUE.preventDefault(e); - },'.pager_link'); + },'.pager_link'); }); @@ -62,18 +62,18 @@ ${c.repo_changesets.pager('$link_previou %endif - + -

${_('Push new repo')}

     ${c.rhodecode_repo.alias} clone ${c.clone_repo_url}
     ${c.rhodecode_repo.alias} add README # add first file
     ${c.rhodecode_repo.alias} commit -m "Initial" # commit with message
     ${c.rhodecode_repo.alias} push # push changes back

- +

${_('Existing repository?')}

     ${c.rhodecode_repo.alias} push ${c.clone_repo_url}
-

+ %endif diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -6,14 +6,14 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.dbrepo.just_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('summary')} <%def name="page_nav()"> - ${self.menu('summary')} + ${self.menu('summary')} <%def name="main()"> @@ -32,50 +32,50 @@

- +

${_('Name')}:

%if c.rhodecode_user.username != 'default': ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')} ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')} %else: ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')} - ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')} - %endif + ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')} + %endif

%if c.rhodecode_user.username != 'default': %if c.following: - + %else: %endif - %endif: + %endif: ##REPO TYPE %if c.dbrepo.repo_type =='hg': $${_('Mercurial repository')}$ %endif %if c.dbrepo.repo_type =='git': $${_('Git repository')}$ - %endif - - ##PUBLIC/PRIVATE + %endif + + ##PUBLIC/PRIVATE %if c.dbrepo.private: $${_('private repository')}$ %else: $${_('public repository')}$ %endif - + ##REPO NAME ${h.repo_link(c.dbrepo.groups_and_repo)} - + ##FORK %if c.dbrepo.fork:

@@ -90,18 +90,18 @@ $${_('remote clone')}$ ${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)} -

- %endif +

+ %endif

- +

${_('Description')}:

${h.urlify_text(c.dbrepo.description)}

- +

${_('Contact')}: @@ -115,7 +115,7 @@ ${_('Email')}: ${c.dbrepo.user.email}

- +

${_('Clone url')}: @@ -127,7 +127,7 @@

- +

${_('Trending files')}: @@ -136,14 +136,14 @@ %if c.show_stats:

%else: - ${_('Statistics are disabled for this repository')} + ${_('Statistics are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable stats on from summary'): ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} %endif - %endif + %endif

- +

${_('Download')}: @@ -155,7 +155,7 @@ ${_('Downloads are disabled for this repository')} %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'): ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} - %endif + %endif %else: ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)} ${h.link_to('Download as zip',h.url('files_archive_home',repo_name=c.dbrepo.repo_name,fname='tip.zip'),class_="archive_icon ui-btn")} @@ -164,33 +164,33 @@ %endif

+ -%if c.show_stats: +%if c.show_stats:

${_('Commit activity by day / author')}

- +

%if c.no_data: ${c.no_data_msg} %if h.HasPermissionAll('hg.admin')('enable stats on from summary'): ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-btn")} - %endif + %endif %else: ${_('Loaded in')} ${c.stats_percentage} % %endif -

- +

@@ -198,10 +198,10 @@

- + %endif -

%if c.repo_changesets: @@ -210,7 +210,7 @@ ${_('Quick start')} %endif

<%include file='../shortlog/shortlog_data.html'/> @@ -219,10 +219,10 @@

%if c.readme_data: -

${c.readme_file}

${c.readme_data|n} @@ -239,7 +239,7 @@ YUE.on(clone_url,'click',function(e){ } else{ YUD.addClass(clone_url,'selected'); - YUD.get(clone_url).select(); + YUD.get(clone_url).select(); } }) @@ -247,18 +247,18 @@ YUE.on('clone_by_name','click',function( // show url by name and hide name button YUD.setStyle('clone_url','display',''); YUD.setStyle('clone_by_name','display','none'); - + // hide url by id and show name button YUD.setStyle('clone_by_id','display',''); - YUD.setStyle('clone_url_id','display','none'); - + YUD.setStyle('clone_url_id','display','none'); + }) YUE.on('clone_by_id','click',function(e){ - + // show url by id and hide id button YUD.setStyle('clone_by_id','display','none'); YUD.setStyle('clone_url_id','display',''); - + // hide url by name and show id button YUD.setStyle('clone_by_name','display',''); YUD.setStyle('clone_url','display','none'); @@ -273,14 +273,14 @@ var tmpl_links = {}; YUE.on(['download_options','archive_subrepos'],'change',function(e){ var sm = YUD.get('download_options'); var new_cs = sm.options[sm.selectedIndex]; - + for(k in tmpl_links){ var s = YUD.get(k+'_link'); if(s){ var title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}"; title_tmpl= title_tmpl.replace('__CS_NAME__',new_cs.text); title_tmpl = title_tmpl.replace('__CS_EXT__',k); - + var url = tmpl_links[k].replace('__CS__',new_cs.value); var subrepos = YUD.get('archive_subrepos').checked; url = url.replace('__SUB__',subrepos); @@ -298,7 +298,7 @@ var no_data = true; for (k in data){ total += data[k].count; no_data = false; -} +} var tbl = document.createElement('table'); tbl.setAttribute('class','trending_language_tbl'); var cnt = 0; @@ -322,20 +322,20 @@ for (k in data){ td2.setAttribute('style','padding-right:14px !important'); var trending_language = document.createElement('div'); var nr_files = value+" ${_('files')}"; - + trending_language.title = k+" "+nr_files; - + if (percentage>22){ - trending_language.innerHTML = ""+percentage+"% "+nr_files+ ""; + trending_language.innerHTML = ""+percentage+"% "+nr_files+ ""; } else{ trending_language.innerHTML = ""+percentage+"%"; } - + trending_language.setAttribute("class", 'trending_language top-right-rounded-corner bottom-right-rounded-corner'); trending_language.style.width=percentage+"%"; td2.appendChild(trending_language); - + tr.appendChild(td1); tr.appendChild(td2); tbl.appendChild(tr); @@ -343,17 +343,17 @@ for (k in data){ var show_more = document.createElement('tr'); var td = document.createElement('td'); lnk = document.createElement('a'); - + lnk.href='#'; lnk.innerHTML = "${_('show more')}"; lnk.id='code_stats_show_more'; td.appendChild(lnk); - + show_more.appendChild(td); show_more.appendChild(document.createElement('td')); tbl.appendChild(show_more); } - + } YUD.get('lang_stats').appendChild(tbl); @@ -365,7 +365,7 @@ YUE.on('code_stats_show_more','click',fu YUD.setStyle(YUD.get('code_stats_show_more'), 'display','none'); }); - + %endif - + diff --git a/rhodecode/templates/switch_to_list.html b/rhodecode/templates/switch_to_list.html --- a/rhodecode/templates/switch_to_list.html +++ b/rhodecode/templates/switch_to_list.html @@ -1,4 +1,4 @@ -## -*- coding: utf-8 -*- +## -*- coding: utf-8 -*-

${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}

${h.link_to(_('There are no branches yet'),'#')}

${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')} @@ -21,9 +21,9 @@ %else:

${h.link_to(_('There are no tags yet'),'#')}

%endif - + -%if c.rhodecode_repo.alias == 'hg': +%if c.rhodecode_repo.alias == 'hg':

${h.link_to('%s (%s)' % (_('bookmarks'),len(c.rhodecode_repo.bookmarks.values()),),h.url('bookmarks_home',repo_name=c.repo_name),class_='bookmarks childs')}

${h.link_to(_('There are no bookmarks yet'),'#')}

-%endif \ No newline at end of file + + +%endif diff --git a/rhodecode/templates/tags/tags.html b/rhodecode/templates/tags/tags.html --- a/rhodecode/templates/tags/tags.html +++ b/rhodecode/templates/tags/tags.html @@ -9,7 +9,7 @@ <%def name="breadcrumbs_links()"> ${h.link_to(u'Home',h.url('/'))} - » + » ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))} » ${_('tags')} @@ -61,7 +61,7 @@ var myDataTable = new YAHOO.widget.DataT MSG_SORTDESC:"${_('Click to sort descending')}", MSG_EMPTY:"${_('No records found.')}", MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", + MSG_LOADING:"${_('Loading...')}", } ); myDataTable.subscribe('postRenderEvent',function(oArgs) { @@ -69,8 +69,8 @@ myDataTable.subscribe('postRenderEvent', var func = function(node){ return node.parentNode.parentNode.parentNode.parentNode.parentNode; } - q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func); -}); + q_filter('q_filter_tags',YUQ('div.table tr td .logtags .tagtag a'),func); +}); - \ No newline at end of file + diff --git a/rhodecode/templates/tags/tags_data.html b/rhodecode/templates/tags/tags_data.html --- a/rhodecode/templates/tags/tags_data.html +++ b/rhodecode/templates/tags/tags_data.html @@ -1,5 +1,5 @@ %if c.repo_tags: -

@@ -10,7 +10,7 @@ %for cnt,tag in enumerate(c.repo_tags.items()): - + - +

${h.link_to(tag[0], @@ -18,7 +18,7 @@	${tag[1].date}	${tag[1].date}	${h.person(tag[1].author)}	@@ -31,4 +31,4 @@ %else: ${_('There are no tags yet')} -%endif \ No newline at end of file +%endif

${_('Default permissions')}

${_('Administration')}

${_('Administration')}

${_('Statistics')}

${_('Remote')}

${_('Cache')}

${_('Public journal')}

${_('Delete')}

${_('Set as fork')}

${_('Built in hooks - read only')}

${_('Custom hooks')}

${_('Remap and rescan repositories')}

${_('Whoosh indexing')}

${_('Global application settings')}

${_('Global application settings')}

${_('Mercurial settings')}

${_('Mercurial settings')}

${_('Test Email')}

${_('Permissions')}

${_('Permissions')}

- +

+ ${_('My repositories')}

${_('Permissions')}

${_('Permissions')}

${_('Compare View')}

${_('Compare View')}

${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}

${subject}

${c.error_message}

- ${_('Go back')} - ${_('No files at given path')}: "${c.f_path or "/"}" + ${_('Go back')} + ${_('No files at given path')}: "${c.f_path or "/"}"

- ${parent.breadcrumbs()} 0 ${_('repositories')} + ${parent.breadcrumbs()} 0 ${_('repositories')}

- +

+ ${_('My repos')} / ${_('Watched')}

${_('Sign In to')} ${c.rhodecode_name}

${_('Reset your password to')} ${c.rhodecode_name}

${_('Sign Up to')} ${c.rhodecode_name}

${_('Push new repo')}

${_('Push new repo')}

${_('Existing repository?')}

${_('Commit activity by day / author')}