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 @@ -4,15 +4,15 @@

Support RhodeCode development.

- - - - + + + +
Flattr this -
+
{% endblock %}} 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 @@ -19,16 +19,16 @@ %endif ${h.action_parser(l)[0]()} -
- ${h.literal(h.action_parser(l)[1]())} -
+
+ ${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)} 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 @@ -25,7 +25,7 @@
-

${_('Connection settings')}

+

${_('Connection settings')}

${h.checkbox('ldap_active',True,class_='small')}
@@ -54,7 +54,7 @@
${h.select('ldap_tls_reqcert',c.tls_reqcert_cur,c.tls_reqcert_choices,class_='small')}
-

${_('Search settings')}

+

${_('Search settings')}

${h.text('ldap_base_dn',class_='small')}
@@ -67,7 +67,7 @@
${h.select('ldap_search_scope',c.search_scope_cur,c.search_scope_choices,class_='small')}
-

${_('Attribute mappings')}

+

${_('Attribute mappings')}

${h.text('ldap_attr_login',class_='small')}
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 @@ -32,14 +32,14 @@
-
+
${h.text('group_name',class_='medium')}
-
+
@@ -48,16 +48,16 @@
${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 @@ -25,14 +25,14 @@
% for hook in c.hooks: -
-
- +
+
+ +
+
+ ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} +
-
- ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} -
-
% endfor
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 @@ -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_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 @@ -173,37 +173,37 @@ 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.doBeforeCallback = function(req,raw,res,cb) { - // This is the filter function - var data = res.results || [], - filtered = [], - i,l; + 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 || [], + filtered = [], + i,l; - if (req) { - req = req.toLowerCase(); - for (i = 0; i %if current not in ['home','admin']: - ##REGULAR MENU + ##REGULAR MENU
  • @@ -207,14 +207,14 @@ %endif %endif -
  • ${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}
    • +
  • ${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}
    • %if h.is_hg(c.rhodecode_repo):
  • ${h.link_to(_('open new pull request'),h.url('pullrequest_home',repo_name=c.repo_name),class_='pull_request')}
    • %endif %if c.rhodecode_db_repo.fork:
  • ${h.link_to(_('compare fork'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name),class_='compare_request')}
    • %endif -
  • ${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}
    • +
  • ${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}
    • %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking: %if c.rhodecode_db_repo.locked[0]: 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,17 +21,17 @@ %if c.ga_code: - + (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 ## 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 @@ -1,15 +1,15 @@ %if c.repo_bookmarks:
    - + - - %for cnt,book in enumerate(c.repo_bookmarks.items()): + + %for cnt,book in enumerate(c.repo_bookmarks.items()): - %endfor + %endfor
    ${_('Name')} ${_('Date')} ${_('Author')} ${_('Revision')}
    @@ -25,7 +25,7 @@
    %else: 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()">
    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 @@ -42,30 +42,30 @@
    - - - - - - - - - - + + + + + + + + + + - - %if c.file.parent: - - - - - - - + + %if c.file.parent: + + + + + + + - %endif + %endif %for cnt,node in enumerate(c.file): @@ -108,9 +108,9 @@ %endfor - - - + + +
    ${_('Name')}${_('Size')}${_('Mimetype')}${_('Last Revision')}${_('Last modified')}${_('Last commiter')}
    ${_('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")} +
    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()">
    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 @@ -89,9 +89,9 @@ ${h.checkbox('update_after_clone',value="True")} ${_('Checkout source after making a clone')}
    -
+
- ${h.submit('',_('fork this repository'),class_="ui-btn large")} + ${h.submit('',_('fork this repository'),class_="ui-btn large")}
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 @@ -10,16 +10,16 @@ ${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}
+ +
${f.description}
${_('forked')} - - ${h.age(f.created_on)} - ${_('Compare fork')} -
+ ${h.age(f.created_on)} + ${_('Compare fork')} +
% endfor diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -15,59 +15,59 @@
-
+
${h.text('username',class_="medium")}
-
+
-
+
${h.password('password',class_="medium")}
-
+
-
-
- -
-
- ${h.password('password_confirmation',class_="medium")} -
-
+
+
+ +
+
+ ${h.password('password_confirmation',class_="medium")} +
+
-
+
${h.text('firstname',class_="medium")}
-
+
-
+
${h.text('lastname',class_="medium")}
-
+
-
+
${h.text('email',class_="medium")}
-
+