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 @@ -3,13 +3,13 @@ {% block sidebarlogo %}

Support RhodeCode development.

-
- - - - -
+
+ + + + +
Flattr this diff --git a/rhodecode/templates/admin/admin.html b/rhodecode/templates/admin/admin.html --- a/rhodecode/templates/admin/admin.html +++ b/rhodecode/templates/admin/admin.html @@ -16,39 +16,39 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()">
- -
- ${self.breadcrumbs()} -
- -
-
- ${c.log_data} -
-
+ +
+ ${self.breadcrumbs()} +
+ +
+
+ ${c.log_data} +
+
diff --git a/rhodecode/templates/admin/admin_log.html b/rhodecode/templates/admin/admin_log.html --- a/rhodecode/templates/admin/admin_log.html +++ b/rhodecode/templates/admin/admin_log.html @@ -1,40 +1,40 @@ ## -*- coding: utf-8 -*- %if c.users_log: - - - - - - - + + + + + + + - %for cnt,l in enumerate(c.users_log): - - + - - + + - - - - %endfor + + + + %endfor
${_('Username')}${_('Action')}${_('Repository')}${_('Date')}${_('From IP')}
${_('Username')}${_('Action')}${_('Repository')}${_('Date')}${_('From IP')}
+ %for cnt,l in enumerate(c.users_log): +
%if l.user is not None: ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} %else: ${l.username} %endif ${h.action_parser(l)[0]()} -
+
${h.action_parser(l)[0]()} +
${h.literal(h.action_parser(l)[1]())}
- 		- %if l.repository is not None: - ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))} - %else: - ${l.repository_name} - %endif - + %if l.repository is not None: + ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))} + %else: + ${l.repository_name} + %endif + ${h.fmt_date(l.action_date)}${l.user_ip}
${h.fmt_date(l.action_date)}${l.user_ip}
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 @@ -12,7 +12,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -36,49 +36,49 @@
-
-
- -
-
- ${h.select('default_repo_perm','',c.repo_perms_choices)} +
+
+ +
+
+ ${h.select('default_repo_perm','',c.repo_perms_choices)} - ${h.checkbox('overwrite_default_repo','true')} - -
-
-
-
- -
-
- ${h.select('default_group_perm','',c.group_perms_choices)} + ${h.checkbox('overwrite_default_repo','true')} + +
+
+
+
+ +
+
+ ${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')} -
-
-
-
- -
-
- ${h.select('default_register','',c.register_choices)} -
-
+
+
+
+
+ +
+
+ ${h.select('default_register','',c.register_choices)} +
+
-
- ${h.select('default_create','',c.create_choices)} -
+
+ ${h.select('default_create','',c.create_choices)} +
@@ -88,10 +88,10 @@ ${h.select('default_fork','',c.fork_choices)}
-
+
${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} -
+
${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 @@ -14,15 +14,15 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> -
- -
- ${self.breadcrumbs()} -
+
+ +
+ ${self.breadcrumbs()} +
<%include file="repo_add_base.html"/>
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 @@ -6,11 +6,11 @@ <%def name="breadcrumbs_links()"> - ${_('add new repository')} + ${_('add new repository')} <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> 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 @@ -14,7 +14,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -35,24 +35,24 @@ ${h.text('repo_name',class_="medium")}
-
-
- -
-
- ${h.text('clone_uri',class_="medium")} +
+
+ +
+
+ ${h.text('clone_uri',class_="medium")} ${_('Optional http[s] url from which repository should be cloned.')} -
-
-
-
- -
-
- ${h.select('repo_group','',c.repo_groups,class_="medium")} +
+
+
+
+ +
+
+ ${h.select('repo_group','',c.repo_groups,class_="medium")} ${_('Optional select a group to put this repository into.')} -
-
+
+
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 @@ -104,10 +104,10 @@ function ajaxActionUser(user_id, field_i function ajaxActionUsersGroup(users_group_id,field_id){ var sUrl = "${h.url('delete_repo_users_group',repo_name=c.repo_name)}"; var callback = { - success:function(o){ - var tr = YUD.get(String(field_id)); - tr.parentNode.removeChild(tr); - }, + success:function(o){ + var tr = YUD.get(String(field_id)); + tr.parentNode.removeChild(tr); + }, failure:function(o){ alert("${_('Failed to remove users group')}"); }, 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 @@ -9,7 +9,7 @@ ${h.link_to(_('Admin'),h.url('admin_home'))} » 0 ${_('repositories')} <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()">
@@ -69,7 +69,7 @@ var myColumnDefs = [ {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, {key:"name",label:"${_('Name')}",sortable:true, - sortOptions: { sortFunction: nameSort }}, + sortOptions: { sortFunction: nameSort }}, {key:"desc",label:"${_('Description')}",sortable:true}, {key:"last_changeset",label:"${_('Tip')}",sortable:true, sortOptions: { sortFunction: revisionSort }}, @@ -126,11 +126,11 @@ }; YUE.on('q_filter','click',function(){ - if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; - //TODO: load here full list later to do search within groups - YUD.addClass('q_filter', 'loaded'); - } + if(!YUD.hasClass('q_filter', 'loaded')){ + YUD.get('q_filter').value = ''; + //TODO: load here full list later to do search within groups + YUD.addClass('q_filter', 'loaded'); + } }); YUE.on('q_filter','keyup',function (e) { diff --git a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html --- a/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html +++ b/rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html @@ -113,7 +113,7 @@ YUE.onDOMReady(function () { YUD.setStyle('add_perm_input', 'display', 'none'); } YAHOO.util.Event.addListener('add_perm', 'click', function () { - addPermAction(${_tmpl}, ${c.users_array|n}, ${c.users_groups_array|n}); + addPermAction(${_tmpl}, ${c.users_array|n}, ${c.users_groups_array|n}); }); }); 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 @@ -41,23 +41,23 @@
-
-
- -
-
- ${h.textarea('group_description',cols=23,rows=5,class_="medium")} -
-
+
+
+ +
+
+ ${h.textarea('group_description',cols=23,rows=5,class_="medium")} +
+
-
-
- -
-
- ${h.select('group_parent_id','',c.repo_groups,class_="medium")} -
-
+
+
+ +
+
+ ${h.select('group_parent_id','',c.repo_groups,class_="medium")} +
+
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 @@ -10,7 +10,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -26,15 +26,15 @@
% for hook in c.hooks:
-
- -
-
+
+ +
+
${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} -
+
% endfor -
+

${_('Custom hooks')}

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 @@ -10,7 +10,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -27,20 +27,20 @@
-
-
- -
-
-
- ${h.checkbox('destroy',True)} - -
+
+
+ +
+
+
+ ${h.checkbox('destroy',True)} + +
${_('Rescan repositories location for new repositories. Also deletes obsolete if `destroy` flag is checked ')} -
-
+
+
${h.submit('rescan',_('Rescan repositories'),class_="ui-btn large")} @@ -196,12 +196,12 @@
-
- ${h.checkbox('web_push_ssl', 'True')} - -
+
+ ${h.checkbox('web_push_ssl', 'True')} + +
${_('RhodeCode will require SSL for pushing or pulling. If SSL is missing it will return HTTP Error 406: Not Acceptable')} -
+
@@ -209,14 +209,14 @@
-
- ${h.checkbox('hooks_changegroup_update','True')} - -
-
- ${h.checkbox('hooks_changegroup_repo_size','True')} - -
+
+ ${h.checkbox('hooks_changegroup_update','True')} + +
+
+ ${h.checkbox('hooks_changegroup_repo_size','True')} + +
${h.checkbox('hooks_changegroup_push_logger','True')} @@ -225,7 +225,7 @@ ${h.checkbox('hooks_outgoing_pull_logger','True')}
-
+
${h.link_to(_('advanced setup'),url('admin_edit_setting',setting_id='hooks'),class_="ui-btn")}
@@ -257,9 +257,9 @@
${h.text('paths_root_path',size=30,readonly="readonly")} - - ${_('unlock')} + + ${_('unlock')} ${_('Location where repositories are stored. After changing this value a restart, and rescan is required')}
@@ -329,8 +329,8 @@ 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 @@ -13,7 +13,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -93,7 +93,7 @@
${h.submit('save',_('save'),class_="ui-btn large")}
- + ${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 @@ -14,7 +14,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -137,7 +137,7 @@ ${h.submit('save',_('Save'),class_="ui-btn large")} ${h.reset('reset',_('Reset'),class_="ui-btn large")} - + ${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 @@ -10,7 +10,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -132,12 +132,12 @@ var show_my = function(e){ YUD.setStyle('my_container','display',''); YUD.setStyle('q_filter','display',''); if(!YUD.hasClass('show_my', 'loaded')){ - table_renderer(${c.data |n}); + table_renderer(${c.data |n}); YUD.addClass('show_my', 'loaded'); } } YUE.on('show_my','click',function(e){ - show_my(e); + show_my(e); }) var show_pullrequests = function(e){ @@ -154,7 +154,7 @@ var show_pullrequests = function(e){ ypjax(url, 'pullrequests_container'); } YUE.on('show_pullrequests','click',function(e){ - show_pullrequests(e) + show_pullrequests(e) }) var tabs = { @@ -173,19 +173,19 @@ if (url[1]) { } function table_renderer(data){ - var myDataSource = new YAHOO.util.DataSource(data); - myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; + var myDataSource = new YAHOO.util.DataSource(data); + myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; - myDataSource.responseSchema = { - resultsList: "records", - fields: [ - {key:"menu"}, - {key:"raw_name"}, - {key:"name"}, - {key:"last_changeset"}, - {key:"action"}, - ] - }; + myDataSource.responseSchema = { + resultsList: "records", + fields: [ + {key:"menu"}, + {key:"raw_name"}, + {key:"name"}, + {key:"last_changeset"}, + {key:"action"}, + ] + }; myDataSource.doBeforeCallback = function(req,raw,res,cb) { // This is the filter function var data = res.results || [], @@ -205,76 +205,76 @@ function table_renderer(data){ return res; } - // main table sorting - var myColumnDefs = [ - {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, - {key:"name",label:"${_('Name')}",sortable:true, - sortOptions: { sortFunction: nameSort }}, - {key:"last_changeset",label:"${_('Tip')}",sortable:true, - sortOptions: { sortFunction: revisionSort }}, - {key:"action",label:"${_('Action')}",sortable:false}, - ]; + // main table sorting + var myColumnDefs = [ + {key:"menu",label:"",sortable:false,className:"quick_repo_menu hidden"}, + {key:"name",label:"${_('Name')}",sortable:true, + sortOptions: { sortFunction: nameSort }}, + {key:"last_changeset",label:"${_('Tip')}",sortable:true, + sortOptions: { sortFunction: revisionSort }}, + {key:"action",label:"${_('Action')}",sortable:false}, + ]; - var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{ - sortedBy:{key:"name",dir:"asc"}, - paginator: new YAHOO.widget.Paginator({ - rowsPerPage: 50, - alwaysVisible: false, - template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}", - pageLinks: 5, - containerClass: 'pagination-wh', - currentPageClass: 'pager_curpage', - pageLinkClass: 'pager_link', - nextPageLinkLabel: '>', - previousPageLinkLabel: '<', - firstPageLinkLabel: '<<', - lastPageLinkLabel: '>>', - containers:['user-paginator'] - }), + var myDataTable = new YAHOO.widget.DataTable("repos_list_wrap", myColumnDefs, myDataSource,{ + sortedBy:{key:"name",dir:"asc"}, + paginator: new YAHOO.widget.Paginator({ + rowsPerPage: 50, + alwaysVisible: false, + template : "{PreviousPageLink} {FirstPageLink} {PageLinks} {LastPageLink} {NextPageLink}", + pageLinks: 5, + containerClass: 'pagination-wh', + currentPageClass: 'pager_curpage', + pageLinkClass: 'pager_link', + nextPageLinkLabel: '>', + previousPageLinkLabel: '<', + firstPageLinkLabel: '<<', + lastPageLinkLabel: '>>', + containers:['user-paginator'] + }), - MSG_SORTASC:"${_('Click to sort ascending')}", - MSG_SORTDESC:"${_('Click to sort descending')}", - MSG_EMPTY:"${_('No records found.')}", - MSG_ERROR:"${_('Data error.')}", - MSG_LOADING:"${_('Loading...')}", - } - ); - myDataTable.subscribe('postRenderEvent',function(oArgs) { - tooltip_activate(); - quick_repo_menu(); - }); + MSG_SORTASC:"${_('Click to sort ascending')}", + MSG_SORTDESC:"${_('Click to sort descending')}", + MSG_EMPTY:"${_('No records found.')}", + MSG_ERROR:"${_('Data error.')}", + MSG_LOADING:"${_('Loading...')}", + } + ); + myDataTable.subscribe('postRenderEvent',function(oArgs) { + tooltip_activate(); + quick_repo_menu(); + }); - var filterTimeout = null; + var filterTimeout = null; - updateFilter = function() { - // Reset timeout - filterTimeout = null; + updateFilter = function() { + // Reset timeout + filterTimeout = null; - // Reset sort - var state = myDataTable.getState(); - state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC}; + // Reset sort + var state = myDataTable.getState(); + state.sortedBy = {key:'name', dir:YAHOO.widget.DataTable.CLASS_ASC}; - // Get filtered data - myDataSource.sendRequest(YUD.get('q_filter').value,{ - success : myDataTable.onDataReturnInitializeTable, - failure : myDataTable.onDataReturnInitializeTable, - scope : myDataTable, - argument: state - }); + // Get filtered data + myDataSource.sendRequest(YUD.get('q_filter').value,{ + success : myDataTable.onDataReturnInitializeTable, + failure : myDataTable.onDataReturnInitializeTable, + scope : myDataTable, + argument: state + }); - }; - YUE.on('q_filter','click',function(){ - if(!YUD.hasClass('q_filter', 'loaded')){ - YUD.get('q_filter').value = ''; - //TODO: load here full list later to do search within groups - YUD.addClass('q_filter', 'loaded'); - } - }); + }; + YUE.on('q_filter','click',function(){ + if(!YUD.hasClass('q_filter', 'loaded')){ + YUD.get('q_filter').value = ''; + //TODO: load here full list later to do search within groups + YUD.addClass('q_filter', 'loaded'); + } + }); - YUE.on('q_filter','keyup',function (e) { - clearTimeout(filterTimeout); - filterTimeout = setTimeout(updateFilter,600); - }); - } + YUE.on('q_filter','keyup',function (e) { + clearTimeout(filterTimeout); + filterTimeout = setTimeout(updateFilter,600); + }); + } 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 @@ -10,7 +10,7 @@ <%def name="page_nav()"> - ${self.menu('admin')} + ${self.menu('admin')} <%def name="main()"> @@ -36,7 +36,7 @@ myDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; myDataSource.responseSchema = { - resultsList: "records", + resultsList: "records", fields: [ {key: "gravatar"}, {key: "raw_username"}, @@ -60,7 +60,7 @@ if (req) { req = req.toLowerCase(); for (i = 0; i -
-
-
- -
-
- ${h.text('users_group_name',class_='small')} -
-
+
+
+
+ +
+
+ ${h.text('users_group_name',class_='small')} +
+
-
-
- -
-
- ${h.checkbox('users_group_active',value=True)} -
-
-
+
+
+ +
+
+ ${h.checkbox('users_group_active',value=True)} +
+
+
- - - - -
-
-
-
${_('Choosen group members')}
- ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} -
- ${_('Remove all elements')} - remove -
-
-
- add -
- remove -
-
-
${_('Available members')}
- ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")} -
- add - ${_('Add all elements')} -
-
-
-
+ + + + +
+
+
+
${_('Choosen group members')}
+ ${h.select('users_group_members',[x[0] for x in c.group_members],c.group_members,multiple=True,size=8,style="min-width:210px")} +
+ ${_('Remove all elements')} + remove +
+
+
+ add +
+ remove +
+
+
${_('Available members')}
+ ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px")} +
+ add + ${_('Add all elements')} +
+
+
+
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 @@ -40,10 +40,10 @@

${_('Submit a bug')}

-

- RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''} - ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski -

+

+ RhodeCode${'-%s' % c.rhodecode_instanceid if c.rhodecode_instanceid else ''} + ${c.rhodecode_version} © 2010-${h.datetime.today().year} by Marcin Kuzminski +

@@ -131,37 +131,37 @@ <%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 - - %else: - ##ROOT MENU + %else: + ##ROOT MENU - %endif + + %endif diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html --- a/rhodecode/templates/base/root.html +++ b/rhodecode/templates/base/root.html @@ -21,18 +21,18 @@ %if c.ga_code: - - %endif + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + + %endif ## JAVASCRIPT ## <%def name="js()"> @@ -94,7 +94,7 @@ YUD.addClass('quick_login_link','enabled'); var usr = YUD.get('username'); if(usr){ - usr.focus(); + usr.focus(); } } }); diff --git a/rhodecode/templates/bookmarks/bookmarks_data.html b/rhodecode/templates/bookmarks/bookmarks_data.html --- a/rhodecode/templates/bookmarks/bookmarks_data.html +++ b/rhodecode/templates/bookmarks/bookmarks_data.html @@ -2,15 +2,15 @@
- + - + - %for cnt,book in enumerate(c.repo_bookmarks.items()): - + %for cnt,book in enumerate(c.repo_bookmarks.items()): + - - + - - %endfor + + %endfor
${_('Name')} ${_('Date')} ${_('Author')} ${_('Revision')}
${h.link_to(book[0], @@ -18,16 +18,16 @@ ${h.fmt_date(book[1].date)}${h.person(book[1].author)} + ${h.person(book[1].author)}
%else: - ${_('There are no bookmarks yet')} + ${_('There are no bookmarks yet')} %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 @@ -34,16 +34,16 @@ - + - %else: - ${_('There are no changes yet')} - %endif + }); + + %else: + ${_('There are no changes yet')} + %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 @@ -31,7 +31,7 @@ AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
-
+
%if c.changeset.parents: %for n, p_cs in enumerate(reversed(c.changeset.parents)): @@ -52,7 +52,7 @@ ${_('No children')} %endif
- -
-
-
-
-
- gravatar -
- ${h.person(c.changeset.author)}
- ${h.email_or_none(c.changeset.author)}
-
-
${h.urlify_commit(c.changeset.message, c.repo_name)}
-
-
-
+
+
+
+
+
+
+ gravatar +
+ ${h.person(c.changeset.author)}
+ ${h.email_or_none(c.changeset.author)}
+
+
${h.urlify_commit(c.changeset.message, c.repo_name)}
+
+
+
% if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: - ${len(c.changeset.removed)} - ${len(c.changeset.changed)} - ${len(c.changeset.added)} - % else: + ${len(c.changeset.removed)} + ${len(c.changeset.changed)} + ${len(c.changeset.added)} + % else: ! ! ! - % endif -
+ % endif +
- + %if len(c.changeset.parents)>1: ${_('merge')} %endif - %if c.changeset.branch: + %if c.changeset.branch: - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endif - %for tag in c.changeset.tags: - - ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} - %endfor - -
-
- + %for tag in c.changeset.tags: + + ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + %endfor + +
+
+ % if c.limited_diff: ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}: % else: - ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: - %endif + ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}: + %endif -
+
%for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():
@@ -136,8 +136,8 @@ % if c.limited_diff:
${_('Changeset was too big and was cut off...')}
% endif -
-
+
+
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 @@ -6,14 +6,14 @@ <%def name="comment_block(co)">
-
+
-
- ${co.author.username} -
-
- ${h.age(co.modified_at)} -
+
+ ${co.author.username} +
+
+ ${h.age(co.modified_at)} +
%if co.status_change:
›
@@ -41,10 +41,10 @@ ${_('Delete')}
%endif -
-
- ${h.rst_w_mentions(co.text)|n} -
+
+
+ ${h.rst_w_mentions(co.text)|n} +
@@ -60,7 +60,7 @@
${_('Commenting on line {1}.')} ${(_('Comments parsed using %s syntax with %s support.') % ( ('RST' % h.url('rst_help')), - ('@mention' % _('Use @username inside this text to send notification to this RhodeCode user')) + ('@mention' % _('Use @username inside this text to send notification to this RhodeCode user')) ) )|n } @@ -134,8 +134,8 @@
${(_('Comments parsed using %s syntax with %s support.') % (('RST' % h.url('rst_help')), - '@mention' % - _('Use @username inside this text to send notification to this RhodeCode user')))|n} + '@mention' % + _('Use @username inside this text to send notification to this RhodeCode user')))|n} %if change_status: | @@ -178,12 +178,12 @@ YUE.onDOMReady(function () { } }) YUE.on(YUQ('.status_change_radio'), 'change',function(e){ - var val = e.currentTarget.value; - if (val == 'approved' || val == 'rejected') { - YUD.removeClass('save_close', 'hidden'); - }else{ - YUD.addClass('save_close', 'hidden'); - } + var val = e.currentTarget.value; + if (val == 'approved' || val == 'rejected') { + YUD.removeClass('save_close', 'hidden'); + }else{ + YUD.addClass('save_close', 'hidden'); + } }) }); 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 @@ -24,17 +24,17 @@ ${self.breadcrumbs()}
-
-
-

${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}

+
+
+

${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}

- ${_('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)} -
-
-
-
-
- + ${_('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)} + + + +
+
+
%for cnt,cs in enumerate(c.cs_ranges): @@ -50,17 +50,17 @@ %endfor
gravatar
-
-
${_('Files affected')}
-
- %for cs in c.cs_ranges: -
${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
- %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): -
${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
- %endfor - %endfor -
-
+
+
${_('Files affected')}
+
+ %for cs in c.cs_ranges: +
${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+ %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): +
${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
+ %endfor + %endfor +
+
<%namespace name="comment" file="/changeset/changeset_file_comment.html"/> 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 @@ -8,45 +8,45 @@ - %if c.redirect_time: - - %endif + %if c.redirect_time: + + %endif - +
-
-
${c.rhodecode_name}
-

${c.error_message}

+
+
${c.rhodecode_name}
+

${c.error_message}

-

${c.error_explanation}

+

${c.error_explanation}

- %if c.redirect_time: -

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

- %endif + %if c.redirect_time: +

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

+ %endif -
+
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 @@ -24,16 +24,16 @@
${self.breadcrumbs()} - +
-
- <%include file='files_ypjax.html'/> -
+
+ <%include file='files_ypjax.html'/> +
@@ -50,10 +50,10 @@ var node_history_url = '${h.url("files_h var ypjax_links = function(){ YUE.on(YUQ('.ypjax-link'), 'click',function(e){ - //don't do ypjax on middle click - if(e.which == 2 || !History.enabled){ - return true; - } + //don't do ypjax on middle click + if(e.which == 2 || !History.enabled){ + return true; + } var el = e.currentTarget; var url = el.href; @@ -64,12 +64,12 @@ var ypjax_links = function(){ //extract rev and the f_path from url. parts = url.split(_base_url) if(parts.length != 2){ - return false; + return false; } var parts2 = parts[1].split('/'); - var rev = parts2.shift(); // pop the first element which is the revision - var f_path = parts2.join('/'); + var rev = parts2.shift(); // pop the first element which is the revision + var f_path = parts2.join('/'); var title = "${_('%s files') % c.repo_name}" + " - " + f_path; @@ -93,7 +93,7 @@ var callbacks = function(State){ fileBrowserListeners(State.url, State.data.node_list_url, State.data.url_base); if(YUD.get('hlcode')){ - YUE.on('hlcode', 'mouseup', getSelectionLink); + YUE.on('hlcode', 'mouseup', getSelectionLink); } //console.log(State); if(YUD.get('load_node_history')){ @@ -102,7 +102,7 @@ var callbacks = function(State){ YUE.on('load_node_history', 'click', function(e){ var _url = node_history_url.replace('__REV__',State.data.rev).replace('__FPATH__', State.data.f_path); ypjax(_url, 'node_history', function(o){ - tooltip_activate(); + tooltip_activate(); }) }); } @@ -132,11 +132,11 @@ YUE.onDOMReady(function(){ } else{ ypjax(State.url,container,function(o){ - //callbacks after ypjax call - callbacks(State); - if (o !== undefined){ - //store our request in cache - var _expire_on = new Date().getTime()+CACHE_EXPIRE; + //callbacks after ypjax call + callbacks(State); + if (o !== undefined){ + //store our request in cache + var _expire_on = new Date().getTime()+CACHE_EXPIRE; CACHE[cache_key] = [_expire_on, o.responseText]; } }); 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()">
@@ -35,8 +35,8 @@
-
- ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")} +
+ ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data")}

${_('Add new file')}

@@ -69,24 +69,24 @@
-
-
+
+ 

-				    
+                    
                 

-				
${_('commit message')}

-				
-			

-			

+                
${_('commit message')}

+                
+            

+            

             ${h.submit('commit',_('Commit changes'),class_="ui-btn")}
             ${h.reset('reset',_('Reset'),class_="ui-btn")}
-			

-			${h.end_form()}
-			
-		

+            

+            ${h.end_form()}
+            
+        

     

 

 
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
@@ -1,27 +1,27 @@
 <%def name="file_class(node)">
-	%if node.is_file():
-		<%return "browser-file" %>
-	%else:
-		<%return "browser-dir"%>
-	%endif
+    %if node.is_file():
+        <%return "browser-file" %>
+    %else:
+        <%return "browser-dir"%>
+    %endif
 
 

     

-		

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

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

-			${h.end_form()}
-		

-	    

-	       ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
-	       
-	    

+        

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

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

+            ${h.end_form()}
+        

+        

+           ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
+           
+        

         

               

                   ${_('search file list')}
@@ -40,77 +40,77 @@
         

     

 
-	

-		
-		         
-		             
-		                 
-		                 
-		                 
-		                 
-		                 
-		                 
-		             
-		         
+    

+        
${_('Name')}${_('Size')}${_('Mimetype')}${_('Last Revision')}${_('Last modified')}${_('Last commiter')}

+                 
+                     
+                         
+                         
+                         
+                         
+                         
+                         
+                     
+                 
-          		%if c.file.parent:
-         		
-	          		
-	          		
-	          		
-	          		
-	          		
-	          		
-				
-          		%endif
+                  %if c.file.parent:
+                 
+                      
+                      
+                      
+                      
+                      
+                      
+                
+                  %endif
 
-		    %for cnt,node in enumerate(c.file):
-				
-		             
+                     
-		             
-		             
-		             
+                     
+                     
+                     
-		             
+                     
-		             
+                     
-				
-			%endfor
+                         %endif
+                     
+                
+            %endfor
                 
-		
${_('Name')}${_('Size')}${_('Mimetype')}${_('Last Revision')}${_('Last modified')}${_('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")}
-	          		

+                          ${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")}
+                      

+            %for cnt,node in enumerate(c.file):
+                

                         %if node.is_submodule():
                            ${h.link_to(node.name,node.url or '#',class_="submodule-dir ypjax-link")}
                         %else:
                           ${h.link_to(node.name, h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=h.safe_unicode(node.path)),class_=file_class(node)+" ypjax-link")}
                         %endif:
-		             
-		             %if node.is_file():
-		             	${h.format_byte_size(node.size,binary=True)}
-		             %endif
-		             
-		              %if node.is_file():
-		                  ${node.mimetype}
-		              %endif
-		             
-		             	%if node.is_file():
-		             		

-		             		
${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}

+                     

+                     %if node.is_file():
+                         ${h.format_byte_size(node.size,binary=True)}
+                     %endif
+                     
+                      %if node.is_file():
+                          ${node.mimetype}
+                      %endif
+                     
+                         %if node.is_file():
+                             

+                             
${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}

                             

-		             	%endif
-		             		
-		             	%if node.is_file():
-		             		
+                         %endif
+                     
+                         %if node.is_file():
+                             
                             ${h.age(node.last_changeset.date)}
-		             	%endif
-		             
-		             	%if node.is_file():
-		             		
+                         %endif
+                     
+                         %if node.is_file():
+                             
                             ${h.person(node.last_changeset.author)}
                             
-		             	%endif
-		             

                 

-	

+        
+    

 

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()">
 

@@ -35,10 +35,10 @@
         
     

     

-		

-			
${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}

-			${h.form(h.url.current(),method='post',id='eform')}
-			

+        

+            
${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.revision,c.file.path)}

+            ${h.form(h.url.current(),method='post',id='eform')}
+            

             

                 

                     

@@ -58,21 +58,21 @@
                 

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

             

-			    

-				
-				
${_('commit message')}

-				
-			

-			

+                

+                
+                
${_('commit message')}

+                
+            

+            

             ${h.submit('commit',_('Commit changes'),class_="ui-btn")}
             ${h.reset('reset',_('Reset'),class_="ui-btn")}
-			

-			${h.end_form()}
-			
-		

+            

+            ${h.end_form()}
+            
+        

     

 

 
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
@@ -10,7 +10,7 @@
 
 
 

-	

+    

         

             

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

@@ -37,24 +37,24 @@
             

             
${h.person(c.file_changeset.author)}

         

-		
${h.urlify_commit(c.file_changeset.message,c.repo_name)}

-	

-	

-	   %if c.file.is_binary:
-	       ${_('Binary file (%s)') % c.file.mimetype}
-	   %else:
-		% if c.file.size < c.cut_off_limit:
+        
${h.urlify_commit(c.file_changeset.message,c.repo_name)}

+    

+    

+       %if c.file.is_binary:
+           ${_('Binary file (%s)') % c.file.mimetype}
+       %else:
+        % if c.file.size < c.cut_off_limit:
             %if c.annotate:
               ${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %else:
-			  ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
+              ${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
             %endif
-		%else:
-			${_('File is too big to display')} ${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))}
-		%endif
+        %else:
+            ${_('File is too big to display')} ${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))}
+        %endif
      %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
@@ -7,37 +7,37 @@
 
 

 
-	

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

-	

-	

-	    ${h.form(url('password_reset'))}
-	    

-	        
-	        

+    

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

+    

+    

+        ${h.form(url('password_reset'))}
+        

+            
+            

 
-	             

-	                

-	                    
-	                

-	                

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

-	             

+                 

+                    

+                        
+                    

+                    

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

+                 

 
-	            

-		            

-		              ${h.submit('send',_('Reset my password'),class_="ui-btn large")}
-					  	
${_('Password reset link will be send to matching email address')}

-		            

-	            

-	    	

-	    

-	    ${h.end_form()}
+                

+                    

+                      ${h.submit('send',_('Reset my password'),class_="ui-btn large")}
+                          
${_('Password reset link will be send to matching email address')}

+                    

+                

+            

+        

+        ${h.end_form()}
         
-	

+    

    

diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html
--- a/rhodecode/templates/pullrequests/pullrequest.html
+++ b/rhodecode/templates/pullrequests/pullrequest.html
@@ -137,10 +137,10 @@
   var other_repos_info = ${c.other_repos_info|n};
 
   var loadPreview = function(){
-	  YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
+      YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','none');
       var url = "${h.url('compare_url',
-    	                 repo_name='org_repo',
-    	                 org_ref_type='org_ref_type', org_ref='org_ref',
+                         repo_name='org_repo',
+                         org_ref_type='org_ref_type', org_ref='org_ref',
                          other_ref_type='other_ref_type', other_ref='other_ref',
                          repo='other_repo',
                          as_form=True, bundle=False,
@@ -175,21 +175,21 @@
       }
 
       YUE.on('other_repo', 'change', function(e){
-    	  var repo_name = e.currentTarget.value;
-    	  // replace the  of changed repo
+          YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
       });
 
       ypjax(url,'pull_request_overview', function(data){
-    	  var sel_box = YUQ('#pull_request_form #other_repo')[0];
-    	  var repo_name = sel_box.options[sel_box.selectedIndex].value;
-    	  YUD.get('pull_request_overview_url').href = url;
-    	  YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
-    	  YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
-    	  YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
-    	  YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
-    	  // select back the revision that was just compared
-    	  setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
+          var sel_box = YUQ('#pull_request_form #other_repo')[0];
+          var repo_name = sel_box.options[sel_box.selectedIndex].value;
+          YUD.get('pull_request_overview_url').href = url;
+          YUD.setStyle(YUD.get('pull_request_overview_url').parentElement,'display','');
+          YUD.get('other_repo_gravatar').src = other_repos_info[repo_name]['gravatar'];
+          YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
+          YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
+          // select back the revision that was just compared
+          setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
       })
   }
   YUE.on('refresh','click',function(e){
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -189,7 +189,7 @@
 
     
diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html
--- a/rhodecode/templates/register.html
+++ b/rhodecode/templates/register.html
@@ -7,31 +7,31 @@
 
 

 
-	

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

-	

-	

-	    ${h.form(url('register'))}
-	    

-	        
-	        

-	             

-	                

-	                    
-	                

-	                

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

-	             

+    

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

+    

+    

+        ${h.form(url('register'))}
+        

+            
+            

+                 

+                    

+                        
+                    

+                    

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

+                 

 
-	             

-	                

-	                    
-	                

-	                

-	                    ${h.password('password',class_="medium")}
-	                

-	             

+                 

+                    

+                        
+                    

+                    

+                        ${h.password('password',class_="medium")}
+                    

+                 

 
                        

                           

@@ -42,50 +42,50 @@
                           

                        

 
-	             

-	                

-	                    
-	                

-	                

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

-	             

+                 

+                    

+                        
+                    

+                    

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

+                 

 
-	             

-	                

-	                    
-	                

-	                

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

-	             

+                 

+                    

+                        
+                    

+                    

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

+                 

 
-	             

-	                

-	                    
-	                

-	                

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

-	             

+                 

+                    

+                        
+                    

+                    

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

+                 

 
-	            

-		            

-		              ${h.submit('sign_up',_('Sign Up'),class_="ui-btn large")}
-		              %if c.auto_active:
-					  	
${_('Your account will be activated right after registration')}

-					  %else:
-					  	
${_('Your account must wait for activation by administrator')}

-					  %endif
-		            

-	            

-	    	

-	    

-	    ${h.end_form()}
+                

+                    

+                      ${h.submit('sign_up',_('Sign Up'),class_="ui-btn large")}
+                      %if c.auto_active:
+                          
${_('Your account will be activated right after registration')}

+                      %else:
+                          
${_('Your account must wait for activation by administrator')}

+                      %endif
+                    

+                

+            

+        

+        ${h.end_form()}
         
-	

+    

  

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,63 +2,63 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
    %if c.cur_query:
-	%if c.repo_name:
-		${_('Search "%s" in repository: %s') % (c.cur_query, c.repo_name)}
-	%else:
-		${_('Search "%s" in all repositories') % c.cur_query}
-	%endif
+    %if c.repo_name:
+        ${_('Search "%s" in repository: %s') % (c.cur_query, c.repo_name)}
+    %else:
+        ${_('Search "%s" in all repositories') % c.cur_query}
+    %endif
    %else:
-	%if c.repo_name:
-		${_('Search in repository: %s') % c.repo_name}
-	%else:
-		${_('Search in all repositories')}
-	%endif
+    %if c.repo_name:
+        ${_('Search in repository: %s') % c.repo_name}
+    %else:
+        ${_('Search in all repositories')}
+    %endif
    %endif
-	- ${c.rhodecode_name}
+    - ${c.rhodecode_name}
 
 <%def name="breadcrumbs()">
-	${c.rhodecode_name}
+    ${c.rhodecode_name}
 
 <%def name="page_nav()">
-	${self.menu('home')}
+    ${self.menu('home')}
 
 <%def name="main()">
 
 

-	
-	

-		

-		%if c.repo_name:
-			${_('Search in repository: %s') % c.repo_name}
-		%else:
-			${_('Search in all repositories')}
-		%endif
-		

-	

-	
-	%if c.repo_name:
-		${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}
-	%else:
-		${h.form(h.url('search'),method='get')}
-	%endif
-	

-		

-			

+    
+    

+        

+        %if c.repo_name:
+            ${_('Search in repository: %s') % c.repo_name}
+        %else:
+            ${_('Search in all repositories')}
+        %endif
+        

+    

+    
+    %if c.repo_name:
+        ${h.form(h.url('search_repo',search_repo=c.repo_name),method='get')}
+    %else:
+        ${h.form(h.url('search'),method='get')}
+    %endif
+    

+        

+            

              

                  
              

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

-						
-					

-				

-				
${c.runtime}

-			

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

+                        
+                    

+                

+                
${c.runtime}

+            

 
-			

-	            

-	                
-	            

+            

+                

+                    
+                

                 

                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ('commit',_('Commit messages')),
@@ -68,9 +68,9 @@
                 

              

 
-		

-	

-	${h.end_form()}
+        

+    

+    ${h.end_form()}
     

     %if c.cur_type == 'content':
         <%include file='search_content.html'/>
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
@@ -2,19 +2,19 @@
 
 %for cnt,sr in enumerate(c.formated_results):
     %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'):
-	    

-	        

-	            ${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.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']))}
+            

+        

     %else:
         %if cnt == 0:
-		    

-		        

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

-		    

+            

+                

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

+            

         %endif
 
     %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
@@ -34,15 +34,15 @@
                     ${h.text('repo_name',class_="small")}
                 

              

-	       

-	           

-	               
-	           

-	           

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

+               

+                   
+               

+               

+                   ${h.text('clone_uri',class_="medium")}
                  ${_('Optional http[s] url from which repository should be cloned.')}
-	           

-	        

+               

+            

             

                 

                     
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
@@ -31,9 +31,9 @@
     

     
     

-	    

-	        ${c.shortlog_data}
-	    

+        

+            ${c.shortlog_data}
+        

     

 

 
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
@@ -1,16 +1,16 @@
 ## -*- coding: utf-8 -*-
 %if c.repo_changesets:
 
-	
-	    
+    
+        
-		
-		
-		
-		
-	
+        
+        
+        
+        
+    
 %for cnt,cs in enumerate(c.repo_changesets):
-	
+    
-		
-		
+        
-		
-	
+            
+        
+        
+    
 %endfor
 
 
${_('revision')}
${_('revision')}
         ${_('commit message')}${_('age')}${_('author')}${_('branch')}${_('tags')}
${_('age')}${_('author')}${_('branch')}${_('tags')}

         
           

             

@@ -35,24 +35,24 @@
         

                       ${h.age(cs.date)}
         ${h.person(cs.author)}
-			
+        ${h.person(cs.author)}
+            
                 %if cs.branch:
-				
+                
                     ${cs.branch}
                 
                 %endif
-			
-		
-			
-				%for tag in cs.tags:
-					${tag}
-				%endfor
-			
-		

+            
+                %for tag in cs.tags:
+                    ${tag}
+                %endfor
+            
+        

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
@@ -13,7 +13,7 @@
 
 
 <%def name="page_nav()">
-	${self.menu('summary')}
+    ${self.menu('summary')}
 
 
 <%def name="head_extra()">
@@ -35,14 +35,14 @@
         ${self.breadcrumbs()}
     

     
-	

-	  

+    

+      

 
-			 

-			  

-			      
-			  

-			  

+             

+              

+                  
+              

+              

                   

                      %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')}
@@ -73,119 +73,119 @@
                       %endif
                     %endif
                  ##REPO TYPE
-		         %if h.is_hg(c.dbrepo):
-		           ${_('Mercurial repository')}
-		         %endif
-		         %if h.is_git(c.dbrepo):
-		           ${_('Git repository')}
-		         %endif
+                 %if h.is_hg(c.dbrepo):
+                   ${_('Mercurial repository')}
+                 %endif
+                 %if h.is_git(c.dbrepo):
+                   ${_('Git repository')}
+                 %endif
 
                  ##PUBLIC/PRIVATE
-	             %if c.dbrepo.private:
-	                ${_('private repository')}
-	             %else:
-	                ${_('public repository')}
-	             %endif
+                 %if c.dbrepo.private:
+                    ${_('private repository')}
+                 %else:
+                    ${_('public repository')}
+                 %endif
 
-	              ##REPO NAME
-			      ${h.repo_link(c.dbrepo.groups_and_repo)}
+                  ##REPO NAME
+                  ${h.repo_link(c.dbrepo.groups_and_repo)}
 
                   ##FORK
-		          %if c.dbrepo.fork:
-	            	
-		          %endif
-		          ##REMOTE
-				  %if c.dbrepo.clone_uri:
+                  %if c.dbrepo.fork:
+                    
+                  %endif
+                  ##REMOTE
+                  %if c.dbrepo.clone_uri:
                     
-				  %endif
-			  

-			 

+                  %endif
+              

+             

 
-			 

-			  

-			      
-			  

+             

+              

+                  
+              

               %if c.visual.stylify_metatags:
                 
${h.urlify_text(h.desc_stylize(c.dbrepo.description))}

               %else:
                 
${h.urlify_text(c.dbrepo.description)}

               %endif
-			 

+             

 
-			 

-			  

-			      
-			  

-			  

-			  	

-			  		gravatar
-			  	

-			  		${_('Username')}: ${c.dbrepo.user.username}

-			  		${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}

-			  		${_('Email')}: ${c.dbrepo.user.email}
-			  

-			 

+             

+              

+                  
+              

+              

+                  

+                      gravatar
+                  

+                      ${_('Username')}: ${c.dbrepo.user.username}

+                      ${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}

+                      ${_('Email')}: ${c.dbrepo.user.email}
+              

+             

 
-			 

-			  

-			      
-			  

-			  

+             

+              

+                  
+              

+              

                   
                   
${_('Show by ID')}

-			      
+                  
                   
-			  

-			 

+              

+             

 
-			 

-			  

-			      
-			  

-			  

+             

+              

+                  
+              

+              

                 %if c.show_stats:
-			    

+                

                 %else:
                    ${_('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
-			  

-			 

+              

+             

 
-			 

-			  

-			      
-			  

-			  

-		        %if len(c.rhodecode_repo.revisions) == 0:
-		          ${_('There are no downloads yet')}
-		        %elif c.enable_downloads is False:
-		          ${_('Downloads are disabled for this repository')}
+             

+              

+                  
+              

+              

+                %if len(c.rhodecode_repo.revisions) == 0:
+                  ${_('There are no downloads yet')}
+                %elif c.enable_downloads is False:
+                  ${_('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
-		        %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")}
+                %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")}
                     
                         
                         
                     
-			    %endif
-			  

-			 

-	  

-	

+                %endif
+              

+             

+      

+    

 

 
 %if c.show_stats:
@@ -210,12 +210,12 @@
         

         

 
-    	

-	    	

-	    	

-				

-	    	

-    	

+        

+            

+            

+                

+            

+        

     
 
 %endif
@@ -279,13 +279,13 @@ YUE.on('clone_by_name','click',function(
 })
 YUE.on('clone_by_id','click',function(e){
 
-	// show url by id and hide id button
-	YUD.setStyle('clone_by_id','display','none');
+    // 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');
+    YUD.setStyle('clone_by_name','display','');
+    YUD.setStyle('clone_url','display','none');
 })
 
 
@@ -323,7 +323,7 @@ var tbl = document.createElement('table'
 tbl.setAttribute('class','trending_language_tbl');
 var cnt = 0;
 for (var i=0;i
     
-    	
+        
-    	
+        
-		%for cnt,tag in enumerate(c.repo_tags.items()):
-		
+        %for cnt,tag in enumerate(c.repo_tags.items()):
+        
-	        
-	        
+            
-		
-		%endfor
+        
+        %endfor
     

       

             ${_('Name')}
             ${_('Date')}
             ${_('Author')}
             ${_('Revision')}
             ${_('Compare')}

       

             
                 
                     ${h.link_to(tag[0],
@@ -20,8 +20,8 @@
                 
             
             ${h.fmt_date(tag[1].date)}${h.person(tag[1].author)}
+            ${h.person(tag[1].author)}
                 
@@ -30,10 +30,10 @@
                 
                 
             

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