# HG changeset patch # User Mads Kiilerich # Date 2016-11-10 15:10:41 # Node ID 19f15cde2cdb0336c2753ac46aad500336fc34b4 # Parent be204b0afed484956d10e87f3e4dd6a2fffb749f repositories: drop the word "dashboard" - it is just a list of repositories and groups diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py --- a/kallithea/controllers/admin/settings.py +++ b/kallithea/controllers/admin/settings.py @@ -260,7 +260,7 @@ class SettingsController(BaseController) ('show_private_icon', 'show_private_icon', 'bool'), ('stylify_metatags', 'stylify_metatags', 'bool'), ('repository_fields', 'repository_fields', 'bool'), - ('dashboard_items', 'dashboard_items', 'int'), + ('dashboard_items', 'page_size', 'int'), ('admin_grid_items', 'admin_grid_items', 'int'), ('show_version', 'show_version', 'bool'), ('use_gravatar', 'use_gravatar', 'bool'), diff --git a/kallithea/lib/base.py b/kallithea/lib/base.py --- a/kallithea/lib/base.py +++ b/kallithea/lib/base.py @@ -319,7 +319,7 @@ class BaseController(WSGIController): c.visual.show_public_icon = str2bool(rc_config.get('show_public_icon')) c.visual.show_private_icon = str2bool(rc_config.get('show_private_icon')) c.visual.stylify_metatags = str2bool(rc_config.get('stylify_metatags')) - c.visual.dashboard_items = safe_int(rc_config.get('dashboard_items', 100)) + c.visual.page_size = safe_int(rc_config.get('dashboard_items', 100)) c.visual.admin_grid_items = safe_int(rc_config.get('admin_grid_items', 100)) c.visual.repository_fields = str2bool(rc_config.get('repository_fields')) c.visual.show_version = str2bool(rc_config.get('show_version')) diff --git a/kallithea/lib/db_manage.py b/kallithea/lib/db_manage.py --- a/kallithea/lib/db_manage.py +++ b/kallithea/lib/db_manage.py @@ -442,7 +442,7 @@ class DbManage(object): ('show_public_icon', True, 'bool'), ('show_private_icon', True, 'bool'), ('stylify_metatags', False, 'bool'), - ('dashboard_items', 100, 'int'), + ('dashboard_items', 100, 'int'), # TODO: call it page_size ('admin_grid_items', 25, 'int'), ('show_version', True, 'bool'), ('use_gravatar', True, 'bool'), diff --git a/kallithea/model/forms.py b/kallithea/model/forms.py --- a/kallithea/model/forms.py +++ b/kallithea/model/forms.py @@ -358,7 +358,7 @@ def ApplicationVisualisationForm(): repository_fields = v.StringBoolean(if_missing=False) lightweight_journal = v.StringBoolean(if_missing=False) - dashboard_items = v.Int(min=5, not_empty=True) + page_size = v.Int(min=5, not_empty=True) admin_grid_items = v.Int(min=5, not_empty=True) show_version = v.StringBoolean(if_missing=False) use_gravatar = v.StringBoolean(if_missing=False) diff --git a/kallithea/templates/admin/repo_groups/repo_group_show.html b/kallithea/templates/admin/repo_groups/repo_group_show.html --- a/kallithea/templates/admin/repo_groups/repo_group_show.html +++ b/kallithea/templates/admin/repo_groups/repo_group_show.html @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> <%block name="title"> - ${_('%s Repository group dashboard') % c.group.group_name} + ${_('Repository group %s') % c.group.group_name} <%def name="breadcrumbs()"> diff --git a/kallithea/templates/admin/settings/settings_visual.html b/kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html +++ b/kallithea/templates/admin/settings/settings_visual.html @@ -50,15 +50,15 @@
- +
- ${h.text('dashboard_items',size=5)} - ${_('Number of items displayed in the main page dashboard before pagination is shown.')} + ${h.text('page_size',size=5)} + ${_('Number of items displayed in the repository pages before pagination is shown.')}
- +
${h.text('admin_grid_items',size=5)} ${_('Number of items displayed in the admin pages grids before pagination is shown.')} diff --git a/kallithea/templates/index.html b/kallithea/templates/index.html --- a/kallithea/templates/index.html +++ b/kallithea/templates/index.html @@ -2,7 +2,7 @@ <%inherit file="base/base.html"/> <%block name="title"> - ${_('Dashboard')} + ${_('Repositories')} <%block name="header_menu">