From d4ab7f9de9ea6dbb9bda44d27604fb5433d9b1e8 Mon Sep 17 00:00:00 2001 From: Mathias Behrle Date: Thu, 10 Jul 2014 01:15:48 +0200 Subject: [PATCH 001/783] Fixing some titles to start with uppercase. --- mayan/apps/installation/views.py | 4 ++-- mayan/apps/statistics/views.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mayan/apps/installation/views.py b/mayan/apps/installation/views.py index 503c206737..ca44712d4d 100644 --- a/mayan/apps/installation/views.py +++ b/mayan/apps/installation/views.py @@ -18,7 +18,7 @@ def namespace_list(request): return render_to_response('generic_list.html', { 'object_list': PropertyNamespace.get_all(), - 'title': _(u'installation property namespaces'), + 'title': _(u'Installation property namespaces'), 'hide_object': True, }, context_instance=RequestContext(request)) @@ -30,7 +30,7 @@ def namespace_details(request, namespace_id): namespace = PropertyNamespace.get(namespace_id) object_list = namespace.get_properties() - title = _(u'installation namespace details for: %s') % namespace.label + title = _(u'Installation namespace details for: %s') % namespace.label return render_to_response('generic_list.html', { 'object_list': object_list, diff --git a/mayan/apps/statistics/views.py b/mayan/apps/statistics/views.py index a3caf21b9b..49eb1ab577 100644 --- a/mayan/apps/statistics/views.py +++ b/mayan/apps/statistics/views.py @@ -15,7 +15,7 @@ def namespace_list(request): return render_to_response('generic_list.html', { 'object_list': StatisticNamespace.get_all(), 'hide_link': True, - 'title': _(u'statistics namespaces'), + 'title': _(u'Statistics namespaces'), 'list_object_variable_name': 'namespace', }, context_instance=RequestContext(request)) @@ -31,7 +31,7 @@ def namespace_details(request, namespace_id): 'namespace': namespace, 'object_list': namespace.statistics, 'hide_link': True, - 'title': _(u'namespace details for: %s') % namespace, + 'title': _(u'Namespace details for: %s') % namespace, 'object_name': _(u'namespace'), }, context_instance=RequestContext(request)) @@ -51,5 +51,5 @@ def execute(request, statistic_id): ], 'object_list': statictic.get_results(), 'hide_link': True, - 'title': _(u'results for: %s') % statictic, + 'title': _(u'Results for: %s') % statictic, }, context_instance=RequestContext(request)) From 7376263ffa3196548cfee5096ce646a2b3aba739 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 26 Aug 2014 02:21:12 -0400 Subject: [PATCH 002/783] Get rid of the web_theme app --- mayan/apps/common/templates/login.html | 71 +- mayan/apps/main/conf/settings.py | 12 +- .../static/packages/animate-custom.css | 0 .../static/packages/jquery-2.1.1.min.js | 0 .../static/web_theme_media/LICENSE | 0 .../static/web_theme_media/README.md | 0 .../static/web_theme_media/Rakefile | 0 .../static/web_theme_media/VERSION | 0 .../web_theme_media/config/locales/de_de.yml | 0 .../web_theme_media/config/locales/pt_br.yml | 0 .../features/step_definitions/layout_steps.rb | 0 .../features/step_definitions/themed_steps.rb | 0 .../web_theme_media/features/support/env.rb | 0 .../features/theme_generator.feature | 0 .../features/themed_generator.feature | 0 .../static/web_theme_media/images/avatar.png | Bin .../images/icons/application_edit.png | Bin .../web_theme_media/images/icons/cross.png | Bin .../web_theme_media/images/icons/key.png | Bin .../web_theme_media/images/icons/tick.png | Bin .../static/web_theme_media/index.html | 0 .../javascripts/jquery-1.3.min.js | 0 .../javascripts/jquery-1.5.2.min.js | 0 .../javascripts/jquery-1.7.min.js | 0 .../javascripts/jquery.localscroll.js | 0 .../javascripts/jquery.scrollTo.js | 0 .../theme/templates/layout_admin.html.erb | 0 .../theme/templates/layout_sign.html.erb | 0 .../web_app_theme/theme/theme_generator.rb | 0 .../themed/templates/view_edit.html.erb | 0 .../themed/templates/view_form.html.erb | 0 .../themed/templates/view_new.html.erb | 0 .../themed/templates/view_show.html.erb | 0 .../themed/templates/view_sidebar.html.erb | 0 .../themed/templates/view_signin.html.erb | 0 .../themed/templates/view_signup.html.erb | 0 .../themed/templates/view_tables.html.erb | 0 .../themed/templates/view_text.html.erb | 0 .../web_app_theme/themed/themed_generator.rb | 0 .../web_theme_media/lib/web_app_theme.rb | 0 .../web_theme_media/stylesheets/base.css | 0 .../web_theme_media/stylesheets/override.css | 0 .../themes/activo/images/arrow.png | Bin .../activo/images/boxbar-background.png | Bin .../images/button-background-active.png | Bin .../activo/images/button-background.png | Bin .../activo/images/menubar-background.png | Bin .../stylesheets/themes/activo/style.css | 0 .../stylesheets/themes/amro/style.css | 0 .../stylesheets/themes/bec-green/style.css | 0 .../stylesheets/themes/bec/style.css | 0 .../stylesheets/themes/blue/style.css | 0 .../fonts/museo700-regular-webfont.eot | Bin .../fonts/museo700-regular-webfont.svg | 0 .../fonts/museo700-regular-webfont.ttf | Bin .../fonts/museo700-regular-webfont.woff | Bin .../default/fonts/museosans_500-webfont.eot | Bin .../default/fonts/museosans_500-webfont.svg | 0 .../default/fonts/museosans_500-webfont.ttf | Bin .../default/fonts/museosans_500-webfont.woff | Bin .../fonts/museosans_500_italic-webfont.eot | Bin .../fonts/museosans_500_italic-webfont.svg | 0 .../fonts/museosans_500_italic-webfont.ttf | Bin .../fonts/museosans_500_italic-webfont.woff | Bin .../themes/default/images/arrow.png | Bin .../stylesheets/themes/default/images/bgd.jpg | Bin .../default/images/boxbar-background.png | Bin .../images/button-background-active.png | Bin .../default/images/button-background.png | Bin .../default/images/menubar-background.png | Bin .../themes/default/images/messages/error.png | Bin .../themes/default/images/messages/notice.png | Bin .../default/images/messages/warning.png | Bin .../stylesheets/themes/default/style.css | 0 .../themes/djime-cerulean/style.css | 0 .../stylesheets/themes/drastic-dark/style.css | 0 .../stylesheets/themes/kathleene/style.css | 0 .../stylesheets/themes/olive/style.css | 0 .../stylesheets/themes/orange/style.css | 0 .../stylesheets/themes/red/style.css | 0 .../themes/reidb-greenish/style.css | 0 .../stylesheets/themes/warehouse/style.css | 0 .../web_theme_media/test/spec_helper.rb | 0 .../test/themed_generator_spec.rb | 0 .../web_theme_media/web-app-theme.gemspec | 0 mayan/apps/main/templates/base.html | 1010 +++++++++-------- .../templates/pagination/pagination.html | 0 .../templatetags/styling.py | 0 .../templatetags/theme_tags.py | 0 mayan/apps/web_theme/__init__.py | 0 mayan/apps/web_theme/conf/__init__.py | 0 mayan/apps/web_theme/conf/settings.py | 14 - .../web_theme/locale/ar/LC_MESSAGES/django.mo | Bin 2461 -> 0 bytes .../web_theme/locale/ar/LC_MESSAGES/django.po | 122 -- .../web_theme/locale/bg/LC_MESSAGES/django.mo | Bin 2840 -> 0 bytes .../web_theme/locale/bg/LC_MESSAGES/django.po | 120 -- .../locale/bs_BA/LC_MESSAGES/django.mo | Bin 2523 -> 0 bytes .../locale/bs_BA/LC_MESSAGES/django.po | 121 -- .../web_theme/locale/da/LC_MESSAGES/django.mo | Bin 456 -> 0 bytes .../web_theme/locale/da/LC_MESSAGES/django.po | 111 -- .../locale/de_DE/LC_MESSAGES/django.mo | Bin 2473 -> 0 bytes .../locale/de_DE/LC_MESSAGES/django.po | 123 -- .../web_theme/locale/en/LC_MESSAGES/django.mo | Bin 2359 -> 0 bytes .../web_theme/locale/en/LC_MESSAGES/django.po | 120 -- .../web_theme/locale/es/LC_MESSAGES/django.mo | Bin 2471 -> 0 bytes .../web_theme/locale/es/LC_MESSAGES/django.po | 121 -- .../web_theme/locale/fa/LC_MESSAGES/django.mo | Bin 450 -> 0 bytes .../web_theme/locale/fa/LC_MESSAGES/django.po | 111 -- .../web_theme/locale/fr/LC_MESSAGES/django.mo | Bin 2556 -> 0 bytes .../web_theme/locale/fr/LC_MESSAGES/django.po | 122 -- .../locale/hr_HR/LC_MESSAGES/django.mo | Bin 546 -> 0 bytes .../locale/hr_HR/LC_MESSAGES/django.po | 112 -- .../web_theme/locale/hu/LC_MESSAGES/django.mo | Bin 459 -> 0 bytes .../web_theme/locale/hu/LC_MESSAGES/django.po | 111 -- .../web_theme/locale/id/LC_MESSAGES/django.mo | Bin 463 -> 0 bytes .../web_theme/locale/id/LC_MESSAGES/django.po | 111 -- .../web_theme/locale/it/LC_MESSAGES/django.mo | Bin 1671 -> 0 bytes .../web_theme/locale/it/LC_MESSAGES/django.po | 118 -- .../locale/nl_NL/LC_MESSAGES/django.mo | Bin 475 -> 0 bytes .../locale/nl_NL/LC_MESSAGES/django.po | 111 -- .../web_theme/locale/pl/LC_MESSAGES/django.mo | Bin 663 -> 0 bytes .../web_theme/locale/pl/LC_MESSAGES/django.po | 113 -- .../web_theme/locale/pt/LC_MESSAGES/django.mo | Bin 1674 -> 0 bytes .../web_theme/locale/pt/LC_MESSAGES/django.po | 118 -- .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 1685 -> 0 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 117 -- .../locale/ro_RO/LC_MESSAGES/django.mo | Bin 2560 -> 0 bytes .../locale/ro_RO/LC_MESSAGES/django.po | 121 -- .../web_theme/locale/ru/LC_MESSAGES/django.mo | Bin 2892 -> 0 bytes .../web_theme/locale/ru/LC_MESSAGES/django.po | 120 -- .../locale/sl_SI/LC_MESSAGES/django.mo | Bin 528 -> 0 bytes .../locale/sl_SI/LC_MESSAGES/django.po | 112 -- .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 933 -> 0 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 112 -- .../locale/vi_VN/LC_MESSAGES/django.mo | Bin 2249 -> 0 bytes .../locale/vi_VN/LC_MESSAGES/django.po | 118 -- mayan/apps/web_theme/models.py | 3 - .../web_theme/templates/web_theme_base.html | 142 --- .../web_theme/templates/web_theme_login.html | 73 -- mayan/apps/web_theme/templatetags/__init__.py | 0 mayan/apps/web_theme/views.py | 1 - mayan/settings/base.py | 1 - 142 files changed, 635 insertions(+), 3257 deletions(-) rename mayan/apps/{web_theme => main}/static/packages/animate-custom.css (100%) rename mayan/apps/{web_theme => main}/static/packages/jquery-2.1.1.min.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/LICENSE (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/README.md (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/Rakefile (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/VERSION (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/config/locales/de_de.yml (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/config/locales/pt_br.yml (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/features/step_definitions/layout_steps.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/features/step_definitions/themed_steps.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/features/support/env.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/features/theme_generator.feature (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/features/themed_generator.feature (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/images/avatar.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/images/icons/application_edit.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/images/icons/cross.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/images/icons/key.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/images/icons/tick.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/index.html (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/javascripts/jquery-1.3.min.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/javascripts/jquery-1.5.2.min.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/javascripts/jquery-1.7.min.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/javascripts/jquery.localscroll.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/javascripts/jquery.scrollTo.js (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/theme/theme_generator.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_edit.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_form.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_new.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_show.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_sidebar.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signin.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signup.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_tables.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_text.html.erb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/generators/web_app_theme/themed/themed_generator.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/lib/web_app_theme.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/base.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/override.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/images/arrow.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/images/button-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/activo/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/amro/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/bec-green/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/bec/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/blue/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/arrow.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/button-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/messages/error.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/default/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/drastic-dark/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/kathleene/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/olive/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/orange/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/red/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/stylesheets/themes/warehouse/style.css (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/test/spec_helper.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/test/themed_generator_spec.rb (100%) rename mayan/apps/{web_theme => main}/static/web_theme_media/web-app-theme.gemspec (100%) rename mayan/apps/{web_theme => main}/templates/pagination/pagination.html (100%) rename mayan/apps/{web_theme => main}/templatetags/styling.py (100%) rename mayan/apps/{web_theme => main}/templatetags/theme_tags.py (100%) delete mode 100644 mayan/apps/web_theme/__init__.py delete mode 100644 mayan/apps/web_theme/conf/__init__.py delete mode 100644 mayan/apps/web_theme/conf/settings.py delete mode 100644 mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/da/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/da/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/en/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/en/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/es/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/es/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/hu/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/hu/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/id/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/id/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/it/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/it/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/pt/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/pt/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/ro_RO/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/ro_RO/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/tr_TR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/tr_TR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/locale/vi_VN/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/web_theme/locale/vi_VN/LC_MESSAGES/django.po delete mode 100644 mayan/apps/web_theme/models.py delete mode 100644 mayan/apps/web_theme/templates/web_theme_base.html delete mode 100644 mayan/apps/web_theme/templates/web_theme_login.html delete mode 100644 mayan/apps/web_theme/templatetags/__init__.py delete mode 100644 mayan/apps/web_theme/views.py diff --git a/mayan/apps/common/templates/login.html b/mayan/apps/common/templates/login.html index 395d54832f..629d728fd9 100644 --- a/mayan/apps/common/templates/login.html +++ b/mayan/apps/common/templates/login.html @@ -1,15 +1,82 @@ -{% extends 'web_theme_login.html' %} +{% extends 'web_theme_base.html' %} {% load i18n %} +{% load autoadmin_tags %} {% load project_tags %} +{% load theme_tags %} + +{% block web_theme_head %} + {% if user.is_authenticated %} + {% get_login_redirect_url %} + + {% endif %} +{% endblock %} {% block html_title %}{% project_name %} :: {% trans 'Login' %}{% endblock %} + {% if user.is_authenticated %} + {% block web_theme_content %} + {% get_login_redirect_url %} +
+

{% trans 'You are already logged in' %}

+
+

+ {% trans 'Redirecting you to the website entry point in 5 seconds.' %} +

+

+ {% blocktrans %}Or click here if redirection doesn't work.{% endblocktrans %} +

+
+
+ {% endblock %} + {% else %} + {% block content_plain %} + {% auto_admin_properties %} + {% if auto_admin_properties.account %} +
+
+

{% trans "First time login" %}

+ +
+
+ {% endif %} +
+

{% project_name %}

+
+

{% trans 'Login' %}

+ +
+ {% get_web_theme_setting "VERBOSE_LOGIN" as verbose_login %} + {% if verbose_login %} + {% include 'verbose_login.html' %} + {% endif %} + {% endblock %} + {% endif %} + {% block web_theme_stylesheets %} {% endblock web_theme_stylesheets %} -{% block project_name %}{% project_name %}{% endblock %} +{% block project_name %}{% endblock %} diff --git a/mayan/apps/main/conf/settings.py b/mayan/apps/main/conf/settings.py index 7a82555ea0..d9f2f80dc1 100644 --- a/mayan/apps/main/conf/settings.py +++ b/mayan/apps/main/conf/settings.py @@ -1,7 +1,7 @@ """Configuration options for the main app""" from django.utils.translation import ugettext_lazy as _ -from smart_settings.api import register_setting +from smart_settings.api import register_setting, register_settings register_setting( namespace=u'main', @@ -27,3 +27,13 @@ register_setting( global_name=u'MAIN_DISABLE_ICONS', default=False, ) + +register_settings( + namespace=u'main', + module=u'main.conf.settings', + settings=[ + {'name': u'THEME', 'global_name': u'MAIN_THEME', 'default': u'activo', 'description': _(u'CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse.')}, + {'name': u'ENABLE_SCROLL_JS', 'global_name': u'MAIN_ENABLE_SCROLL_JS', 'default': True, 'hidden': True}, + {'name': u'VERBOSE_LOGIN', 'global_name': u'MAIN_VERBOSE_LOGIN', 'default': True, 'description': _(u'Display extra information in the login screen.')}, + ] +) diff --git a/mayan/apps/web_theme/static/packages/animate-custom.css b/mayan/apps/main/static/packages/animate-custom.css similarity index 100% rename from mayan/apps/web_theme/static/packages/animate-custom.css rename to mayan/apps/main/static/packages/animate-custom.css diff --git a/mayan/apps/web_theme/static/packages/jquery-2.1.1.min.js b/mayan/apps/main/static/packages/jquery-2.1.1.min.js similarity index 100% rename from mayan/apps/web_theme/static/packages/jquery-2.1.1.min.js rename to mayan/apps/main/static/packages/jquery-2.1.1.min.js diff --git a/mayan/apps/web_theme/static/web_theme_media/LICENSE b/mayan/apps/main/static/web_theme_media/LICENSE similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/LICENSE rename to mayan/apps/main/static/web_theme_media/LICENSE diff --git a/mayan/apps/web_theme/static/web_theme_media/README.md b/mayan/apps/main/static/web_theme_media/README.md similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/README.md rename to mayan/apps/main/static/web_theme_media/README.md diff --git a/mayan/apps/web_theme/static/web_theme_media/Rakefile b/mayan/apps/main/static/web_theme_media/Rakefile similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/Rakefile rename to mayan/apps/main/static/web_theme_media/Rakefile diff --git a/mayan/apps/web_theme/static/web_theme_media/VERSION b/mayan/apps/main/static/web_theme_media/VERSION similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/VERSION rename to mayan/apps/main/static/web_theme_media/VERSION diff --git a/mayan/apps/web_theme/static/web_theme_media/config/locales/de_de.yml b/mayan/apps/main/static/web_theme_media/config/locales/de_de.yml similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/config/locales/de_de.yml rename to mayan/apps/main/static/web_theme_media/config/locales/de_de.yml diff --git a/mayan/apps/web_theme/static/web_theme_media/config/locales/pt_br.yml b/mayan/apps/main/static/web_theme_media/config/locales/pt_br.yml similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/config/locales/pt_br.yml rename to mayan/apps/main/static/web_theme_media/config/locales/pt_br.yml diff --git a/mayan/apps/web_theme/static/web_theme_media/features/step_definitions/layout_steps.rb b/mayan/apps/main/static/web_theme_media/features/step_definitions/layout_steps.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/features/step_definitions/layout_steps.rb rename to mayan/apps/main/static/web_theme_media/features/step_definitions/layout_steps.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/features/step_definitions/themed_steps.rb b/mayan/apps/main/static/web_theme_media/features/step_definitions/themed_steps.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/features/step_definitions/themed_steps.rb rename to mayan/apps/main/static/web_theme_media/features/step_definitions/themed_steps.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/features/support/env.rb b/mayan/apps/main/static/web_theme_media/features/support/env.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/features/support/env.rb rename to mayan/apps/main/static/web_theme_media/features/support/env.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/features/theme_generator.feature b/mayan/apps/main/static/web_theme_media/features/theme_generator.feature similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/features/theme_generator.feature rename to mayan/apps/main/static/web_theme_media/features/theme_generator.feature diff --git a/mayan/apps/web_theme/static/web_theme_media/features/themed_generator.feature b/mayan/apps/main/static/web_theme_media/features/themed_generator.feature similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/features/themed_generator.feature rename to mayan/apps/main/static/web_theme_media/features/themed_generator.feature diff --git a/mayan/apps/web_theme/static/web_theme_media/images/avatar.png b/mayan/apps/main/static/web_theme_media/images/avatar.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/images/avatar.png rename to mayan/apps/main/static/web_theme_media/images/avatar.png diff --git a/mayan/apps/web_theme/static/web_theme_media/images/icons/application_edit.png b/mayan/apps/main/static/web_theme_media/images/icons/application_edit.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/images/icons/application_edit.png rename to mayan/apps/main/static/web_theme_media/images/icons/application_edit.png diff --git a/mayan/apps/web_theme/static/web_theme_media/images/icons/cross.png b/mayan/apps/main/static/web_theme_media/images/icons/cross.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/images/icons/cross.png rename to mayan/apps/main/static/web_theme_media/images/icons/cross.png diff --git a/mayan/apps/web_theme/static/web_theme_media/images/icons/key.png b/mayan/apps/main/static/web_theme_media/images/icons/key.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/images/icons/key.png rename to mayan/apps/main/static/web_theme_media/images/icons/key.png diff --git a/mayan/apps/web_theme/static/web_theme_media/images/icons/tick.png b/mayan/apps/main/static/web_theme_media/images/icons/tick.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/images/icons/tick.png rename to mayan/apps/main/static/web_theme_media/images/icons/tick.png diff --git a/mayan/apps/web_theme/static/web_theme_media/index.html b/mayan/apps/main/static/web_theme_media/index.html similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/index.html rename to mayan/apps/main/static/web_theme_media/index.html diff --git a/mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.3.min.js b/mayan/apps/main/static/web_theme_media/javascripts/jquery-1.3.min.js similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.3.min.js rename to mayan/apps/main/static/web_theme_media/javascripts/jquery-1.3.min.js diff --git a/mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.5.2.min.js b/mayan/apps/main/static/web_theme_media/javascripts/jquery-1.5.2.min.js similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.5.2.min.js rename to mayan/apps/main/static/web_theme_media/javascripts/jquery-1.5.2.min.js diff --git a/mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.7.min.js b/mayan/apps/main/static/web_theme_media/javascripts/jquery-1.7.min.js similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/javascripts/jquery-1.7.min.js rename to mayan/apps/main/static/web_theme_media/javascripts/jquery-1.7.min.js diff --git a/mayan/apps/web_theme/static/web_theme_media/javascripts/jquery.localscroll.js b/mayan/apps/main/static/web_theme_media/javascripts/jquery.localscroll.js similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/javascripts/jquery.localscroll.js rename to mayan/apps/main/static/web_theme_media/javascripts/jquery.localscroll.js diff --git a/mayan/apps/web_theme/static/web_theme_media/javascripts/jquery.scrollTo.js b/mayan/apps/main/static/web_theme_media/javascripts/jquery.scrollTo.js similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/javascripts/jquery.scrollTo.js rename to mayan/apps/main/static/web_theme_media/javascripts/jquery.scrollTo.js diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_admin.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/templates/layout_sign.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/theme_generator.rb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/theme_generator.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/theme/theme_generator.rb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/theme/theme_generator.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_edit.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_edit.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_edit.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_edit.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_form.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_form.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_form.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_form.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_new.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_new.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_new.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_new.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_show.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_show.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_show.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_show.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_sidebar.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_sidebar.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_sidebar.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_sidebar.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signin.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signin.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signin.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signin.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signup.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signup.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signup.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_signup.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_tables.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_tables.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_tables.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_tables.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_text.html.erb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_text.html.erb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_text.html.erb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/templates/view_text.html.erb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/themed_generator.rb b/mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/themed_generator.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/generators/web_app_theme/themed/themed_generator.rb rename to mayan/apps/main/static/web_theme_media/lib/generators/web_app_theme/themed/themed_generator.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/lib/web_app_theme.rb b/mayan/apps/main/static/web_theme_media/lib/web_app_theme.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/lib/web_app_theme.rb rename to mayan/apps/main/static/web_theme_media/lib/web_app_theme.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/base.css b/mayan/apps/main/static/web_theme_media/stylesheets/base.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/base.css rename to mayan/apps/main/static/web_theme_media/stylesheets/base.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/override.css b/mayan/apps/main/static/web_theme_media/stylesheets/override.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/override.css rename to mayan/apps/main/static/web_theme_media/stylesheets/override.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/arrow.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/arrow.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/arrow.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/arrow.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/boxbar-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/button-background-active.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/button-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/button-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/button-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/button-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/images/menubar-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/activo/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/activo/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/amro/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/amro/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/amro/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/amro/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/bec-green/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/bec-green/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/bec-green/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/bec-green/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/bec/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/bec/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/bec/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/bec/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/blue/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/blue/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/blue/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/blue/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.eot diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.svg diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.ttf diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museo700-regular-webfont.woff diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.eot diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.svg diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.ttf diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500-webfont.woff diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/arrow.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/arrow.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/arrow.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/arrow.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/bgd.jpg diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/boxbar-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/button-background-active.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/button-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/button-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/button-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/button-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/menubar-background.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/error.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/error.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/error.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/error.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/notice.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/images/messages/warning.png diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/default/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/default/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/default/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/djime-cerulean/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/drastic-dark/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/drastic-dark/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/drastic-dark/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/drastic-dark/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/kathleene/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/kathleene/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/kathleene/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/kathleene/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/olive/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/olive/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/olive/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/olive/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/orange/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/orange/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/orange/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/orange/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/red/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/red/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/red/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/red/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/reidb-greenish/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/warehouse/style.css b/mayan/apps/main/static/web_theme_media/stylesheets/themes/warehouse/style.css similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/stylesheets/themes/warehouse/style.css rename to mayan/apps/main/static/web_theme_media/stylesheets/themes/warehouse/style.css diff --git a/mayan/apps/web_theme/static/web_theme_media/test/spec_helper.rb b/mayan/apps/main/static/web_theme_media/test/spec_helper.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/test/spec_helper.rb rename to mayan/apps/main/static/web_theme_media/test/spec_helper.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/test/themed_generator_spec.rb b/mayan/apps/main/static/web_theme_media/test/themed_generator_spec.rb similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/test/themed_generator_spec.rb rename to mayan/apps/main/static/web_theme_media/test/themed_generator_spec.rb diff --git a/mayan/apps/web_theme/static/web_theme_media/web-app-theme.gemspec b/mayan/apps/main/static/web_theme_media/web-app-theme.gemspec similarity index 100% rename from mayan/apps/web_theme/static/web_theme_media/web-app-theme.gemspec rename to mayan/apps/main/static/web_theme_media/web-app-theme.gemspec diff --git a/mayan/apps/main/templates/base.html b/mayan/apps/main/templates/base.html index ff9c7055b0..7f91c4ff4b 100644 --- a/mayan/apps/main/templates/base.html +++ b/mayan/apps/main/templates/base.html @@ -1,476 +1,576 @@ -{% extends 'web_theme_base.html' %} - {% load i18n %} - -{% load project_tags %} -{% load navigation_tags %} -{% load settings %} -{% load search_tags %} {% load static %} + +{% load compress %} + {% load main_settings_tags %} -{% load variable_tags %} +{% load navigation_tags %} +{% load project_tags %} {% load registration_tags %} +{% load search_tags %} +{% load settings %} +{% load theme_tags %} +{% load variable_tags %} -{% block web_theme_head %} - {% if new_window_url %} - - - {% endif %} +{% get_theme as web_theme %} + + + + + + {% project_name %}{{ request.new_window_url }}{% block title %}{% endblock %} - {% if html_redirect %} - - {% endif %} -{% endblock %} - -{% block html_title %}{% project_name %}{{ request.new_window_url }}{% block title %}{% endblock %}{% endblock %} - -{% block web_theme_project_name %}{% project_name %}{% if debug %} {% trans "(DEBUG)" %}{% endif %} - {% registered_name %}{% endblock %} - -{% block web_theme_stylesheets %} - - - - - - {% block stylesheets %}{% endblock %} -{% endblock %} - -{% block web_theme_javascript %} - - - - - - - {% block javascript %}{% endblock %} -{% endblock %} - -{% block web_theme_user_navigation %} -
  • {% trans 'User' %}: - {% if not user.is_authenticated %} - {% trans 'Anonymous' %} - {% else %} - {{ user.get_full_name|default:user }} - + {% if new_window_url %} + + {% endif %} -
    • - {% get_setting "MIDDLEWARE_CLASSES" as middleware_classes %} - {% if 'django.middleware.locale.LocaleMiddleware' in middleware_classes %} -
  • -
    {% csrf_token %} - -
    -
    • - {% endif %} - {% get_setting "LOGIN_URL" as login_url %} -
  • {% if not user.is_authenticated %}{% trans 'Login' %}{% else %}{% trans 'Logout' %}{% endif %}
    • -{% endblock %} + {% if html_redirect %} + + {% endif %} -{% block web_theme_main_navigation %} - {% get_top_menu_links %} - {% for link in menu_links %} - {% with 'true' as as_li %} - {% with 'true' as hide_active_anchor %} - {% with 'active' as li_class_active %} - {% with 'first' as li_class_first %} - {% include 'generic_subnavigation.html' %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endfor %} -{% endblock %} + {% compress css %} + + + + + + + + + + {% block stylesheets %}{% endblock %} + + {% endcompress %} + + +
    + {% if web_theme_view_type == 'plain' %} +
    + {% block content_plain %}{% endblock %} +
    + {% else %} + {% if not web_theme_hide_menus %} + {% endif %} - {% endfor %} - {% else %} - {% get_object_navigation_links "form_header" as form_navigation_links %} - {% if form_navigation_links %} -
    -
      - {% with form_navigation_links as object_navigation_links %} - {% with 'true' as as_li %} - {% with 'true' as hide_active_anchor %} - {% with 'active' as li_class_active %} - {% with 'first' as li_class_first %} - {% include 'generic_navigation.html' %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endwith %} -
    -
    - {% endif %} - {% endif %} -{% endblock %} - -{% block web_theme_sidebar %} - {% get_main_setting "SIDE_BAR_SEARCH" as side_bar_search %} - {% if side_bar_search and not web_theme_hide_menus %} - {% with 'true' as side_bar %} - {% with 'true' as form_hide_required_text %} - {% with '' as read_only %} - {% with '' as object %} - {% search_form %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endwith %} - {% endif %} - - {% get_object_navigation_links "secondary_menu" as object_navigation_links %} - {% if object_navigation_links %} -
    -

    {% trans "Secondary menu" %}

    -
      - {% with 'true' as as_li %} - {% include 'generic_navigation.html' %} - {% endwith %} -
    -
    - {% endif %} - {% if navigation_object_list %} - {% for navigation_object_dict in navigation_object_list %} - {% copy_variable navigation_object_dict.object as "navigation_object_name" %} - {% get_object_navigation_links as object_navigation_links %} - {% if object_navigation_links %} -
    - {% if navigation_object %} - {% if navigation_object_dict.name %} -

    {% blocktrans with navigation_object_dict.name as name %}Actions for {{ name }}: {{ navigation_object }}{% endblocktrans %}

    - {% else %} -

    {% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}

    +
    +
    + {% if messages %} +
    +
    + {% for message in messages %} +
    +

    + {{ message }} + [{% trans 'close all' %}] + [{% trans 'close' %}] +

    +
    + {% endfor %} +
    +
    {% endif %} - {% else %} -

    {% trans 'Available actions' %}

    - {% endif %} -
      - {% with 'true' as as_li %} - {% include 'generic_navigation.html' %} - {% endwith %} -
    -
    + + {% block messages %}{% endblock %} + +
    + {% if navigation_object_list %} + {% for navigation_object_dict in navigation_object_list %} + {% copy_variable navigation_object_dict.object as "navigation_object_name" %} + {% get_object_navigation_links "form_header" as form_navigation_links %} + {% if form_navigation_links %} +
    +
      + {% with form_navigation_links as object_navigation_links %} + {% with 'true' as as_li %} + {% with 'true' as hide_active_anchor %} + {% with 'active' as li_class_active %} + {% with 'first' as li_class_first %} + {% include 'generic_navigation.html' %} + {% endwith %} + {% endwith %} + {% endwith %} + {% endwith %} + {% endwith %} +
    +
    + {% endif %} + {% endfor %} + {% else %} + {% get_object_navigation_links "form_header" as form_navigation_links %} + {% if form_navigation_links %} +
    +
      + {% with form_navigation_links as object_navigation_links %} + {% with 'true' as as_li %} + {% with 'true' as hide_active_anchor %} + {% with 'active' as li_class_active %} + {% with 'first' as li_class_first %} + {% include 'generic_navigation.html' %} + {% endwith %} + {% endwith %} + {% endwith %} + {% endwith %} + {% endwith %} +
    +
    + {% endif %} + {% endif %} + {% block content %}{% endblock %} +
    + {% block footer %}{% endblock %} +
    + +
    {% endif %} - {% get_object_navigation_links "related" as object_navigation_links %} - {% if object_navigation_links %} -
    -

    {% trans "Related actions" %}

    -
      - {% with 'true' as as_li %} - {% include 'generic_navigation.html' %} - {% endwith %} -
    -
    - {% endif %} - {% get_object_navigation_links "sidebar" as object_navigation_links %} - {% if object_navigation_links %} -
    -

    {% trans 'Other available actions' %}

    -
      - {% with 'true' as as_li %} - {% include 'generic_navigation.html' %} - {% endwith %} -
    -
    - {% endif %} - {% endfor %} - {% else %} - {% get_object_navigation_links as object_navigation_links %} - {% if object_navigation_links %} -
    - {% if navigation_object %} - {% if object_name %} -

    {% blocktrans %}Actions for {{ object_name }}: {{ navigation_object }}{% endblocktrans %}

    - {% else %} -

    {% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}

    - {% endif %} - {% else %} -

    {% trans 'Actions' %}

    +
    + + {% compress js %} + + + {% if enable_scroll_js %} + + + {% endif %} + + + + + + + + {% block javascript %}{% endblock %} + + + {% endcompress %} + + + diff --git a/mayan/apps/web_theme/templates/pagination/pagination.html b/mayan/apps/main/templates/pagination/pagination.html similarity index 100% rename from mayan/apps/web_theme/templates/pagination/pagination.html rename to mayan/apps/main/templates/pagination/pagination.html diff --git a/mayan/apps/web_theme/templatetags/styling.py b/mayan/apps/main/templatetags/styling.py similarity index 100% rename from mayan/apps/web_theme/templatetags/styling.py rename to mayan/apps/main/templatetags/styling.py diff --git a/mayan/apps/web_theme/templatetags/theme_tags.py b/mayan/apps/main/templatetags/theme_tags.py similarity index 100% rename from mayan/apps/web_theme/templatetags/theme_tags.py rename to mayan/apps/main/templatetags/theme_tags.py diff --git a/mayan/apps/web_theme/__init__.py b/mayan/apps/web_theme/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mayan/apps/web_theme/conf/__init__.py b/mayan/apps/web_theme/conf/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mayan/apps/web_theme/conf/settings.py b/mayan/apps/web_theme/conf/settings.py deleted file mode 100644 index 405b2814fc..0000000000 --- a/mayan/apps/web_theme/conf/settings.py +++ /dev/null @@ -1,14 +0,0 @@ -"""Configuration options for the web_theme app""" -from django.utils.translation import ugettext_lazy as _ - -from smart_settings.api import register_settings - -register_settings( - namespace=u'web_theme', - module=u'web_theme.conf.settings', - settings=[ - {'name': u'THEME', 'global_name': u'WEB_THEME_THEME', 'default': u'activo', 'description': _(u'CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse.')}, - {'name': u'ENABLE_SCROLL_JS', 'global_name': u'WEB_THEME_ENABLE_SCROLL_JS', 'default': True, 'hidden': True}, - {'name': u'VERBOSE_LOGIN', 'global_name': u'WEB_THEME_VERBOSE_LOGIN', 'default': True, 'description': _(u'Display extra information in the login screen.')}, - ] -) diff --git a/mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.mo deleted file mode 100644 index 0ffccb4b12b30c66df8b86a9e7c5dc9f66706fe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2461 zcmeH{&u=3&6vqcx78+oIazX;htkfT?%_NhwUAk#f*#1J5+HIAlNPD4jW}Jyzk3F(I z&E|%L#FY~l1QI6>T-iSWZb2lUG%-@FrfVi9)drC--5Hx2SE+|0ek~|3cd*b3C@FmgEv6-LJ%B)bKnA4 zfG>mJfUDqlAkF_Bd>g!pMKqs*6fXy7z;lrNpI-1Q@Goe20+O!pZ%%am1Cp+qwz82%+UK&p3S$->^2cc`Yn31A($(y zVBWBJ$aM;9C|J&&8yTC>YpG)^xWhaV7gqW))lkB(QYDQtk*_4^819a7(&e@i7yRz2!LFz}SqF zKG@~ql}TYaoLcBwup_PW%tH<<9l;*CCnGDI)M>eBV3aZ=dcwLyXfL^Pt>7Vc2@Wia zm5k3=o3o)6gU;=_#l3@%b|0Q}x3_k?+nc?UH6H_WyS8ecKzaIaA?K3#G!-kWhlrSn}VuJRUV1HlU^{W zwPThWsXgUjg(_`y;%dRM6ISyKRh#a_WGf>;50hWuQx z(*ju>NR5J&9_P7Il&;Ib`+Uqb+uqtgx;j9WK}Kr1FH~6|_g)Yy%)DQ$|T$EjGiZC(kBJUJ;I&UeA8e#Jui&k6BmAesI zWe+zx?BU)zoX%KiFhibY$j*bkt%KtY);>3d(!zh3W?ZUTY_fGM(rJP3EbIxMwb%p8 z`!Z&WL+|rey*?U^YPi(e$$@xG3+nmgtgfEdGfHqMlFZfBMU*qhhd%Yo#Wn4xH_Fj0tUi{+d4K0O59?red#NQ zs<2#zJNVpOi|M?4be(%^Y+`nFrxURcSj6D%bQ&-l6SE1kN#u45 eu{8BH8rPin@58wa=gL~;*^lnokM95Wqx%=~dC}JZ diff --git a/mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.po deleted file mode 100644 index f45d87523e..0000000000 --- a/mayan/apps/web_theme/locale/ar/LC_MESSAGES/django.po +++ /dev/null @@ -1,122 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Mohammed ALDOUB , 2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-01-26 08:25+0000\n" -"Last-Translator: Mohammed ALDOUB \n" -"Language-Team: Arabic (http://www.transifex.com/projects/p/mayan-edms/" -"language/ar/)\n" -"Language: ar\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Display extra information in the login screen." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "dismiss all notifications" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "close all" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "dismiss this notification" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "close" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "You are already logged in" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Redirecting you to the website entry point in 5 seconds." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Or click here if redirection doesn't " -"work." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "First time login" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"You have just finished installing Mayan EDMS, " -"congratulations!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Login using the following credentials:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Username: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Username: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Password: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Be sure to change the password to increase security and to disable this " -"message." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Previous" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Next" diff --git a/mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.mo deleted file mode 100644 index 0bf281680a32c9e6ce74be910e63d566028527f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2840 zcmc&#&u<$=6kebdaDhU(fCSRCqBK#nwv#rra+4r6KTt%{1UE%OLaN5zvAxZD*P7W) z8i_-iPzpIvQG|pjs30URNXSWSWt%i9{0HNI03^%Gw>VWkw+~n30wz02mB5AIPfpvYrwyO z2Y~D`%bEfn2c7^%z$bxU1J44#2a^4-z?Xmrv5D*%ko;AEPXXtEw7%HFFM*$eOAYt~ z=En|NRu%Xsa2EL86Nm{sj9?V6AD_2?LqOuY0(>8M8+a1i-%@JAr! z;}2j6Jd}WT;3Du<;Ag;7z!*q=eg{&@p2tfMe(pXL_ZhsP_`m}S7UY}UBW>n^ETg~m z({Q7>kYygwu@2!qjQ3fZIWL%sq+nsd@+IyUF)9gG;Y!U1(xGYB&r87->_k42Zn(g> zZx$R^@tj8+T*b;lDP9ywYxv?ta#1!ed8Ohl^st~3x`D44mmSq42UC-UZF7o`wB zhF&Ckm?H{2@4)D;3*=EM(UBi;*&7%8Y0e$pCqr3zUHI?OCs z6SUm?vPijp(QGONo)^s1FYI%KAG+LA8S4U~SW}YaJvTqg1~@B8Q5ZaSylZ0W&G8GD zv!f&9+0o&d%a^hf-Rjs-Nk}n};zP_WkQ7&nykX`9Lir~`hMLSKt?5>EGHgJFGVqH- z$Gh4U>sAA))}%Ep#heS#R<`X5^cI4Ms!CO!7dhpIf`P4EV3ol2L&`xvRXXq;m9#D? zA$?v()jE-QJ|9GWxHr(d@QDO7?x9nh1xi#=IPhiBN{P=2b|pd<3$BlXm=zUr&!cp; z9Z&KF?z7R6$&0%JdKhRFB@ZLd6i6Ml@?M}s^NVPng&r)s3Z3P7%nw4h;O3jAyDO$U z_bwqV!4>4y9(U|_gjA?}hIOJRvZ4~m(4JI9*Rjt>MP<(f8J3uynz4r=kLqEM@DMra zOZT3((`W4TDc0AUIn{5cPp8u`w6n-N`R&;C*}e3~(ywRIXHKT^Bqq?&_6+(~L0up- zEF0v6L}{{t;?fOZ;1?sDDSJlna)zCcydvh2q^?pJRx+v7{QP_pJ?tyDAg(6!K{-`v zN>iyys!aK`g;Q23ujMF}E2g@4-DX&>n3x=&9PMPGH5VO>@c{fvc@&ctT&e7VjJ_<8cR&at=%<*sp?G_)20|E6rs*&HzsIv zV+F(2#>a+Gtn1DDjjTWt1Pm1-9c%E@>v%yN9Csk)L(Ini!-WTdd+s}Z2V^!uY=blr zy=G>RK_a;V;>enjL?eib^>*U}Bx{j0k_xKK8f#Z)!z|UY&`!Ww<2roRl9s*=T<^qb zrDp}MkYIAK(pa+et)~6I%#pPiB&nubEwXn(Jf<3MA>p+)&vs8#sZknBl>LmQzik;o zBwOh|&b7*5(P^`F-;d@k!va}gtBo778G<2q=sLBS&RYRj8xGqlV#%vSZP zX}uVUxPz$F%IJ!{m*;-hw7x^WjXbb6KOP7KkxbtrDVwO)y{4iYh_+>-wHtjIK31W! zs_#NC&PhKdu8vL1;9Ap7RyZ0a+G@MxurUH-O6Fdw``q(jQE%L!6M}O@tkz7JvQR-qvP diff --git a/mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.po deleted file mode 100644 index 6eabb22ba8..0000000000 --- a/mayan/apps/web_theme/locale/bg/LC_MESSAGES/django.po +++ /dev/null @@ -1,120 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Pavlin Koldamov , 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Bulgarian (http://www.transifex.com/projects/p/mayan-edms/" -"language/bg/)\n" -"Language: bg\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"CSS тема за прилагане, опции: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish и " -"warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Показване на допълнителна информация в прозореца за вход." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "отказване на всички промени" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "затваряне на всичко" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "отказ от това съобщение" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "затваряне" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Вход" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Вече сте влезли" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Прехвърляме Ви към началото на уебсайта, 5 секунди." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Или натиснете тук ако прехвърлянето " -"не сработи." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Логване за първи път" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Вие приключихте инсталирането на Mayan EDMS, поздравления!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Логване, използвайки следните параметри:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Потребителско име: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Потребителско име: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Парола: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Моля променете паролата, за да повишите нивото на сигурност и да " -"деактивирате това съобщение." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Предна" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Следваща" diff --git a/mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.mo deleted file mode 100644 index 783d234383b44027068fd85b8cbbaf00c4ca17bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2523 zcmcgtO>Y}T7@k6D!F-ofC6L}$N*jx;y-reE96LZh3K2;Y<)ad(YP>tP$KIV;&CJ?$ z)B~JQ4?XsRgrFDBNb~?4P?6fd0TMreLpgEdnYG;nsUS{_H2ciw`|-T*y!*?UlXn@~ z8|ZJM-$#E7ee(o9Xb*rpz@LF%1J69eSOxeU@HOCXz~_K}051Ul1fB%avy5#6XMh)h zIq-Slm%uB)Z-D;%ufVgwQ@G^M6VS`cfG+?CK)?U#1it{DgpT{bHr9VQ#n@LsI?Y%B zd;mNH{2l1!oPg3Y@HEiNs{yxwOF*yx_GJBA;APBzoUA_vdLGW=(gyG{5F*)Uz!!nH zf#-pDC-^2F5U(eIa=rHwf4JsJiFSv(GMT1*~-IFPM2?Ots*Xcmr{=cpy3;uCa?5DLR27jqPgHqR4>K~JV4h=j=# z!Lc11Zk>#Rn4A6_^||XNxP}`#kpmCL+dfA|#Qr1W)>yE#-NM`o^Y0+}F~c!ErcN1mvT zh#`yloh}~;>g8auEfoS%>{!Q>#M3nuyv0Xc(fZof-V+Dr2xfE)cX?6-$ev?SqOBNz zp)Fy^!BkpgR+5m?PPSzWo@Sjj+1rNyby)2T4;Po~Q_tU5W~SFkU5TBj9l zl>}Y0<3W+)9|?0PI(i@#FVk$-xvXBTdYMRbWo293tVBAkW@GPdHLIqc@<7C?ttJ!s z)t0@n@ND5{_fO+?=0oHJXclSlkF3wUBPz8ehSgu#7u3+?g*gmGCg>khf4a2L1(rlvMVF zl1}>CH}It|=6Di4{_qZBO;&btqcn0@l2#(so&4eF{$|XRp1&{q{7??K!bBt8kwSTY zS`9_Yq0Apjp(FS8FoHG|URd+LmqSU%is6no{LxR6VjXj*#Izn3_9;Ftc_jLXU5>(I zWRDLx1@L76rgAr_hSQC{HuBLuq(x7pWWh`Op zK8A~UeEs8^o>CI8!*Q}jYI)A!wUSl;0|Aqg9b{0ei~U1BFpus@kRg>XiX7DE|6Uaz x-Vyj2I+%Tq9dZZ1XmKQGe*xY4@9F>m diff --git a/mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.po deleted file mode 100644 index e3ed877c4f..0000000000 --- a/mayan/apps/web_theme/locale/bs_BA/LC_MESSAGES/django.po +++ /dev/null @@ -1,121 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# www.ping.ba , 2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-06-24 15:49+0000\n" -"Last-Translator: www.ping.ba \n" -"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/" -"projects/p/mayan-edms/language/bs_BA/)\n" -"Language: bs_BA\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"CSS tema za primjenu, opcije su : amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish i " -"warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Prikaži dodatne informacije na login ekranu." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "ne prikazuj više ove notifikacije" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "zatvori sve" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "ne prikazuj više ovu notifikaciju" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "zatvori" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Već ste prijavljeni/logirani" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Preusmjeravamo vas na website entry point za 5 sekundi." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Ili birajte here ako redirekcja ne " -"radi." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Prijava - prvi put" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Upravo ste završili instalaciju Mayan EDMS, čestitamo!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Prijava korištenjem sljedećih podataka:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Korisnik: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Korisnik: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Pasvord: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Ne zaboravite promijeniti pasvord da pojačate sigurnost i onemogućite dalje " -"prikazivanje ove poruke." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Prethodni" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Sljedeći" diff --git a/mayan/apps/web_theme/locale/da/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/da/LC_MESSAGES/django.mo deleted file mode 100644 index d87f6f4ee9bdccae9163f621b120df4543612ce9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 456 zcmYL_%}xR_6ooOmnx$(OHE{vaOFIJ!mavhZgv5yiNB3o>3^gFLS6{kgpOZlKPPE93?_NA8eXedG%-AFkU>XtTJfO`9|at5-Cbf#zHH%Ce5|? z6{mE&-L`%GTCL=+otlzXhq)ZBXjzW~GAkV|{!?fsXzQ5CNhX4L7EexJ5Vlz`GTKXx zZS5sRUwofkaR7qlYaP?Ord}B)eWqqg^5m0rgY9pf2n*hFE&;bFg3PxoapNB U=!VgN9Ja%zCf7p}wgy4t7seBWmjD0& diff --git a/mayan/apps/web_theme/locale/da/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/da/LC_MESSAGES/django.po deleted file mode 100644 index 7b8b7cc260..0000000000 --- a/mayan/apps/web_theme/locale/da/LC_MESSAGES/django.po +++ /dev/null @@ -1,111 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Danish (http://www.transifex.com/projects/p/mayan-edms/" -"language/da/)\n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.mo deleted file mode 100644 index ae60e70d2bd4bfef66e359b74a4e61db4217884c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2473 zcmc(gTW=dh6vqcBH*+sfNFbdSg(l#&owSAGTtt(&AyU#ru>)#fqVevrJ@xFYH8UI6 ze&PY~4R`?|kU;QSiKbR@WdPcS?5-SP~RAN_BXpTbLQOU__woXJ{4#$ zqrZxN7yUK#jYsf6`w83ze+It-&ps+d1^ga-5&Q#u9Q+e}1N;j-1JYwcY=KkY1uzGn z0>1#SfZu{){qNu_;1k#s))N@y4Zx?teK5>_bjZ)ZJJ97Wcmv=02_e1%e+1{j?vp}1 z3w{j-Id{M*@E(XI;#Y7FyboRgSD+Mzq7R052fhh@4hDbx0>p@;KNH;5E4zwkZWRy3GZ=zaKF*m4#xLC4T=jCck;=cDF*{RDpNM_Dl?9xXxN_Ey5W zPG(aX^uxF?UT0m59IR$j5!aM;o;=i{VnS?$>B*CFr%bol)XB8YhT#qS5;k5*?dsw> zP7zy{Vy)snElBEF?kt|4n%>x2Tfe@y(^y^KX{@yNc6T;r-1(&*TVANjB~qPWin1IR znk5-KbHNj0(yxf^!|2p$!FijR?$XrsQN(84LiO;Y*tWc{V6@md5(V`}SstPqqCDib zQ=SRh+7S&hWqk0#}{ON;kKqeeaQX^B6QE*h36UY)_ zrYHBAZsqV|M;Qd9m~mce9o%&!cvFs~p~mWF^VongL5;4JKG#Kn+&K~J%<<%j)3iVi zrph6+v?h~z)luG4dFou{YZmh2Y%8m%YM2W%Z8U#FAPOFKNstdBNbS0&MM-gQwc zt5a!vs}-%lybzCQReJbjt~Prqs=X7{F4Ej={o>`QcBxjw!e|G64{{$^cQKlsquICX zvvY6N&`KM~=%|Ifb+9h8K?mq69W8Uu;#w^rE5m#Hz4TpIX{+%PwwP{?TNbrgrgd6l zWUis<2}d(D-Sd7>uU3b{VFk%;oa*rHN}Q$D!Ng`)9aPic=!lclRrR5~YQlS~jq1$t z0d?F&d?{_NZ#GVxG+U{aRx;y}FHvhWfCoI%yNcVS%zP*x*0EpQZC#75oU99Kbl64> z6K4qmUZ*Q<)YIZ50&@GH}6@|Dk3D)lb!|h8@BW4}PS!I+LV~X(XrW&GhTy|5$pp%<^xJKCGkE@wKU1R>On%&Ip!4Gj?oJbqzmYQB# z?}Db2($(ZXd>8CqW|RBzL)EV)f?Pxze@poD@Te#FH%VD1>_y1Bo@|F)$T%Qm+`1_W z*yMjBKJX4(jxtzv Z;YbK*v-1bv_z+|KrG+H_=b{Ie{0;4`>3#qJ diff --git a/mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.po deleted file mode 100644 index eac015938c..0000000000 --- a/mayan/apps/web_theme/locale/de_DE/LC_MESSAGES/django.po +++ /dev/null @@ -1,123 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Mathias Behrle , 2014 -# Stefan Lodders , 2012 -# tetjarediske , 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2014-03-12 16:12+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Anzuwendendes CSS Thema, Optionen sind: amro, bec, bec-green, blue, default, " -"djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish " -"und warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Erweiterte Informationen auf dem Login-Bildschirm anzeigen." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "Alle Benachrichtigungen bestätigen" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "Alle schließen" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "Diese Benachrichtigung bestätigen" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "Schließen" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Sind sind bereits angemeldet" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Umleitung zur Startseite in 5 Sekunden." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Oder hier klicken , wenn die " -"Umleitung nicht funktioniert." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Erster Login" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Sie haben soeben die Installation des Mayan EDMS beendet. " -"Herzlichen Glückwunsch!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Einloggen mit folgenden Zugangsdaten:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Benutzername: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Benutzername: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Passwort: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Ändern Sie das Passwort, um die Sicherheit zu erhöhen und diese Nachricht " -"abzuschalten." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Zurück" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Weiter" diff --git a/mayan/apps/web_theme/locale/en/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/en/LC_MESSAGES/django.mo deleted file mode 100644 index c930a0fb47ec6fc64fb2dad261967e70f89d39f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2359 zcmeH{%WfP+6owlT0t|PvLL$;hBx75do*p|lt9@C-9wSS3Y>mfAtfHFknx3+&t6Ejn zo{YqTEh|>pAR!?|LhQ){z>9#yE3hFu{?p@2cm`6Ms;{Q&)VX*6F?ao0gz+in=a?@r zZ({Dffd%6?@DThR{0W?UGm1Lkui(evU*KEd-{2SEOYk~K*P`eEoCg=c8hi)*5nKg- z23h`3@H6lRF0nj;tgiy!1`$bsTuO*P>halVi4rKY~U=t_Ee!V1>;ZGHaH&a8ep%2O!@+IkD=nrZp9Uuo-N?F9uz%P$!E0M!=Ml9u zooGinA1J^bY7U}3KAx>qdu58|(#UFUC;Siha%qAR+NaTDScwiCWm;vYv@U4u%P3PDHx3srD$YHO}4S9v0bUIj_;)=jCh$^_2AeXg`M zx$i{BUOFR6RPD-=$TC}-@T#G&p%V!vq0uS%loM6R9J(St8H+PXCpEG-QU(QSPJ9qr zbGj}R?~AE0)Z5-ax(uLAaHDV{)Ve80-3@(9!V#ed`gObt(1j zP&$;RZ@qBJLckO?-l=#XMVV616q?(4aU4RGCdp(n>7av+S0nkfli4zUG)2{0`@8$Ss~jwMx~(m10@@)SOe+K!(7g#>7G>7>>)^Z$8^?p4 zc=bw-9T-U$_e^GU)H9{kp$e@-T|1%U9lTpUB~vwj{l>}~&9)nhhHh=p^3q!C^(W}{ KC+Pq73HlccC%Jn7 diff --git a/mayan/apps/web_theme/locale/en/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/en/LC_MESSAGES/django.po deleted file mode 100644 index ba87f86cd6..0000000000 --- a/mayan/apps/web_theme/locale/en/LC_MESSAGES/django.po +++ /dev/null @@ -1,120 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: English (http://www.transifex.com/projects/p/mayan-edms/" -"language/en/)\n" -"Language: en\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Display extra information in the login screen." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "dismiss all notifications" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "close all" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "dismiss this notification" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "close" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "You are already logged in" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Redirecting you to the website entry point in 5 seconds." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Or click here if redirection doesn't " -"work." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "First time login" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"You have just finished installing Mayan EDMS, " -"congratulations!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Login using the following credentials:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Username: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Username: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Password: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Be sure to change the password to increase security and to disable this " -"message." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Previous" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Next" diff --git a/mayan/apps/web_theme/locale/es/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/es/LC_MESSAGES/django.mo deleted file mode 100644 index 5e5af385af3b74ec8264442eae42761b955655f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2471 zcmcgt&2Jnv6gSWoSiZ{zBoMEaN)yQJZqk-k+oV#P4-}C!(PmSrr{bOQ&N}hfgFTaU zPw)>Q#DNPE5?p#f;(*#yPn7&0AaUe|;L;nvH?v7rsDc~Tj(?tc&(H76zy0O(iLV64 z>v-P6^8nA=c-Ef6gz*z_6Zi=DE%5ZyLNtN*fv*C81D*u_349m$7AfzX4tW-UG7!ufR8fr?83j3CQ+x;Pb#eAj>}+Z(AHga1YY)?P;HN;=e+1;5`~lnop2TJxA#MX- z1bz&B2bclbzt4eiOT31MN27*n<~+TGhxbnom=*}XItOX12EwZ1AHP;-oyH5?tp<(} zFW}+WUgj@16ot|&DjdZ_X;Z9*igFpkzViux);9J^2I#4{^tu?4w3Q&yLG}%A(19`) zf=pFYEN*SFiL5dy^W2PP$mNB0HjwnHLo)MjhWaY5rYQAFSu9PdW++huS(*Zi9i6Et zR=zY!LY#OR3LQs@^t&^(D~qAQHtcXl?=g7xeTKYBc+yF~Hmt+2a(5p`4_z7H;F1ox zkt0%f3ojAf!1+wFe^^(+8<%1g5Vf*Rv7&t_sDL|E3B($U>zT@+ZCY&_IAh#CzhPgZ zY@wwI9dQ$<;C8e?e5xiID2iVyqa&x zYorGpiuNk5JWHGk_IyF8$!=3@j;qt5`A~Rg(`)CZ4l6bt=3C>BV$-WVji5#M&=lMo zxst2ORo++qpbJIt){iK6+7_IHOI&GZlh72~L3t}PRPFdA8ON@)#pFS^VG{`^Y0xRj zh!d5n1hxcAhH_8QPKhiIv_(NGNhqW-oUTK|>vAM5EibKa9R)B$a3l4yC{0zMa7M(& z1y#>D%?R{hrUN?57_zR=10C0@N0O>LCq+n$+d*EV)g-#5d_d(pbbNZFt8(XyXg#Dl ziEfl>h&wSEm~FNj zi_R8khp0Eo5nzGtZQ-(LdzIP22URR=_g11S$9n9*K>29d#x6lUJ9MS5i^irYy)@AZ z?pElK&8ye2Fn5*e<-(MuGYd33eYGL32bCT?^a>P{D2ip)*V2=bTzv!>)WMGujD*W7 z%M8xdLTmyXB{CtjE(;SChO)1XW(5_{*H8{}2UotQGD%EKwUr!~QTiDi5kO5b3Z()C zZiD}wn?^LjOzRFe7tW74Db@$~Ey+Z)htlAha#GL*e04ZpD6))KK?T+ZH+V1=oA`%B ztnwEaA8Xd{M;kfURX&1FON}HWBQ=p>lTl!@twVv>z>Q8(9c1yp8BKmt9{f;ITF~tN znAPgotfN6`tMKs0aa`?5x_J_@U59_TAzo}L+Cy8^R&}a9h=6jiQG zf$%tsOmJyw699RhU3n?r^$=7c3>?cs&HW~{p2O^ghZ_31ppTApCNCq0O?xizC zwVI4&zbX{m&9p`KtD-UYVf`=6*A)2cLo18{gbimWUeLJQyoa<_AA2ZA@5>1h+Cuyd DI=AVt diff --git a/mayan/apps/web_theme/locale/es/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/es/LC_MESSAGES/django.po deleted file mode 100644 index efb3bcc8af..0000000000 --- a/mayan/apps/web_theme/locale/es/LC_MESSAGES/django.po +++ /dev/null @@ -1,121 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Roberto Rosario, 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/mayan-edms/" -"language/es/)\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Tema CSS para aplicar, las opciones son: amro, bec, bec-green, blue, " -"default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-" -"greenish y warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Mostrar información adicional en la pantalla de inicio de sesión." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "cerrar todas las notificaciones" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "cerrar todos" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "cerrar esta notificación" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "cerrar" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Iniciar sesión" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Usted ya ha entrado" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Se va a redirigir al punto de entrada al sitio web en 5 segundos." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"O haga clic aquí si la redirección no " -"funciona." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Primer inicio de sesión" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"¡Felicitaciones! Usted acaba de terminar de instalar Mayan EDMS." - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Inicie sesión con las siguientes credenciales:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Nombre de usuario: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Nombre de usuario: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Contraseña: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Asegúrese de cambiar la contraseña para aumentar la seguridad y para " -"deshabilitar este mensaje." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Anterior" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Siguiente" diff --git a/mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.mo deleted file mode 100644 index 6bac2b6522ae7e6da44176947ea4de48c2d803b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmYLFOHRWu6a>L4OV%vBU;%&Mu{ESE^TkX1-Kq(;f11h zq|vkGd7~NsTwQ*jA$yFz8~v?&}UhLd3NlEBzX;ZYA0;Uy<+7IuLRfOSYawxxm9*aAbiyiw0$prGAt8~X;$+ce#gMma z?`ux!cDrr)W?kiS*Gf%A>q9X|Yg#pZKxUPr<-ZNh1-(0(a*~T6p2ySEAA~IyjE(kE zW3GLT1-;yPT9-oUAxYQ5I_XDm$qb^Ct_hG!3saq%OzDD?Xr+9xC^uG=Ff+Dtoap-R P>PF#^9F8M4494fl diff --git a/mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.po deleted file mode 100644 index a9df9a1fbf..0000000000 --- a/mayan/apps/web_theme/locale/fa/LC_MESSAGES/django.po +++ /dev/null @@ -1,111 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-06-16 18:57+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Persian (http://www.transifex.com/projects/p/mayan-edms/" -"language/fa/)\n" -"Language: fa\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.mo deleted file mode 100644 index e43afc77b4d7d75fe50a9fc02e58c8c73263a9c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2556 zcmah~O>Y}T7#^S$FyG~bDB`6eI8nW}leV;SlS*wqAX3sqj@!bin(U74NoIGJnOUcf zgv1}<$OVK{^?+&)z0lr)J#pp^QvU)6#EoZm?Zi}-I`Ygjo{#r?p8fOGiEkO&JLsp; zAELjHzVRFev|oVRz+ZuPfv28ltPcDc_!jUn@I~O?z>k6d0#5+x1;)03Gr%e^1HKIW z0eA`cBha7!3-~VZBrf^$1oZM!;48oZ(C>de#_xdNz?O%=eXL(Q3EO}VfGfcCrP7y2 zK!5*t;Ag-;fcUY~FyeFIN5HeduYj)tN5HGVN5BT~AK-hyDumnuE(4*0eGmKqcyElq z0lj^XfiR1`jqY2egktn@dL7;0pKegW;C>N%gso_BtMGsPm%WC`DRghUZ%|X%`zG)W zzi>^E&5R(YDeUv4hgn}x%B?-nCi2TN3604wCUVk454?<#*mT8f3WyeH~x zd1uFqhzpTCP1UeQI(1Sfmbeiu;<3>++7)3j1U(}}f~m?xjUv(InR1xy$yfxTFqsk@ z+mYec$uNkx*{{()cYTFxxS^FCcrf1f8W|D!K}Nf!U}^h>xd%|)*O`TZE7GQl4@ul{ zhQqtAHZk}1VO}_|bPqENuSHU4YtmRp4(3p?!8ZJMIZ|e2(km`?wNm=P|HHjVBu;W= zTkJZtuq{KOlHoora_Sq=T{<%}yRr4@`t{rG)s^-3>T>7yjrPWzJ#(cmj96^&DMV0NXPOuF3d_IB|?huoO=KT4fc`<07qlNj_xeGz_e6xvzK^t-Ra*xj~1oQq! z%}-j*i)Wi?l?_yM&_Uf=c&AN^+Im+Qq^7McH&Ww3(#!Csf{x&Ei`I-t!amLRol9Gd z#=*fs9R-|N*%f!{p^h7A>6dM!jo1e>5K(L!YAmJEHI2C=nJwy?%I5m!>Tw9>>&?ot zP8_Ns=nPZ%=TN*2ycL;T_T*r!a7#BjYr&=CbKZciFu`gP>Ims<(WPDKD%&bETm@@* zTDC<=TKu(33zw;!F3l!%h34ljSJ;joibKLnchCa@7}JoUfp#dVSUbPy%NwK4459vv z&L8+q#mVNQf|c?S30EFSa8PBaiGh}Qd5|&TrcOV9=;|cQNB<+PsQM&z z>8xZhPhQXv<@dag@XEhWk>(Fwon7ss!od=ViJj&y3l@hv`6$L=4&JcdLsdm|kfI{2 zI!VMG6eak>h*;+LAsp|kTx7`n^elAZFc^S4pqw%%6}WyJmMO-x6jfzGc9VApGbTY} zJLQyZWuE>JhQntQpbTZfe^&bBPE#PV>Z9nNpHDCcJ8e$Y#xz4coeL3)eB_N~H@#nA z3>cLE{5g(KcYne&DV7d*T->jBE##Q@Yu}kQwXxq z2wg}E>SYh9DIy=bd{kO9z{l*cOjGRB=#XMnl}SO9<<|+XV4}mbB>6XPYe!^B-F$?P mjC2#KToWc1h81uK%Fn!ZU+B|hXv=-`%>7U}d?}`{vi|@lDHeeM diff --git a/mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.po deleted file mode 100644 index c48155ddae..0000000000 --- a/mayan/apps/web_theme/locale/fr/LC_MESSAGES/django.po +++ /dev/null @@ -1,122 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# PatrickHetu , 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: French (http://www.transifex.com/projects/p/mayan-edms/" -"language/fr/)\n" -"Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Thème CSS à appliquer, les options sont les suivantes: amro, bec, bec-vert, " -"bleu, défaut, Djime-céruléen, drastique-foncé, kathleene, d'olive, orange, " -"rouge, reidb-verdâtre et entrepôt." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Afficher des informations supplémentaires à l'écran de connexion." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "Fermer toutes les notifications" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "Fermez toutes les notifications" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "Fermer cette notification" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "Fermer" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Connexion" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Vous êtes déjà connecté" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Vous allez être redirigé l'accueil du site Web dans 5 secondes." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Ou cliquez ici si la redirection ne " -"fonctionne pas." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Première connexion" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Vous venez de compléter l'installation de EDMS mayas, " -"félicitations!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" -"Connectez-vous en utilisant les informations d'identification suivantes:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Nom d'utilisateur: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Nom d'utilisateur: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Mot de passe: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Soyez certain de changer votre mot de passe pour accroître la sécurité et " -"pour ne plus avoir ce message." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Précédent" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Suivant" diff --git a/mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.mo deleted file mode 100644 index 934a17d52e83286fcd5dc6dc092c3e3c24c944c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmYL_!A=`75QeGXw8x$~3{r~{m5J?5T2hCl5+SHaT{TL#y;deMo2_>3mF+Yj@fy4y zXC9;Dgp!eedF=USJmaUg2akJXZ%BuvccgvN2`So;^i09ev`6OErq2G+^MKb2{H2|* ztdWqbdu3p9ng2*;y0tD~?#pU{7pu}^VI?Hf?*)#XR)KiDR6$EfxfmcnMc#*0$o@y< z1I`J=nf_bFx;rjK5f|`JlAnIyWXU(>0~SshU#no9gqgk3E?C;Va+M{(lq*$gEVODQ zjGd*&smsob*M-h9gjO=PUaxy0R;q6GU2kq1)^2C?tYu9c4fUe&tbVD;mhSi08SB12 zAz^cq4%)A#o%LE)BLv;C3CIox|4n))WJWKzF&ay#t YI~(jwaCmswrVzuslp`o79VL7J08tN_#{d8T diff --git a/mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.po deleted file mode 100644 index 9420113871..0000000000 --- a/mayan/apps/web_theme/locale/hr_HR/LC_MESSAGES/django.po +++ /dev/null @@ -1,112 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/mayan-" -"edms/language/hr_HR/)\n" -"Language: hr_HR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/hu/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/hu/LC_MESSAGES/django.mo deleted file mode 100644 index 8d01b6cfd4332eca8af62545ddaca9e224254f63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmYLFOHRWu6a>L4OV%um#G)0v+DQv7uDYQgQHhAE1om#?CP9fE*$!=w!Gh~?7G5Z7 zM;<+YMxz=3T%3QOAWo5&$ZO;o@)p@(fc(P82b_)OfQ8W?GIlUe;9VMSwO9W#hg+o0|gp-^E%=d6Fj5Z<$}4k9CzEripClcios<1|hyOs-L&(psbvA}LBvo@$liJ;rQh z&Q+Y!&1TbajX}Pa+fJ-YTJ5V@TG6s;1TrZtE&h#YR@3&umXoaZ!g)A7{(|3O-dHOq z6(-wNSkcL?qg5etH6(E+jFoQm7R_LA)HMOt(!f;3I>}Ya$zYW`Z&B1n6fo1Kw4A8w V?`TKCknFdkmLgXp;here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/id/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/id/LC_MESSAGES/django.mo deleted file mode 100644 index c87384d68b94673a7481570ea3f06d1aceb31143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmYL_QBT4!6ooPRv`3$P=z|X$y|e?2Sj32IBukhQ7{1r7jGC=o+9L2n_SheD7SV>%4Q1PwuRlqb6E?^VC9=!6(;7C`nPwwoIZh zh-coES4vxmO)fHcTjd54MUgl8NMNWrvyO*=Sx!-l_#GgRK-#F~)Aj?94j~SNDgP05 z?uqlk_YYjBbw`}MF*6nt&7>)qRhpvFd^|?)gE&ObVLXV&uY(|%hO^m=LuI~VIfsO^ zlA=gvN^&FI#y3lAD~j=Yy>8k%ODy=NnW_?3`<4b*xU9)AxI5KlVw_Yy1IKJB8W+ diff --git a/mayan/apps/web_theme/locale/id/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/id/LC_MESSAGES/django.po deleted file mode 100644 index 51f9c35a5f..0000000000 --- a/mayan/apps/web_theme/locale/id/LC_MESSAGES/django.po +++ /dev/null @@ -1,111 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2011-11-03 21:42+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/mayan-edms/" -"language/id/)\n" -"Language: id\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/it/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/it/LC_MESSAGES/django.mo deleted file mode 100644 index 3077aaef072ab87c13b86f83f4772b667ccfd18a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1671 zcma)+&u<(x6vtgC6qX_ZHxP$MBt#ir0nwwxBjQfwk z55OG6Hg&<0+UE`MRn!>wMTz$S)7nRjHx`5@-a?J%6+1^q6sBA-1xug|q8)%t_tI%rP5u^NQCg<%z2DfX-80uuRxhIV()3PWhk{nJRa(PA4i%b1cIO zo9nX(r%VPqPGh6fhJE2`a9z%k4F1zer0>gj_Ba!6R^Pi6a?U8~!Cu4)2=%hZhznlqE?f)@_ z`0P^zF85OTn4QNJb!njH%20oIaMT!aXU6cH!U4nYnM*Dq(ft{H|Ss8L8sYn>{t_!7df7nIAFl@XyH|9vqi~NInSZ@ zX#7xaUfIO}ChTP2BsSG1>(b^iJRjzjQ@MPIN9em`%6jN~8(XyK_Ersj)T7SYRzr-r zP!#o*s#;k{p~IWc83H@UEo$=CAO-gy9MJv2X!w%K&e)|eh035M{ogu+Dwi@-(kE3^ z>A!@g*74euNi?RM^**B3T6B*rIZI51%GCL}Hnu4S7T+#4wg_<{JC!eFwv^XVl_c!F zKC@z2mK9#~{}kG3r7v_=vLpC_^2q4|qQ_&wbEi;Qf{ZK~&M8qI9cX=0nL3_Yg$bv~ zB}0eWK&<-wTow3mxxB360QZKxIqXqS)IML5qi%{L)|BaAp4U3W_9B_;D%DFMl7MeV e1&5&P0sd?FLUL0Ua9v`Dc!JZ4eNY#3O8gBhHtP}q diff --git a/mayan/apps/web_theme/locale/it/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/it/LC_MESSAGES/django.po deleted file mode 100644 index aa00d163e4..0000000000 --- a/mayan/apps/web_theme/locale/it/LC_MESSAGES/django.po +++ /dev/null @@ -1,118 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Carlo Zanatto <>, 2012 -# Pierpaolo Baldan , 2011 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Italian (http://www.transifex.com/projects/p/mayan-edms/" -"language/it/)\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Tema CSS da applicare, le opzioni sono: ABN AMRO, bec, bec-verde, blu, di " -"default, djime-ceruleo, drastica-scuro, kathleene, oliva, arancio, rosso, " -"reidb-verdastro e magazzino." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Mostra informazioni extra al login" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "Smetti tutte le notifiche" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "chiudi tutto" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "respingere questa notifica" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "chiudi" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Sei già loggato" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Reindirizzamento al tuo punto di ingresso al sito in 5 secondi." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Oppure click qui if per essere " -"rimandato al tuo sito nel caso non funzioni." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Precedente" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Successivo" diff --git a/mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.mo deleted file mode 100644 index 877cc2dd6afcface6fb519572acd8fe92ff8bf46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 475 zcmYLF%TB{E5Cp*~N6s9K#Gw^z?UYw>)eCKrkO)*Ia789r(xAkS>@9^4;REVVK~IijFurswu*K382q~Ici^-C*h3MQN zEznoS=AkP(3!+9#xmvAy)LNCV_|eN;Et|g~gKT8o&IXv*LGrV;rL@)a-L35Y*U(~p z6D2pvbn`25Peo&A2`zW}+3?7OA0(T~ly)exh4BGt^q5}5V54i>ctsCWo4LHSg%*RC jlA>9)^rnJq=j*`Ln)NY^`a|)z9d)cY7>T$$jJAFOEscv% diff --git a/mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.po deleted file mode 100644 index 69914433b3..0000000000 --- a/mayan/apps/web_theme/locale/nl_NL/LC_MESSAGES/django.po +++ /dev/null @@ -1,111 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/" -"mayan-edms/language/nl_NL/)\n" -"Language: nl_NL\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.mo deleted file mode 100644 index 69f8ab33a5625a8cf3c115b1926629cf24f652cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmYL`!EO^V5QZ08B-kT2Bo1?-N>n-PO#-c)EJ(DeREd-*q)13yoUFTXx@)_(H)*O$ zJOzioOOI6IDR>sfDI%l&G-J;{vt#?u%iW(5+Ai`M=_AjO??^C%gxnSK99bf-kRQnJ zCsA~V{sl69`shpafa@iCOmAv2jCPQXor!B7jjUKoUAyR;u7O(tytIPnYbbS5h#aIs ziC&1AC#O02Dy)-QF&OeSS1>ppeu>AzXzR()6*4Cu>%x(VW)P1)PskCr@~9`r+zSS6 znsy02AhZMRly%+`+NBhQWQ;R}zFS?Jq~Qblj?sgCiWYz3&XbAd%9Y$}%V4ah!g`I~ zaVs?nR8jLnkcr?GgOM(!n?qynyRLcu--J0ntF^}hRiAkz(93t|{CFQ>^ zi7Auj|DFs?84pi~gY6ZhEgBzb<%Pnr)&|e#@j|hTOVxwfoLeV+c0M^Fhg)43;6hk3 zP&1uNRWLZ5N*|BP+VYZ|Xj?f3%50V{>-6xqA(J&!mZk6kC}8?cO5bN~*xTEL{j3|p zM%bqPl)~-pW&~ckG}6Z2h+N6&{NaA>FZD{vOIQf!VNpNa M!wtvh*DH?Fza4|QO8@`> diff --git a/mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.po deleted file mode 100644 index f8a9754e0c..0000000000 --- a/mayan/apps/web_theme/locale/pl/LC_MESSAGES/django.po +++ /dev/null @@ -1,113 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# mic , 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Polish (http://www.transifex.com/projects/p/mayan-edms/" -"language/pl/)\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Użytkownik jest już zalogowany" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Poprzedni" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Następny" diff --git a/mayan/apps/web_theme/locale/pt/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/pt/LC_MESSAGES/django.mo deleted file mode 100644 index cc84cae91e5ae8fbe08690f2f7778533183415c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1674 zcmc&!&u<(x6n3FdSjquzs2pA^ArcYqkF+JxqzQs#ivmd#ZMI02kSg!Y+gUd=_SE)t zvv=-DNL&#p2PCcti4&K-aPAd}184pO4t(ApO*!?5HP4?tetz@W?|t*<+n2u;Xm7&a zg?$Bk3-&iGw)Q036!7Mvn&hSrrT^20bX zr^4nK`7{!1ii0>4_uws#9HoU$Pw9@Lk>la^jrUd#jy~PL_psO9+wXOE`w#E;4p#k* zoe?{}(^5O6hmn$YoX)7-+E)p5@!0W)oCb$Vz zR+|tx-X_nfHJNXU2XMy8NEMD%Hi^`8&fp}{!g`+fSS>`ReW^WCP!wcr&_kWh4(*?< zgpv0DSpq-%2*l-nCcj|kaYYFos);hx-8(#K^tiGv$U~p&Ony@5UiNK5jpL)f+y$L@ zV7aFPQoi2q+>-4L*}h5Zo#f_i*}m0o!%_Bd0Wt1{-@5F?huR+|?TruGXpIA;UiOh- zU#MVRLOnZRhdb(7ubj4UFnO(VmVH)bLdRfL=QVq#l~D*)(rS&z<0i6gydLsdGqq)_ znxD(`+|(tqDkt>`yA3F`z<&1Ic(qW-<6veev!bCo$Q*_X4>QlZ4Pv392d1yg}jS8^a+`2Huc-nL2V|wSZ2hj zo1R1PbGa>bcI>7N|nftC4<|bVQtd*$~DEu z$Qr7~Emap^o6Jf}mBJ4JfV|qsEb2~WiZV-c9hNig, 2011 -# Vítor Figueiró , 2012 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Portuguese (http://www.transifex.com/projects/p/mayan-edms/" -"language/pt/)\n" -"Language: pt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Tema CSS a ser aplicado, as opções são: amro, bec, bec-green, blue, default, " -"djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish " -"and warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Exibir informações extras no ecrã de login." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "descartar todas as notificações" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "fechar todos" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "descartar esta notificação" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "fechar" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Já se encontra autenticado" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Redirecionando-o para o ponto de entrada do site em 5 segundos." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Ou clique aqui se o redirecionamento " -"não funcionar." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Anterior" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Próximo" diff --git a/mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.mo deleted file mode 100644 index 0b706c8971a79063a7e1de106dc253b2cc50b56d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1685 zcmc&!&u<(x6n3FdSjqtoNJt!>Dj^aP?~k;l(WZ$+Hd_cvnrO2vs)Q7IXWq^_nX#v~ zC!0ka;ZNWQD(V5LSA@ig%U(G12Y|$h1AhVsKJSl~o;YI7^JkBrJ)hru-~9IG<*x#%oVU&7vi{RNAyc}a*zz!tC${1x~T@X`xHTn1hN9s;idUjcpw+yFB0ZQ!@S=>HS& zRp8Hy_rEOg58xx5`8V(h*1y4_68JGT#eL`K;<;Y{9{|5v%zp=VF#i+y7I5ulA@GO} zx~srXfCT&$81Hof#Ajv=TSN_Z1@m!T80FZ89X8kJ5u7p^&~X|&oet&)Yd<1oQX1paBU^c{i(T!@Tuq2Cf>Wf;(7HlJ zei%pQl-mp=pG0DHu^(sRF1*E|qa@eK8QoSiay;C+_U_95;YWLSPkP0&aP*eXUY5*hQr>%hb& zxCxb3n-DqPB+rR8sjrI%aK_C@<&IT4iPSSr;UtpWdY<=K%|)txp*>QN=VWZqL!Hbn z?VqlMk@n9mfuB7Eak-bu`|LbI)TRS9QHHv^2gkJ@m(~S&;4_`dohtLPZ`)KmI_%31 z=)?=lT@{e>^=9jaY~GU1>$Ki#U%x4vH=0d2${qp`&wb{%E?e=T<_GQOt@oQ~wSA;s z_K{$pt6*K5dUn7LG3r^boVIW|(ipOnU6a^Uo2*S6108BddF50t@1QJw zn@l;I`mOa%nh&>D3~f_ub+ab=TqufyQz!`swV^sy3Uw(D%}u|b{>YyE^fA)%f2*#0 zp$FP6<+h+UlOT#tAzZnF`sdnPitflwf4I7LBq-<@s+EK50NvJkXuSHzBZ|)bDK<`P^s{Tuuxvy3U*P5Dg{wXb72-UF=iFE zK#lijn@*?S5&M81YD6}~kYfQX0NRGHaD2)-C>N(l7M`Uj=b;fP`$W0u!QQKXuRgZo EAFW&X>i_@% diff --git a/mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po deleted file mode 100644 index 0944e756b4..0000000000 --- a/mayan/apps/web_theme/locale/pt_BR/LC_MESSAGES/django.po +++ /dev/null @@ -1,117 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# emersonsoares , 2011 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" -"mayan-edms/language/pt_BR/)\n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Tema CSS a ser aplicado, as opções são: amro, bec, bec-green, blue, default, " -"djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish " -"and warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Exibir informações extras na tela de login." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "rejeitar todas as notificações" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "fechar todos" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "descartar essa notificação" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "fechar" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Você já está logado" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Redirecionando você para o ponto de entrada do site em 5 segundos." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Ou clique aqui se o redirecionamento " -"não funcionar." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Anterior" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Próximo" diff --git a/mayan/apps/web_theme/locale/ro_RO/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/ro_RO/LC_MESSAGES/django.mo deleted file mode 100644 index 6ef6d8a45f3a34ca2325a7f9a0669667678c0c2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2560 zcmc&#OK)5?6gE&^!@I1CKyoXkoe^{Ak+h<{&7?F(-3 z&QUak6CNBxo+nD-C;5WLiV^em$0szxpgV;yyHhlUBV>ZeCpJ^?3?g#Lo=aE~ncCSnLUfgoGLEn3SHbiQzRiWQr~?t!+*Ns8YDm zH_R0>B*-2oiPV;l-Z)JX)L3DYT%?6&*Dk?hapl&Uq(j&QM zXH3XiqO%2TQT+n9Eb4HU#k8$6rUY0kk9!qb9ypiB_4?l4UJd1~tmyIUeset^MQ!VO zJ@ZsYJk4xfjxE-WzSdr^SEfhAG>nwiR@RmeX=>IQrAt~lR7}(v=HS4g!0WhALY?;l zVk~#9t?BP1^Mvt3lStU9}%42%AD_m(q7KX{_GOnMEsmjBrZOxshqi(CLTCL`V zMqDnJ)l9R|SZJQB+`KvdXtf%ZlPAmSIIvQ=FdH{3mGdQX(TYCI-v2~Iy9fI;LCbx4 zqdsw?2O{e-h?~(8Fdav}#YEkZSVr&P7KhU*zrk<|cNt{~M-fBm*mjL{c*dv~yQv+P z$@W~GM%0N6fj6m3r42}hH1uT0FD4dYu#=Xz+AHlp73U{z?JQsz@4)&eK8p&g_ zHTp7SlNGcFX5mdx$^RBfCK3@uGG#u$W1Yl)twMMT1`Cyh0nTn5?0d!ZDSueS{zWg7 zpxtCFm=l}6jvQjkVHRTKd4X1ja6Mf?M13bHXQ5IMwH0U>UF?a(&6NK^J2z1xA^4PU zKfSK2)#jR6J>qqZ~)9 haV7D$!>B7, 2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-02-10 14:23+0000\n" -"Last-Translator: Badea Gabriel \n" -"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/mayan-" -"edms/language/ro_RO/)\n" -"Language: ro_RO\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" -"2:1));\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Tema CSS pentru a aplica, opțiunile sunt: ​​amro, bec, bec-green, blue, " -"default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-" -"greenish and warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Afișarea informațiilor suplimentare, în ecranul de autentificare." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "respingerea tuturor notificărilor" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "închide toate" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "respinge această notificare" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "închide" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Login" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Sunteți deja autentificat" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Redirecționare către punctul de intrare în site în 5 secunde." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Sau faceți clic aici dacă " -"redirecționarea nu funcționează." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Prima autentificare" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Tocmai ați terminat de instalat Mayan EDMS, felicitări!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Intrare utilizând acreditările următoarele:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Utilizator: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Utilizator: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Parola: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Asigurați-vă că pentru a schimba parola pentru a spori securitatea și pentru " -"a dezactiva acest mesaj." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Precedent" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Următor" diff --git a/mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.mo deleted file mode 100644 index ece4ef41e6f570c00d6cb88a22c24eb514530bef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2892 zcmc&#-)|IE6uv5=uD?+qOf=KKKKuqkoe|zW_GuQH2UalX1@F5+;hM4 zopbO0x@Xtd49{zL-@;qR`!?Q@C-A}Z05}f(3HTjw&y$QLfwzFK0RI3!4g3qZ5BN85 z7mz>2*ch-K_zutqJ`4O7cnJ6-knDd0z6sooMP$!``S}KZ1N;+Q>cATq zzrGtjfthC*`v~|8uosxdW(i;ccpUgCa1ZbS@B;8>;C|pqZ1Otr0`Mg8Ixq`-23KxFXJUX?1<#rSCV@!&y|EzM5`ouMQAYMo~%W zplSQEi|1uQ__l|}X{#)aoK(Io1*Y>#XwS+Sd7);y_>AyMHkM(9Yg@Afinw=iCG+&L z^3$v17x> zPfZLB4o?gXOr1J0G195`_LroReJRn;tpbH&DVd9yoU#c<4#+9745Hy=;x&pnb>r+-K%X4yCTb|@#tE#->T8>8=9H30QPF^S3 z2`!Z)%E;Q*P9m3ceaG9r(Z}!!fw{0zDfuc1Rg`)7Vl-0{vyz|op<=;ukdSCbd&0I! zuBPKrQ56m!8XTQ$1<=Joqo{=E+fjma8_U_Qmhl(6*$g#Uwlpfswz=baR>8`}rmdN% zI=4?j7WXuCHHP!Xhf--|KEt=7p=T;#4l=N%FXb^_}G*&fbb|E#-Q+^ zNw=BqHOzyC*~7cjnVtiN*=w3GG$x=s`Q5VXG0X!-x|f^pWqQ;5O+1MaRJ1XLy48rz zRT(}hRZ&*?G28M4?PA4Vf?Nl-+QXQhutlUpBNn;9oiBkoiq~zuH&IL zjHzk`(RwK56i$xi9Hy&6Y3XH8OdT~2ZP^ilf>g$klXLS(ZiXM4w!Fl+?JHp$M{&?} zhC7w0tFt|adECr)IPGaOn@#h5`#3etwro1h-{&TWIr{zC?&efqwwIdG3bQY5^0Q~- zC9p9&u_lc*-JORMEVvOYg^R&zPzx7=mEdl8IoJp`d9a3|dl=XV)@XtU_hB&~Y?1{J z>VQQW+YFY&OW_v{LkumUxr$*jKS!>@b6CFyhaByNU>z&3gcn;2!mlv68Qj92u;0XQ zDg3fIn`FTcXx|Gjak?7H>da>{&-t8*wMYg6|)*zr%uS z7y@aeB)E-u;wt&is~buoK#;y1UEpAcPVDJ^6f#v@EmEY0@QEcVkO*xM$$89C?iYX{ z8wu4a%k9_iP8WS}Gt#k+04Z{c8*#)+Ke{b~fxcA1t(uEcLxU^9k^#!KNa-4nRHO8) z;vWIyE5Ukr9%Sp_b}i0XOM9e;oW|#DaXZ}|{w;#5sCu}%O~IoOaL6LTcSt)K(jlV5 zyG{q`B6T@cCH0ZTi-?t0BWya3lv?5fs{j7a64eb-7734Z;HE&WwXxWBIFGZx5MF+) k3%Vo(1NkLdNG6Rj3Wy}EWBYr}?1qbvn#Nbcj;8SX53U=U{Qv*} diff --git a/mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.po deleted file mode 100644 index c199e4fa6a..0000000000 --- a/mayan/apps/web_theme/locale/ru/LC_MESSAGES/django.po +++ /dev/null @@ -1,120 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Sergey Glita , 2012-2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-05-14 06:41+0000\n" -"Last-Translator: Sergey Glita \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/mayan-edms/" -"language/ru/)\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" -"Темы CSS на выбор: amro, bec, bec-green, blue, default, djime-cerulean, " -"drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse." - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Показать дополнительную информацию в при входе." - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "убрать все уведомления" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "закрыть все" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "убрать это уведомление" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "закрыть" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Войти" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Вы уже вошли в систему" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Перенаправит вас на вход веб-сайта через 5 секунд." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Или нажмите здесь , если " -"перенаправление не работает." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Первое время входа в систему" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Вы только что закончили установку Mayan EDMS, поздравляем!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Войти, используя следующие учетные данные:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Имя пользователя: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Имя пользователя: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Пароль: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Обязательно измените пароль для повышения безопасности и отключения этого " -"сообщения." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Предыдущий" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Следующий" diff --git a/mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.mo deleted file mode 100644 index 7c6a2e77caa1c06abef7f4aa10d6887970cb0432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmYLF!Ab)$5LNWFN6#MSpwObzWVcmo$|9&03NDs*^(wKAYh*WBlGG~r8~&O{zr|Ur zcF1Gq=O0}TZBVG6Me!biKmns&wq@aeO9x8qdDFw=e0EgGWjMA z3@@{3G*Pv60W)9dIi4>HkGT~Pjc;F({`O?Pyq}I(`~MLEKQ~b} z%7*K2i90;HuqG%&qrTO&b5O5=)uq&C0JA6Qyb9@Ueue$DuNmV}IUJgqooiDF=s)NX zjmw3TC0$*Wp+4;mU{$6qvmbMwrZJoW2ePbaLNs2}F1)}0Nj;JhlDh3dwDAq` Cz?TC6 diff --git a/mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.po deleted file mode 100644 index 7ca85d1be5..0000000000 --- a/mayan/apps/web_theme/locale/sl_SI/LC_MESSAGES/django.po +++ /dev/null @@ -1,112 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2012-12-12 06:07+0000\n" -"Last-Translator: Roberto Rosario\n" -"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/" -"mayan-edms/language/sl_SI/)\n" -"Language: sl_SI\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "" - -#: templates/web_theme_login.html:43 -#, python-format -msgid "Email: %(email)s" -msgstr "" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "" diff --git a/mayan/apps/web_theme/locale/tr_TR/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/tr_TR/LC_MESSAGES/django.mo deleted file mode 100644 index b3fcf4341867da17ff538fb6bdd33aa6e93ae893..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 933 zcmZva%T5$Q6oyO1TPH^2f|ZNfAP`gCJ-{ewE-_p~WORa!8y0%#u4ziDt2$NH4m^b` z*1UiV*t27J4WqB%%8iMqW+pHTPV)6%b#l&Mm#&}B$4&^wW8?*rBTtYYh>u^$GvqgN zANhlfA%BrcP$!2PqE6tviRyj#P(#!& zsNUy0>QmGcRJ0%{eP8e4*S(AQ@V!1BBEIiBHiWT`I#F^ebs-el?tkC&BS+d`ZC9H- zp^MfTt%~J|scM*;wu{j)N!o^g6S}r!*K(tvC(Y)o7$evQ>sV?)SqV;?gsy_(hOWTX zDPWc^?t}G%F!TAhMF~QNnJ$;HQx!E7oTVJfgr>DQ6!w5l`2jzkrc(#bRY??eyWP6o6;s!RsE@5 zYAn#fa4B90NbgJ@(wujI7Q%?DQ?fY_%yT2~-54!l^by?lYBqi8yISI5d*@m2oI>6^ YA8oqj, 2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-06-10 10:55+0000\n" -"Last-Translator: Caner Başaran \n" -"Language-Team: Turkish (Turkey) (http://www.transifex.com/projects/p/mayan-" -"edms/language/tr_TR/)\n" -"Language: tr_TR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "tümünü kapat" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "kapat" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Giriş" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "" - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "İlk defa giriş" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Kullanıcı adı: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Kullanıcı adı: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Parola: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Geri" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "İleri" diff --git a/mayan/apps/web_theme/locale/vi_VN/LC_MESSAGES/django.mo b/mayan/apps/web_theme/locale/vi_VN/LC_MESSAGES/django.mo deleted file mode 100644 index 7db227b86b4393f5279fa3551a6cc278d1ab198a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2249 zcma)+UuYaf9LLAD{yYB{d{7joh1!I6_byFC>*Wt6O=<$UB*aV5r!u!Uw>!=5%(*k0 zotv-vDR8L!bf|Km#5JcfhB> zzreHL-=LLu4-)bUxC~l(1zLR%z^B2Vd;7oj_$PQ5J{*LR4eWmp;d5Z|2|`{4o8WWc z6>tFj6nqB!2@Jqr!4u$_C%gW5;3&RB@Fe&pcm(_%`~dt1#1Ybh^Dlw#gB1J(d>On4 z!ks)9K<=}p9WP)$i)rKOA5fVOn`@*Y9|$YYTkkXX+1j(V?SL6lzFllewnXjTjD0ikKcwPrqd$&}E|khLh^ zFfqg7hKeI*gpzpAb%)Bwn}$*@U2;Lh+E61RPV)^iXScggnrI>Y{7^%Mp<1_JI9KP= z2o~xxnTHj!5K}J{-YOkqG>Ca){OGZPxrMi8=PxczPt7h(pRZnAUYZ-!M<)Uv^RXhE zprS#cM#S99J*z9O<#9t1@~TS~d%>6Km^QJJ{=~6?-GmJ4v0`tLEXI6Is6>;cT~%?#qZxjTGS=v)tRk3D?HYye3|ZBFD&tCHPPU(zO8m6a)%EKd0>2#?CL1zhhw|e*G zhMm%ob83W^O6B1Dihvg~c$5S?FBAU#QDeHuFzCJ~T?Zuj8fB z0-4O(TawE3Yx{@d-`%;Ib*>2-W$kT4SA(qmRg$k=re^0dl4#OxB(RpXudANWTDsYj zSPjzeAR>eGmerQEZ=hkb&gTM4S^KsJGn*|cv(9bik{OY8F6UyMD-h048vG+Q*vGwO zP1zriM(L)cR$~AwxeHd=c9ZOU-1h}L?VHm2(Y~2Hy!G%Gt*1XgtCwzh{Z=(g%A_i? z_Jbytxgs+vYv1?&@9lydC>T$_Xytc|gq{S|N?Li0!7q2R&S$XNOHi0@MyP()`OtGo zr7zR{m%*d1oobwG@(>c*>JbKP{14>b_0!GZT6!14Bh(l0&n5G|Rf3}Andmq9i2JA8 z9*FEZ!n5bDd;cjzpM;lgio68(4c)M{+r5Ei5UOp6&Q&bFm!Nqh4bvadOgIqQMA#;? zL_=hq?Y>K6@5*xNJLnECNZTG7uk#Hwp$oU<5d!b-Nxui2Z{IM~gAIaK`l#>wp`zE) PE!7j~_MTnH8, 2013 -msgid "" -msgstr "" -"Project-Id-Version: Mayan EDMS\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-31 19:55-0400\n" -"PO-Revision-Date: 2013-01-25 00:39+0000\n" -"Last-Translator: Trung Phan Minh \n" -"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/projects/p/" -"mayan-edms/language/vi_VN/)\n" -"Language: vi_VN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/settings.py:10 -msgid "" -"CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-" -"cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and " -"warehouse." -msgstr "" - -#: conf/settings.py:12 -msgid "Display extra information in the login screen." -msgstr "Hiển thị thông tin bổ sung trong màn hình đăng nhập" - -#: templates/web_theme_base.html:75 -msgid "dismiss all notifications" -msgstr "bỏ tất cả các thông báo" - -#: templates/web_theme_base.html:75 -msgid "close all" -msgstr "đóng tất cả" - -#: templates/web_theme_base.html:76 -msgid "dismiss this notification" -msgstr "bỏ thông báo này" - -#: templates/web_theme_base.html:76 -msgid "close" -msgstr "đóng" - -#: templates/web_theme_login.html:15 templates/web_theme_login.html.py:53 -#: templates/web_theme_login.html:61 -msgid "Login" -msgstr "Đăng nhập" - -#: templates/web_theme_login.html:21 -msgid "You are already logged in" -msgstr "Bạn đã được đăng nhập" - -#: templates/web_theme_login.html:24 -msgid "Redirecting you to the website entry point in 5 seconds." -msgstr "Đang chuyển hướng đến website trong vòng 5 giây." - -#: templates/web_theme_login.html:27 -#, python-format -msgid "" -"Or click here if redirection doesn't " -"work." -msgstr "" -"Hoặc click vào đây nếu chuyển hướng " -"không làm việc." - -#: templates/web_theme_login.html:38 -msgid "First time login" -msgstr "Đăng nhập lần đầu" - -#: templates/web_theme_login.html:40 -msgid "" -"You have just finished installing Mayan EDMS, " -"congratulations!" -msgstr "" -"Bạn đã cài đặt xong Hệ thống quản lý tài liệu điện tử Mayan EDMS. Xin chúc mừng bạn!" - -#: templates/web_theme_login.html:41 -msgid "Login using the following credentials:" -msgstr "Đăng nhập dùng các thông tin sau:" - -#: templates/web_theme_login.html:42 -#, python-format -msgid "Username: %(account)s" -msgstr "Người dùng: %(account)s" - -#: templates/web_theme_login.html:43 -#, fuzzy, python-format -msgid "Email: %(email)s" -msgstr "Người dùng: %(account)s" - -#: templates/web_theme_login.html:44 -#, python-format -msgid "Password: %(password)s" -msgstr "Mật khẩu: %(password)s" - -#: templates/web_theme_login.html:45 -msgid "" -"Be sure to change the password to increase security and to disable this " -"message." -msgstr "" -"Bạn nên thay đổi mật khẩu để tăng tính bảo mật và để không nhìn thấy lời " -"nhắc này nữa." - -#: templates/pagination/pagination.html:6 -#: templates/pagination/pagination.html:8 -msgid "Previous" -msgstr "Trước" - -#: templates/pagination/pagination.html:26 -#: templates/pagination/pagination.html:28 -msgid "Next" -msgstr "Tiếp theo" diff --git a/mayan/apps/web_theme/models.py b/mayan/apps/web_theme/models.py deleted file mode 100644 index 71a8362390..0000000000 --- a/mayan/apps/web_theme/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/mayan/apps/web_theme/templates/web_theme_base.html b/mayan/apps/web_theme/templates/web_theme_base.html deleted file mode 100644 index d7545803b3..0000000000 --- a/mayan/apps/web_theme/templates/web_theme_base.html +++ /dev/null @@ -1,142 +0,0 @@ -{% load i18n %} -{% load static %} - -{% load compress %} - -{% load theme_tags %} - -{% get_theme as web_theme %} - - - - - - {% block html_title %}{% endblock %} - - {% block web_theme_head %}{% endblock %} - - {% compress css %} - - - - - {% block web_theme_stylesheets %}{% endblock %} - {% endcompress %} - - -
    - {% if web_theme_view_type == 'plain' %} -
    - {% block content_plain %}{% endblock %} -
    - {% else %} - {% if not web_theme_hide_menus %} - - {% endif %} -
    -
    - {% if messages %} -
    -
    - {% for message in messages %} -
    -

    - {{ message }} - [{% trans 'close all' %}] - [{% trans 'close' %}] -

    -
    - {% endfor %} -
    -
    - {% endif %} - {% block web_theme_messages %}{% endblock %} -
    - {#{% if not web_theme_hide_menus %}#} - {% block web_theme_secondary_navigation %}{% endblock %} - {#{% endif %}#} - {% block web_theme_content %}{% endblock %} -
    - {% block web_theme_footer %}{% endblock %} -
    - -
    - {% endif %} -
    - - {% compress js %} - - - {% if enable_scroll_js %} - - - {% endif %} - - {% block web_theme_javascript %}{% endblock %} - - - {% endcompress %} - - - diff --git a/mayan/apps/web_theme/templates/web_theme_login.html b/mayan/apps/web_theme/templates/web_theme_login.html deleted file mode 100644 index da8a5575da..0000000000 --- a/mayan/apps/web_theme/templates/web_theme_login.html +++ /dev/null @@ -1,73 +0,0 @@ -{% extends 'web_theme_base.html' %} - -{% load i18n %} - -{% load theme_tags %} -{% load autoadmin_tags %} - -{% block web_theme_head %} - {% if user.is_authenticated %} - {% get_login_redirect_url %} - - {% endif %} -{% endblock %} - -{% block html_title %}{% trans 'Login' %}{% endblock %} - - {% if user.is_authenticated %} - {% block web_theme_content %} - {% get_login_redirect_url %} -
    -

    {% trans 'You are already logged in' %}

    -
    -

    - {% trans 'Redirecting you to the website entry point in 5 seconds.' %} -

    -

    - {% blocktrans %}Or click here if redirection doesn't work.{% endblocktrans %} -

    -
    -
    - {% endblock %} - {% else %} - {% block content_plain %} - {% auto_admin_properties %} - {% if auto_admin_properties.account %} -
    -
    -

    {% trans "First time login" %}

    - -
    -
    - {% endif %} -
    -

    {% block project_name %}{% endblock %}

    -
    -

    {% trans 'Login' %}

    - -
    - {% get_web_theme_setting "VERBOSE_LOGIN" as verbose_login %} - {% if verbose_login %} - {% include 'verbose_login.html' %} - {% endif %} - {% endblock %} - {% endif %} diff --git a/mayan/apps/web_theme/templatetags/__init__.py b/mayan/apps/web_theme/templatetags/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mayan/apps/web_theme/views.py b/mayan/apps/web_theme/views.py deleted file mode 100644 index 60f00ef0ef..0000000000 --- a/mayan/apps/web_theme/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/mayan/settings/base.py b/mayan/settings/base.py index 470302e689..105cb754d5 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -61,7 +61,6 @@ INSTALLED_APPS = ( 'smart_settings', 'navigation', 'lock_manager', - 'web_theme', # pagination needs to go after web_theme so that the pagination template # if found 'pagination', From b42e9badf6e06c893908c6a5963ba9f1c61cffc3 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 26 Aug 2014 02:44:49 -0400 Subject: [PATCH 003/783] Move common templates to apps/main/templates/main/* --- mayan/apps/__init__.py | 0 mayan/apps/acls/views.py | 26 ++++---- mayan/apps/bootstrap/views.py | 22 +++---- mayan/apps/checkouts/views.py | 6 +- .../common/locale/ar/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/bg/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/bs_BA/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/da/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/de_DE/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/en/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/es/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/fa/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/fr/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/hr_HR/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/hu/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/id/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/it/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/nl_NL/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/pl/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/pt/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/pt_BR/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/ro_RO/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/ru/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/sl_SI/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/tr_TR/LC_MESSAGES/django.po | 46 ++++++------- .../common/locale/vi_VN/LC_MESSAGES/django.po | 46 ++++++------- mayan/apps/common/urls.py | 10 +-- mayan/apps/common/views.py | 24 +++---- mayan/apps/converter/views.py | 2 +- mayan/apps/django_gpg/views.py | 12 ++-- mayan/apps/document_comments/views.py | 6 +- mayan/apps/document_indexing/utils.py | 2 +- mayan/apps/document_indexing/views.py | 24 +++---- mayan/apps/document_signatures/views.py | 6 +- mayan/apps/documents/views.py | 66 +++++++++---------- .../templates/search_results.html | 6 +- .../templates/search_results_subtemplate.html | 2 +- .../templatetags/search_tags.py | 2 +- mayan/apps/dynamic_search/views.py | 2 +- .../apps/folders/templatetags/folder_tags.py | 2 +- mayan/apps/folders/views.py | 12 ++-- mayan/apps/history/views.py | 6 +- mayan/apps/installation/views.py | 4 +- mayan/apps/linking/views.py | 22 +++---- .../apps/main/locale/ar/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/bg/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/bs_BA/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/da/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/de_DE/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/en/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/es/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/fa/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/fr/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/hr_HR/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/hu/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/id/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/it/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/nl_NL/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/pl/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/pt/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/pt_BR/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/ro_RO/LC_MESSAGES/django.po | 28 ++++---- .../apps/main/locale/ru/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/sl_SI/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/tr_TR/LC_MESSAGES/django.po | 28 ++++---- .../main/locale/vi_VN/LC_MESSAGES/django.po | 28 ++++---- .../templates/main}/403.html | 2 +- .../templates/main}/404.html | 2 +- .../templates/main}/500.html | 0 .../apps/main/templates/{ => main}/about.html | 4 +- .../apps/main/templates/{ => main}/base.html | 0 .../templates/main}/calculate_form_title.html | 0 .../templates/{ => main}/diagnostics.html | 2 +- .../main}/generic_assign_remove.html | 2 +- .../templates/main}/generic_confirm.html | 2 +- .../templates/main}/generic_detail.html | 8 +-- .../main}/generic_detail_subtemplate.html | 2 +- .../templates/main}/generic_form.html | 6 +- .../main}/generic_form_instance.html | 0 .../main}/generic_form_subtemplate.html | 6 +- .../templates/main}/generic_list.html | 4 +- .../main}/generic_list_horizontal.html | 4 +- .../generic_list_horizontal_subtemplate.html | 0 .../main}/generic_list_subtemplate.html | 0 .../templates/main}/generic_subtemplate.html | 0 .../templates/main}/generic_template.html | 4 +- .../templates/main}/generic_wizard.html | 6 +- .../apps/main/templates/{ => main}/home.html | 2 +- .../templates/main}/login.html | 6 +- .../templates/main}/password_change_done.html | 2 +- .../templates/main}/password_change_form.html | 2 +- .../{ => main}/project_description.html | 0 .../main/templates/{ => main}/statistics.html | 4 +- .../apps/main/templates/{ => main}/tools.html | 2 +- .../templates/{ => main}/verbose_login.html | 2 +- mayan/apps/main/views.py | 6 +- mayan/apps/metadata/views.py | 24 +++---- .../templatetags/navigation_tags.py | 2 +- mayan/apps/ocr/views.py | 14 ++-- mayan/apps/permissions/views.py | 10 +-- mayan/apps/project_setup/views.py | 2 +- mayan/apps/project_tools/views.py | 2 +- mayan/apps/registration/views.py | 2 +- mayan/apps/scheduler/views.py | 2 +- mayan/apps/settings_editor/__init__.py | 13 ++++ mayan/apps/settings_editor/admin.py | 3 + mayan/apps/settings_editor/forms.py | 14 ++++ mayan/apps/settings_editor/models.py | 3 + .../settings_editor/editor_window.html | 7 ++ mayan/apps/settings_editor/tests.py | 3 + mayan/apps/settings_editor/urls.py | 7 ++ mayan/apps/settings_editor/views.py | 11 ++++ mayan/apps/smart_settings/views.py | 2 +- mayan/apps/sources/views.py | 32 ++++----- mayan/apps/sources/wizards.py | 2 +- mayan/apps/statistics/views.py | 6 +- mayan/apps/tags/templatetags/tags_tags.py | 2 +- mayan/apps/tags/views.py | 14 ++-- mayan/apps/user_management/views.py | 18 ++--- 119 files changed, 1114 insertions(+), 1053 deletions(-) create mode 100644 mayan/apps/__init__.py rename mayan/apps/{common/templates => main/templates/main}/403.html (93%) rename mayan/apps/{common/templates => main/templates/main}/404.html (92%) rename mayan/apps/{common/templates => main/templates/main}/500.html (100%) rename mayan/apps/main/templates/{ => main}/about.html (82%) rename mayan/apps/main/templates/{ => main}/base.html (100%) rename mayan/apps/{common/templates => main/templates/main}/calculate_form_title.html (100%) rename mayan/apps/main/templates/{ => main}/diagnostics.html (95%) rename mayan/apps/{common/templates => main/templates/main}/generic_assign_remove.html (98%) rename mayan/apps/{common/templates => main/templates/main}/generic_confirm.html (98%) rename mayan/apps/{common/templates => main/templates/main}/generic_detail.html (89%) rename mayan/apps/{common/templates => main/templates/main}/generic_detail_subtemplate.html (88%) rename mayan/apps/{common/templates => main/templates/main}/generic_form.html (90%) rename mayan/apps/{common/templates => main/templates/main}/generic_form_instance.html (100%) rename mayan/apps/{common/templates => main/templates/main}/generic_form_subtemplate.html (95%) rename mayan/apps/{common/templates => main/templates/main}/generic_list.html (89%) rename mayan/apps/{common/templates => main/templates/main}/generic_list_horizontal.html (88%) rename mayan/apps/{common/templates => main/templates/main}/generic_list_horizontal_subtemplate.html (100%) rename mayan/apps/{common/templates => main/templates/main}/generic_list_subtemplate.html (100%) rename mayan/apps/{common/templates => main/templates/main}/generic_subtemplate.html (100%) rename mayan/apps/{common/templates => main/templates/main}/generic_template.html (53%) rename mayan/apps/{common/templates => main/templates/main}/generic_wizard.html (76%) rename mayan/apps/main/templates/{ => main}/home.html (90%) rename mayan/apps/{common/templates => main/templates/main}/login.html (93%) rename mayan/apps/{common/templates => main/templates/main}/password_change_done.html (86%) rename mayan/apps/{common/templates => main/templates/main}/password_change_form.html (79%) rename mayan/apps/main/templates/{ => main}/project_description.html (100%) rename mayan/apps/main/templates/{ => main}/statistics.html (75%) rename mayan/apps/main/templates/{ => main}/tools.html (95%) rename mayan/apps/main/templates/{ => main}/verbose_login.html (77%) create mode 100644 mayan/apps/settings_editor/__init__.py create mode 100644 mayan/apps/settings_editor/admin.py create mode 100644 mayan/apps/settings_editor/forms.py create mode 100644 mayan/apps/settings_editor/models.py create mode 100644 mayan/apps/settings_editor/templates/settings_editor/editor_window.html create mode 100644 mayan/apps/settings_editor/tests.py create mode 100644 mayan/apps/settings_editor/urls.py create mode 100644 mayan/apps/settings_editor/views.py diff --git a/mayan/apps/__init__.py b/mayan/apps/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index d3dedbc0fd..f0ec32fce8 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -60,7 +60,7 @@ def acl_list_for(request, obj, extra_context=None): if extra_context: context.update(extra_context) - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -91,7 +91,7 @@ def acl_detail_for(request, actor, obj): # TODO : get all globally assigned permission, new function get_permissions_for_holder (roles aware) subtemplates_list = [ { - 'name': u'generic_list_subtemplate.html', + 'name': u'main/generic_list_subtemplate.html', 'context': { 'title': _(u'permissions available to: %(actor)s for %(obj)s' % { 'actor': actor, @@ -129,7 +129,7 @@ def acl_detail_for(request, actor, obj): } return render_to_response( - 'generic_detail.html', + 'main/generic_detail.html', context, context_instance=RequestContext(request) ) @@ -224,7 +224,7 @@ def acl_grant(request): if navigation_object_count == 1: context['object'] = navigation_object.source_object - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -317,7 +317,7 @@ def acl_revoke(request): if navigation_object_count == 1: context['object'] = navigation_object.source_object - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -363,7 +363,7 @@ def acl_new_holder_for(request, obj, extra_context=None, navigation_object=None) if extra_context: context.update(extra_context) - return render_to_response('generic_form.html', context, + return render_to_response('main/generic_form.html', context, context_instance=RequestContext(request)) @@ -389,7 +389,7 @@ def acl_setup_valid_classes(request): 'hide_object': True, } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -413,7 +413,7 @@ def acl_class_acl_list(request, access_object_class_gid): 'object': access_object_class, } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -429,7 +429,7 @@ def acl_class_acl_detail(request, access_object_class_gid, holder_object_gid): # TODO : get all globally assigned permission, new function get_permissions_for_holder (roles aware) subtemplates_list = [ { - 'name': u'generic_list_subtemplate.html', + 'name': u'main/generic_list_subtemplate.html', 'context': { 'title': _(u'permissions available to: %(actor)s for class %(class)s' % { 'actor': actor, @@ -450,7 +450,7 @@ def acl_class_acl_detail(request, access_object_class_gid, holder_object_gid): }, ] - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'object': access_object_class, 'subtemplates_list': subtemplates_list, 'multi_select_as_buttons': True, @@ -486,7 +486,7 @@ def acl_class_new_holder_for(request, access_object_class_gid): 'submit_icon_famfam': 'tick' } - return render_to_response('generic_form.html', context, + return render_to_response('main/generic_form.html', context, context_instance=RequestContext(request)) @@ -565,7 +565,7 @@ def acl_class_multiple_grant(request): if navigation_object_count == 1: context['object'] = navigation_object - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -644,5 +644,5 @@ def acl_class_multiple_revoke(request): if navigation_object_count == 1: context['object'] = navigation_object - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) diff --git a/mayan/apps/bootstrap/views.py b/mayan/apps/bootstrap/views.py index 694d067b2b..ae6a4ade64 100644 --- a/mayan/apps/bootstrap/views.py +++ b/mayan/apps/bootstrap/views.py @@ -37,7 +37,7 @@ def bootstrap_setup_list(request): ], } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -55,7 +55,7 @@ def bootstrap_setup_create(request): else: form = BootstrapSetupForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create bootstrap'), 'form': form, }, @@ -83,7 +83,7 @@ def bootstrap_setup_edit(request, bootstrap_setup_pk): else: form = BootstrapSetupForm_edit(instance=bootstrap) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit bootstrap setup: %s') % bootstrap, 'form': form, 'object': bootstrap, @@ -126,7 +126,7 @@ def bootstrap_setup_delete(request, bootstrap_setup_pk): 'form_icon': 'lightning_delete.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -145,7 +145,7 @@ def bootstrap_setup_view(request, bootstrap_setup_pk): 'object_name': _(u'bootstrap setup'), } - return render_to_response('generic_detail.html', context, + return render_to_response('main/generic_detail.html', context, context_instance=RequestContext(request)) @@ -180,7 +180,7 @@ def bootstrap_setup_execute(request, bootstrap_setup_pk): context['title'] = _(u'Are you sure you wish to execute the database bootstrap setup named: %s?') % bootstrap_setup - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -203,7 +203,7 @@ def bootstrap_setup_dump(request): else: form = BootstrapSetupForm_dump() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'dump current configuration into a bootstrap setup'), 'form': form, }, @@ -248,7 +248,7 @@ def bootstrap_setup_import_from_file(request): else: form = BootstrapFileImportForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'Import bootstrap setup from file'), 'form_icon': 'folder.png', 'form': form, @@ -276,7 +276,7 @@ def bootstrap_setup_import_from_url(request): else: form = BootstrapURLImportForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'Import bootstrap setup from URL'), 'form_icon': 'folder.png', 'form': form, @@ -311,7 +311,7 @@ def erase_database_view(request): context['title'] = _(u'Are you sure you wish to erase the entire database and document storage?') context['message'] = _(u'All documents, sources, metadata, metadata types, set, tags, indexes and logs will be lost irreversibly!') - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -339,5 +339,5 @@ def bootstrap_setup_repository_sync(request): 'form_icon': 'world.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py index 1e611e122c..5d85230b3c 100644 --- a/mayan/apps/checkouts/views.py +++ b/mayan/apps/checkouts/views.py @@ -56,7 +56,7 @@ def checkout_info(request, document_pk): paragraphs.append(_(u'Check out expiration: %s') % checkout_info.expiration_datetime) paragraphs.append(_(u'New versions allowed: %s') % (_(u'yes') if not checkout_info.block_new_version else _(u'no'))) - return render_to_response('generic_template.html', { + return render_to_response('main/generic_template.html', { 'paragraphs': paragraphs, 'object': document, 'title': _(u'Check out details for document: %s') % document @@ -89,7 +89,7 @@ def checkout_document(request, document_pk): else: form = DocumentCheckoutForm(initial={'document': document}) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'object': document, 'title': _(u'Check out document: %s') % document @@ -142,5 +142,5 @@ def checkin_document(request, document_pk): else: context['title'] = _(u'Are you sure you wish to check in document: %s?') % document - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) diff --git a/mayan/apps/common/locale/ar/LC_MESSAGES/django.po b/mayan/apps/common/locale/ar/LC_MESSAGES/django.po index 8b039beb13..8104e94f97 100644 --- a/mayan/apps/common/locale/ar/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/ar/LC_MESSAGES/django.po @@ -321,70 +321,70 @@ msgstr "انشاء" msgid "Assign %(title)s %(object)s" msgstr "تعيين %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "تأكيد" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "تأكيد حذف" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "أيقونة النموذج" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "هل أنت متأكد أنك تريد حذف %(object_name)s: %(object)s ؟" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "هل أنت متأكد أنك تريد حذف %(object)s ؟" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "نعم" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "لا" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "مطلوب" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "حفظ" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "ارسال" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "إلغاء" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "قائمة ل: %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -394,16 +394,16 @@ msgstr "" "%(page_number)s of %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "قائمة ل: %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "معرف" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "لا توجد أي %(stripped_title)s" diff --git a/mayan/apps/common/locale/bg/LC_MESSAGES/django.po b/mayan/apps/common/locale/bg/LC_MESSAGES/django.po index fcc8c5bbd2..0264a1154e 100644 --- a/mayan/apps/common/locale/bg/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/bg/LC_MESSAGES/django.po @@ -314,70 +314,70 @@ msgstr "Създаване" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Потвърждаване" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Потвърдете изтриване" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Да" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Не" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Запазване" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Подаване" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Отказ" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -385,16 +385,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Идентификатор" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po index 9568d2059c..7ebae90d85 100644 --- a/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/bs_BA/LC_MESSAGES/django.po @@ -322,70 +322,70 @@ msgstr "Kreirati" msgid "Assign %(title)s %(object)s" msgstr "Dodijeliti %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Potvrditi" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Potvrditi brisanje" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "napraviti ikonu" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Jeste li sigurni da želite izbrisati %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Jeste li sigurni da želite izbrisati: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Da" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Ne" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "potrebno" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Sačuvati" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Podnijeti" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Otkazati" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Lista %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -395,16 +395,16 @@ msgstr "" "%(page_number)s od %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Lista %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identifikator" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Ne postoje %(stripped_title)s" diff --git a/mayan/apps/common/locale/da/LC_MESSAGES/django.po b/mayan/apps/common/locale/da/LC_MESSAGES/django.po index b2dbe72e86..afb202c435 100644 --- a/mayan/apps/common/locale/da/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/da/LC_MESSAGES/django.po @@ -312,70 +312,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -383,16 +383,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po index 4e12a30da7..56d8808342 100644 --- a/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/de_DE/LC_MESSAGES/django.po @@ -328,70 +328,70 @@ msgstr "Erstellen" msgid "Assign %(title)s %(object)s" msgstr "%(title)s %(object)s zuordnen" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Bestätigen" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Löschen bestätigen" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "Formularsymbol" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Sind Sie sicher, dass Sie %(object_name)s %(object)s löschen möchten?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Soll %(object)s wirklich gelöscht werden?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Ja" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Nein" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "Erforderlich" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Speichern" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Senden" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Abbrechen" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "%(title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -401,16 +401,16 @@ msgstr "" "%(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "%(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Bezeichner" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "There are no %(title)s" diff --git a/mayan/apps/common/locale/en/LC_MESSAGES/django.po b/mayan/apps/common/locale/en/LC_MESSAGES/django.po index 3b3bc84ebc..3418e4dfd2 100644 --- a/mayan/apps/common/locale/en/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/en/LC_MESSAGES/django.po @@ -321,70 +321,70 @@ msgstr "Create" msgid "Assign %(title)s %(object)s" msgstr "Assign %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirm" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirm delete" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "form icon" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Are you sure you wish to delete %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Are you sure you wish to delete: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Yes" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "No" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "required" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Save" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Submit" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Cancel" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "List of %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -394,16 +394,16 @@ msgstr "" "%(page_number)s of %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "List of %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identifier" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "There are no %(stripped_title)s" diff --git a/mayan/apps/common/locale/es/LC_MESSAGES/django.po b/mayan/apps/common/locale/es/LC_MESSAGES/django.po index f7f7e85abc..4ef15cb79d 100644 --- a/mayan/apps/common/locale/es/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/es/LC_MESSAGES/django.po @@ -327,70 +327,70 @@ msgstr "Crear" msgid "Assign %(title)s %(object)s" msgstr "Asignar %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirmar" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirmar eliminación" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "icono del formulario" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "¿Está seguro que desea eliminar %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "¿Está seguro que desea eliminar: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Sí" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "No" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "requerido" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Guardar" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Enviar" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Cancelar" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "Lista de %(title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -400,16 +400,16 @@ msgstr "" "%(page_number)s de %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Lista de %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identificador" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "No existen %(title)s" diff --git a/mayan/apps/common/locale/fa/LC_MESSAGES/django.po b/mayan/apps/common/locale/fa/LC_MESSAGES/django.po index ff4f5d1ca6..86f80c2adf 100644 --- a/mayan/apps/common/locale/fa/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/fa/LC_MESSAGES/django.po @@ -314,70 +314,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -385,16 +385,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/fr/LC_MESSAGES/django.po b/mayan/apps/common/locale/fr/LC_MESSAGES/django.po index e03d873217..f9d69b1246 100644 --- a/mayan/apps/common/locale/fr/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/fr/LC_MESSAGES/django.po @@ -325,72 +325,72 @@ msgstr "Créer" msgid "Assign %(title)s %(object)s" msgstr "Attribuer %(title)s à %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirmer" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirmer la suppression" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "icône du formulaire" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" "Etes-vous certain de vouloir supprimer l'élément %(object_name)s : " "%(object)s ?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Etes-vous certain de vouloir supprimer l'élément: %(object)s ?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Oui" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Non" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "requis" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Sauvegarder" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Envoyer" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Annuler" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "Liste des %(title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -400,16 +400,16 @@ msgstr "" "%(page_number)s de %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Liste des %(title)s (%(total)s )" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identifiant" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "Il n'y a pas de %(title)s" diff --git a/mayan/apps/common/locale/hr_HR/LC_MESSAGES/django.po b/mayan/apps/common/locale/hr_HR/LC_MESSAGES/django.po index 7b416bd0ee..5b2d4657bf 100644 --- a/mayan/apps/common/locale/hr_HR/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/hr_HR/LC_MESSAGES/django.po @@ -313,70 +313,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -384,16 +384,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/hu/LC_MESSAGES/django.po b/mayan/apps/common/locale/hu/LC_MESSAGES/django.po index 3625c370bd..7d7fdb5a7c 100644 --- a/mayan/apps/common/locale/hu/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/hu/LC_MESSAGES/django.po @@ -312,70 +312,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -383,16 +383,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/id/LC_MESSAGES/django.po b/mayan/apps/common/locale/id/LC_MESSAGES/django.po index 296907d26e..55e814f8a1 100644 --- a/mayan/apps/common/locale/id/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/id/LC_MESSAGES/django.po @@ -312,70 +312,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -383,16 +383,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/it/LC_MESSAGES/django.po b/mayan/apps/common/locale/it/LC_MESSAGES/django.po index 27d8d1c9a7..edfbb5dc1a 100644 --- a/mayan/apps/common/locale/it/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/it/LC_MESSAGES/django.po @@ -326,70 +326,70 @@ msgstr "Crea" msgid "Assign %(title)s %(object)s" msgstr "Assigna %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Conferma" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Conferma la cancellazione" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "icona del modulo" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Sei sicuro di voler cancellare %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Sei sicuro di volr cancellare: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Si" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "No" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "richiesto" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Salva" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Conferma" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Annullare" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Lista di %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -399,16 +399,16 @@ msgstr "" "%(page_number)s of %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Lista di %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identificatore" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Non ci sono %(stripped_title)s" diff --git a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po index 57663793a7..4e14c4e796 100644 --- a/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/nl_NL/LC_MESSAGES/django.po @@ -312,70 +312,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -383,16 +383,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/pl/LC_MESSAGES/django.po b/mayan/apps/common/locale/pl/LC_MESSAGES/django.po index 8ffef612e8..43789ebbbf 100644 --- a/mayan/apps/common/locale/pl/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/pl/LC_MESSAGES/django.po @@ -321,70 +321,70 @@ msgstr "Utwórz" msgid "Assign %(title)s %(object)s" msgstr "Przypisz %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Potwierdź" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Potwierdź usunięcie" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "form icon" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Czy na pewno chcesz usunąć %(object_name)s : %(object)s ?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Czy na pewno chcesz usunąć: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Tak" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Nie" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "wymagane" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Zapisz" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Wyślij" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Anuluj" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Wykaz %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -394,16 +394,16 @@ msgstr "" "%(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Wykaz %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identyfikator" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Brak %(stripped_title)s" diff --git a/mayan/apps/common/locale/pt/LC_MESSAGES/django.po b/mayan/apps/common/locale/pt/LC_MESSAGES/django.po index de2f192951..7194e8dc43 100644 --- a/mayan/apps/common/locale/pt/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/pt/LC_MESSAGES/django.po @@ -321,70 +321,70 @@ msgstr "Criar" msgid "Assign %(title)s %(object)s" msgstr "Atribuir %(title)s %(object)s " -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirmar" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirmar exclusão" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "ícone de formulário" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Tem certeza de que deseja excluir %(object_name)s: %(object)s ?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Tem a certeza de que deseja excluir: %(object)s ?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Sim" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Não" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "exigido" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Salvar" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Submeter" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Cancelar" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Lista de %(stripped_title)s " #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -394,16 +394,16 @@ msgstr "" "%(page_number)s de %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Lista de %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identificador" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Não há %(stripped_title)s " diff --git a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po index 82b28fbf8d..aefb163036 100644 --- a/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/pt_BR/LC_MESSAGES/django.po @@ -320,70 +320,70 @@ msgstr "Criar" msgid "Assign %(title)s %(object)s" msgstr "Atribuir %(title)s %(object)s " -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirmar" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirmar exclusão" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "ícone de formulário" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Tem certeza de que deseja excluir %(object_name)s: %(object)s ?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Tem certeza de que deseja excluir: %(object)s ?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Sim" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Não" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "exigido" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Salvar" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Submeter" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Cancelar" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Lista de %(stripped_title)s " #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -393,16 +393,16 @@ msgstr "" "of %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Lista de %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Identificador" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Não há %(stripped_title)s " diff --git a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po index b2c251c778..04cd3a4416 100644 --- a/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/ro_RO/LC_MESSAGES/django.po @@ -325,70 +325,70 @@ msgstr "Creati" msgid "Assign %(title)s %(object)s" msgstr "Atribuirea %(title)s %(object)s " -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Confirmă" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Confirmă stergerea" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "icon formular" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Sunteți sigur că doriți să ștergeți %(object_name)s: %(object)s ?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Sunteți sigur că doriți să ștergeți: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Da" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Nu" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "necesar" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "salvează" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Trimiteţi" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Anulează" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Lista de %(stripped_title)s" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -398,16 +398,16 @@ msgstr "" "din %(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Listă de %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "ID" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Nu sunt %(stripped_title)s" diff --git a/mayan/apps/common/locale/ru/LC_MESSAGES/django.po b/mayan/apps/common/locale/ru/LC_MESSAGES/django.po index 9ba63e77e6..41131b5f26 100644 --- a/mayan/apps/common/locale/ru/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/ru/LC_MESSAGES/django.po @@ -324,70 +324,70 @@ msgstr "Создать" msgid "Assign %(title)s %(object)s" msgstr "Назначить %(title)s%(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Подтверждать" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Подтвердить удаление" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "значок формы" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Вы действительно хотите удалить %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Вы действительно хотите удалить: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Да" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Нет" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "требуется" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Сохранить" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Выполнить" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "Отменить" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "Список \"%(stripped_title)s\"" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -397,16 +397,16 @@ msgstr "" "%(total_pages)s)" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "Список %(title)s (%(total)s)" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "Идентификатор" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, fuzzy, python-format msgid "There are no %(title)s" msgstr "Нет %(stripped_title)s" diff --git a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po index 4d732baba6..757637328c 100644 --- a/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/sl_SI/LC_MESSAGES/django.po @@ -313,70 +313,70 @@ msgstr "" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -384,16 +384,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/common/locale/tr_TR/LC_MESSAGES/django.po index ce2e08ae6c..c7b80e376d 100644 --- a/mayan/apps/common/locale/tr_TR/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/tr_TR/LC_MESSAGES/django.po @@ -316,70 +316,70 @@ msgstr "Oluştur" msgid "Assign %(title)s %(object)s" msgstr "" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Onayla" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "Evet" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "Hayır" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "Kaydet" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "Gönder" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "İptal" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, fuzzy, python-format msgid "List of %(title)s" msgstr "%(stripped_title)s listesi" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -387,16 +387,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po index 274711b7fb..bc170a3fab 100644 --- a/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po +++ b/mayan/apps/common/locale/vi_VN/LC_MESSAGES/django.po @@ -315,70 +315,70 @@ msgstr "Tạo" msgid "Assign %(title)s %(object)s" msgstr "Gán %(title)s %(object)s" -#: templates/generic_confirm.html:5 templates/generic_confirm.html.py:19 +#: templates/main/generic_confirm.html:5 templates/main/generic_confirm.html.py:19 msgid "Confirm" msgstr "Xác nhận" -#: templates/generic_confirm.html:17 +#: templates/main/generic_confirm.html:17 msgid "Confirm delete" msgstr "Xác nhận xóa" -#: templates/generic_confirm.html:33 +#: templates/main/generic_confirm.html:33 msgid "form icon" msgstr "biểu tượng form" -#: templates/generic_confirm.html:41 +#: templates/main/generic_confirm.html:41 #, python-format msgid "Are you sure you wish to delete %(object_name)s: %(object)s?" msgstr "Bạn chắc chắn muốn xóa %(object_name)s: %(object)s?" -#: templates/generic_confirm.html:43 +#: templates/main/generic_confirm.html:43 #, python-format msgid "Are you sure you wish to delete: %(object)s?" msgstr "Bạn chắc chắn muốn xóa: %(object)s?" -#: templates/generic_confirm.html:51 +#: templates/main/generic_confirm.html:51 msgid "Yes" msgstr "" -#: templates/generic_confirm.html:55 +#: templates/main/generic_confirm.html:55 msgid "No" msgstr "" -#: templates/generic_form_instance.html:40 -#: templates/generic_form_subtemplate.html:59 +#: templates/main/generic_form_instance.html:40 +#: templates/main/generic_form_subtemplate.html:59 msgid "required" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Save" msgstr "" -#: templates/generic_form_subtemplate.html:83 -#: templates/generic_form_subtemplate.html:85 +#: templates/main/generic_form_subtemplate.html:83 +#: templates/main/generic_form_subtemplate.html:85 #: templates/generic_list_horizontal_subtemplate.html:50 #: templates/generic_list_horizontal_subtemplate.html:88 -#: templates/generic_list_subtemplate.html:53 -#: templates/generic_list_subtemplate.html:173 +#: templates/main/generic_list_subtemplate.html:53 +#: templates/main/generic_list_subtemplate.html:173 msgid "Submit" msgstr "" -#: templates/generic_form_subtemplate.html:90 +#: templates/main/generic_form_subtemplate.html:90 msgid "Cancel" msgstr "" -#: templates/generic_list.html:8 templates/generic_list_horizontal.html:8 +#: templates/main/generic_list.html:8 templates/main/generic_list_horizontal.html:8 #, python-format msgid "List of %(title)s" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:24 -#: templates/generic_list_subtemplate.html:25 +#: templates/main/generic_list_subtemplate.html:25 #, python-format msgid "" "List of %(title)s (%(start)s - %(end)s out of %(total)s) (Page " @@ -386,16 +386,16 @@ msgid "" msgstr "" #: templates/generic_list_horizontal_subtemplate.html:26 -#: templates/generic_list_subtemplate.html:27 +#: templates/main/generic_list_subtemplate.html:27 #, python-format msgid "List of %(title)s (%(total)s)" msgstr "" -#: templates/generic_list_subtemplate.html:73 +#: templates/main/generic_list_subtemplate.html:73 msgid "Identifier" msgstr "" -#: templates/generic_list_subtemplate.html:147 +#: templates/main/generic_list_subtemplate.html:147 #, python-format msgid "There are no %(title)s" msgstr "" diff --git a/mayan/apps/common/urls.py b/mayan/apps/common/urls.py index 46c7163d81..d2a9d407d6 100644 --- a/mayan/apps/common/urls.py +++ b/mayan/apps/common/urls.py @@ -4,7 +4,7 @@ from django.views.generic import RedirectView, TemplateView urlpatterns = patterns('common.views', - url(r'^about/$', TemplateView.as_view(template_name='about.html'), name='about_view'), + url(r'^about/$', TemplateView.as_view(template_name='main/about.html'), name='about_view'), url(r'^license/$', 'license_view', (), name='license_view'), url(r'^password/change/done/$', 'password_change_done', (), name='password_change_done'), url(r'^object/multiple/action/$', 'multi_object_action_view', (), name='multi_object_action_view'), @@ -19,10 +19,10 @@ urlpatterns = patterns('common.views', urlpatterns += patterns('', url(r'^logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name='logout_view'), - url(r'^password/reset/$', 'django.contrib.auth.views.password_reset', {'email_template_name': 'password_reset_email.html', 'template_name': 'password_reset_form.html', 'post_reset_redirect': '/password/reset/done'}, name='password_reset_view'), - url(r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'), - url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'password_reset_complete.html'}, name='password_reset_complete_view'), - url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'password_reset_done.html'}, name='password_reset_done_view'), + url(r'^password/reset/$', 'django.contrib.auth.views.password_reset', {'email_template_name': 'main/password_reset_email.html', 'template_name': 'main/password_reset_form.html', 'post_reset_redirect': '/password/reset/done'}, name='password_reset_view'), + url(r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'main/password_reset_confirm.html', 'post_reset_redirect': '/password/reset/complete/'}, name='password_reset_confirm_view'), + url(r'^password/reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'main/password_reset_complete.html'}, name='password_reset_complete_view'), + url(r'^password/reset/done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'main/password_reset_done.html'}, name='password_reset_done_view'), (r'^favicon\.ico$', RedirectView.as_view(url='%s%s' % (settings.STATIC_URL, 'images/favicon.ico'))), ) diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py index 707bdd687e..cf587c526d 100644 --- a/mayan/apps/common/views.py +++ b/mayan/apps/common/views.py @@ -131,7 +131,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef context = { 'subtemplates_list': [ { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'grid': 6, 'context': { 'form': unselected_list, @@ -141,7 +141,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef } }, { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'grid': 6, 'grid_clear': True, 'context': { @@ -157,7 +157,7 @@ def assign_remove(request, left_list, right_list, add_method, remove_method, lef if extra_context: context.update(extra_context) - return render_to_response('generic_form.html', context, + return render_to_response('main/generic_form.html', context, context_instance=RequestContext(request)) @@ -168,7 +168,7 @@ def current_user_details(request): form = UserForm_view(instance=request.user) return render_to_response( - 'generic_form.html', { + 'main/generic_form.html', { 'form': form, 'title': _(u'current user details'), 'read_only': True, @@ -196,7 +196,7 @@ def current_user_edit(request): form = UserForm(instance=request.user) return render_to_response( - 'generic_form.html', { + 'main/generic_form.html', { 'form': form, 'next': next, 'title': _(u'edit current user details'), @@ -209,7 +209,7 @@ def login_view(request): Control how the use is to be authenticated, options are 'email' and 'username' """ - kwargs = {'template_name': 'login.html'} + kwargs = {'template_name': 'main/login.html'} if LOGIN_METHOD == 'email': kwargs['authentication_form'] = EmailAuthenticationForm @@ -228,7 +228,7 @@ def license_view(request): """ form = LicenseForm() return render_to_response( - 'generic_detail.html', { + 'main/generic_detail.html', { 'form': form, 'title': _(u'License'), }, @@ -244,7 +244,7 @@ def password_change_view(request): return password_change( request, extra_context=context, - template_name='password_change_form.html', + template_name='main/password_change_form.html', post_change_redirect=reverse('password_change_done'), ) @@ -294,7 +294,7 @@ class MayanViewMixin(object): class SingleObjectEditView(MayanPermissionCheckMixin, MayanViewMixin, UpdateView): - template_name = 'generic_form.html' + template_name = 'main/generic_form.html' def form_invalid(self, form): result = super(SingleObjectEditView, self).form_invalid(form) @@ -318,7 +318,7 @@ class SingleObjectEditView(MayanPermissionCheckMixin, MayanViewMixin, UpdateView class SingleObjectCreateView(MayanPermissionCheckMixin, MayanViewMixin, CreateView): - template_name = 'generic_form.html' + template_name = 'main/generic_form.html' def form_invalid(self, form): result = super(SingleObjectCreateView, self).form_invalid(form) @@ -341,7 +341,7 @@ class SingleObjectCreateView(MayanPermissionCheckMixin, MayanViewMixin, CreateVi class SingleObjectDeleteView(MayanPermissionCheckMixin, MayanViewMixin, DeleteView): - template_name = 'generic_confirm.html' + template_name = 'main/generic_confirm.html' def get_context_data(self, **kwargs): context = super(SingleObjectDeleteView, self).get_context_data(**kwargs) @@ -369,4 +369,4 @@ class SingleObjectDeleteView(MayanPermissionCheckMixin, MayanViewMixin, DeleteVi class SingleObjectListView(MayanPermissionCheckMixin, MayanViewMixin, ListView): # TODO: filter object_list by permission - template_name = 'generic_list.html' + template_name = 'main/generic_list.html' diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py index 18c7873d77..b00826c7b5 100644 --- a/mayan/apps/converter/views.py +++ b/mayan/apps/converter/views.py @@ -30,7 +30,7 @@ def formats_list(request): 'backend': GRAPHICS_BACKEND, } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) else: raise PermissionDenied diff --git a/mayan/apps/django_gpg/views.py b/mayan/apps/django_gpg/views.py index 441775b749..30cb6466d2 100644 --- a/mayan/apps/django_gpg/views.py +++ b/mayan/apps/django_gpg/views.py @@ -47,7 +47,7 @@ def key_receive(request, key_id): ) return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'title': _(u'Import key'), 'message': _(u'Are you sure you wish to import key id: %s?') % key_id, 'form_icon': 'key_add.png', @@ -68,7 +68,7 @@ def key_list(request, secret=True): object_list = Key.get_all(gpg) title = _(u'public keys') - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object_list': object_list, 'title': title, 'hide_object': True, @@ -104,7 +104,7 @@ def key_delete(request, fingerprint, key_type): messages.error(request, exception) return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'title': _(u'Delete key'), 'delete_view': True, 'message': _(u'Are you sure you wish to delete key: %s? If you try to delete a public key that is part of a public/private pair the private key will be deleted as well.') % key, @@ -123,7 +123,7 @@ def key_query(request): form = KeySearchForm(initial={'term': term}) subtemplates_list.append( { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'context': { 'title': _(u'Query key server'), 'form': form, @@ -136,7 +136,7 @@ def key_query(request): results = gpg.query(term) subtemplates_list.append( { - 'name': 'generic_list_subtemplate.html', + 'name': 'main/generic_list_subtemplate.html', 'context': { 'title': _(u'results'), 'object_list': results, @@ -184,6 +184,6 @@ def key_query(request): } ) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'subtemplates_list': subtemplates_list, }, context_instance=RequestContext(request)) diff --git a/mayan/apps/document_comments/views.py b/mayan/apps/document_comments/views.py index 0bb525e28d..4323f706e0 100644 --- a/mayan/apps/document_comments/views.py +++ b/mayan/apps/document_comments/views.py @@ -63,7 +63,7 @@ def comment_delete(request, comment_id=None, comment_id_list=None): elif len(comments) > 1: context['title'] = _(u'Are you sure you wish to delete the comments: %s?') % ', '.join([unicode(d) for d in comments]) - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -100,7 +100,7 @@ def comment_add(request, document_id): else: form = CommentForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'title': _(u'Add comment to document: %s') % document, 'next': next, @@ -119,7 +119,7 @@ def comments_for_document(request, document_id): except PermissionDenied: AccessEntry.objects.check_access(PERMISSION_COMMENT_VIEW, request.user, document) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object': document, 'access_object': document, 'title': _(u'comments: %s') % document, diff --git a/mayan/apps/document_indexing/utils.py b/mayan/apps/document_indexing/utils.py index 24f32d7f12..cf9af08c22 100644 --- a/mayan/apps/document_indexing/utils.py +++ b/mayan/apps/document_indexing/utils.py @@ -14,7 +14,7 @@ def get_document_indexing_subtemplate(document): object_list.append(get_breadcrumbs(index_instance, single_link=True, include_count=True)) return { - 'name': 'generic_list_subtemplate.html', + 'name': 'main/generic_list_subtemplate.html', 'context': { 'title': _(u'document indexes'), 'object_list': object_list, diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index ffc3cb2c84..c987f105e0 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -56,7 +56,7 @@ def index_setup_list(request): context['object_list'] = queryset - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -73,7 +73,7 @@ def index_setup_create(request): else: form = IndexForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create index'), 'form': form, }, context_instance=RequestContext(request)) @@ -96,7 +96,7 @@ def index_setup_edit(request, index_pk): else: form = IndexForm(instance=index) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit index: %s') % index, 'form': form, 'index': index, @@ -139,7 +139,7 @@ def index_setup_delete(request, index_pk): 'form_icon': u'tab_delete.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -168,7 +168,7 @@ def index_setup_view(request, index_pk): ], } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -215,7 +215,7 @@ def template_node_create(request, parent_pk): else: form = IndexTemplateNodeForm(initial={'index': parent_node.index, 'parent': parent_node}) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create child node'), 'form': form, 'index': parent_node.index, @@ -241,7 +241,7 @@ def template_node_edit(request, node_pk): else: form = IndexTemplateNodeForm(instance=node) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit index template node: %s') % node, 'form': form, 'index': node.index, @@ -292,7 +292,7 @@ def template_node_delete(request, node_pk): ], } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -319,7 +319,7 @@ def index_list(request): context['object_list'] = queryset - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -351,7 +351,7 @@ def index_instance_node_view(request, index_instance_node_pk): } ) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object_list': index_instance_list, 'extra_columns_preffixed': [ { @@ -381,7 +381,7 @@ def rebuild_index_instances(request): next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) if request.method != 'POST': - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'next': next, 'title': _(u'Are you sure you wish to rebuild all indexes?'), @@ -420,7 +420,7 @@ def document_index_list(request, document_id): for index_instance in queryset: object_list.append(get_breadcrumbs(index_instance, single_link=True, include_count=True)) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'title': _(u'indexes containing: %s') % document, 'object_list': object_list, 'hide_link': True, diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py index 14d1a550aa..bd6449d0f1 100644 --- a/mayan/apps/document_signatures/views.py +++ b/mayan/apps/document_signatures/views.py @@ -72,7 +72,7 @@ def document_verify(request, document_pk): ] ) - return render_to_response('generic_template.html', { + return render_to_response('main/generic_template.html', { 'title': _(u'signature properties for: %s') % document, 'object': document, 'document': document, @@ -107,7 +107,7 @@ def document_signature_upload(request, document_pk): else: form = DetachedSignatureForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'Upload detached signature for: %s') % document, 'form_icon': 'key_delete.png', 'next': next, @@ -164,7 +164,7 @@ def document_signature_delete(request, document_pk): messages.error(request, _(u'Error while deleting the detached signature; %s') % exception) return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'title': _(u'Are you sure you wish to delete the detached signature from document: %s?') % document, 'form_icon': 'pencil_delete.png', 'next': next, diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index ba735e6aab..ad93868198 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -79,7 +79,7 @@ def document_list(request, object_list=None, title=None, extra_context=None): if extra_context: context.update(extra_context) - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -117,7 +117,7 @@ def document_view(request, document_id, advanced=False): subtemplates_list.append( { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'context': { 'form': document_properties_form, 'object': document, @@ -129,7 +129,7 @@ def document_view(request, document_id, advanced=False): preview_form = DocumentPreviewForm(document=document) subtemplates_list.append( { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'context': { 'form': preview_form, 'object': document, @@ -141,7 +141,7 @@ def document_view(request, document_id, advanced=False): subtemplates_list.append( { - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'context': { 'title': _(u'document data'), 'form': content_form, @@ -150,7 +150,7 @@ def document_view(request, document_id, advanced=False): } ) - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'object': document, 'document': document, 'subtemplates_list': subtemplates_list, @@ -204,7 +204,7 @@ def document_delete(request, document_id=None, document_id_list=None): elif len(documents) > 1: context['title'] = _(u'Are you sure you wish to delete the documents: %s?') % ', '.join([unicode(d) for d in documents]) - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -247,7 +247,7 @@ def document_edit(request, document_id): form = DocumentForm_edit(instance=document, initial={ 'description': document.description}) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'object': document, }, context_instance=RequestContext(request)) @@ -295,7 +295,7 @@ def document_download(request, document_id=None, document_id_list=None, document subtemplates_list = [] subtemplates_list.append( { - 'name': 'generic_list_subtemplate.html', + 'name': 'main/generic_list_subtemplate.html', 'context': { 'title': _(u'documents to be downloaded'), 'object_list': document_versions, @@ -373,7 +373,7 @@ def document_download(request, document_id=None, document_id_list=None, document context['object'] = document_versions[0].document return render_to_response( - 'generic_form.html', + 'main/generic_form.html', context, context_instance=RequestContext(request) ) @@ -404,7 +404,7 @@ def _find_duplicate_list(request, source_document_list=Document.objects.all(), i previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) if confirmation and request.method != 'POST': - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'title': _(u'Are you sure you wish to find all duplicates?'), 'message': _(u'On large databases this operation may take some time to execute.'), @@ -462,7 +462,7 @@ def document_update_page_count(request): }) return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'title': _(u'Are you sure you wish to update the page count for the office documents (%d)?') % qs.count(), 'message': _(u'On large databases this operation may take some time to execute.'), @@ -517,7 +517,7 @@ def document_clear_transformations(request, document_id=None, document_id_list=N elif len(documents) > 1: context['title'] = _(u'Are you sure you wish to clear all the page transformations for documents: %s?') % ', '.join([unicode(d) for d in documents]) - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -531,7 +531,7 @@ def document_missing_list(request): previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) if request.method != 'POST': - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'message': _(u'On large databases this operation may take some time to execute.'), }, context_instance=RequestContext(request)) @@ -541,7 +541,7 @@ def document_missing_list(request): if not storage_backend.exists(document.file): missing_id_list.append(document.pk) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object_list': Document.objects.in_bulk(missing_id_list).values(), 'title': _(u'missing documents'), }, context_instance=RequestContext(request)) @@ -571,7 +571,7 @@ def document_page_view(request, document_page_id): else: rotation_text = u'' - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'page': document_page, 'access_object': document_page.document, 'navigation_object_name': 'page', @@ -596,7 +596,7 @@ def document_page_text(request, document_page_id): document_page_form = DocumentPageForm_text(instance=document_page) - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'page': document_page, 'navigation_object_name': 'page', 'web_theme_hide_menus': True, @@ -625,7 +625,7 @@ def document_page_edit(request, document_page_id): else: form = DocumentPageForm_edit(instance=document_page) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'page': document_page, 'navigation_object_name': 'page', @@ -806,7 +806,7 @@ def document_print(request, document_id): else: form = PrintForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'object': document, 'title': _(u'print: %s') % document, @@ -866,7 +866,7 @@ def document_type_list(request): 'list_object_variable_name': 'document_type', } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -888,7 +888,7 @@ def document_type_edit(request, document_type_id): else: form = DocumentTypeForm(instance=document_type) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit document type: %s') % document_type, 'form': form, 'object_name': _(u'document type'), @@ -934,7 +934,7 @@ def document_type_delete(request, document_type_id): 'form_icon': u'layout_delete.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -954,7 +954,7 @@ def document_type_create(request): else: form = DocumentTypeForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create document type'), 'form': form, }, @@ -981,7 +981,7 @@ def document_type_filename_list(request, document_type_id): ] } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -1005,7 +1005,7 @@ def document_type_filename_edit(request, document_type_filename_id): else: form = DocumentTypeFilenameForm(instance=document_type_filename) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit filename "%(filename)s" from document type "%(document_type)s"') % { 'document_type': document_type_filename.document_type, 'filename': document_type_filename }, @@ -1057,7 +1057,7 @@ def document_type_filename_delete(request, document_type_filename_id): 'form_icon': u'database_delete.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -1084,7 +1084,7 @@ def document_type_filename_create(request, document_type_id): else: form = DocumentTypeFilenameForm_create() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create filename for document type: %s') % document_type, 'form': form, 'document_type': document_type, @@ -1109,7 +1109,7 @@ def document_clear_image_cache(request): return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'title': _(u'Are you sure you wish to clear the document image cache?'), 'form_icon': u'camera_delete.png', @@ -1160,7 +1160,7 @@ def document_version_list(request, document_pk): ] } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -1183,7 +1183,7 @@ def document_version_revert(request, document_version_pk): return HttpResponseRedirect(previous) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'previous': previous, 'object': document_version.document, 'title': _(u'Are you sure you wish to revert to this version?'), @@ -1219,7 +1219,7 @@ def document_page_transformation_list(request, document_page_id): 'hide_object': True, } return render_to_response( - 'generic_list.html', context, context_instance=RequestContext(request) + 'main/generic_list.html', context, context_instance=RequestContext(request) ) @@ -1241,7 +1241,7 @@ def document_page_transformation_create(request, document_page_id): else: form = DocumentPageTransformationForm(initial={'document_page': document_page}) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'page': document_page, 'navigation_object_name': 'page', @@ -1269,7 +1269,7 @@ def document_page_transformation_edit(request, document_page_transformation_id): else: form = DocumentPageTransformationForm(instance=document_page_transformation) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'transformation': document_page_transformation, 'page': document_page_transformation.document_page, @@ -1300,7 +1300,7 @@ def document_page_transformation_delete(request, document_page_transformation_id messages.success(request, _(u'Document page transformation deleted successfully.')) return HttpResponseRedirect(redirect_view) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'delete_view': True, 'page': document_page_transformation.document_page, 'transformation': document_page_transformation, diff --git a/mayan/apps/dynamic_search/templates/search_results.html b/mayan/apps/dynamic_search/templates/search_results.html index 79ded014eb..5fb664fffa 100644 --- a/mayan/apps/dynamic_search/templates/search_results.html +++ b/mayan/apps/dynamic_search/templates/search_results.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "main/base.html" %} {% load i18n %} {% block title %} :: {% trans "Search results" %}{% endblock %} @@ -7,10 +7,10 @@ {% include "search_results_subtemplate.html" %} {% endif %} {% if query_string %} - {% include "generic_list_subtemplate.html" %} + {% include "main/generic_list_subtemplate.html" %} {% endif %} {% if not form and not query_string %} - {% include "generic_list_subtemplate.html" %} + {% include "main/generic_list_subtemplate.html" %} {% endif %} {% endblock %} diff --git a/mayan/apps/dynamic_search/templates/search_results_subtemplate.html b/mayan/apps/dynamic_search/templates/search_results_subtemplate.html index bb8d612210..8d525a3c2d 100644 --- a/mayan/apps/dynamic_search/templates/search_results_subtemplate.html +++ b/mayan/apps/dynamic_search/templates/search_results_subtemplate.html @@ -1,5 +1,5 @@ {% with "get" as submit_method %} {% with form_title as title %} - {% include "generic_form_subtemplate.html" %} + {% include "main/generic_form_subtemplate.html" %} {% endwith %} {% endwith %} diff --git a/mayan/apps/dynamic_search/templatetags/search_tags.py b/mayan/apps/dynamic_search/templatetags/search_tags.py index aa20e22149..8a19e63ae6 100644 --- a/mayan/apps/dynamic_search/templatetags/search_tags.py +++ b/mayan/apps/dynamic_search/templatetags/search_tags.py @@ -23,7 +23,7 @@ def search_form(context): return context -@register.inclusion_tag('generic_subtemplate.html', takes_context=True) +@register.inclusion_tag('main/generic_subtemplate.html', takes_context=True) def recent_searches_template(context): recent_searches = RecentSearch.objects.filter(user=context['user']) context.update({ diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index 341a694c3c..e2e78d2a3a 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -72,7 +72,7 @@ def results(request, extra_context=None): def search(request, advanced=False): if advanced: form = AdvancedSearchForm(data=request.GET, search_model=document_search) - return render_to_response('generic_form.html', + return render_to_response('main/generic_form.html', { 'form': form, 'title': _(u'advanced search'), diff --git a/mayan/apps/folders/templatetags/folder_tags.py b/mayan/apps/folders/templatetags/folder_tags.py index ea97f9a403..e03a9b417f 100644 --- a/mayan/apps/folders/templatetags/folder_tags.py +++ b/mayan/apps/folders/templatetags/folder_tags.py @@ -8,7 +8,7 @@ from folders.forms import AddDocumentForm register = Library() -@register.inclusion_tag('generic_form_subtemplate.html', takes_context=True) +@register.inclusion_tag('main/generic_form_subtemplate.html', takes_context=True) def get_add_document_to_folder_form(context): context.update({ 'form': AddDocumentForm(user=context['request'].user), diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index 2d75221141..3cf9e1ee8b 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -51,7 +51,7 @@ def folder_list(request, queryset=None, extra_context=None): context['object_list'] = queryset - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -71,7 +71,7 @@ def folder_create(request): else: form = FolderForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'create folder'), 'form': form, }, @@ -99,7 +99,7 @@ def folder_edit(request, folder_id): else: form = FolderForm(instance=folder) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'title': _(u'edit folder: %s') % folder, 'form': form, 'object': folder, @@ -141,7 +141,7 @@ def folder_delete(request, folder_id): 'form_icon': u'folder_delete.png', } - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) @@ -216,7 +216,7 @@ def folder_add_document(request, document_id=None, document_id_list=None): elif len(documents) > 1: context['title'] = _(u'Add documents: %s to folder.') % ', '.join([unicode(d) for d in documents]) - return render_to_response('generic_form.html', context, + return render_to_response('main/generic_form.html', context, context_instance=RequestContext(request)) @@ -288,7 +288,7 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis context['title'] = _(u'Are you sure you wish to remove the documents: %(documents)s from the folder "%(folder)s"?') % { 'documents': ', '.join([unicode(d) for d in folder_documents]), 'folder': folder} - return render_to_response('generic_confirm.html', context, + return render_to_response('main/generic_confirm.html', context, context_instance=RequestContext(request)) diff --git a/mayan/apps/history/views.py b/mayan/apps/history/views.py index a0786435bb..2e000b086d 100644 --- a/mayan/apps/history/views.py +++ b/mayan/apps/history/views.py @@ -47,7 +47,7 @@ def history_list(request, object_list=None, title=None, extra_context=None): if extra_context: context.update(extra_context) - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -70,7 +70,7 @@ def history_for_object(request, app_label, module_name, object_id): 'hide_object': True, } - return render_to_response('generic_list.html', context, + return render_to_response('main/generic_list.html', context, context_instance=RequestContext(request)) @@ -90,7 +90,7 @@ def history_view(request, object_id): {'label': _(u'Additional details'), 'field': lambda x: x.get_processed_details() or _(u'None')}, ]) - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'title': _(u'details for: %s') % history.get_processed_summary(), 'form': form, }, context_instance=RequestContext(request)) diff --git a/mayan/apps/installation/views.py b/mayan/apps/installation/views.py index ca44712d4d..ea45ba1074 100644 --- a/mayan/apps/installation/views.py +++ b/mayan/apps/installation/views.py @@ -16,7 +16,7 @@ def namespace_list(request): Installation().get_properties() - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object_list': PropertyNamespace.get_all(), 'title': _(u'Installation property namespaces'), 'hide_object': True, @@ -32,7 +32,7 @@ def namespace_details(request, namespace_id): object_list = namespace.get_properties() title = _(u'Installation namespace details for: %s') % namespace.label - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'object_list': object_list, 'hide_object': True, 'title': title, diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 73540fc3ab..6b77ee722f 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -91,7 +91,7 @@ def smart_link_instances_for_document(request, document_id): if smart_link_instances: subtemplates_list = [{ - 'name': 'generic_form_subtemplate.html', + 'name': 'main/generic_form_subtemplate.html', 'context': { 'title': _(u'smart links (%s)') % len(smart_link_instances.keys()), 'form': SmartLinkInstanceForm( @@ -105,13 +105,13 @@ def smart_link_instances_for_document(request, document_id): else: # If there are not group display a placeholder messages saying so subtemplates_list = [{ - 'name': 'generic_subtemplate.html', + 'name': 'main/generic_subtemplate.html', 'context': { 'content': _(u'There no defined smart links for the current document.'), } }] - return render_to_response('generic_detail.html', { + return render_to_response('main/generic_detail.html', { 'object': document, 'document': document, 'subtemplates_list': subtemplates_list, @@ -126,7 +126,7 @@ def smart_link_list(request): except PermissionDenied: qs = AccessEntry.objects.filter_objects_by_access(PERMISSION_SMART_LINK_VIEW, request.user, qs) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'title': _(u'smart links'), 'object_list': qs, 'extra_columns': [ @@ -152,7 +152,7 @@ def smart_link_create(request): else: form = SmartLinkForm() - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'title': _(u'Create new smart link') }, context_instance=RequestContext(request)) @@ -175,7 +175,7 @@ def smart_link_edit(request, smart_link_pk): else: form = SmartLinkForm(instance=smart_link) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'object': smart_link, 'form': form, 'title': _(u'Edit smart link: %s') % smart_link @@ -204,7 +204,7 @@ def smart_link_delete(request, smart_link_pk): }) return HttpResponseRedirect(next) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'delete_view': True, 'object': smart_link, 'title': _(u'Are you sure you wish to delete smart link: %s?') % smart_link, @@ -222,7 +222,7 @@ def smart_link_condition_list(request, smart_link_pk): except PermissionDenied: AccessEntry.objects.check_accesses([PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT], request.user, smart_link) - return render_to_response('generic_list.html', { + return render_to_response('main/generic_list.html', { 'title': _(u'conditions for smart link: %s') % smart_link, 'object_list': smart_link.smartlinkcondition_set.all(), 'extra_columns': [ @@ -253,7 +253,7 @@ def smart_link_condition_create(request, smart_link_pk): else: form = SmartLinkConditionForm(initial={'smart_link': smart_link}) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'title': _(u'Add new conditions to smart link: "%s"') % smart_link, 'object': smart_link, @@ -282,7 +282,7 @@ def smart_link_condition_edit(request, smart_link_condition_pk): else: form = SmartLinkConditionForm(instance=smart_link_condition) - return render_to_response('generic_form.html', { + return render_to_response('main/generic_form.html', { 'form': form, 'title': _(u'Edit smart link condition'), 'next': next, @@ -319,7 +319,7 @@ def smart_link_condition_delete(request, smart_link_condition_pk): }) return HttpResponseRedirect(next) - return render_to_response('generic_confirm.html', { + return render_to_response('main/generic_confirm.html', { 'delete_view': True, 'condition': smart_link_condition, 'object': smart_link_condition.smart_link, diff --git a/mayan/apps/main/locale/ar/LC_MESSAGES/django.po b/mayan/apps/main/locale/ar/LC_MESSAGES/django.po index e42fa14ec5..6a57cee44d 100644 --- a/mayan/apps/main/locale/ar/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/ar/LC_MESSAGES/django.po @@ -71,62 +71,62 @@ msgstr "الاصدار" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "مستخدم" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "مجهول" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "تفاصيل المستخدم" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "دخول" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "خروج" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "القائمة الثانوية" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "إجراءات ل %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "إجراءات ل %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "الإجراءات المتاحة" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "الإجراءات ذات الصلة" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "الإجراءات الأخرى المتاحة" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "إجراءات ل %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "الإجراءات" diff --git a/mayan/apps/main/locale/bg/LC_MESSAGES/django.po b/mayan/apps/main/locale/bg/LC_MESSAGES/django.po index 17860ab327..b3a2f954e2 100644 --- a/mayan/apps/main/locale/bg/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/bg/LC_MESSAGES/django.po @@ -73,62 +73,62 @@ msgstr "Версия" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Потребител" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Анонимен" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Данни за потребител" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Вход" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Изход" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Вторично меню" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Възможни действия" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Други възможни действия" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/bs_BA/LC_MESSAGES/django.po b/mayan/apps/main/locale/bs_BA/LC_MESSAGES/django.po index b76b137642..aa8aa96630 100644 --- a/mayan/apps/main/locale/bs_BA/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/bs_BA/LC_MESSAGES/django.po @@ -73,62 +73,62 @@ msgstr "Verzija" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Korisnik" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonimni" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Detalji o korisniku" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Logout" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Pomoćni meni" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Akcije za %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Akcije za: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Omogućene akcije" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Vezane akcije" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Ostale omogućene akcije" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Akcije za %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Akcije" diff --git a/mayan/apps/main/locale/da/LC_MESSAGES/django.po b/mayan/apps/main/locale/da/LC_MESSAGES/django.po index 29aa70a98e..8d29b794a4 100644 --- a/mayan/apps/main/locale/da/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/da/LC_MESSAGES/django.po @@ -71,62 +71,62 @@ msgstr "Version" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Bruger" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonym" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Bruger detaljer" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Log ind" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Log ud" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Sekundær menu" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Handlinger for %(name)s : %(navigation_object)s " -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Handlinger for: %(navigation_object)s " -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Mulige valg" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Relaterede handlinger" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Andre mulige valg" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Handlinger for %(object_name)s : %(navigation_object)s " -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Handlinger" diff --git a/mayan/apps/main/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/main/locale/de_DE/LC_MESSAGES/django.po index 74a25b1cad..ffe8bf395f 100644 --- a/mayan/apps/main/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/de_DE/LC_MESSAGES/django.po @@ -79,62 +79,62 @@ msgstr "Version" msgid "Copyright © 2011 Roberto Rosario." msgstr "Copyright © 2011 Roberto Rosario." -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Benutzer" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonym" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Benutzerdetails" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Logout" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Untermenü" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Aktionen für %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Aktionen für: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Verfügbare Aktionen" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Verwandte Aktionen" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Andere verfügbare Aktionen" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Aktionen für %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Aktionen" diff --git a/mayan/apps/main/locale/en/LC_MESSAGES/django.po b/mayan/apps/main/locale/en/LC_MESSAGES/django.po index 07c19c4420..757e3091c8 100644 --- a/mayan/apps/main/locale/en/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/en/LC_MESSAGES/django.po @@ -71,62 +71,62 @@ msgstr "Version" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "User" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonymous" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "User details" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Logout" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Secondary menu" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Actions for %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Actions for: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Available actions" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Related actions" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Other available actions" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Actions for %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Actions" diff --git a/mayan/apps/main/locale/es/LC_MESSAGES/django.po b/mayan/apps/main/locale/es/LC_MESSAGES/django.po index f6a6e7f77b..734474760a 100644 --- a/mayan/apps/main/locale/es/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/es/LC_MESSAGES/django.po @@ -74,62 +74,62 @@ msgstr "Versión" msgid "Copyright © 2011 Roberto Rosario." msgstr "Copyright © 2011 Roberto Rosario." -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Usuario" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anónimo" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Detalles de usuario" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Iniciar sesión" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Desconectarse" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Menú secundario" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Acciones para %(name)s: %(navigation_object)s " -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Acciones para: %(navigation_object)s " -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Acciones disponibles" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Acciones relacionadas" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Otras acciones disponibles" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Acciones para %(object_name)s: %(navigation_object)s " -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Acciones" diff --git a/mayan/apps/main/locale/fa/LC_MESSAGES/django.po b/mayan/apps/main/locale/fa/LC_MESSAGES/django.po index 0302662cf8..e80ab73213 100644 --- a/mayan/apps/main/locale/fa/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/fa/LC_MESSAGES/django.po @@ -70,62 +70,62 @@ msgstr "نسخه" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "کاربر" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "ناشناس" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "خروج" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/fr/LC_MESSAGES/django.po b/mayan/apps/main/locale/fr/LC_MESSAGES/django.po index 1a5196b2bb..9e124fc8c8 100644 --- a/mayan/apps/main/locale/fr/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/fr/LC_MESSAGES/django.po @@ -75,62 +75,62 @@ msgstr "Version" msgid "Copyright © 2011 Roberto Rosario." msgstr "Copyright © 2011 Roberto Rosario." -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Utilisateur" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonyme" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Profil Utilisateur" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "S'identifier" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Se déconnecter" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Menu secondaire" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Actions pour %(name)s:%(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Actions pour: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Actions disponibles" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Actions relatives" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Autres actions disponibles" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Actions pour %(object_name)s:%(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Actions" diff --git a/mayan/apps/main/locale/hr_HR/LC_MESSAGES/django.po b/mayan/apps/main/locale/hr_HR/LC_MESSAGES/django.po index b3822cdf23..ca8059b467 100644 --- a/mayan/apps/main/locale/hr_HR/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/hr_HR/LC_MESSAGES/django.po @@ -70,62 +70,62 @@ msgstr "" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/hu/LC_MESSAGES/django.po b/mayan/apps/main/locale/hu/LC_MESSAGES/django.po index b89017ed67..19f2eb1083 100644 --- a/mayan/apps/main/locale/hu/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/hu/LC_MESSAGES/django.po @@ -72,62 +72,62 @@ msgstr "Verzió" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(Hibakeresés)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Felhasználó" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "névtelen felhasználó" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "A felhasználó adatai" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Bejelentkezés" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Kijelentkezés" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Másodlagos menü" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Műveletek ezzel %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Műveletek ezen: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Rendelkezésre álló műveletek" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Kapcsolódó műveletek" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "További rendelkezésre álló műveletek" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Műveletek ezzel %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Műveletek" diff --git a/mayan/apps/main/locale/id/LC_MESSAGES/django.po b/mayan/apps/main/locale/id/LC_MESSAGES/django.po index fb5cb84b95..15366d3df5 100644 --- a/mayan/apps/main/locale/id/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/id/LC_MESSAGES/django.po @@ -69,62 +69,62 @@ msgstr "" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/it/LC_MESSAGES/django.po b/mayan/apps/main/locale/it/LC_MESSAGES/django.po index 27ebc51cfa..ce08b23411 100644 --- a/mayan/apps/main/locale/it/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/it/LC_MESSAGES/django.po @@ -74,62 +74,62 @@ msgstr "Versione" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Utente" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonimo" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Dettagli utente" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Logout" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Menu secondario" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Azioni disponibili" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Altre azioni disponibili" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/nl_NL/LC_MESSAGES/django.po b/mayan/apps/main/locale/nl_NL/LC_MESSAGES/django.po index fd99d852e1..56d8dbaeac 100644 --- a/mayan/apps/main/locale/nl_NL/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/nl_NL/LC_MESSAGES/django.po @@ -72,62 +72,62 @@ msgstr "Versie" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Gebruiker" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anoniem" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Gegevens over vim Gebruiker" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Aanmelden" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Afmelden" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Onderliggend menu" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Acties voor %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Acties for: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Beschikbare acties" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Gerelateerde acties" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Overige beschikbare acties" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Acties voor %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Acties" diff --git a/mayan/apps/main/locale/pl/LC_MESSAGES/django.po b/mayan/apps/main/locale/pl/LC_MESSAGES/django.po index 0003751b5c..7f25dfa3d6 100644 --- a/mayan/apps/main/locale/pl/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/pl/LC_MESSAGES/django.po @@ -72,62 +72,62 @@ msgstr "Wersja" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Użytkownik" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonimowy" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Dane użytkownika" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Wyloguj" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Dodatkowe menu" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/pt/LC_MESSAGES/django.po b/mayan/apps/main/locale/pt/LC_MESSAGES/django.po index 438cd3cdcd..af02583209 100644 --- a/mayan/apps/main/locale/pt/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/pt/LC_MESSAGES/django.po @@ -74,62 +74,62 @@ msgstr "Versão" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Utilizador" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anónimo" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Detalhes do utilizador" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Sair" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Menu secundário" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Ações disponíveis" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Outras ações disponíveis" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/pt_BR/LC_MESSAGES/django.po b/mayan/apps/main/locale/pt_BR/LC_MESSAGES/django.po index feb0221543..113fb2c33e 100644 --- a/mayan/apps/main/locale/pt_BR/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/pt_BR/LC_MESSAGES/django.po @@ -73,62 +73,62 @@ msgstr "Versão" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Usuário" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anônimo" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Detalhes do usuário" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Login" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Sair" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Menu secundário" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Ações disponíveis" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Outras ações disponíveis" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/ro_RO/LC_MESSAGES/django.po b/mayan/apps/main/locale/ro_RO/LC_MESSAGES/django.po index 4f7f8e50a2..196cb8736a 100644 --- a/mayan/apps/main/locale/ro_RO/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/ro_RO/LC_MESSAGES/django.po @@ -73,62 +73,62 @@ msgstr "Versiune" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "utilizator" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "anonim" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "detalii utilizator" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "logare" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "deconectare" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "meniu secundar" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Acţiuni pentru %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Acţiuni pentru: %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "acţiuni disponibile" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "acţiuni conexe" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "alte acţuni disponibile" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Acţiuni pentru %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Acţiuni" diff --git a/mayan/apps/main/locale/ru/LC_MESSAGES/django.po b/mayan/apps/main/locale/ru/LC_MESSAGES/django.po index cd53b9edcd..e85e8a6e17 100644 --- a/mayan/apps/main/locale/ru/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/ru/LC_MESSAGES/django.po @@ -73,62 +73,62 @@ msgstr "Версия" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Пользователь" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Анонимно" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "сведения о пользователе" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Войти" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Выход" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "Вторичное меню" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "Действия для %(name)s: %(navigation_object)s" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "Действия для %(navigation_object)s" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Доступные действия" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Соответствующие действия" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Другие возможные действия" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "Действия для %(object_name)s: %(navigation_object)s" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Действия" diff --git a/mayan/apps/main/locale/sl_SI/LC_MESSAGES/django.po b/mayan/apps/main/locale/sl_SI/LC_MESSAGES/django.po index 38ba7f99f8..b47d74ad15 100644 --- a/mayan/apps/main/locale/sl_SI/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/sl_SI/LC_MESSAGES/django.po @@ -70,62 +70,62 @@ msgstr "" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/tr_TR/LC_MESSAGES/django.po b/mayan/apps/main/locale/tr_TR/LC_MESSAGES/django.po index 30f464d7a1..4f3f98c308 100644 --- a/mayan/apps/main/locale/tr_TR/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/tr_TR/LC_MESSAGES/django.po @@ -70,62 +70,62 @@ msgstr "Sürüm" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonim" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Giriş" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Çıkış" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "" diff --git a/mayan/apps/main/locale/vi_VN/LC_MESSAGES/django.po b/mayan/apps/main/locale/vi_VN/LC_MESSAGES/django.po index d7069fec3f..072ea791cd 100644 --- a/mayan/apps/main/locale/vi_VN/LC_MESSAGES/django.po +++ b/mayan/apps/main/locale/vi_VN/LC_MESSAGES/django.po @@ -70,62 +70,62 @@ msgstr "Phiên bản" msgid "Copyright © 2011 Roberto Rosario." msgstr "" -#: templates/base.html:31 +#: templates/main/base.html:31 msgid "(DEBUG)" msgstr "(DEBUG)" -#: templates/base.html:262 +#: templates/main/base.html:262 msgid "User" msgstr "Người dùng" -#: templates/base.html:264 +#: templates/main/base.html:264 msgid "Anonymous" msgstr "Anonymous" -#: templates/base.html:267 +#: templates/main/base.html:267 msgid "User details" msgstr "Chi tiết người dùng" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Login" msgstr "Đăng nhập" -#: templates/base.html:284 +#: templates/main/base.html:284 msgid "Logout" msgstr "Đăng xuất" -#: templates/base.html:364 +#: templates/main/base.html:364 msgid "Secondary menu" msgstr "" -#: templates/base.html:380 +#: templates/main/base.html:380 #, python-format msgid "Actions for %(name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:382 templates/base.html.py:425 +#: templates/main/base.html:382 templates/main/base.html.py:425 #, python-format msgid "Actions for: %(navigation_object)s" msgstr "" -#: templates/base.html:385 +#: templates/main/base.html:385 msgid "Available actions" msgstr "Các thao tác khả dụng" -#: templates/base.html:397 templates/base.html.py:440 +#: templates/main/base.html:397 templates/main/base.html.py:440 msgid "Related actions" msgstr "Các thao tác liên quan" -#: templates/base.html:408 templates/base.html.py:453 +#: templates/main/base.html:408 templates/main/base.html.py:453 msgid "Other available actions" msgstr "Các thao tác khác" -#: templates/base.html:423 +#: templates/main/base.html:423 #, python-format msgid "Actions for %(object_name)s: %(navigation_object)s" msgstr "" -#: templates/base.html:428 +#: templates/main/base.html:428 msgid "Actions" msgstr "Các thao tác" diff --git a/mayan/apps/common/templates/403.html b/mayan/apps/main/templates/main/403.html similarity index 93% rename from mayan/apps/common/templates/403.html rename to mayan/apps/main/templates/main/403.html index c32b705f74..152d67d8b3 100644 --- a/mayan/apps/common/templates/403.html +++ b/mayan/apps/main/templates/main/403.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} diff --git a/mayan/apps/common/templates/404.html b/mayan/apps/main/templates/main/404.html similarity index 92% rename from mayan/apps/common/templates/404.html rename to mayan/apps/main/templates/main/404.html index 42d4f0c33e..ab427c7472 100644 --- a/mayan/apps/common/templates/404.html +++ b/mayan/apps/main/templates/main/404.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} diff --git a/mayan/apps/common/templates/500.html b/mayan/apps/main/templates/main/500.html similarity index 100% rename from mayan/apps/common/templates/500.html rename to mayan/apps/main/templates/main/500.html diff --git a/mayan/apps/main/templates/about.html b/mayan/apps/main/templates/main/about.html similarity index 82% rename from mayan/apps/main/templates/about.html rename to mayan/apps/main/templates/main/about.html index 4968571ec0..e8ffd6d87d 100644 --- a/mayan/apps/main/templates/about.html +++ b/mayan/apps/main/templates/main/about.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} @@ -11,7 +11,7 @@

    {% project_name %} ({% trans 'Version' %} {% app_version 'mayan' %})

    - {% include 'project_description.html' %} + {% include 'main/project_description.html' %} {% endblock %} {% block footer %} diff --git a/mayan/apps/main/templates/base.html b/mayan/apps/main/templates/main/base.html similarity index 100% rename from mayan/apps/main/templates/base.html rename to mayan/apps/main/templates/main/base.html diff --git a/mayan/apps/common/templates/calculate_form_title.html b/mayan/apps/main/templates/main/calculate_form_title.html similarity index 100% rename from mayan/apps/common/templates/calculate_form_title.html rename to mayan/apps/main/templates/main/calculate_form_title.html diff --git a/mayan/apps/main/templates/diagnostics.html b/mayan/apps/main/templates/main/diagnostics.html similarity index 95% rename from mayan/apps/main/templates/diagnostics.html rename to mayan/apps/main/templates/main/diagnostics.html index fea22e33cc..9c6ee810dc 100644 --- a/mayan/apps/main/templates/diagnostics.html +++ b/mayan/apps/main/templates/main/diagnostics.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% block title %} :: {{ title|capfirst }}{% endblock %} diff --git a/mayan/apps/common/templates/generic_assign_remove.html b/mayan/apps/main/templates/main/generic_assign_remove.html similarity index 98% rename from mayan/apps/common/templates/generic_assign_remove.html rename to mayan/apps/main/templates/main/generic_assign_remove.html index d26a74347d..7d8ede337b 100644 --- a/mayan/apps/common/templates/generic_assign_remove.html +++ b/mayan/apps/main/templates/main/generic_assign_remove.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} diff --git a/mayan/apps/common/templates/generic_confirm.html b/mayan/apps/main/templates/main/generic_confirm.html similarity index 98% rename from mayan/apps/common/templates/generic_confirm.html rename to mayan/apps/main/templates/main/generic_confirm.html index 4ed23a39f7..e6b663d040 100644 --- a/mayan/apps/common/templates/generic_confirm.html +++ b/mayan/apps/main/templates/main/generic_confirm.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} diff --git a/mayan/apps/common/templates/generic_detail.html b/mayan/apps/main/templates/main/generic_detail.html similarity index 89% rename from mayan/apps/common/templates/generic_detail.html rename to mayan/apps/main/templates/main/generic_detail.html index 8b2f8c9b08..1ebaa988c9 100644 --- a/mayan/apps/common/templates/generic_detail.html +++ b/mayan/apps/main/templates/main/generic_detail.html @@ -1,10 +1,10 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} {% load subtemplates_tags %} -{% block title %} :: {% with 'true' as read_only %}{% include 'calculate_form_title.html' %}{% endwith %}{% endblock %} +{% block title %} :: {% with 'true' as read_only %}{% include 'main/calculate_form_title.html' %}{% endwith %}{% endblock %} {% block sidebar %} {% for subtemplate in sidebar_subtemplates %} @@ -17,7 +17,7 @@ {% with 'true' as side_bar %} {% if subtemplate.form %} {% render_subtemplate subtemplate.name subtemplate.context as rendered_subtemplate %} - {% with "true" as read_only %} + {% with 'true' as read_only %}
    {{ rendered_subtemplate }}
    @@ -49,7 +49,7 @@ {% with 'true' as read_only %}
    - {% include 'generic_form_subtemplate.html' %} + {% include 'main/generic_form_subtemplate.html' %}
    {% if grid_clear or not grid %} diff --git a/mayan/apps/common/templates/generic_detail_subtemplate.html b/mayan/apps/main/templates/main/generic_detail_subtemplate.html similarity index 88% rename from mayan/apps/common/templates/generic_detail_subtemplate.html rename to mayan/apps/main/templates/main/generic_detail_subtemplate.html index f95cb66f83..e4d71da5bc 100644 --- a/mayan/apps/common/templates/generic_detail_subtemplate.html +++ b/mayan/apps/main/templates/main/generic_detail_subtemplate.html @@ -14,7 +14,7 @@ {% if form %} {% with 'true' as read_only %}
    - {% include 'generic_form_subtemplate.html' %} + {% include 'main/generic_form_subtemplate.html' %}
    {% endwith %} {% endif %} diff --git a/mayan/apps/common/templates/generic_form.html b/mayan/apps/main/templates/main/generic_form.html similarity index 90% rename from mayan/apps/common/templates/generic_form.html rename to mayan/apps/main/templates/main/generic_form.html index faf745b14b..328735ea4e 100644 --- a/mayan/apps/common/templates/generic_form.html +++ b/mayan/apps/main/templates/main/generic_form.html @@ -1,8 +1,8 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load subtemplates_tags %} -{% block title %} :: {% include 'calculate_form_title.html' %}{% endblock %} +{% block title %} :: {% include 'main/calculate_form_title.html' %}{% endblock %} {% block sidebar %} {% for subtemplate in sidebar_subtemplates_list %} @@ -23,7 +23,7 @@ {% block content %} {% if form %}
    - {% include "generic_form_subtemplate.html" %} + {% include "main/generic_form_subtemplate.html" %}
    {% endif %} diff --git a/mayan/apps/common/templates/generic_form_instance.html b/mayan/apps/main/templates/main/generic_form_instance.html similarity index 100% rename from mayan/apps/common/templates/generic_form_instance.html rename to mayan/apps/main/templates/main/generic_form_instance.html diff --git a/mayan/apps/common/templates/generic_form_subtemplate.html b/mayan/apps/main/templates/main/generic_form_subtemplate.html similarity index 95% rename from mayan/apps/common/templates/generic_form_subtemplate.html rename to mayan/apps/main/templates/main/generic_form_subtemplate.html index 59d5474afd..8e820ae98d 100644 --- a/mayan/apps/common/templates/generic_form_subtemplate.html +++ b/mayan/apps/main/templates/main/generic_form_subtemplate.html @@ -8,7 +8,7 @@

    {% endif %} -{% include 'calculate_form_title.html' %} +{% include 'main/calculate_form_title.html' %} {% if side_bar %}

    @@ -64,7 +64,7 @@ {% endif %} {% for form in formset.forms %} - {% include 'generic_form_instance.html' %} + {% include 'main/generic_form_instance.html' %} {% endfor %} {% if form_display_mode_table %} @@ -72,7 +72,7 @@ {% endif %} {% endwith %} {% else %} - {% include 'generic_form_instance.html' %} + {% include 'main/generic_form_instance.html' %} {% endif %} {% if not read_only %}
    diff --git a/mayan/apps/common/templates/generic_list.html b/mayan/apps/main/templates/main/generic_list.html similarity index 89% rename from mayan/apps/common/templates/generic_list.html rename to mayan/apps/main/templates/main/generic_list.html index 30042f376b..2d53a9bdd6 100644 --- a/mayan/apps/common/templates/generic_list.html +++ b/mayan/apps/main/templates/main/generic_list.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} @@ -23,6 +23,6 @@ {% endblock %} {% block content %} - {% include 'generic_list_subtemplate.html' %} + {% include 'main/generic_list_subtemplate.html' %} {% endblock %} diff --git a/mayan/apps/common/templates/generic_list_horizontal.html b/mayan/apps/main/templates/main/generic_list_horizontal.html similarity index 88% rename from mayan/apps/common/templates/generic_list_horizontal.html rename to mayan/apps/main/templates/main/generic_list_horizontal.html index 20deef929d..4dbd5272f8 100644 --- a/mayan/apps/common/templates/generic_list_horizontal.html +++ b/mayan/apps/main/templates/main/generic_list_horizontal.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} @@ -23,6 +23,6 @@ {% endblock %} {% block content %} - {% include 'generic_list_horizontal_subtemplate.html' %} + {% include 'main/generic_list_horizontal_subtemplate.html' %} {% endblock %} diff --git a/mayan/apps/common/templates/generic_list_horizontal_subtemplate.html b/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html similarity index 100% rename from mayan/apps/common/templates/generic_list_horizontal_subtemplate.html rename to mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html diff --git a/mayan/apps/common/templates/generic_list_subtemplate.html b/mayan/apps/main/templates/main/generic_list_subtemplate.html similarity index 100% rename from mayan/apps/common/templates/generic_list_subtemplate.html rename to mayan/apps/main/templates/main/generic_list_subtemplate.html diff --git a/mayan/apps/common/templates/generic_subtemplate.html b/mayan/apps/main/templates/main/generic_subtemplate.html similarity index 100% rename from mayan/apps/common/templates/generic_subtemplate.html rename to mayan/apps/main/templates/main/generic_subtemplate.html diff --git a/mayan/apps/common/templates/generic_template.html b/mayan/apps/main/templates/main/generic_template.html similarity index 53% rename from mayan/apps/common/templates/generic_template.html rename to mayan/apps/main/templates/main/generic_template.html index cec6977d44..7d042dd647 100644 --- a/mayan/apps/common/templates/generic_template.html +++ b/mayan/apps/main/templates/main/generic_template.html @@ -1,7 +1,7 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% block title %} :: {{ title|capfirst }}{% endblock %} {% block content %} - {% include 'generic_subtemplate.html' %} + {% include 'main/generic_subtemplate.html' %} {% endblock %} diff --git a/mayan/apps/common/templates/generic_wizard.html b/mayan/apps/main/templates/main/generic_wizard.html similarity index 76% rename from mayan/apps/common/templates/generic_wizard.html rename to mayan/apps/main/templates/main/generic_wizard.html index 916b93b491..a535e50ff0 100644 --- a/mayan/apps/common/templates/generic_wizard.html +++ b/mayan/apps/main/templates/main/generic_wizard.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} @@ -16,12 +16,12 @@ {% with wizard.form as form %} {% with 'true' as form_display_mode_table %} - {% include 'generic_form_subtemplate.html' %} + {% include 'main/generic_form_subtemplate.html' %} {% endwith %} {% endwith %} {% else %} {% with wizard.form as form %} - {% include 'generic_form_subtemplate.html' %} + {% include 'main/generic_form_subtemplate.html' %} {% endwith %} {% endif %} {% endwith %} diff --git a/mayan/apps/main/templates/home.html b/mayan/apps/main/templates/main/home.html similarity index 90% rename from mayan/apps/main/templates/home.html rename to mayan/apps/main/templates/main/home.html index 72edafd7bf..7d09f28d5b 100644 --- a/mayan/apps/main/templates/home.html +++ b/mayan/apps/main/templates/main/home.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'main/base.html' %} {% load i18n %} diff --git a/mayan/apps/common/templates/login.html b/mayan/apps/main/templates/main/login.html similarity index 93% rename from mayan/apps/common/templates/login.html rename to mayan/apps/main/templates/main/login.html index 629d728fd9..a435a6b61f 100644 --- a/mayan/apps/common/templates/login.html +++ b/mayan/apps/main/templates/main/login.html @@ -1,4 +1,4 @@ -{% extends 'web_theme_base.html' %} +{% extends 'main/base.html' %} {% load i18n %} @@ -55,7 +55,7 @@
    %s%s' % ('', ugettext(u'Click on the image for full size preview'))) @@ -68,11 +68,11 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget): def document_thumbnail(document, **kwargs): - return document_html_widget(document, click_view='document_display', **kwargs) + return document_html_widget(document, click_view='documents:document_display', **kwargs) def document_link(document): - return mark_safe(u'%s' % (reverse('document_view_simple', args=[document.pk]), document)) + return mark_safe(u'%s' % (reverse('documents:document_view_simple', args=[document.pk]), document)) def document_html_widget(document, click_view=None, page=DEFAULT_PAGE_NUMBER, zoom=DEFAULT_ZOOM_LEVEL, rotation=DEFAULT_ROTATION, gallery_name=None, fancybox_class='fancybox', version=None, image_class='lazy-load', title=None, size=THUMBNAIL_SIZE, nolazyload=False): diff --git a/mayan/apps/folders/links.py b/mayan/apps/folders/links.py index fd8e1d6aff..187fa5d9de 100644 --- a/mayan/apps/folders/links.py +++ b/mayan/apps/folders/links.py @@ -10,15 +10,15 @@ from .permissions import (PERMISSION_FOLDER_CREATE, PERMISSION_FOLDER_REMOVE_DOCUMENT, PERMISSION_FOLDER_VIEW, PERMISSION_FOLDER_ADD_DOCUMENT) -folder_list = {'text': _(u'folder list'), 'view': 'folder_list', 'famfam': 'folder_user'} -folder_create = {'text': _('create folder'), 'view': 'folder_create', 'famfam': 'folder_add', 'permissions': [PERMISSION_FOLDER_CREATE]} -folder_edit = {'text': _('edit'), 'view': 'folder_edit', 'args': 'object.pk', 'famfam': 'folder_edit', 'permissions': [PERMISSION_FOLDER_EDIT]} -folder_delete = {'text': _('delete'), 'view': 'folder_delete', 'args': 'object.pk', 'famfam': 'folder_delete', 'permissions': [PERMISSION_FOLDER_DELETE]} -folder_document_multiple_remove = {'text': _('remove from folder'), 'view': 'folder_document_multiple_remove', 'args': 'object.pk', 'famfam': 'folder_delete', 'permissions': [PERMISSION_FOLDER_REMOVE_DOCUMENT]} -folder_view = {'text': _(u'folder documents'), 'view': 'folder_view', 'args': 'object.pk', 'famfam': 'folder_go', 'permissions': [PERMISSION_FOLDER_VIEW]} -folder_add_document = {'text': _('add to a folder'), 'view': 'folder_add_document', 'args': 'object.pk', 'famfam': 'folder_add', 'permissions': [PERMISSION_FOLDER_ADD_DOCUMENT]} -folder_add_multiple_documents = {'text': _('add to folder'), 'view': 'folder_add_multiple_documents', 'famfam': 'folder_add'} -document_folder_list = {'text': _(u'folders'), 'view': 'document_folder_list', 'args': 'object.pk', 'famfam': 'folder_user', 'permissions': [PERMISSION_DOCUMENT_VIEW], 'children_view_regex': [r'folder']} +folder_list = {'text': _(u'folder list'), 'view': 'folders:folder_list', 'famfam': 'folder_user'} +folder_create = {'text': _('create folder'), 'view': 'folders:folder_create', 'famfam': 'folder_add', 'permissions': [PERMISSION_FOLDER_CREATE]} +folder_edit = {'text': _('edit'), 'view': 'folders:folder_edit', 'args': 'object.pk', 'famfam': 'folder_edit', 'permissions': [PERMISSION_FOLDER_EDIT]} +folder_delete = {'text': _('delete'), 'view': 'folders:folder_delete', 'args': 'object.pk', 'famfam': 'folder_delete', 'permissions': [PERMISSION_FOLDER_DELETE]} +folder_document_multiple_remove = {'text': _('remove from folder'), 'view': 'folders:folder_document_multiple_remove', 'args': 'object.pk', 'famfam': 'folder_delete', 'permissions': [PERMISSION_FOLDER_REMOVE_DOCUMENT]} +folder_view = {'text': _(u'folder documents'), 'view': 'folders:folder_view', 'args': 'object.pk', 'famfam': 'folder_go', 'permissions': [PERMISSION_FOLDER_VIEW]} +folder_add_document = {'text': _('add to a folder'), 'view': 'folders:folder_add_document', 'args': 'object.pk', 'famfam': 'folder_add', 'permissions': [PERMISSION_FOLDER_ADD_DOCUMENT]} +folder_add_multiple_documents = {'text': _('add to folder'), 'view': 'folders:folder_add_multiple_documents', 'famfam': 'folder_add'} +document_folder_list = {'text': _(u'folders'), 'view': 'folders:document_folder_list', 'args': 'object.pk', 'famfam': 'folder_user', 'permissions': [PERMISSION_DOCUMENT_VIEW], 'children_view_regex': [r'folder']} -folder_acl_list = {'text': _(u'ACLs'), 'view': 'folder_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} -folders_main_menu_link = {'text': _('folders'), 'famfam': 'folder_user', 'view': 'folder_list'} +folder_acl_list = {'text': _(u'ACLs'), 'view': 'folders:folder_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +folders_main_menu_link = {'text': _('folders'), 'famfam': 'folder_user', 'view': 'folders:folder_list'} diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index 3cf9e1ee8b..b5bdba962c 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -116,7 +116,7 @@ def folder_delete(request, folder_id): except PermissionDenied: AccessEntry.objects.check_access(PERMISSION_FOLDER_DELETE, request.user, folder) - post_action_redirect = reverse('folder_list') + post_action_redirect = reverse('folders:folder_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) diff --git a/mayan/apps/linking/forms.py b/mayan/apps/linking/forms.py index 8216d482f1..b93905eec4 100644 --- a/mayan/apps/linking/forms.py +++ b/mayan/apps/linking/forms.py @@ -49,10 +49,10 @@ class SmartLinkImageWidget(forms.widgets.Widget): output.append(u'
    %s: %d
    ' % (ugettext(u'Pages'), document.pages.count())) output.append(get_tags_inline_widget(document)) output.append(u'
    ') - output.append(document_html_widget(document, click_view='document_display', size=MULTIPAGE_PREVIEW_SIZE, fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk)) + output.append(document_html_widget(document, click_view='documents:document_display', size=MULTIPAGE_PREVIEW_SIZE, fancybox_class='fancybox-noscaling', gallery_name=u'smart_link_%d_documents_gallery' % value['smart_link_instance'].pk)) output.append(u'
    ') output.append(u'
    ') - output.append(u'%s' % (reverse('document_view_simple', args=[document.pk]), ugettext(u'Select'))) + output.append(u'%s' % (reverse('documents:document_view_simple', args=[document.pk]), ugettext(u'Select'))) output.append(u'
    ') output.append(u'
    ') diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 8d2e0dee4e..3b545d0a68 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -267,7 +267,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No staging_file.delete() messages.success(request, _(u'Staging file: %s, deleted successfully.') % staging_file.filename) if document: - return HttpResponseRedirect(reverse('document_view_simple', args=[document.pk])) + return HttpResponseRedirect(reverse('documents:document_view_simple', args=[document.pk])) else: return HttpResponseRedirect(request.get_full_path()) except NewDocumentVersionNotAllowed: diff --git a/mayan/urls.py b/mayan/urls.py index 2b5753c28a..959ec3c372 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -11,8 +11,8 @@ urlpatterns = patterns('', (r'^', include('common.urls')), (r'^', include('main.urls')), url(r'^docs/', include('rest_framework_swagger.urls')), - (r'^documents/', include('documents.urls')), - (r'^folders/', include('folders.urls')), + (r'^documents/', include('documents.urls', namespace='documents')), + (r'^folders/', include('folders.urls', namespace='folders')), (r'^search/', include('dynamic_search.urls')), (r'^ocr/', include('ocr.urls')), (r'^permissions/', include('permissions.urls')), From d7aef364426404507c31a965ed163ebfa0a788a3 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 26 Aug 2014 04:06:09 -0400 Subject: [PATCH 006/783] Add url namespacing to the checkouts, linking, metadata, sources and tags apps --- mayan/apps/checkouts/links.py | 8 ++++---- mayan/apps/checkouts/models.py | 2 +- mayan/apps/linking/links.py | 24 ++++++++++++------------ mayan/apps/linking/views.py | 2 +- mayan/apps/metadata/links.py | 34 +++++++++++++++++----------------- mayan/apps/metadata/views.py | 12 ++++++------ mayan/apps/sources/links.py | 32 ++++++++++++++++---------------- mayan/apps/sources/views.py | 10 +++++----- mayan/apps/tags/__init__.py | 2 +- mayan/apps/tags/links.py | 24 ++++++++++++------------ mayan/apps/tags/views.py | 8 ++++---- mayan/urls.py | 10 +++++----- 12 files changed, 84 insertions(+), 84 deletions(-) diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py index f266745cd7..4e54ae0ae4 100644 --- a/mayan/apps/checkouts/links.py +++ b/mayan/apps/checkouts/links.py @@ -13,7 +13,7 @@ def is_not_checked_out(context): return not context['object'].is_checked_out() -checkout_list = {'text': _(u'checkouts'), 'view': 'checkout_list', 'famfam': 'basket'} -checkout_document = {'text': _('check out document'), 'view': 'checkout_document', 'args': 'object.pk', 'famfam': 'basket_put', 'condition': is_not_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKOUT]} -checkin_document = {'text': _('check in document'), 'view': 'checkin_document', 'args': 'object.pk', 'famfam': 'basket_remove', 'condition': is_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE]} -checkout_info = {'text': _('check in/out'), 'view': 'checkout_info', 'args': 'object.pk', 'famfam': 'basket', 'children_views': ['checkout_document', 'checkin_document'], 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE, PERMISSION_DOCUMENT_CHECKOUT]} +checkout_list = {'text': _(u'checkouts'), 'view': 'checkout:checkout_list', 'famfam': 'basket'} +checkout_document = {'text': _('check out document'), 'view': 'checkout:checkout_document', 'args': 'object.pk', 'famfam': 'basket_put', 'condition': is_not_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKOUT]} +checkin_document = {'text': _('check in document'), 'view': 'checkout:checkin_document', 'args': 'object.pk', 'famfam': 'basket_remove', 'condition': is_checked_out, 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE]} +checkout_info = {'text': _('check in/out'), 'view': 'checkout:checkout_info', 'args': 'object.pk', 'famfam': 'basket', 'children_views': ['checkout_document', 'checkin_document'], 'permissions': [PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE, PERMISSION_DOCUMENT_CHECKOUT]} diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py index 679f2994eb..183ebe79df 100644 --- a/mayan/apps/checkouts/models.py +++ b/mayan/apps/checkouts/models.py @@ -48,7 +48,7 @@ class DocumentCheckout(models.Model): @models.permalink def get_absolute_url(self): - return ('checkout_info', [self.document.pk]) + return ('checkout:checkout_info', [self.document.pk]) class Meta: verbose_name = _(u'document checkout') diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index 0505b4c65c..ebedaab885 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -8,18 +8,18 @@ from documents.permissions import PERMISSION_DOCUMENT_VIEW from .permissions import (PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT) -smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} -smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} +smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'linking:smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} +smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'linking:smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]} -smart_link_setup = {'text': _(u'smart links'), 'view': 'smart_link_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE], 'children_view_regex': [r'smart_link_list', 'smart_link_create', 'smart_link_delete', 'smart_link_edit', 'smart_link_condition_']} -smart_link_list = {'text': _(u'smart links list'), 'view': 'smart_link_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]} -smart_link_create = {'text': _(u'create new smart link'), 'view': 'smart_link_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]} -smart_link_edit = {'text': _(u'edit'), 'view': 'smart_link_edit', 'args': 'object.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]} -smart_link_delete = {'text': _(u'delete'), 'view': 'smart_link_delete', 'args': 'object.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]} +smart_link_setup = {'text': _(u'smart links'), 'view': 'linking:smart_link_list', 'icon': 'link.png', 'permissions': [PERMISSION_SMART_LINK_CREATE], 'children_view_regex': [r'smart_link_list', 'smart_link_create', 'smart_link_delete', 'smart_link_edit', 'smart_link_condition_']} +smart_link_list = {'text': _(u'smart links list'), 'view': 'linking:smart_link_list', 'famfam': 'link', 'permissions': [PERMISSION_SMART_LINK_CREATE]} +smart_link_create = {'text': _(u'create new smart link'), 'view': 'linking:smart_link_create', 'famfam': 'link_add', 'permissions': [PERMISSION_SMART_LINK_CREATE]} +smart_link_edit = {'text': _(u'edit'), 'view': 'linking:smart_link_edit', 'args': 'object.pk', 'famfam': 'link_edit', 'permissions': [PERMISSION_SMART_LINK_EDIT]} +smart_link_delete = {'text': _(u'delete'), 'view': 'linking:smart_link_delete', 'args': 'object.pk', 'famfam': 'link_delete', 'permissions': [PERMISSION_SMART_LINK_DELETE]} -smart_link_condition_list = {'text': _(u'conditions'), 'view': 'smart_link_condition_list', 'args': 'object.pk', 'famfam': 'cog', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE]} -smart_link_condition_create = {'text': _(u'create condition'), 'view': 'smart_link_condition_create', 'args': 'object.pk', 'famfam': 'cog_add', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} -smart_link_condition_edit = {'text': _(u'edit'), 'view': 'smart_link_condition_edit', 'args': 'condition.pk', 'famfam': 'cog_edit', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} -smart_link_condition_delete = {'text': _(u'delete'), 'view': 'smart_link_condition_delete', 'args': 'condition.pk', 'famfam': 'cog_delete', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} +smart_link_condition_list = {'text': _(u'conditions'), 'view': 'linking:smart_link_condition_list', 'args': 'object.pk', 'famfam': 'cog', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_CREATE]} +smart_link_condition_create = {'text': _(u'create condition'), 'view': 'linking:smart_link_condition_create', 'args': 'object.pk', 'famfam': 'cog_add', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} +smart_link_condition_edit = {'text': _(u'edit'), 'view': 'linking:smart_link_condition_edit', 'args': 'condition.pk', 'famfam': 'cog_edit', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} +smart_link_condition_delete = {'text': _(u'delete'), 'view': 'linking:smart_link_condition_delete', 'args': 'condition.pk', 'famfam': 'cog_delete', 'permissions': [PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_EDIT]} -smart_link_acl_list = {'text': _(u'ACLs'), 'view': 'smart_link_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +smart_link_acl_list = {'text': _(u'ACLs'), 'view': 'linking:smart_link_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 6b77ee722f..6698854218 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -171,7 +171,7 @@ def smart_link_edit(request, smart_link_pk): if form.is_valid(): smart_link = form.save() messages.success(request, _(u'Smart link: %s edited successfully.') % smart_link) - return HttpResponseRedirect(reverse('smart_link_list')) + return HttpResponseRedirect(reverse('linking:smart_link_list')) else: form = SmartLinkForm(instance=smart_link) diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index c91ff60625..1810316f53 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -12,23 +12,23 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_SET_CREATE, PERMISSION_METADATA_SET_DELETE, PERMISSION_METADATA_SET_VIEW) -metadata_edit = {'text': _(u'edit metadata'), 'view': 'metadata_edit', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_EDIT]} -metadata_view = {'text': _(u'metadata'), 'view': 'metadata_view', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_VIEW], 'children_view_regex': ['metadata']} -metadata_multiple_edit = {'text': _(u'edit metadata'), 'view': 'metadata_multiple_edit', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_EDIT]} -metadata_add = {'text': _(u'add metadata'), 'view': 'metadata_add', 'args': 'object.pk', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_DOCUMENT_ADD]} -metadata_multiple_add = {'text': _(u'add metadata'), 'view': 'metadata_multiple_add', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_DOCUMENT_ADD]} -metadata_remove = {'text': _(u'remove metadata'), 'view': 'metadata_remove', 'args': 'object.pk', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_DOCUMENT_REMOVE]} -metadata_multiple_remove = {'text': _(u'remove metadata'), 'view': 'metadata_multiple_remove', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_DOCUMENT_REMOVE]} +metadata_edit = {'text': _(u'edit metadata'), 'view': 'metadata:metadata_edit', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_EDIT]} +metadata_view = {'text': _(u'metadata'), 'view': 'metadata:metadata_view', 'args': 'object.pk', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_VIEW], 'children_view_regex': ['metadata']} +metadata_multiple_edit = {'text': _(u'edit metadata'), 'view': 'metadata:metadata_multiple_edit', 'famfam': 'xhtml_go', 'permissions': [PERMISSION_METADATA_DOCUMENT_EDIT]} +metadata_add = {'text': _(u'add metadata'), 'view': 'metadata:metadata_add', 'args': 'object.pk', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_DOCUMENT_ADD]} +metadata_multiple_add = {'text': _(u'add metadata'), 'view': 'metadata:metadata_multiple_add', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_DOCUMENT_ADD]} +metadata_remove = {'text': _(u'remove metadata'), 'view': 'metadata:metadata_remove', 'args': 'object.pk', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_DOCUMENT_REMOVE]} +metadata_multiple_remove = {'text': _(u'remove metadata'), 'view': 'metadata:metadata_multiple_remove', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_DOCUMENT_REMOVE]} -setup_metadata_type_list = {'text': _(u'metadata types'), 'view': 'setup_metadata_type_list', 'famfam': 'xhtml_go', 'icon': 'xhtml.png', 'permissions': [PERMISSION_METADATA_TYPE_VIEW]} -setup_metadata_type_edit = {'text': _(u'edit'), 'view': 'setup_metadata_type_edit', 'args': 'object.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_METADATA_TYPE_EDIT]} -setup_metadata_type_delete = {'text': _(u'delete'), 'view': 'setup_metadata_type_delete', 'args': 'object.pk', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_TYPE_DELETE]} -setup_metadata_type_create = {'text': _(u'create new'), 'view': 'setup_metadata_type_create', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_TYPE_CREATE]} +setup_metadata_type_list = {'text': _(u'metadata types'), 'view': 'metadata:setup_metadata_type_list', 'famfam': 'xhtml_go', 'icon': 'xhtml.png', 'permissions': [PERMISSION_METADATA_TYPE_VIEW]} +setup_metadata_type_edit = {'text': _(u'edit'), 'view': 'metadata:setup_metadata_type_edit', 'args': 'object.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_METADATA_TYPE_EDIT]} +setup_metadata_type_delete = {'text': _(u'delete'), 'view': 'metadata:setup_metadata_type_delete', 'args': 'object.pk', 'famfam': 'xhtml_delete', 'permissions': [PERMISSION_METADATA_TYPE_DELETE]} +setup_metadata_type_create = {'text': _(u'create new'), 'view': 'metadata:setup_metadata_type_create', 'famfam': 'xhtml_add', 'permissions': [PERMISSION_METADATA_TYPE_CREATE]} -setup_metadata_set_list = {'text': _(u'metadata sets'), 'view': 'setup_metadata_set_list', 'famfam': 'table', 'icon': 'table.png', 'permissions': [PERMISSION_METADATA_SET_VIEW]} -setup_metadata_set_edit = {'text': _(u'edit'), 'view': 'setup_metadata_set_edit', 'args': 'object.pk', 'famfam': 'table_edit', 'permissions': [PERMISSION_METADATA_SET_EDIT]} -setup_metadata_set_members = {'text': _(u'members'), 'view': 'setup_metadata_set_members', 'args': 'object.pk', 'famfam': 'table_link', 'permissions': [PERMISSION_METADATA_SET_EDIT]} -setup_metadata_set_delete = {'text': _(u'delete'), 'view': 'setup_metadata_set_delete', 'args': 'object.pk', 'famfam': 'table_delete', 'permissions': [PERMISSION_METADATA_SET_DELETE]} -setup_metadata_set_create = {'text': _(u'create new'), 'view': 'setup_metadata_set_create', 'famfam': 'table_add', 'permissions': [PERMISSION_METADATA_SET_CREATE]} +setup_metadata_set_list = {'text': _(u'metadata sets'), 'view': 'metadata:setup_metadata_set_list', 'famfam': 'table', 'icon': 'table.png', 'permissions': [PERMISSION_METADATA_SET_VIEW]} +setup_metadata_set_edit = {'text': _(u'edit'), 'view': 'metadata:setup_metadata_set_edit', 'args': 'object.pk', 'famfam': 'table_edit', 'permissions': [PERMISSION_METADATA_SET_EDIT]} +setup_metadata_set_members = {'text': _(u'members'), 'view': 'metadata:setup_metadata_set_members', 'args': 'object.pk', 'famfam': 'table_link', 'permissions': [PERMISSION_METADATA_SET_EDIT]} +setup_metadata_set_delete = {'text': _(u'delete'), 'view': 'metadata:setup_metadata_set_delete', 'args': 'object.pk', 'famfam': 'table_delete', 'permissions': [PERMISSION_METADATA_SET_DELETE]} +setup_metadata_set_create = {'text': _(u'create new'), 'view': 'metadata:setup_metadata_set_create', 'famfam': 'table_add', 'permissions': [PERMISSION_METADATA_SET_CREATE]} -setup_document_type_metadata = {'text': _(u'default metadata'), 'view': 'setup_document_type_metadata', 'args': 'document_type.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]} +setup_document_type_metadata = {'text': _(u'default metadata'), 'view': 'metadata:setup_document_type_metadata', 'args': 'document_type.pk', 'famfam': 'xhtml', 'permissions': [PERMISSION_DOCUMENT_TYPE_EDIT]} diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index c28ae903ee..f54602c215 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -50,7 +50,7 @@ def metadata_edit(request, document_id=None, document_id_list=None): messages.error(request, _(u'Must provide at least one document.')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) - post_action_redirect = reverse('document_list_recent') + post_action_redirect = reverse('documents:document_list_recent') next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect))) @@ -133,7 +133,7 @@ def metadata_add(request, document_id=None, document_id_list=None): for document in documents: RecentDocument.objects.add_document_for_user(request.user, document) - post_action_redirect = reverse('document_list_recent') + post_action_redirect = reverse('documents:document_list_recent') next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect))) @@ -201,7 +201,7 @@ def metadata_remove(request, document_id=None, document_id_list=None): messages.error(request, _(u'Must provide at least one document.')) return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/')) - post_action_redirect = reverse('document_list_recent') + post_action_redirect = reverse('documents:document_list_recent') next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect))) @@ -349,7 +349,7 @@ def setup_metadata_type_delete(request, metadatatype_id): metadata_type = get_object_or_404(MetadataType, pk=metadatatype_id) - post_action_redirect = reverse('setup_metadata_type_list') + post_action_redirect = reverse('metadata:setup_metadata_type_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', post_action_redirect))) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect))) @@ -408,7 +408,7 @@ def setup_metadata_set_edit(request, metadata_set_id): try: form.save() messages.success(request, _(u'Metadata set edited successfully')) - return HttpResponseRedirect(reverse('setup_metadata_set_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_set_list')) except Exception as exception: messages.error(request, _(u'Error editing metadata set; %s') % exception) pass @@ -489,7 +489,7 @@ def setup_metadata_set_delete(request, metadata_set_id): metadata_set = get_object_or_404(MetadataSet, pk=metadata_set_id) - post_action_redirect = reverse('setup_metadata_set_list') + post_action_redirect = reverse('metadata:setup_metadata_set_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', post_action_redirect))) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', post_action_redirect))) diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index 81d5ed40cb..13727f370b 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -10,25 +10,25 @@ from .permissions import (PERMISSION_SOURCES_SETUP_VIEW, PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE, PERMISSION_SOURCES_SETUP_CREATE) -document_create_multiple = {'text': _(u'upload new documents'), 'view': 'document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']} -document_create_siblings = {'text': _(u'clone metadata'), 'view': 'document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]} +document_create_multiple = {'text': _(u'upload new documents'), 'view': 'sources:document_create_multiple', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_CREATE], 'children_view_regex': [r'upload_interactive']} +document_create_siblings = {'text': _(u'clone metadata'), 'view': 'sources:document_create_siblings', 'args': 'object.id', 'famfam': 'page_copy', 'permissions': [PERMISSION_DOCUMENT_CREATE]} -staging_file_delete = {'text': _(u'delete'), 'view': 'staging_file_delete', 'args': ['source.pk', 'object.encoded_filename'], 'famfam': 'delete', 'keep_query': True, 'permissions': [PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE]} +staging_file_delete = {'text': _(u'delete'), 'view': 'sources:staging_file_delete', 'args': ['source.pk', 'object.encoded_filename'], 'famfam': 'delete', 'keep_query': True, 'permissions': [PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE]} -setup_sources = {'text': _(u'sources'), 'view': 'setup_web_form_list', 'famfam': 'application_form', 'icon': 'application_form.png', 'children_classes': [WebForm], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW], 'children_view_regex': [r'setup_web_form', r'setup_staging_folder', r'setup_source_']} -setup_web_form_list = {'text': _(u'web forms'), 'view': 'setup_web_form_list', 'famfam': 'application_form', 'icon': 'application_form.png', 'children_classes': [WebForm], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} -setup_staging_folder_list = {'text': _(u'staging folders'), 'view': 'setup_staging_folder_list', 'famfam': 'folder_camera', 'children_classes': [StagingFolder], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} -setup_watch_folder_list = {'text': _(u'watch folders'), 'view': 'setup_watch_folder_list', 'famfam': 'folder_magnify', 'children_classes': [WatchFolder], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} +setup_sources = {'text': _(u'sources'), 'view': 'sources:setup_web_form_list', 'famfam': 'application_form', 'icon': 'application_form.png', 'children_classes': [WebForm], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW], 'children_view_regex': [r'setup_web_form', r'setup_staging_folder', r'setup_source_']} +setup_web_form_list = {'text': _(u'web forms'), 'view': 'sources:setup_web_form_list', 'famfam': 'application_form', 'icon': 'application_form.png', 'children_classes': [WebForm], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} +setup_staging_folder_list = {'text': _(u'staging folders'), 'view': 'sources:setup_staging_folder_list', 'famfam': 'folder_camera', 'children_classes': [StagingFolder], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} +setup_watch_folder_list = {'text': _(u'watch folders'), 'view': 'sources:setup_watch_folder_list', 'famfam': 'folder_magnify', 'children_classes': [WatchFolder], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} -setup_source_edit = {'text': _(u'edit'), 'view': 'setup_source_edit', 'args': ['source.source_type', 'source.pk'], 'famfam': 'application_form_edit', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} -setup_source_delete = {'text': _(u'delete'), 'view': 'setup_source_delete', 'args': ['source.source_type', 'source.pk'], 'famfam': 'application_form_delete', 'permissions': [PERMISSION_SOURCES_SETUP_DELETE]} -setup_source_create = {'text': _(u'add new source'), 'view': 'setup_source_create', 'args': 'source_type', 'famfam': 'application_form_add', 'permissions': [PERMISSION_SOURCES_SETUP_CREATE]} +setup_source_edit = {'text': _(u'edit'), 'view': 'sources:setup_source_edit', 'args': ['source.source_type', 'source.pk'], 'famfam': 'application_form_edit', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} +setup_source_delete = {'text': _(u'delete'), 'view': 'sources:setup_source_delete', 'args': ['source.source_type', 'source.pk'], 'famfam': 'application_form_delete', 'permissions': [PERMISSION_SOURCES_SETUP_DELETE]} +setup_source_create = {'text': _(u'add new source'), 'view': 'sources:setup_source_create', 'args': 'source_type', 'famfam': 'application_form_add', 'permissions': [PERMISSION_SOURCES_SETUP_CREATE]} -setup_source_transformation_list = {'text': _(u'transformations'), 'view': 'setup_source_transformation_list', 'args': ['source.source_type', 'source.pk'], 'famfam': 'shape_move_front', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} -setup_source_transformation_create = {'text': _(u'add transformation'), 'view': 'setup_source_transformation_create', 'args': ['source.source_type', 'source.pk'], 'famfam': 'shape_square_add', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} -setup_source_transformation_edit = {'text': _(u'edit'), 'view': 'setup_source_transformation_edit', 'args': 'transformation.pk', 'famfam': 'shape_square_edit', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} -setup_source_transformation_delete = {'text': _(u'delete'), 'view': 'setup_source_transformation_delete', 'args': 'transformation.pk', 'famfam': 'shape_square_delete', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} +setup_source_transformation_list = {'text': _(u'transformations'), 'view': 'sources:setup_source_transformation_list', 'args': ['source.source_type', 'source.pk'], 'famfam': 'shape_move_front', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} +setup_source_transformation_create = {'text': _(u'add transformation'), 'view': 'sources:setup_source_transformation_create', 'args': ['source.source_type', 'source.pk'], 'famfam': 'shape_square_add', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} +setup_source_transformation_edit = {'text': _(u'edit'), 'view': 'sources:setup_source_transformation_edit', 'args': 'transformation.pk', 'famfam': 'shape_square_edit', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} +setup_source_transformation_delete = {'text': _(u'delete'), 'view': 'sources:setup_source_transformation_delete', 'args': 'transformation.pk', 'famfam': 'shape_square_delete', 'permissions': [PERMISSION_SOURCES_SETUP_EDIT]} -source_list = {'text': _(u'Document sources'), 'view': 'setup_web_form_list', 'famfam': 'page_add', 'children_url_regex': [r'sources/setup'], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} +source_list = {'text': _(u'Document sources'), 'view': 'sources:setup_web_form_list', 'famfam': 'page_add', 'children_url_regex': [r'sources/setup'], 'permissions': [PERMISSION_SOURCES_SETUP_VIEW]} -upload_version = {'text': _(u'upload new version'), 'view': 'upload_version', 'args': 'object.pk', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_NEW_VERSION]} +upload_version = {'text': _(u'upload new version'), 'view': 'sources:upload_version', 'args': 'object.pk', 'famfam': 'page_add', 'permissions': [PERMISSION_DOCUMENT_NEW_VERSION]} diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 3b545d0a68..254efe90e0 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -477,7 +477,7 @@ def setup_source_delete(request, source_type, source_id): form_icon = u'folder_delete.png' redirect_view = 'setup_watch_folder_list' - redirect_view = reverse('setup_source_list', args=[source_type]) + redirect_view = reverse('sources:setup_source_list', args=[source_type]) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', redirect_view))) source = get_object_or_404(cls, pk=source_id) @@ -527,7 +527,7 @@ def setup_source_create(request, source_type): try: form.save() messages.success(request, _(u'Source created successfully')) - return HttpResponseRedirect(reverse('setup_web_form_list')) + return HttpResponseRedirect(reverse('sources:setup_web_form_list')) except Exception as exception: messages.error(request, _(u'Error creating source; %s') % exception) else: @@ -578,7 +578,7 @@ def setup_source_transformation_edit(request, transformation_id): Permission.objects.check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) source_transformation = get_object_or_404(SourceTransformation, pk=transformation_id) - redirect_view = reverse('setup_source_transformation_list', args=[source_transformation.content_object.source_type, source_transformation.content_object.pk]) + redirect_view = reverse('sources:setup_source_transformation_list', args=[source_transformation.content_object.source_type, source_transformation.content_object.pk]) next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', redirect_view))) if request.method == 'POST': @@ -611,7 +611,7 @@ def setup_source_transformation_delete(request, transformation_id): Permission.objects.check_permissions(request.user, [PERMISSION_SOURCES_SETUP_EDIT]) source_transformation = get_object_or_404(SourceTransformation, pk=transformation_id) - redirect_view = reverse('setup_source_transformation_list', args=[source_transformation.content_object.source_type, source_transformation.content_object.pk]) + redirect_view = reverse('sources:setup_source_transformation_list', args=[source_transformation.content_object.source_type, source_transformation.content_object.pk]) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', redirect_view))) if request.method == 'POST': @@ -653,7 +653,7 @@ def setup_source_transformation_create(request, source_type, source_id): source = get_object_or_404(cls, pk=source_id) - redirect_view = reverse('setup_source_transformation_list', args=[source.source_type, source.pk]) + redirect_view = reverse('sources:setup_source_transformation_list', args=[source.source_type, source.pk]) if request.method == 'POST': form = SourceTransformationForm_create(request.POST) diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index 34e6bb4717..1fff0884ce 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -42,7 +42,7 @@ register_model_list_columns(Document, [ register_links(Tag, [tag_tagged_item_list, tag_edit, tag_delete, tag_acl_list]) register_multi_item_links(['tag_list'], [tag_multiple_delete]) register_links([Tag, 'tag_list', 'tag_create'], [tag_list, tag_create], menu_name='secondary_menu') -register_top_menu('tags', link={'text': _(u'tags'), 'view': 'tag_list', 'famfam': 'tag_blue'}, children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)']) +register_top_menu('tags', link={'text': _(u'tags'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'}, children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)']) register_links(Document, [tag_document_list], menu_name='form_header') register_links(['document_tags', 'tag_remove', 'tag_multiple_remove', 'tag_attach'], [tag_attach], menu_name='sidebar') diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index 01a82ded87..8967903f86 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -7,18 +7,18 @@ from acls.permissions import ACLS_VIEW_ACL from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT) -tag_list = {'text': _(u'tag list'), 'view': 'tag_list', 'famfam': 'tag_blue'} -tag_create = {'text': _(u'create new tag'), 'view': 'tag_create', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_CREATE]} +tag_list = {'text': _(u'tag list'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'} +tag_create = {'text': _(u'create new tag'), 'view': 'tags:tag_create', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_CREATE]} -tag_attach = {'text': _(u'attach tag'), 'view': 'tag_attach', 'args': 'object.pk', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_ATTACH]} -tag_multiple_attach = {'text': _(u'attach tag'), 'view': 'tag_multiple_attach', 'famfam': 'tag_blue_add'} +tag_attach = {'text': _(u'attach tag'), 'view': 'tags:tag_attach', 'args': 'object.pk', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_ATTACH]} +tag_multiple_attach = {'text': _(u'attach tag'), 'view': 'tags:tag_multiple_attach', 'famfam': 'tag_blue_add'} -multiple_documents_selection_tag_remove = {'text': _(u'remove tag'), 'view': 'multiple_documents_selection_tag_remove', 'famfam': 'tag_blue_delete'} -single_document_multiple_tag_remove = {'text': _(u'remove tags'), 'view': 'single_document_multiple_tag_remove', 'args': 'document.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_REMOVE]} +multiple_documents_selection_tag_remove = {'text': _(u'remove tag'), 'view': 'tags:multiple_documents_selection_tag_remove', 'famfam': 'tag_blue_delete'} +single_document_multiple_tag_remove = {'text': _(u'remove tags'), 'view': 'tags:single_document_multiple_tag_remove', 'args': 'document.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_REMOVE]} -tag_document_list = {'text': _(u'tags'), 'view': 'document_tags', 'args': 'object.pk', 'famfam': 'tag_blue', 'permissions': [PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], 'children_view_regex': ['tag']} -tag_delete = {'text': _(u'delete'), 'view': 'tag_delete', 'args': 'object.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]} -tag_edit = {'text': _(u'edit'), 'view': 'tag_edit', 'args': 'object.id', 'famfam': 'tag_blue_edit', 'permissions': [PERMISSION_TAG_EDIT]} -tag_tagged_item_list = {'text': _(u'tagged documents'), 'view': 'tag_tagged_item_list', 'args': 'object.id', 'famfam': 'page'} -tag_multiple_delete = {'text': _(u'delete'), 'view': 'tag_multiple_delete', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]} -tag_acl_list = {'text': _(u'ACLs'), 'view': 'tag_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +tag_document_list = {'text': _(u'tags'), 'view': 'tags:document_tags', 'args': 'object.pk', 'famfam': 'tag_blue', 'permissions': [PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], 'children_view_regex': ['tag']} +tag_delete = {'text': _(u'delete'), 'view': 'tags:tag_delete', 'args': 'object.id', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]} +tag_edit = {'text': _(u'edit'), 'view': 'tags:tag_edit', 'args': 'object.id', 'famfam': 'tag_blue_edit', 'permissions': [PERMISSION_TAG_EDIT]} +tag_tagged_item_list = {'text': _(u'tagged documents'), 'view': 'tags:tag_tagged_item_list', 'args': 'object.id', 'famfam': 'page'} +tag_multiple_delete = {'text': _(u'delete'), 'view': 'tags:tag_multiple_delete', 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_DELETE]} +tag_acl_list = {'text': _(u'ACLs'), 'view': 'tags:tag_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 6c0d5d847d..10d3a113c9 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -31,7 +31,7 @@ logger = logging.getLogger(__name__) def tag_create(request): Permission.objects.check_permissions(request.user, [PERMISSION_TAG_CREATE]) - redirect_url = reverse('tag_list') + redirect_url = reverse('tags:tag_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', redirect_url))) if request.method == 'POST': @@ -62,7 +62,7 @@ def tag_create(request): def tag_attach(request, document_id=None, document_id_list=None): if document_id: documents = [get_object_or_404(Document, pk=document_id)] - post_action_redirect = reverse('tag_list') + post_action_redirect = reverse('tags:tag_list') elif document_id_list: documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] else: @@ -147,7 +147,7 @@ def tag_delete(request, tag_id=None, tag_id_list=None): if tag_id: tags = [get_object_or_404(Tag, pk=tag_id)] - post_action_redirect = reverse('tag_list') + post_action_redirect = reverse('tags:tag_list') elif tag_id_list: tags = [get_object_or_404(Tag, pk=tag_id) for tag_id in tag_id_list.split(',')] else: @@ -216,7 +216,7 @@ def tag_edit(request, tag_id): tag_properties.color = form.cleaned_data['color'] tag_properties.save() messages.success(request, _(u'Tag updated succesfully.')) - return HttpResponseRedirect(reverse('tag_list')) + return HttpResponseRedirect(reverse('tags:tag_list')) else: form = TagForm(initial={ 'name': tag.name, diff --git a/mayan/urls.py b/mayan/urls.py index 959ec3c372..e6d4e0fa75 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -16,16 +16,16 @@ urlpatterns = patterns('', (r'^search/', include('dynamic_search.urls')), (r'^ocr/', include('ocr.urls')), (r'^permissions/', include('permissions.urls')), - (r'^tags/', include('tags.urls')), + (r'^tags/', include('tags.urls', namespace='tags')), (r'^comments/', include('document_comments.urls')), (r'^user_management/', include('user_management.urls')), (r'^settings/', include('smart_settings.urls')), - (r'^metadata/', include('metadata.urls')), - (r'^linking/', include('linking.urls')), + (r'^metadata/', include('metadata.urls', namespace='metadata')), + (r'^linking/', include('linking.urls', namespace='linking')), (r'^document_indexing/', include('document_indexing.urls')), (r'^history/', include('history.urls')), (r'^converter/', include('converter.urls')), - (r'^sources/', include('sources.urls')), + (r'^sources/', include('sources.urls', namespace='sources')), (r'^project_setup/', include('project_setup.urls')), (r'^project_tools/', include('project_tools.urls')), (r'^acls/', include('acls.urls')), @@ -33,7 +33,7 @@ urlpatterns = patterns('', (r'^api/', include('rest_api.urls')), (r'^gpg/', include('django_gpg.urls')), (r'^documents/signatures/', include('document_signatures.urls')), - (r'^checkouts/', include('checkouts.urls')), + (r'^checkouts/', include('checkouts.urls', namespace='checkout')), (r'^installation/', include('installation.urls')), (r'^scheduler/', include('scheduler.urls')), (r'^bootstrap/', include('bootstrap.urls')), From 7c4d4a5485c233820659d3f140b0812a7401bd1c Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 14:29:33 -0400 Subject: [PATCH 007/783] Add note about Python/Django familiarity --- docs/intro/installation.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/intro/installation.rst b/docs/intro/installation.rst index 75b00bfbb9..3dad77e42f 100644 --- a/docs/intro/installation.rst +++ b/docs/intro/installation.rst @@ -7,6 +7,10 @@ Ubuntu, Debian or Fedora server **Mayan EDMS** should be deployed like any other Django_ project and preferably using virtualenv_. +Being a Django_ and a Python_ project familiarity with these technologies is +required to understand why **Mayan EDMS** does some of the things it does the way +it does them. + If using a Debian_ or Ubuntu_ based Linux distribution getting the executable requirements is as easy as:: $ sudo apt-get install python-dev gcc tesseract-ocr unpaper python-virtualenv ghostscript libjpeg-dev libpng-dev poppler-utils -y @@ -51,7 +55,7 @@ in the directory: venv/lib/python2.7/site-packages/mayan/settings/ with the foll To test your settings launch **Mayan EDMS** using:: - $ mayan-edms runserver --settings=mayan.settings.my_settings + $ mayan-edms.py runserver --settings=mayan.settings.my_settings After making sure everything is running correctly, stop the runserver command. Deploy **Mayan EDMS** using the webserver of your preference. For more information From d9ce1bd196c9d88e8c06f4646dba7ba47153fca6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 14:30:33 -0400 Subject: [PATCH 008/783] Update references to ./manage.py to mayan-edms.py --- docs/releases/1.0.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/releases/1.0.rst b/docs/releases/1.0.rst index 3dfd1c6561..9173c0e9ee 100644 --- a/docs/releases/1.0.rst +++ b/docs/releases/1.0.rst @@ -162,14 +162,14 @@ Next upgrade/add the new requirements:: Migrate existing database schema with:: - $ ./manage.py migrate acls 0001 --fake - $ ./manage.py migrate taggit 0001 --fake - $ ./manage.py migrate ocr 0001 --fake - $ ./manage.py migrate + $ mayan-edms.py migrate acls 0001 --fake + $ mayan-edms.py migrate taggit 0001 --fake + $ mayan-edms.py migrate ocr 0001 --fake + $ mayan-edms.py migrate Add new static media:: - $ ./manage.py collectstatic --noinput + $ mayan-edms.py collectstatic --noinput The upgrade procedure is now complete. From d9de69ea3da0918b57ffb4b6e78e8de15aea9e19 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 14:30:51 -0400 Subject: [PATCH 009/783] Add placeholder release notes for version 1.1 --- docs/releases/1.1.rst | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 docs/releases/1.1.rst diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst new file mode 100644 index 0000000000..113902eb01 --- /dev/null +++ b/docs/releases/1.1.rst @@ -0,0 +1,50 @@ +============================= +Mayan EDMS v1.1 release notes +============================= + +*? 2014* + +Welcome to Mayan EDMS v1.1 + +Overview +======== + +What's new in Mayan EDMS v1.1 +============================= + + +Upgrading from a previous version +================================= +If you installed Mayan EDMS by cloning the Git repository issue the commands:: + + $ git reset --hard HEAD + $ git pull + +otherwise download the compressed archived and uncompress it overriding the existing installation. + +Next upgrade/add the new requirements:: + + $ pip install --upgrade -r requirements.txt + +Migrate existing database schema with:: + + $ mayan-edms.py migrate + +Add new static media:: + + $ mayan-edms.py collectstatic --noinput + +The upgrade procedure is now complete. + + +Backward incompatible changes +============================= + + + +Bugs fixed or issues closed +=========================== +* None + + +.. _PyPI: https://pypi.python.org/pypi/mayan-edms/ From 274f346c421dc10c5a32c714f21cbf1b966461af Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 14:36:57 -0400 Subject: [PATCH 010/783] Update ocurrences of ./manage.py to mayan-edms.py --- docs/faq/index.rst | 4 ++-- docs/topics/initial_import.rst | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/faq/index.rst b/docs/faq/index.rst index 79cc8e98e6..e4b97407e5 100644 --- a/docs/faq/index.rst +++ b/docs/faq/index.rst @@ -22,7 +22,7 @@ before trying again. * Solution:: - $ manage.py shell + $ mayan-edms.py shell >>> from django.db import connection >>> cursor = connection.cursor() @@ -110,7 +110,7 @@ Django's development server doesn't serve static files unless the ``DEBUG`` option is set to ``True``, this mode of operation should only be used for development or testing. For production deployments the management command:: - $ ./manage.py collectstatic + $ mayan-edms.py collectstatic should be used and the resulting ``static`` folder served from a webserver. For more information, read https://docs.djangoproject.com/en/dev/howto/static-files/ diff --git a/docs/topics/initial_import.rst b/docs/topics/initial_import.rst index 55a15e33f8..0f84a434f6 100644 --- a/docs/topics/initial_import.rst +++ b/docs/topics/initial_import.rst @@ -5,24 +5,24 @@ Initial data loading Bulk document import -------------------- -**Mayan EDMS** has the ability to individually upload the contents of compressed -files, however by nature of being a web based application it is bounded by the -limitations of the HTTP protocol. This imposes a limit on the file size and -the amount of time **Mayan EDMS** may keep a connection open while it processes -compressed files. When the desired amount of documents is bigger than what -these limitations allow, **Mayan EDMS** provides a command line tool for out of +**Mayan EDMS** has the ability to individually upload the contents of compressed +files, however by nature of being a web based application it is bounded by the +limitations of the HTTP protocol. This imposes a limit on the file size and +the amount of time **Mayan EDMS** may keep a connection open while it processes +compressed files. When the desired amount of documents is bigger than what +these limitations allow, **Mayan EDMS** provides a command line tool for out of process document importation. The command line options for this feature are as follows:: - $ ./manage.py bulk_upload --noinput --metadata '{"project": "bulk"}' --document_type "Accounting documents" compressed.zip + $ mayan-edms.py bulk_upload --noinput --metadata '{"project": "bulk"}' --document_type "Accounting documents" compressed.zip **Optional arguments** * The ``--noinput`` argument skips confirmation and starts the upload immediately. * The ``--metadata`` argument allows specifing what metadata will be assigned to the documents when uploaded. -* And the ``--document_type`` applies a previously defined +* And the ``--document_type`` applies a previously defined document type to the uploaded documents. @@ -34,9 +34,9 @@ includes a management command to import a large number of users from a CSV file. The command line options for this feature are as follow:: - $ ./manage.py import_users --noinput --password=welcome123 --skip-repeated user_list.csv + $ mayan-edms.py import_users --noinput --password=welcome123 --skip-repeated user_list.csv -The CSV field order must be: username, first name, last name and email, any columns after +The CSV field order must be: username, first name, last name and email, any columns after those are ignored. **Optional arguments** From 5caf61670786c36916ae9d77eacb97782599fe2a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 14:40:15 -0400 Subject: [PATCH 011/783] German translation files update --- .../locale/de_DE/LC_MESSAGES/django.po | 63 +++---- .../locale/de_DE/LC_MESSAGES/django.po | 14 +- .../locale/de_DE/LC_MESSAGES/django.po | 163 ++++++------------ .../locale/de_DE/LC_MESSAGES/django.po | 12 +- .../locale/de_DE/LC_MESSAGES/django.po | 52 +++--- .../locale/de_DE/LC_MESSAGES/django.po | 92 ++++------ .../ocr/locale/de_DE/LC_MESSAGES/django.po | 78 +++------ .../locale/de_DE/LC_MESSAGES/django.po | 46 +++-- .../tags/locale/de_DE/LC_MESSAGES/django.po | 35 ++-- 9 files changed, 202 insertions(+), 353 deletions(-) diff --git a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po index 2cb5f99cb6..d663d6b583 100644 --- a/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/document_indexing/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Stefan Lodders , 2012 @@ -16,14 +16,13 @@ msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:52-0400\n" -"PO-Revision-Date: 2014-07-20 00:06+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:29+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:45 @@ -39,16 +38,13 @@ msgstr "Maximale Suffix (%s) Anzahl erreicht." #, python-format msgid "" "Error in document indexing update expression: %(expression)s; %(exception)s" -msgstr "" -"Fehler in Updateausdruck für Dokumentenindex: %(expression)s; %(exception)s" +msgstr "Fehler in Updateausdruck für Dokumentenindex: %(expression)s; %(exception)s" #: api.py:94 api.py:109 #, python-format msgid "" "Error updating document index, expression: %(expression)s; %(exception)s" -msgstr "" -"Fehler beim Aktualisieren des Dokumentenindex, Ausdruck: %(expression)s; " -"%(exception)s" +msgstr "Fehler beim Aktualisieren des Dokumentenindex, Ausdruck: %(expression)s; %(exception)s" #: api.py:151 #, python-format @@ -61,19 +57,16 @@ msgid "Unable to create indexing directory; %s" msgstr "Indizierungsverzeichnis kann nicht erstellt werden: %s" #: filesystem.py:69 -#, fuzzy, python-format +#, python-format msgid "" "Unable to create symbolic link, file exists and could not be deleted: " "%(filepath)s; %(exception)s" -msgstr "" -"Symbolische Verknüpfung kann nicht erstellt werden, Datei existiert und kann " -"nicht gelöscht werden: %(filepath)s; %(exc)s" +msgstr "Erstellen der symbolischen Verknüpfung nicht möglich, Datei existiert und kann nicht gelöscht werden: %(filepath)s; %(exception)s" #: filesystem.py:71 -#, fuzzy, python-format +#, python-format msgid "Unable to create symbolic link: %(filepath)s; %(exception)s" -msgstr "" -"Symbolische Verknüpfung kann nicht erstellt werden: %(filepath)s; %(exc)s" +msgstr "Erstellen der symbolischen Verknüpfung nicht möglich: %(filepath)s; %(exception)s" #: filesystem.py:84 #, python-format @@ -155,10 +148,9 @@ msgid "enabled" msgstr "Aktiviert" #: models.py:20 -msgid "Causes this index to be visible and updated when document data changes." -msgstr "" -"Bewirkt Sichtbarkeit und Aktualisierung des Index, wenn Dokumente geändert " -"werden." +msgid "" +"Causes this index to be visible and updated when document data changes." +msgstr "Bewirkt Sichtbarkeit und Aktualisierung des Index, wenn Dokumente geändert werden." #: models.py:63 models.py:69 views.py:103 views.py:133 views.py:159 #: views.py:195 views.py:222 views.py:251 views.py:290 @@ -175,9 +167,7 @@ msgstr "Geben Sie einen Python-Ausdruck zur Auswertung an." #: models.py:72 msgid "Causes this node to be visible and updated when document data changes." -msgstr "" -"Bewirkt Sichtbarkeit und Aktualisierung des Index, wenn Dokumente geändert " -"werden." +msgstr "Bewirkt Sichtbarkeit und Aktualisierung des Index, wenn Dokumente geändert werden." #: models.py:73 msgid "link documents" @@ -185,12 +175,9 @@ msgstr "Dokumente verknüpfen" #: models.py:73 msgid "" -"Check this option to have this node act as a container for documents and not " -"as a parent for further nodes." -msgstr "" -"Wählen Sie diese Option, wenn Dokumente in diesem Knoten dargestellt werden " -"sollen (und dieser Knoten nicht als Eltern-Knoten für weitere Kind-" -"Knotenpunkte fungieren soll)." +"Check this option to have this node act as a container for documents and not" +" as a parent for further nodes." +msgstr "Wählen Sie diese Option, wenn Dokumente in diesem Knoten dargestellt werden sollen (und dieser Knoten nicht als Eltern-Knoten für weitere Kind-Knotenpunkte fungieren soll)." #: models.py:83 models.py:89 msgid "index template node" @@ -370,8 +357,7 @@ msgstr "Sind Sie sicher, dass Sie alle Indices neu aufbauen möchten?" #: views.py:388 msgid "On large databases this operation may take some time to execute." -msgstr "" -"Bei großen Datenbanken kann dieser Vorgang einige Zeit in Anspruch nehmen." +msgstr "Bei großen Datenbanken kann dieser Vorgang einige Zeit in Anspruch nehmen." #: views.py:394 msgid "Index rebuild completed successfully." @@ -393,11 +379,9 @@ msgstr "Wurzel" #: conf/settings.py:22 msgid "" -"A dictionary that maps the index name and where on the filesystem that index " -"will be mirrored." -msgstr "" -"Ein Python-Dictionary, das Zuweisungen von Index-Namen an Verzeichnisse im " -"Dateisystem (wo der Index abgebildet wird) enthält." +"A dictionary that maps the index name and where on the filesystem that index" +" will be mirrored." +msgstr "Ein Python-Dictionary, das Zuweisungen von Index-Namen an Verzeichnisse im Dateisystem (wo der Index abgebildet wird) enthält." #: templates/indexing_help.html:3 msgid "What are indexes?" @@ -405,5 +389,4 @@ msgstr "Was sind Indices?" #: templates/indexing_help.html:4 msgid "Indexes group documents into a tree like hierarchical structure." -msgstr "" -"Indices gruppieren Dokumente in eine baumartige, hierarchische Struktur." +msgstr "Indices gruppieren Dokumente in eine baumartige, hierarchische Struktur." diff --git a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po index f234209309..b50337fdbc 100644 --- a/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/document_signatures/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Mathias Behrle , 2014 @@ -9,19 +9,19 @@ # Stefan Lodders , 2012 # tetjarediske , 2012 # tetjarediske , 2012 +# Tobias Paepke , 2014 msgid "" msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:52-0400\n" -"PO-Revision-Date: 2014-07-20 00:06+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:32+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: forms.py:7 @@ -99,7 +99,7 @@ msgstr "Separat" #: views.py:62 msgid "None" -msgstr "" +msgstr "Nichts" #: views.py:67 #, python-format diff --git a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po index e08362b886..51f2168261 100644 --- a/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/documents/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Stefan Lodders , 2012 @@ -16,14 +16,13 @@ msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:52-0400\n" -"PO-Revision-Date: 2014-07-20 00:06+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:31+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:96 __init__.py:154 permissions.py:7 @@ -75,18 +74,16 @@ msgid "Comments" msgstr "Kommentare" #: __init__.py:155 -#, fuzzy msgid "Document tendencies" -msgstr "Dokument bearbeitet" +msgstr "Dokument-Tendenzen" #: __init__.py:156 -#, fuzzy msgid "Document usage" -msgstr "Dokumentenseite" +msgstr "Dokumenten-Nutzung" #: __init__.py:160 msgid "Returns a list of all the documents." -msgstr "" +msgstr "Gibt eine Liste aller Dokumente zurück." #: events.py:5 msgid "Document creation" @@ -99,10 +96,8 @@ msgstr "Dokument \"%(content_object)s\" erstellt von %(fullname)s." #: events.py:7 #, python-format -msgid "" -"Document \"%(content_object)s\" created on %(datetime)s by %(fullname)s." -msgstr "" -"Dokument \"%(content_object)s\" erstellt am %(datetime)s, von %(fullname)s." +msgid "Document \"%(content_object)s\" created on %(datetime)s by %(fullname)s." +msgstr "Dokument \"%(content_object)s\" erstellt am %(datetime)s, von %(fullname)s." #: events.py:13 msgid "Document edited" @@ -116,11 +111,9 @@ msgstr "Dokument \"%(content_object)s\" bearbeitet von %(fullname)s." #: events.py:15 #, python-format msgid "" -"Document \"%(content_object)s\" was edited on %(datetime)s by %(fullname)s. " -"The following changes took place: %(changes)s." -msgstr "" -"Dokument \"%(content_object)s\" wurde bearbeitet am %(datetime)s, von " -"%(fullname)s. Die folgenden Veränderungen wurden durchgeführt: %(changes)s." +"Document \"%(content_object)s\" was edited on %(datetime)s by %(fullname)s." +" The following changes took place: %(changes)s." +msgstr "Dokument \"%(content_object)s\" wurde bearbeitet am %(datetime)s, von %(fullname)s. Die folgenden Veränderungen wurden durchgeführt: %(changes)s." #: events.py:24 msgid "Document deleted" @@ -134,8 +127,7 @@ msgstr "Dokument \"%(document)s\" durch %(fullname)s gelöscht." #: events.py:26 #, python-format msgid "Document \"%(document)s\" deleted on %(datetime)s by %(fullname)s." -msgstr "" -"Dokument \"%(document)s\" am %(datetime)s, durch %(fullname)s gelöscht." +msgstr "Dokument \"%(document)s\" am %(datetime)s, durch %(fullname)s gelöscht." #: forms.py:47 msgid "Page image" @@ -146,9 +138,9 @@ msgid "Contents" msgstr "Inhalte" #: forms.py:90 forms.py:92 -#, fuzzy, python-format +#, python-format msgid "Document pages (%d)" -msgstr "Dokumentseiten (%s)" +msgstr "Dokument Seitenzahl (%d)" #: forms.py:118 msgid "Use the new version filename as the document filename" @@ -195,10 +187,7 @@ msgid "" "Download the document in the original format or in a compressed manner. " "This option is selectable only when downloading one document, for multiple " "documents, the bundle will always be downloads as a compressed file." -msgstr "" -"Datei im Originalformat oder als komprimiertes Archiv herunterladen. Diese " -"Option ist nur wählbar, wenn ein einzelnes Dokument heruntergeladen wird. " -"Mmehrere Dateien werden immer als komprimiertes Archiv heruntergeladen." +msgstr "Datei im Originalformat oder als komprimiertes Archiv herunterladen. Diese Option ist nur wählbar, wenn ein einzelnes Dokument heruntergeladen wird. Mmehrere Dateien werden immer als komprimiertes Archiv heruntergeladen." #: forms.py:281 msgid "Compressed filename" @@ -208,9 +197,7 @@ msgstr "Name der komprimierten Datei" msgid "" "The filename of the compressed file that will contain the documents to be " "downloaded, if the previous option is selected." -msgstr "" -"Name der komprimierten Datei, die die Dokumente zum Download beeinhaltet, " -"wenn die vorherige Option gewählt wurde." +msgstr "Name der komprimierten Datei, die die Dokumente zum Download beeinhaltet, wenn die vorherige Option gewählt wurde." #: links.py:39 msgid "all documents" @@ -251,9 +238,7 @@ msgstr "Alle Duplikate finden" #: links.py:50 msgid "" "Search all the documents' checksums and return a list of the exact matches." -msgstr "" -"Eine Liste mit exakten Treffen von identischen Dokumentenprüfsummen " -"erstellen." +msgstr "Eine Liste mit exakten Treffen von identischen Dokumentenprüfsummen erstellen." #: links.py:51 msgid "update office documents' page count" @@ -264,10 +249,7 @@ msgid "" "Update the page count of the office type documents. This is useful when " "enabling office document support after there were already office type " "documents in the database." -msgstr "" -"Seitenzahlen von Office-Dokumenten aktualisieren. Dies ist nützlich, wenn " -"Support für Office-Dokumente aktiviert wird, nachdem schon entsprechende " -"Dokumente in der Datenbank gespeichert sind." +msgstr "Seitenzahlen von Office-Dokumenten aktualisieren. Dies ist nützlich, wenn Support für Office-Dokumente aktiviert wird, nachdem schon entsprechende Dokumente in der Datenbank gespeichert sind." #: links.py:52 links.py:53 msgid "clear transformations" @@ -293,9 +275,7 @@ msgstr "Dokumenten-Bildercache löschen" msgid "" "Clear the graphics representations used to speed up the documents' display " "and interactive transformations results." -msgstr "" -"Grafiken löschen, die benutzt werden um die Dokumentendarstellung und " -"interaktive Transformationsausgabe zu beschleunigen." +msgstr "Grafiken löschen, die benutzt werden um die Dokumentendarstellung und interaktive Transformationsausgabe zu beschleunigen." #: links.py:62 msgid "page transformations" @@ -427,9 +407,8 @@ msgid "document" msgstr "Dokument" #: models.py:102 -#, fuzzy msgid "Uninitialized document" -msgstr "Alle Dokumente" +msgstr "Nicht initialisiertes Dokument" #: models.py:300 #, python-format @@ -550,9 +529,8 @@ msgid "arguments" msgstr "Argumente" #: models.py:621 -#, fuzzy msgid "Use dictionaries to indentify arguments, example: {'degrees':90}" -msgstr "Python-Dictionaries um Argumente zu identifizieren, Beispiel: %s" +msgstr "Benutze Wörterbücher um Argumente zu identifizieren: {'degrees':90}" #: models.py:629 msgid "document page transformation" @@ -667,11 +645,9 @@ msgstr "Dokumente im Dateispeicher: %d" #: statistics.py:72 #, python-format msgid "" -"Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d " -"bytes" -msgstr "" -"Genutzter Dateispeicher: %(base_2)s (base 2), %(base_10)s (base 10), " -"%(bytes)d bytes" +"Space used in storage: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d" +" bytes" +msgstr "Genutzter Dateispeicher: %(base_2)s (base 2), %(base_10)s (base 10), %(bytes)d bytes" #: statistics.py:81 #, python-format @@ -786,8 +762,7 @@ msgstr "Sind Sie sicher, dass Sie alle Duplikate suchen möchten?" #: views.py:410 views.py:468 views.py:536 msgid "On large databases this operation may take some time to execute." -msgstr "" -"Bei großen Datenbanken kann diese Operation einige Zeit in Anspruch nehmen." +msgstr "Bei großen Datenbanken kann diese Operation einige Zeit in Anspruch nehmen." #: views.py:433 msgid "duplicated documents" @@ -798,33 +773,28 @@ msgstr "Duplikate" msgid "" "Page count update complete. Documents processed: %(total)d, documents with " "changed page count: %(change)d" -msgstr "" -"Aktualisierung der Seitenzahlen abgeschlossen. Dokumente verarbeitet: " -"%(total)d, Dokumente mit veränderter Seitenzahl: %(change)d" +msgstr "Aktualisierung der Seitenzahlen abgeschlossen. Dokumente verarbeitet: %(total)d, Dokumente mit veränderter Seitenzahl: %(change)d" #: views.py:467 #, python-format msgid "" -"Are you sure you wish to update the page count for the office documents (%d)?" -msgstr "" -"Sind Sie sicher, dass Sie die Seitenzahlen der Office-Dokumente (%d) " -"aktualisieren möchten?" +"Are you sure you wish to update the page count for the office documents " +"(%d)?" +msgstr "Sind Sie sicher, dass Sie die Seitenzahlen der Office-Dokumente (%d) aktualisieren möchten?" #: views.py:499 #, python-format msgid "" "All the page transformations for document: %s, have been deleted " "successfully." -msgstr "" -"Alle Seiten-Transformationen für Dokument %s, wurden erfolgreich gelöscht." +msgstr "Alle Seiten-Transformationen für Dokument %s, wurden erfolgreich gelöscht." #: views.py:501 #, python-format msgid "" "Error deleting the page transformations for document: %(document)s; " "%(error)s." -msgstr "" -"Fehler beim Löschen der Seiten-Transformation für %(document)s; %(error)s" +msgstr "Fehler beim Löschen der Seiten-Transformation für %(document)s; %(error)s" #: views.py:507 msgid "document transformation" @@ -833,19 +803,16 @@ msgstr "Dokumenten-Transformation" #: views.py:516 #, python-format msgid "" -"Are you sure you wish to clear all the page transformations for document: %s?" -msgstr "" -"Sind Sie sicher, dass Sie alle Seiten-Transformationen für Dokument %s " -"entfernen möchten?" +"Are you sure you wish to clear all the page transformations for document: " +"%s?" +msgstr "Sind Sie sicher, dass Sie alle Seiten-Transformationen für Dokument %s entfernen möchten?" #: views.py:518 #, python-format msgid "" "Are you sure you wish to clear all the page transformations for documents: " "%s?" -msgstr "" -"Sind Sie sicher, dass Sie alle Seiten-Transformationen für die Dokumente %s " -"entfernen möchten?" +msgstr "Sind Sie sicher, dass Sie alle Seiten-Transformationen für die Dokumente %s entfernen möchten?" #: views.py:546 msgid "missing documents" @@ -905,16 +872,13 @@ msgstr "Fehler beim Löschen von Dokumententyp %(document_type)s: %(error)s" #: views.py:932 #, python-format msgid "Are you sure you wish to delete the document type: %s?" -msgstr "" -"Sind Sie sicher, dass Sie den Dokumententyp %s wirklich löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den Dokumententyp %s wirklich löschen möchten?" #: views.py:933 msgid "" "The document type of all documents using this document type will be set to " "none." -msgstr "" -"Der Dokumententyp aller Dokumente, die diesen Typ benutzen, wird auf Keiner " -"gesetzt." +msgstr "Der Dokumententyp aller Dokumente, die diesen Typ benutzen, wird auf Keiner gesetzt." #: views.py:949 msgid "Document type created successfully" @@ -942,8 +906,7 @@ msgstr "Fehler beim Bearbeiten von Dokumententyp Dateiname: %s" #: views.py:1009 #, python-format msgid "edit filename \"%(filename)s\" from document type \"%(document_type)s\"" -msgstr "" -"Dateiname \"%(filename)s\" von Dokumententyp \"%(document_type)s\" bearbeiten" +msgstr "Dateiname \"%(filename)s\" von Dokumententyp \"%(document_type)s\" bearbeiten" #: views.py:1018 views.py:1044 views.py:1052 msgid "document type filename" @@ -958,18 +921,14 @@ msgstr "Dokumententyp Dateiname: %s erfolgreich gelöscht." #, python-format msgid "" "Document type filename: %(document_type_filename)s delete error: %(error)s" -msgstr "" -" Fehler beim Löschen von Dokumententyp Dateiname %(document_type_filename)s: " -"%(error)s" +msgstr " Fehler beim Löschen von Dokumententyp Dateiname %(document_type_filename)s: %(error)s" #: views.py:1054 #, python-format msgid "" "Are you sure you wish to delete the filename: %(filename)s, from document " "type \"%(document_type)s\"?" -msgstr "" -"Sind Sie sicher, dass Sie den Dateinamen %(filename)s des Dokumententyps " -"\"%(document_type)s\" löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den Dateinamen %(filename)s des Dokumententyps \"%(document_type)s\" löschen möchten?" #: views.py:1079 msgid "Document type filename created successfully" @@ -996,9 +955,7 @@ msgstr "Fehler beim Bereinigen des Dokumentenbilder-Zwischenspeichers: %s" #: views.py:1114 msgid "Are you sure you wish to clear the document image cache?" -msgstr "" -"Sind Sie sicher, das Sie den Dokumentenbilder-Zwischenspeicher bereinigen " -"möchten?" +msgstr "Sind Sie sicher, das Sie den Dokumentenbilder-Zwischenspeicher bereinigen möchten?" #: views.py:1131 #, python-format @@ -1028,9 +985,7 @@ msgstr "Fehler beim Wiederherstellen der Dokumentenversion %s" #: views.py:1189 msgid "Are you sure you wish to revert to this version?" -msgstr "" -"Sind Sie sicher, dass Sie diese Version des Dokuments wiederherstellen " -"möchten?" +msgstr "Sind Sie sicher, dass Sie diese Version des Dokuments wiederherstellen möchten?" #: views.py:1190 msgid "All later version after this one will be deleted too." @@ -1068,9 +1023,7 @@ msgstr "Dokumentseiten-Transformation erfolgreich gelöscht." msgid "" "Are you sure you wish to delete transformation \"%(transformation)s\" for: " "%(document_page)s" -msgstr "" -"Sind Sie sicher, dass Sie die Transformation \"%(transformation)s\" für " -"%(document_page)s löschen möchten?" +msgstr "Sind Sie sicher, dass Sie die Transformation \"%(transformation)s\" für %(document_page)s löschen möchten?" #: widgets.py:57 #, python-format @@ -1091,16 +1044,13 @@ msgstr "Dokumentenseitenbild" #: conf/settings.py:38 msgid "" -"Maximum number of recent (created, edited, viewed) documents to remember per " -"user." -msgstr "" -"Maximale Anzahl von Letzte Dokumente (erstellt, bearbeitet, angezeigt) pro " -"Benutzer." +"Maximum number of recent (created, edited, viewed) documents to remember per" +" user." +msgstr "Maximale Anzahl von Letzte Dokumente (erstellt, bearbeitet, angezeigt) pro Benutzer." #: conf/settings.py:39 msgid "Amount in percent zoom in or out a document page per user interaction." -msgstr "" -"Betrag in Prozent für Ansicht vergrößern/verkleinern pro Benutzer Aktion." +msgstr "Betrag in Prozent für Ansicht vergrößern/verkleinern pro Benutzer Aktion." #: conf/settings.py:40 msgid "" @@ -1128,12 +1078,7 @@ msgid "" "such as: invoices, regulations or manuals. The advantage of using document " "types are: assigning a list of typical filenames for quick renaming during " "creation, as well as assigning default metadata types and sets to it." -msgstr "" -"Dokumententypen definieren eine Klasse, die eine Gruppe von Dokumenten " -"repräsentiert, wie zum Beispiel: Rechnungen, Verordnungen oder Handbücher. " -"Der Vorteil der Verwendung von Dokumententypen sind: Zuweisen einer Liste " -"von typischen Dateinamen für die schnelle Umbenennung während der " -"Erstellung, sowie die Zuordnung von Metadatentypen und deren Werte." +msgstr "Dokumententypen definieren eine Klasse, die eine Gruppe von Dokumenten repräsentiert, wie zum Beispiel: Rechnungen, Verordnungen oder Handbücher. Der Vorteil der Verwendung von Dokumententypen sind: Zuweisen einer Liste von typischen Dateinamen für die schnelle Umbenennung während der Erstellung, sowie die Zuordnung von Metadatentypen und deren Werte." #: templates/recent_document_list_help.html:3 msgid "What are recent documents?" @@ -1144,15 +1089,13 @@ msgstr "Was sind Letzte Dokumente?" msgid "" "Here you will find the latest %(recent_count)s documents you have either " "created or edited in any way." -msgstr "" -"Hier finden Sie die letzten %(recent_count)s Dokumente, die Sie erstellt " -"oder bearbeitet haben." +msgstr "Hier finden Sie die letzten %(recent_count)s Dokumente, die Sie erstellt oder bearbeitet haben." #~ msgid "preview" -#~ msgstr "Vorschau" +#~ msgstr "preview" #~ msgid "Document statistics" -#~ msgstr "Dokumentenstatistiken" +#~ msgstr "Document statistics" #~ msgid "upload new documents" #~ msgstr "upload new documents" diff --git a/mayan/apps/installation/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/installation/locale/de_DE/LC_MESSAGES/django.po index 935f8cbe49..19d8b1cf61 100644 --- a/mayan/apps/installation/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/installation/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Stefan Lodders , 2012 @@ -14,14 +14,13 @@ msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:53-0400\n" -"PO-Revision-Date: 2014-07-20 00:23+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:32+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:37 __init__.py:48 @@ -197,7 +196,6 @@ msgid "HEAD commit message" msgstr "HEAD commit Nachricht" #: models.py:130 -#, fuzzy msgid "VirtualEnv" msgstr "VirtualEnv" diff --git a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po index 567b7dde52..9ff92cd961 100644 --- a/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/linking/locale/de_DE/LC_MESSAGES/django.po @@ -1,26 +1,29 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# +# Translators: # Translators: # Stefan Lodders , 2012 # Mathias Behrle , 2014 # Stefan Lodders , 2012 +# Stefan Lodders , 2012 # tilmannsittig , 2012 # tilmannsittig , 2012 +# tilmannsittig , 2012 +# Tobias Paepke , 2014 msgid "" msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:53-0400\n" -"PO-Revision-Date: 2014-03-12 16:12+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:33+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: forms.py:49 @@ -33,8 +36,7 @@ msgstr "Auswählen" #: forms.py:62 msgid "Click on the image for full size view of the first page." -msgstr "" -"Klicken Sie auf das Bild um die erste Seite in voller Größe anzuzeigen." +msgstr "Klicken Sie auf das Bild um die erste Seite in voller Größe anzuzeigen." #: links.py:11 msgid "smart links actions" @@ -153,10 +155,7 @@ msgid "" "This expression will be evaluated against the current selected document. " "The document metadata is available as variables `metadata` and document " "properties under the variable `document`." -msgstr "" -"Dieser Ausdruck wird gegen das aktuell ausgewählte Dokument ausgewertet " -"werden. Die Dokument-Metadaten sind verfügbar als Variable `metadata` und " -"Dokumenteneigenschaften als Variable `document`. " +msgstr "Dieser Ausdruck wird gegen das aktuell ausgewählte Dokument ausgewertet werden. Die Dokument-Metadaten sind verfügbar als Variable `metadata` und Dokumenteneigenschaften als Variable `document`. " #: models.py:14 models.py:33 views.py:134 views.py:229 msgid "enabled" @@ -178,9 +177,7 @@ msgstr "Fremde Dokumentendaten" msgid "" "This represents the metadata of all other documents. Available objects: " "`document.` and `metadata.`." -msgstr "" -"Dies stellt die Metadaten aller anderen Dokumenten dar. Verfügbare Objekte: " -"`document. ` und ` metadata. `." +msgstr "Dies stellt die Metadaten aller anderen Dokumenten dar. Verfügbare Objekte: `document. ` und ` metadata. `." #: models.py:31 msgid "expression" @@ -274,16 +271,14 @@ msgid "Smart link: %s deleted successfully." msgstr "Intelligente Verknüpfung %s erfolgreich gelöscht." #: views.py:201 -#, fuzzy, python-format +#, python-format msgid "Error deleting smart link: %(smart_link)s; %(exception)s." -msgstr "" -"Fehler beim Löschen der intelligenten Verknüpfung %(smart_link)s: %(error)s ." +msgstr "Fehler beim Löschen der intelligenten Verknüpfung: %(smart_link)s ; %(exception)s ." #: views.py:210 #, python-format msgid "Are you sure you wish to delete smart link: %s?" -msgstr "" -"Sind Sie sicher, dass Sie die intelligente Verknüpfung %s löschen möchten?" +msgstr "Sind Sie sicher, dass Sie die intelligente Verknüpfung %s löschen möchten?" #: views.py:226 #, python-format @@ -319,10 +314,11 @@ msgid "Smart link condition: \"%s\" deleted successfully." msgstr "Bedingung für Intelligente Verknüpfung: \"%s\" erfolgreich gelöscht." #: views.py:316 -#, fuzzy, python-format +#, python-format msgid "" -"Error deleting smart link condition: %(smart_link_condition)s; %(exception)s." -msgstr "Fehler beim Löschen der Bedingung %(smart_link_condition)s: %(error)s." +"Error deleting smart link condition: %(smart_link_condition)s; " +"%(exception)s." +msgstr "Fehler beim Löschen der Bedingung: %(smart_link_condition)s ; %(exception)s ." #: views.py:330 #, python-format @@ -331,8 +327,7 @@ msgstr "Sind Sie sicher, dass Sie die Bedingung \"%s\" löschen möchten?" #: conf/settings.py:11 msgid "Show smart link that don't return any documents." -msgstr "" -"Intelligente Verknüpfungen anzeigen, die auf keine Dokumente verweisen." +msgstr "Intelligente Verknüpfungen anzeigen, die auf keine Dokumente verweisen." #: templates/smart_links_help.html:3 msgid "What are smart links?" @@ -345,9 +340,4 @@ msgid "" "source, the results of these queries are a list of documents that relate in " "some manner to the document being displayed and allow users the ability to " "jump to and from linked documents very easily." -msgstr "" -"Intelligente Verknüpfungen liegen eine Reihe von Bedingungen zugrunde, die " -"ein Dokument mit anderen Dokumenten in der Datenbank in Beziehung setzen. " -"Sie liefern andere Dokumente, die mit dem Quelldokument in der gewünschten " -"Weise in Beziehung stehen und bieten so dem Benutzer die Möglichkeit, " -"zwischen verwandten Dokumenten einfach zu navigieren." +msgstr "Intelligente Verknüpfungen liegen eine Reihe von Bedingungen zugrunde, die ein Dokument mit anderen Dokumenten in der Datenbank in Beziehung setzen. Sie liefern andere Dokumente, die mit dem Quelldokument in der gewünschten Weise in Beziehung stehen und bieten so dem Benutzer die Möglichkeit, zwischen verwandten Dokumenten einfach zu navigieren." diff --git a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po index b2888a1565..18a8925f7b 100644 --- a/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/metadata/locale/de_DE/LC_MESSAGES/django.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# +# Translators: # Translators: # Stefan Lodders , 2012 # Mathias Behrle , 2014 # Stefan Lodders , 2012 +# Stefan Lodders , 2012 # Tobias Paepke , 2014 msgid "" msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:53-0400\n" -"PO-Revision-Date: 2014-03-12 16:12+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:35+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:51 links.py:16 @@ -124,18 +125,16 @@ msgid "default" msgstr "Standard" #: models.py:19 -#, fuzzy msgid "Enter a string to be evaluated." -msgstr "Geben Sie einen String an, der ausgewertet werden soll. %s" +msgstr "Geben Sie einen String an, der ausgewertet werden soll." #: models.py:23 msgid "lookup" msgstr "Nachschlagen" #: models.py:24 -#, fuzzy msgid "Enter a string to be evaluated that returns an iterable." -msgstr "Geben Sie einen String an, der ausgewertet werden soll. %s" +msgstr "Geben Sie einen String an, der ausgewertet werden soll, um einen Iterator zurückzugeben" #: models.py:38 models.py:69 views.py:325 views.py:368 msgid "metadata type" @@ -249,8 +248,7 @@ msgstr "Es muss mindestens ein Dokument angegeben werden." #: views.py:92 #, python-format msgid "Error editing metadata for document %(document)s; %(error)s." -msgstr "" -"Fehler beim Bearbeiten der Metadaten des Dokuments %(document)s; %(error)s." +msgstr "Fehler beim Bearbeiten der Metadaten des Dokuments %(document)s; %(error)s." #: views.py:95 #, python-format @@ -270,17 +268,15 @@ msgstr "Metadaten der Dokumente %s bearbeiten" #: views.py:147 #, python-format msgid "" -"Metadata type: %(metadata_type)s successfully added to document %(document)s." -msgstr "" -"Metadatentyp %(metadata_type)s erfolgreich hinzugefügt zu Dokument " +"Metadata type: %(metadata_type)s successfully added to document " "%(document)s." +msgstr "Metadatentyp %(metadata_type)s erfolgreich hinzugefügt zu Dokument %(document)s." #: views.py:150 #, python-format msgid "" "Metadata type: %(metadata_type)s already present in document %(document)s." -msgstr "" -"Metadatentyp %(metadata_type)s existiert schon für Dokument %(document)s." +msgstr "Metadatentyp %(metadata_type)s existiert schon für Dokument %(document)s." #: views.py:173 #, python-format @@ -297,17 +293,13 @@ msgstr "Metadaten zu Dokumenten %s hinzufügen" msgid "" "Successfully remove metadata type: %(metadata_type)s from document: " "%(document)s." -msgstr "" -"Metadatentyp %(metadata_type)s erfolgreich von Dokument %(document)s " -"entfernt." +msgstr "Metadatentyp %(metadata_type)s erfolgreich von Dokument %(document)s entfernt." #: views.py:242 #, python-format msgid "" "Error removing metadata type: %(metadata_type)s from document: %(document)s." -msgstr "" -"Fehler beim Löschen des Metadatentyps %(metadata_type)s von Dokument " -"%(document)s." +msgstr "Fehler beim Löschen des Metadatentyps %(metadata_type)s von Dokument %(document)s." #: views.py:254 #, python-format @@ -363,8 +355,7 @@ msgstr "Fehler beim Löschen von Metadatentyp %(metadata_type)s: %(error)s" #: views.py:373 #, python-format msgid "Are you sure you wish to delete the metadata type: %s?" -msgstr "" -"Sind Sie sicher, dass Sie den Metadatentyp %s wirklich löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den Metadatentyp %s wirklich löschen möchten?" #: views.py:410 msgid "Metadata set edited successfully" @@ -436,11 +427,7 @@ msgid "" "A metadata set is a group of one or more metadata types. Metadata sets are " "useful when creating new documents; selecing a metadata set automatically " "attaches it's member metadata types to said document." -msgstr "" -"Ein Metadatenset ist eine Gruppe von einem oder mehreren Metadatentypen. " -"Metadatensets sind nützlich beim Erstellen von neuen Dokumenten. Das " -"Auswählen eines Metadatensets fügt automatisch seine Elemente für das " -"angegebene Dokument hinzu." +msgstr "Ein Metadatenset ist eine Gruppe von einem oder mehreren Metadatentypen. Metadatensets sind nützlich beim Erstellen von neuen Dokumenten. Das Auswählen eines Metadatensets fügt automatisch seine Elemente für das angegebene Dokument hinzu." #: templates/metadata_type_help.html:3 msgid "What are metadata types?" @@ -448,44 +435,35 @@ msgstr "Was sind Metadatentypen?" #: templates/metadata_type_help.html:4 msgid "" -"A metadata type defines the characteristics of a value of some kind that can " -"be attached to a document. Examples of metadata types are: a client name, a " -"date, or a project to which several documents belong. A metadata type's " +"A metadata type defines the characteristics of a value of some kind that can" +" be attached to a document. Examples of metadata types are: a client name, " +"a date, or a project to which several documents belong. A metadata type's " "name is the internal identifier with which it can be referenced to by other " -"modules such as the indexing module, the title is the value that is shown to " -"the users, the default value is the value an instance of this metadata type " -"will have initially, and the lookup value turns an instance of a metadata of " -"this type into a choice list which options are the result of the lookup's " -"code execution." -msgstr "" -"Ein Metadatentyp definiert die Eigenschaften eines Wertes, welcher bei einem " -"Dokument hinterlegt werden kann. Beispiele von Metadatentypen sind: Ein " -"Kundenname, ein Datum oder ein Projekt, zu dem mehrere Dokumente gehören. " -"Der Name des Metadatentyps ist der interne Bezeichner, welcher von anderen " -"Modulen, wie dem Index-Modul, benutzt werden kann. Der Titel wird dem " -"Benutzer angezeigt, ein Standard-Wert wird als Startwert des Feldes benutzt. " -"Ein Lookup-Wert gibt eine Auswahlliste zurück (gefüllt mit den " -"Listenelementen, welche durch das Ausführen des Lookup-Codes zurückgegeben " -"werden)." +"modules such as the indexing module, the title is the value that is shown to" +" the users, the default value is the value an instance of this metadata type" +" will have initially, and the lookup value turns an instance of a metadata " +"of this type into a choice list which options are the result of the lookup's" +" code execution." +msgstr "Ein Metadatentyp definiert die Eigenschaften eines Wertes, welcher bei einem Dokument hinterlegt werden kann. Beispiele von Metadatentypen sind: Ein Kundenname, ein Datum oder ein Projekt, zu dem mehrere Dokumente gehören. Der Name des Metadatentyps ist der interne Bezeichner, welcher von anderen Modulen, wie dem Index-Modul, benutzt werden kann. Der Titel wird dem Benutzer angezeigt, ein Standard-Wert wird als Startwert des Feldes benutzt. Ein Lookup-Wert gibt eine Auswahlliste zurück (gefüllt mit den Listenelementen, welche durch das Ausführen des Lookup-Codes zurückgegeben werden)." #~ msgid " Available models: %s" -#~ msgstr "Verfügbare Modelle: %s" +#~ msgstr " Available models: %s" #~ msgid " Available functions: %s" -#~ msgstr "Verfügbare Funktionen: %s" +#~ msgstr " Available functions: %s" #~ msgid "" -#~ "Enter a string to be evaluated. Example: [user.get_full_name() for user " -#~ "in User.objects.all()].%s" +#~ "Enter a string to be evaluated. Example: [user.get_full_name() for user in " +#~ "User.objects.all()].%s" #~ msgstr "" -#~ "Einen String angeben, der ausgewertet werden soll. Beispiel: [user." -#~ "get_full_name() for user in User.objects.all()].%s" +#~ "Enter a string to be evaluated. Example: [user.get_full_name() for user in " +#~ "User.objects.all()].%s" #~ msgid "Error deleting document indexes; %s" -#~ msgstr "Fehler beim Löschen des Dokumentenindexes: %s" +#~ msgstr "Error deleting document indexes; %s" #~ msgid "Error updating document indexes; %s" -#~ msgstr "Fehler beim Aktualisieren des Dokumentenindexes: %s" +#~ msgstr "Error updating document indexes; %s" #~ msgid "Document indexes updated successfully." -#~ msgstr "Dokumentenindex erfolgreich aktualisiert." +#~ msgstr "Document indexes updated successfully." diff --git a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po index 32b69ea4d0..073933e390 100644 --- a/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/ocr/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Mathias Behrle , 2014 @@ -9,19 +9,19 @@ # Stefan Lodders , 2012 # tilmannsittig , 2012 # tilmannsittig , 2012 +# Tobias Paepke , 2014 msgid "" msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:53-0400\n" -"PO-Revision-Date: 2014-07-20 00:07+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:26+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:45 __init__.py:85 links.py:22 permissions.py:7 @@ -33,9 +33,8 @@ msgid "Checks the OCR queue for pending documents." msgstr "Prüft die OCR-Warteschlange auf ausstehende Dokumente." #: __init__.py:86 -#, fuzzy msgid "OCR queue statistics" -msgstr "OCR-Statistiken" +msgstr "OCR-Warteschlangen-Statistiken" #: api.py:74 msgid "Text from OCR" @@ -69,9 +68,7 @@ msgstr "Seiteninhalt aufräumen" msgid "" "Runs a language filter to remove common OCR mistakes from document pages " "content." -msgstr "" -"Lässt einen Sprachfilter über den erkannten Inhalt laufen, um häufige " -"Erkennungsfehler zu beseitigen." +msgstr "Lässt einen Sprachfilter über den erkannten Inhalt laufen, um häufige Erkennungsfehler zu beseitigen." #: links.py:21 msgid "queue document list" @@ -214,26 +211,22 @@ msgstr "Dokument %(document)s erfolgreich von Warteschlange gelöscht." #: views.py:90 #, python-format msgid "Error deleting document: %(document)s; %(error)s" -msgstr "" -"Fehler beim Löschen des Warteschlangen-Dokuments %(document)s: %(error)s" +msgstr "Fehler beim Löschen des Warteschlangen-Dokuments %(document)s: %(error)s" #: views.py:103 #, python-format msgid "Are you sure you wish to delete queue document: %s?" -msgstr "" -"Sind Sie sicher, dass das Warteschlangen-Dokument %s gelöscht werden soll?" +msgstr "Sind Sie sicher, dass das Warteschlangen-Dokument %s gelöscht werden soll?" #: views.py:105 #, python-format msgid "Are you sure you wish to delete queue documents: %s?" -msgstr "" -"Sind Sie sicher, dass die Warteschlangen-Dokumente %s gelöscht werden sollen?" +msgstr "Sind Sie sicher, dass die Warteschlangen-Dokumente %s gelöscht werden sollen?" #: views.py:141 #, python-format msgid "Document: %(document)s was added to the OCR queue: %(queue)s." -msgstr "" -"Dokument %(document)s wurde zu OCR-Warteschlange %(queue)s hinzugefügt." +msgstr "Dokument %(document)s wurde zu OCR-Warteschlange %(queue)s hinzugefügt." #: views.py:145 #, python-format @@ -243,9 +236,7 @@ msgstr "Dokument %(document)s ist bereits in der Warteschlange." #: views.py:175 #, python-format msgid "Document: %(document)s was re-queued to the OCR queue: %(queue)s" -msgstr "" -"Dokument %(document)s wurde erneut in die OCR-Warteschlange: %(queue)s " -"eingestellt." +msgstr "Dokument %(document)s wurde erneut in die OCR-Warteschlange: %(queue)s eingestellt." #: views.py:181 #, python-format @@ -255,9 +246,7 @@ msgstr "Dokument mit ID %d existiert nicht mehr." #: views.py:185 #, python-format msgid "Document: %s is already being processed and can't be re-queded." -msgstr "" -"Dokument %s wird bereits verarbeitet und kann nicht erneut eingestellt " -"werden." +msgstr "Dokument %s wird bereits verarbeitet und kann nicht erneut eingestellt werden." #: views.py:197 #, python-format @@ -282,9 +271,7 @@ msgstr "Dokumenten-Warteschlange %s angehalten." #: views.py:229 #, python-format msgid "Are you sure you wish to disable document queue: %s" -msgstr "" -"Sind Sie sicher, dass Sie die Dokumenten-Warteschlange %s deaktivieren " -"möchten?" +msgstr "Sind Sie sicher, dass Sie die Dokumenten-Warteschlange %s deaktivieren möchten?" #: views.py:244 #, python-format @@ -299,19 +286,15 @@ msgstr "Dokumenten-Warteschlange %s erfolgreich aktiviert." #: views.py:256 #, python-format msgid "Are you sure you wish to activate document queue: %s" -msgstr "" -"Sind Sie sicher, dass Sie die Dokumenten-Warteschlange %s aktivieren möchten?" +msgstr "Sind Sie sicher, dass Sie die Dokumenten-Warteschlange %s aktivieren möchten?" #: views.py:273 msgid "Are you sure you wish to clean up all the pages content?" -msgstr "" -"Sind Sie sicher, dass Sie den gesamten erkannten Seiteninhalt bereinigen " -"möchten?" +msgstr "Sind Sie sicher, dass Sie den gesamten erkannten Seiteninhalt bereinigen möchten?" #: views.py:274 msgid "On large databases this operation may take some time to execute." -msgstr "" -"Auf großen Datenbanken kann diese Operation einige Zeit in Anspruch nehmen." +msgstr "Auf großen Datenbanken kann diese Operation einige Zeit in Anspruch nehmen." #: views.py:280 msgid "Document pages content clean up complete." @@ -326,15 +309,11 @@ msgstr "Fehler bei der Bereinigung des Dokumenten-Seiteninhalts: %s" msgid "" "Amount of seconds to delay OCR of documents to allow for the node's storage " "replication overhead." -msgstr "" -"Verzögerung in Sekunden für die OCR-Texterkennung, um den Overhead für die " -"Speicherreplikation zu berücksichtigen." +msgstr "Verzögerung in Sekunden für die OCR-Texterkennung, um den Overhead für die Speicherreplikation zu berücksichtigen." #: conf/settings.py:14 msgid "Maximum amount of concurrent document OCRs a node can perform." -msgstr "" -"Maximale Anzahl an parallelen OCR-Texterkennungsvorgängen einer " -"Serverinstanz." +msgstr "Maximale Anzahl an parallelen OCR-Texterkennungsvorgängen einer Serverinstanz." #: conf/settings.py:15 msgid "Automatically queue newly created documents for OCR." @@ -346,16 +325,13 @@ msgstr "Pfad zum 'unpaper'-Programm" #: conf/settings.py:18 msgid "" -"File path to poppler's pdftotext program used to extract text from PDF files." -msgstr "" -"Pfad zum \"pdftotext\"-Programm (bereitgestellt von poppler), das benutzt " -"wird, um Text aus PDF-Dateien zu extrahieren." +"File path to poppler's pdftotext program used to extract text from PDF " +"files." +msgstr "Pfad zum \"pdftotext\"-Programm (bereitgestellt von poppler), das benutzt wird, um Text aus PDF-Dateien zu extrahieren." #: conf/settings.py:19 msgid "Full path to the backend to be used to do OCR." -msgstr "" -"Vollständiger Pfad zum Backend, das für die OCR-Schrifterkennung verwendet " -"werden soll." +msgstr "Vollständiger Pfad zum Backend, das für die OCR-Schrifterkennung verwendet werden soll." #: parsers/__init__.py:93 parsers/__init__.py:170 msgid "Text extracted from PDF" @@ -413,11 +389,9 @@ msgstr "Text extrahiert aus PDF" #~ msgstr "Error deleting queue transformation; %(error)s" #~ msgid "" -#~ "Are you sure you wish to delete queue transformation \"%(transformation)s" -#~ "\"" +#~ "Are you sure you wish to delete queue transformation \"%(transformation)s\"" #~ msgstr "" -#~ "Are you sure you wish to delete queue transformation \"%(transformation)s" -#~ "\"" +#~ "Are you sure you wish to delete queue transformation \"%(transformation)s\"" #~ msgid "Queue transformation created successfully" #~ msgstr "Queue transformation created successfully" diff --git a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po index 5c7ca3b06e..f18ec0205f 100644 --- a/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/sources/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Ingo, 2013 @@ -11,19 +11,19 @@ # tetjarediske , 2012 # tilmannsittig , 2012 # tilmannsittig , 2012 +# Tobias Paepke , 2014 msgid "" msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:54-0400\n" -"PO-Revision-Date: 2014-07-20 00:07+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:38+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:50 @@ -32,7 +32,7 @@ msgstr "Miniaturbild" #: __init__.py:62 msgid "Returns a list of all the staging folders and the files they contain." -msgstr "" +msgstr "Gibt eine Liste aller Arbeitsordner und deren Dateien zurück" #: forms.py:39 forms.py:64 msgid "Expand compressed files" @@ -253,7 +253,8 @@ msgstr "Intervall" #: models.py:201 msgid "" -"Inverval in seconds where the watch folder path is checked for new documents." +"Inverval in seconds where the watch folder path is checked for new " +"documents." msgstr "Intervall für die Überprüfung des Überwachungsordners (in Sekunden)." #: models.py:225 @@ -328,16 +329,12 @@ msgstr "Quellen hochladen" #: views.py:118 msgid "" "No interactive document sources have been defined or none have been enabled." -msgstr "" -"Es wurden keine interaktiven Dokumentenquellen definiert oder sie sind nicht " -"aktiviert." +msgstr "Es wurden keine interaktiven Dokumentenquellen definiert oder sie sind nicht aktiviert." #: views.py:119 #, python-format msgid "Click %(setup_link)s to add or enable some document sources." -msgstr "" -"Klicken Sie %(setup_link)s um Dokumentenquellen hinzuzufügen oder zu " -"aktivieren." +msgstr "Klicken Sie %(setup_link)s um Dokumentenquellen hinzuzufügen oder zu aktivieren." #: views.py:177 msgid "New document version uploaded successfully." @@ -387,9 +384,9 @@ msgstr "Arbeitsdatei %s erfolgreich hochgeladen." #: views.py:259 #, python-format msgid "" -"Staging file: %s, uncompressed successfully and uploaded as individual files." -msgstr "" -"Arbeitsdatei %s erfolgreich entpackt und als einzelne Dateien hochgeladen." +"Staging file: %s, uncompressed successfully and uploaded as individual " +"files." +msgstr "Arbeitsdatei %s erfolgreich entpackt und als einzelne Dateien hochgeladen." #: views.py:262 #, python-format @@ -516,9 +513,7 @@ msgstr "Fehler beim Löschen der Quellen-Transformation: %(error)s" #, python-format msgid "" "Are you sure you wish to delete source transformation \"%(transformation)s\"" -msgstr "" -"Sind Sie sicher, dass Sie die Quellen-Transformation \"%(transformation)s\" " -"löschen möchten?" +msgstr "Sind Sie sicher, dass Sie die Quellen-Transformation \"%(transformation)s\" löschen möchten?" #: views.py:663 msgid "Source transformation created successfully" @@ -535,9 +530,8 @@ msgid "Create new transformation for source: %s" msgstr "Transformation für Quelle erstellen: %s" #: widgets.py:40 -#, fuzzy msgid "staging file page image" -msgstr "Arbeitsdatei" +msgstr "Seiten Bild der Arbeitsdatei" #: wizards.py:53 msgid "step 1 of 3: Document type" @@ -556,13 +550,13 @@ msgid "Next step" msgstr "Nächster Schritt" #~ msgid "preview" -#~ msgstr "Vorschau" +#~ msgstr "preview" #~ msgid "Unable to upload staging file: %s" -#~ msgstr "Arbeitsdatei konnte nicht hochgeladen werden: %s" +#~ msgstr "Unable to upload staging file: %s" #~ msgid "Unable to delete staging file: %s" -#~ msgstr "Arbeitsdatei konnte nicht gelöscht werden: %s" +#~ msgstr "Unable to delete staging file: %s" #~ msgid "Staging file transformation error: %(error)s" -#~ msgstr "Fehler bei Transformation der Arbeitsdatei: %(error)s" +#~ msgstr "Staging file transformation error: %(error)s" diff --git a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po index 974f099e46..69e2ffeaa8 100644 --- a/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po +++ b/mayan/apps/tags/locale/de_DE/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Translators: # Ingo, 2013 @@ -16,14 +16,13 @@ msgstr "" "Project-Id-Version: Mayan EDMS\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-31 19:54-0400\n" -"PO-Revision-Date: 2014-07-20 00:23+0000\n" -"Last-Translator: Mathias Behrle \n" -"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-" -"edms/language/de_DE/)\n" -"Language: de_DE\n" +"PO-Revision-Date: 2014-08-28 12:40+0000\n" +"Last-Translator: Tobias Paepke \n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/mayan-edms/language/de_DE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: __init__.py:26 @@ -40,7 +39,7 @@ msgstr "Tags" #: __init__.py:68 msgid "Returns a list of all the tags." -msgstr "" +msgstr "Gibt eine Liste aller Tags zurück." #: forms.py:24 msgid "Name" @@ -194,8 +193,7 @@ msgstr "Dokument \"%(document)s\" ist schon als \"%(tag)s\" getagt" #: views.py:92 #, python-format msgid "Tag \"%(tag)s\" attached successfully to document \"%(document)s\"." -msgstr "" -"Markierung \"%(tag)s\" erfolgreich an Dokument \"%(document)s\" angehängt." +msgstr "Markierung \"%(tag)s\" erfolgreich an Dokument \"%(document)s\" angehängt." #: views.py:100 msgid "document" @@ -277,36 +275,28 @@ msgstr "Markierung von Dokumenten %s entfernen." msgid "" "Are you sure you wish to remove the tag \"%(tag)s\" from the document: " "%(document)s?" -msgstr "" -"Sind sie sicher, dass Sie die Markierung %(tag)s von Dokument %(document)s " -"entfernen möchten?" +msgstr "Sind sie sicher, dass Sie die Markierung %(tag)s von Dokument %(document)s entfernen möchten?" #: views.py:321 #, python-format msgid "" "Are you sure you wish to remove the tag \"%(tag)s\" from the documents: " "%(documents)s?" -msgstr "" -"Sind sie sicher, dass Sie die Markierung %(tag)s von den Dokumenten " -"%(documents)s entfernen möchten?" +msgstr "Sind sie sicher, dass Sie die Markierung %(tag)s von den Dokumenten %(documents)s entfernen möchten?" #: views.py:326 #, python-format msgid "" "Are you sure you wish to remove the tags: %(tags)s from the document: " "%(document)s?" -msgstr "" -"Sind sie sicher, dass Sie die Tags %(tags)s von Dokument %(document)s " -"entfernen möchten?" +msgstr "Sind sie sicher, dass Sie die Tags %(tags)s von Dokument %(document)s entfernen möchten?" #: views.py:329 #, python-format msgid "" "Are you sure you wish to remove the tags %(tags)s from the documents: " "%(documents)s?" -msgstr "" -"Sind sie sicher, dass Sie die Markierungen %(tags)s von den Dokumenten " -"%(documents)s entfernen möchten?" +msgstr "Sind sie sicher, dass Sie die Markierungen %(tags)s von den Dokumenten %(documents)s entfernen möchten?" #: views.py:336 #, python-format @@ -316,8 +306,7 @@ msgstr "Dokument \"%(document)s war nicht mit \"%(tag)s\" markiert" #: views.py:341 #, python-format msgid "Tag \"%(tag)s\" removed successfully from document \"%(document)s\"." -msgstr "" -"Markierung \"%(tag)s\" erfolgreich von Dokument \"%(document)s\" entfernt." +msgstr "Markierung \"%(tag)s\" erfolgreich von Dokument \"%(document)s\" entfernt." #: templatetags/tags_tags.py:18 msgid "Add tag to document" From 805bf58d594863be3ced9236219ec28ca43336c3 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 15:19:39 -0400 Subject: [PATCH 012/783] Fix outdated references to non namespaced app views --- mayan/apps/documents/__init__.py | 26 +++++++++---------- .../templatetags/navigation_tags.py | 1 + mayan/apps/sources/__init__.py | 14 +++++----- mayan/apps/sources/views.py | 6 ++--- mayan/apps/sources/wizards.py | 2 +- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py index 221cf18284..0869f4ea86 100644 --- a/mayan/apps/documents/__init__.py +++ b/mayan/apps/documents/__init__.py @@ -59,19 +59,19 @@ register_history_type(HISTORY_DOCUMENT_DELETED) register_links(DocumentType, [document_type_edit, document_type_delete, document_type_filename_list]) register_links(DocumentTypeFilename, [document_type_filename_edit, document_type_filename_delete]) -register_links(['setup_document_type_metadata', 'document_type_filename_delete', 'document_type_create', 'document_type_filename_create', 'document_type_filename_edit', 'document_type_filename_list', 'document_type_list', 'document_type_edit', 'document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu') -register_links([DocumentTypeFilename, 'document_type_filename_list', 'document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') +register_links(['documents:setup_document_type_metadata', 'documents:document_type_filename_delete', 'documents:document_type_create', 'documents:document_type_filename_create', 'documents:document_type_filename_edit', 'documents:document_type_filename_list', 'documents:document_type_list', 'documents:document_type_edit', 'documents:document_type_delete'], [document_type_list, document_type_create], menu_name='secondary_menu') +register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar') # Register document links register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_find_duplicates, document_clear_transformations]) -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'index_instance_node_view', 'search', 'results', 'document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [document_multiple_clear_transformations, document_multiple_delete, document_multiple_download]) # Document Version links register_links(DocumentVersion, [document_version_revert, document_version_download]) secondary_menu_links = [document_list_recent, document_list] -register_links(['document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], secondary_menu_links, menu_name='secondary_menu') +register_links(['documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], secondary_menu_links, menu_name='secondary_menu') register_links(Document, secondary_menu_links, menu_name='secondary_menu') # Document page links @@ -86,12 +86,12 @@ register_links(DocumentPage, [ document_page_navigation_next, document_page_navigation_last ], menu_name='related') -register_links(['document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header') +register_links(['documents:document_page_view'], [document_page_rotate_left, document_page_rotate_right, document_page_zoom_in, document_page_zoom_out, document_page_view_reset], menu_name='form_header') register_links(DocumentPageTransformation, [document_page_transformation_edit, document_page_transformation_delete]) -register_links('document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar') -register_links('document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar') -register_links(['document_page_transformation_edit', 'document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar') +register_links('documents:document_page_transformation_list', [document_page_transformation_create], menu_name='sidebar') +register_links('documents:document_page_transformation_create', [document_page_transformation_create], menu_name='sidebar') +register_links(['documents:document_page_transformation_edit', 'documents:document_page_transformation_delete'], [document_page_transformation_create], menu_name='sidebar') register_diagnostic('documents', _(u'Documents'), document_missing_list) @@ -100,7 +100,7 @@ register_maintenance_links([document_find_all_duplicates, document_update_page_c register_model_list_columns(Document, [ { 'name': _(u'thumbnail'), 'attribute': - encapsulate(lambda x: document_thumbnail(x, gallery_name='document_list', title=getattr(x, 'filename', None), size=THUMBNAIL_SIZE)) + encapsulate(lambda x: document_thumbnail(x, gallery_name='documents:document_list', title=getattr(x, 'filename', None), size=THUMBNAIL_SIZE)) }, ]) @@ -110,13 +110,13 @@ register_top_menu( children_path_regex=[ r'^documents/[^t]', r'^metadata/[^s]', r'comments', r'tags/document', r'grouping/[^s]', r'history/list/for_object/documents', ], - children_view_regex=[r'document_acl', r'smart_link_instance'], - children_views=['document_folder_list', 'folder_add_document', 'document_index_list', 'upload_version', ], + children_view_regex=[r'documents:document_acl', r'smart_link_instance'], + children_views=['documents:document_folder_list', 'folders:folder_add_document', 'documents:document_index_list', 'documents:upload_version', ], position=1 ) -register_sidebar_template(['document_list_recent'], 'recent_document_list_help.html') -register_sidebar_template(['document_type_list'], 'document_types_help.html') +register_sidebar_template(['documents:document_list_recent'], 'recent_document_list_help.html') +register_sidebar_template(['documents:document_type_list'], 'document_types_help.html') register_links(Document, [document_view_simple], menu_name='form_header', position=0) register_links(Document, [document_view_advanced], menu_name='form_header', position=1) diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py index 789cb70cd0..deaf0429bd 100644 --- a/mayan/apps/navigation/templatetags/navigation_tags.py +++ b/mayan/apps/navigation/templatetags/navigation_tags.py @@ -78,6 +78,7 @@ def resolve_links(context, links, current_view, current_path, parsed_query_strin """ Express a list of links from definition to final values """ + context_links = [] for link in links: # Check to see if link has conditional display diff --git a/mayan/apps/sources/__init__.py b/mayan/apps/sources/__init__.py index f5b85f05e3..6a44641052 100644 --- a/mayan/apps/sources/__init__.py +++ b/mayan/apps/sources/__init__.py @@ -25,12 +25,12 @@ register_links([StagingFile], [staging_file_delete]) register_links(SourceTransformation, [setup_source_transformation_edit, setup_source_transformation_delete]) -register_links(['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_create'], [setup_web_form_list, setup_staging_folder_list], menu_name='form_header') +register_links(['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_create'], [setup_web_form_list, setup_staging_folder_list], menu_name='form_header') register_links(WebForm, [setup_web_form_list, setup_staging_folder_list], menu_name='form_header') register_links(WebForm, [setup_source_transformation_list, setup_source_edit, setup_source_delete]) -register_links(['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_edit', 'setup_source_delete', 'setup_source_create'], [setup_sources, setup_source_create], menu_name='sidebar') +register_links(['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_edit', 'sources:setup_source_delete', 'sources:setup_source_create'], [setup_sources, setup_source_create], menu_name='sidebar') register_links(StagingFolder, [setup_web_form_list, setup_staging_folder_list], menu_name='form_header') register_links(StagingFolder, [setup_source_transformation_list, setup_source_edit, setup_source_delete]) @@ -39,22 +39,22 @@ register_links(WatchFolder, [setup_web_form_list, setup_staging_folder_list, set register_links(WatchFolder, [setup_source_transformation_list, setup_source_edit, setup_source_delete]) # Document version -register_links(['document_version_list', 'upload_version', 'document_version_revert'], [upload_version], menu_name='sidebar') +register_links(['documents:document_version_list', 'documents:upload_version', 'documents:document_version_revert'], [upload_version], menu_name='sidebar') -register_links(['setup_source_transformation_create', 'setup_source_transformation_edit', 'setup_source_transformation_delete', 'setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar') +register_links(['sources:setup_source_transformation_create', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_list'], [setup_source_transformation_create], menu_name='sidebar') -source_views = ['setup_web_form_list', 'setup_staging_folder_list', 'setup_watch_folder_list', 'setup_source_edit', 'setup_source_delete', 'setup_source_create', 'setup_source_transformation_list', 'setup_source_transformation_edit', 'setup_source_transformation_delete', 'setup_source_transformation_create'] +source_views = ['sources:setup_web_form_list', 'sources:setup_staging_folder_list', 'sources:setup_watch_folder_list', 'sources:setup_source_edit', 'sources:setup_source_delete', 'sources:setup_source_create', 'sources:setup_source_transformation_list', 'sources:setup_source_transformation_edit', 'sources:setup_source_transformation_delete', 'sources:setup_source_transformation_create'] register_model_list_columns(StagingFile, [ { 'name': _(u'thumbnail'), 'attribute': - encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='staging_list', title=x.filename, size='100')) + encapsulate(lambda x: staging_file_thumbnail(x, gallery_name='sources:staging_list', title=x.filename, size='100')) }, ]) register_setup(setup_sources) -register_links([Document, 'document_list_recent', 'document_list', 'document_create', 'document_create_multiple', 'upload_interactive', 'staging_file_delete'], [document_create_multiple], menu_name='secondary_menu') +register_links([Document, 'documents:document_list_recent', 'documents:document_list', 'sources:document_create', 'sources:document_create_multiple', 'sources:upload_interactive', 'sources:staging_file_delete'], [document_create_multiple], menu_name='secondary_menu') register_links(Document, [document_create_siblings]) endpoint = APIEndPoint('sources') diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 254efe90e0..3b89e50f8a 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -45,7 +45,7 @@ def document_create_siblings(request, document_id): if document.document_type_id: query_dict['document_type_id'] = document.document_type_id - url = reverse('upload_interactive') + url = reverse('sources:upload_interactive') return HttpResponseRedirect('%s?%s' % (url, urlencode(query_dict))) @@ -58,7 +58,7 @@ def get_tab_link_for_source(source, document=None): view = u'upload_version' args = [document.pk, u'"%s"' % source.source_type, source.pk] else: - view = u'upload_interactive' + view = u'sources:upload_interactive' args = [u'"%s"' % source.source_type, source.pk] return { @@ -322,7 +322,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No 'upload_version': { 'links': results['tab_links'] }, - 'upload_interactive': { + 'sources:upload_interactive': { 'links': results['tab_links'] } } diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index b34029565f..505bc4e987 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -89,5 +89,5 @@ class DocumentCreateWizard(MayanPermissionCheckMixin, SessionWizardView): except TypeError: pass - url = '?'.join([reverse('upload_interactive'), urlencode(query_dict, doseq=True)]) + url = '?'.join([reverse('sources:upload_interactive'), urlencode(query_dict, doseq=True)]) return HttpResponseRedirect(url) From e8edaf42195750a6775640945b487d681dc549b4 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 5 Sep 2014 15:20:20 -0400 Subject: [PATCH 013/783] Begin merge of the new style navigation systems --- mayan/apps/navigation/classes.py | 330 +++++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) create mode 100644 mayan/apps/navigation/classes.py diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py new file mode 100644 index 0000000000..eeca8bc016 --- /dev/null +++ b/mayan/apps/navigation/classes.py @@ -0,0 +1,330 @@ +from __future__ import absolute_import + +import logging +import re +import urllib +import urlparse +import inspect + +from django.core.urlresolvers import NoReverseMatch, resolve, reverse +from django.template import VariableDoesNotExist, Variable +from django.template import (VariableDoesNotExist, Variable) +from django.utils.encoding import smart_str, smart_unicode +from django.utils.http import urlquote, urlencode +from django.utils.text import unescape_string_literal +from django.utils.translation import ugettext_lazy as _ + +logger = logging.getLogger(__name__) + + +class ResolvedLink(object): + active = False + url = '#' + text = _('Unnamed link') + + +class Link(object): + bound_links = {} + + @classmethod + def bind_links(cls, sources, links, menu_name=None, position=0): + """ + Associate a link to a model, a view, or an url + """ + cls.bound_links.setdefault(menu_name, {}) + try: + for source in sources: + cls.bound_links[menu_name].setdefault(source, {'links': []}) + try: + cls.bound_links[menu_name][source]['links'].extend(links) + except TypeError: + # Try to see if links is a single link + cls.bound_links[menu_name][source]['links'].append(links) + except TypeError: + raise Exception('The bind_links source argument must be a list, even for single element sources.') + + def __init__(self, text, view, klass=None, args=None, icon=None, + permissions=None, condition=None, conditional_disable=None, + description=None, dont_mark_active=False, children_view_regex=None, + keep_query=False, children_classes=None, children_views=None, + conditional_highlight=None): + + self.text = text + self.view = view + self.args = args or {} + #self.kwargs = kwargs or {} + self.icon = icon + self.permissions = permissions or [] + self.condition = condition + self.conditional_disable = conditional_disable + self.description = description + self.dont_mark_active = dont_mark_active + self.klass = klass + self.keep_query = keep_query + self.conditional_highlight = conditional_highlight # Used by dynamic sources + self.children_views = children_views or [] + self.children_classes = children_classes or [] + self.children_view_regex = children_view_regex + + def resolve(self, context, request=None, current_path=None, current_view=None, resolved_object=None): + # Don't calculate these if passed in an argument + request = request or Variable('request').resolve(context) + current_path = current_path or request.META['PATH_INFO'] + if not current_view: + match = resolve(current_path) + if match.namespace: + current_view = '{}:{}'.format(match.namespace, match.url_name) + else: + current_view = match.url_name + + # Preserve unicode data in URL query + previous_path = smart_unicode(urllib.unquote_plus(smart_str(request.get_full_path()) or smart_str(request.META.get('HTTP_REFERER', u'/')))) + query_string = urlparse.urlparse(previous_path).query + parsed_query_string = urlparse.parse_qs(query_string) + + logger.debug('condition: %s', self.condition) + + if resolved_object: + context['resolved_object'] = resolved_object + + # Check to see if link has conditional display + if self.condition: + self.condition_result = self.condition(context) + else: + self.condition_result = True + + logger.debug('self.condition_result: %s', self.condition_result) + + if self.condition_result: + resolved_link = ResolvedLink() + resolved_link.text = self.text + resolved_link.icon = self.icon + resolved_link.permissions = self.permissions + resolved_link.condition_result = self.condition_result + + try: + #args, kwargs = resolve_arguments(context, self.get('args', {})) + args, kwargs = Link.resolve_arguments(context, self.args) + except VariableDoesNotExist: + args = [] + kwargs = {} + + if self.view: + if not self.dont_mark_active: + resolved_link.active = self.view == current_view + + try: + if kwargs: + resolved_link.url = reverse(self.view, kwargs=kwargs) + else: + resolved_link.url = reverse(self.view, args=args) + if self.keep_query: + resolved_link.url = u'%s?%s' % (urlquote(resolved_link.url), urlencode(parsed_query_string, doseq=True)) + + except NoReverseMatch, exc: + resolved_link.url = '#' + resolved_link.error = exc + elif self.url: + if not self.dont_mark_active: + resolved_link.url.active = self.url == current_path + + if kwargs: + resolved_link.url = self.url % kwargs + else: + resolved_link.url = self.url % args + if self.keep_query: + resolved_link.url = u'%s?%s' % (urlquote(resolved_link.url), urlencode(parsed_query_string, doseq=True)) + else: + resolved_link.active = False + + if self.conditional_highlight: + resolved_link.active = self.conditional_highlight(context) + + if self.conditional_disable: + resolved_link.disabled = self.conditional_disable(context) + else: + resolved_link.disabled = False + + if current_view in self.children_views: + resolved_link.active = True + + # TODO: add tree base main menu support to auto activate parent links + + if self.children_view_regex and re.compile(self.children_view_regex).match(current_view): + resolved_link.active = True + + return resolved_link + + @classmethod + def get_context_navigation_links(cls, context, menu_name=None, links_dict=None): + request = Variable('request').resolve(context) + current_path = request.META['PATH_INFO'] + match = resolve(current_path) + if match.namespace: + current_view = '{}:{}'.format(match.namespace, match.url_name) + else: + current_view = match.url_name + + context_links = {} + if not links_dict: + links_dict = Link.bound_links + + # Don't fudge with the original global dictionary + # TODO: fix this + links_dict = links_dict.copy() + + # Dynamic sources + # TODO: improve name to 'injected...' + # TODO: remove, only used by staging files + try: + """ + Check for and inject a temporary navigation dictionary + """ + temp_navigation_links = Variable('temporary_navigation_links').resolve(context) + if temp_navigation_links: + links_dict.update(temp_navigation_links) + except VariableDoesNotExist: + pass + + # Get view only links + try: + view_links = links_dict[menu_name][current_view]['links'] + except KeyError: + pass + else: + context_links[None] = [] + + for link in view_links: + context_links[None].append(link.resolve(context, request=request, current_path=current_path, current_view=current_view)) + + # Get object links + for resolved_object in Link.get_navigation_objects(context).keys(): + for source, data in links_dict.get(menu_name, {}).items(): + if inspect.isclass(source) and isinstance(resolved_object, source) or Combined(obj=type(resolved_object), view=current_view) == source: + context_links[resolved_object] = [] + for link in data['links']: + context_links[resolved_object].append(link.resolve(context, request=request, current_path=current_path, current_view=current_view, resolved_object=resolved_object)) + break # No need for further content object match testing + return context_links + + @classmethod + def get_navigation_objects(cls, context): + objects = {} + + try: + object_list = Variable('navigation_object_list').resolve(context) + except VariableDoesNotExist: + pass + else: + logger.debug('found: navigation_object_list') + for obj in object_list: + objects.setdefault(obj, {}) + + # Legacy + try: + indirect_reference_list = Variable('navigation_object_list_ref').resolve(context) + except VariableDoesNotExist: + pass + else: + logger.debug('found: navigation_object_list_ref') + for indirect_reference in indirect_reference_list: + try: + resolved_object = Variable(indirect_reference['object']).resolve(context) + except VariableDoesNotExist: + resolved_object = None + else: + objects.setdefault(resolved_object, {}) + objects[resolved_object]['label'] = indirect_reference.get('object_name') + + try: + resolved_object = Variable('object').resolve(context) + except VariableDoesNotExist: + pass + else: + logger.debug('found single object') + try: + object_label = Variable('object_name').resolve(context) + except VariableDoesNotExist: + object_label = None + finally: + objects.setdefault(resolved_object, {}) + objects[resolved_object]['label'] = object_label + + #logger.debug('objects: %s' % objects) + return objects + + @classmethod + def resolve_template_variable(cls, context, name): + try: + return unescape_string_literal(name) + except ValueError: + #return Variable(name).resolve(context) + #TODO: Research if should return always as a str + return str(Variable(name).resolve(context)) + except TypeError: + return name + + @classmethod + def resolve_arguments(cls, context, src_args): + args = [] + kwargs = {} + + if type(src_args) == type([]): + for i in src_args: + try: + # Try to execute as a function + val = i(context=context) + except TypeError: + val = Link.resolve_template_variable(context, i) + if val: + args.append(val) + else: + args.append(val) + elif type(src_args) == type({}): + for key, value in src_args.items(): + try: + # Try to execute as a function + val = i(context=context) + except TypeError: + val = Link.resolve_template_variable(context, value) + if val: + kwargs[key] = val + else: + kwargs[key] = val + else: + val = Link.resolve_template_variable(context, src_args) + if val: + args.append(val) + + return args, kwargs + + +class ModelListColumn(object): + _model_list_columns = {} + + @classmethod + def get_model(cls, model): + return cls._model_list_columns.get(model) + + def __init__(self, model, name, attribute): + self.__class__._model_list_columns.setdefault(model, []) + self.__class__._model_list_columns[model].extend(columns) + + +class Combined(object): + """ + Class that binds a link to a combination of an object and a view. + This is used to show links relating to a specific object type but only + in certain views. + Used by the PageDocument class to show rotatio and zoom link only on + certain views + """ + def __init__(self, obj, view): + self.obj = obj + self.view = view + + def __hash__(self): + return hash((self.obj, self.view)) + + def __eq__(self, other): + return hash(self) == hash(other) From 214c1e54301b3fd56f14fdb0dc922d2a06e73354 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 15:43:48 -0400 Subject: [PATCH 014/783] Remove the MAIN_SIDE_BAR_SEARCH configuration option, move search app menu links to the search app --- mayan/apps/dynamic_search/__init__.py | 14 ++++++++------ mayan/apps/dynamic_search/links.py | 7 ++++--- mayan/apps/main/__init__.py | 4 +--- mayan/apps/main/conf/settings.py | 9 --------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/mayan/apps/dynamic_search/__init__.py b/mayan/apps/dynamic_search/__init__.py index ba9af28e2e..e5e9885b60 100644 --- a/mayan/apps/dynamic_search/__init__.py +++ b/mayan/apps/dynamic_search/__init__.py @@ -1,12 +1,14 @@ from __future__ import absolute_import -from navigation.api import register_sidebar_template, register_links +from navigation.api import (register_links, register_sidebar_template, + register_top_menu) -from .links import search, search_advanced, search_again +from .links import search, search_advanced, search_again, search_menu -register_sidebar_template(['search', 'search_advanced'], 'search_help.html') +register_sidebar_template(['search:search', 'search:search_advanced'], 'search_help.html') -register_links(['search', 'search_advanced', 'results'], [search, search_advanced], menu_name='form_header') -register_links(['results'], [search_again], menu_name='sidebar') +register_links(['search:search', 'search:search_advanced', 'search:results'], [search, search_advanced], menu_name='form_header') +register_links(['search:results'], [search_again], menu_name='sidebar') -register_sidebar_template(['search', 'search_advanced', 'results'], 'recent_searches.html') +register_sidebar_template(['search:search', 'search:search_advanced', 'search:results'], 'recent_searches.html') +register_top_menu('search', search_menu) diff --git a/mayan/apps/dynamic_search/links.py b/mayan/apps/dynamic_search/links.py index 3cb73ac99b..00e8f92ad4 100644 --- a/mayan/apps/dynamic_search/links.py +++ b/mayan/apps/dynamic_search/links.py @@ -1,5 +1,6 @@ from django.utils.translation import ugettext_lazy as _ -search = {'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'} -search_advanced = {'text': _(u'advanced search'), 'view': 'search_advanced', 'famfam': 'zoom_in'} -search_again = {'text': _(u'search again'), 'view': 'search_again', 'famfam': 'arrow_undo'} +search = {'text': _(u'search'), 'view': 'search:search', 'famfam': 'zoom'} +search_advanced = {'text': _(u'advanced search'), 'view': 'search:search_advanced', 'famfam': 'zoom_in'} +search_again = {'text': _(u'search again'), 'view': 'search:search_again', 'famfam': 'arrow_undo'} +search_menu = {'text': _(u'search'), 'view': 'search:search', 'famfam': 'zoom', 'children_view_regex': [r'^search:']} diff --git a/mayan/apps/main/__init__.py b/mayan/apps/main/__init__.py index 153440f0ba..99dcf524a2 100644 --- a/mayan/apps/main/__init__.py +++ b/mayan/apps/main/__init__.py @@ -7,13 +7,11 @@ from navigation.api import register_top_menu from project_setup.api import register_setup from project_tools.api import register_tool -from .conf.settings import SIDE_BAR_SEARCH, DISABLE_HOME_VIEW +from .conf.settings import DISABLE_HOME_VIEW from .links import admin_site, diagnostics, maintenance_menu, sentry if not DISABLE_HOME_VIEW: register_top_menu('home', link={'text': _(u'home'), 'view': 'home', 'famfam': 'house'}, position=0) -if not SIDE_BAR_SEARCH: - register_top_menu('search', link={'text': _(u'search'), 'view': 'search', 'famfam': 'zoom'}, children_path_regex=[r'^search/']) if 'django.contrib.admin' in settings.INSTALLED_APPS: register_setup(admin_site) diff --git a/mayan/apps/main/conf/settings.py b/mayan/apps/main/conf/settings.py index d9f2f80dc1..08902e092c 100644 --- a/mayan/apps/main/conf/settings.py +++ b/mayan/apps/main/conf/settings.py @@ -3,15 +3,6 @@ from django.utils.translation import ugettext_lazy as _ from smart_settings.api import register_setting, register_settings -register_setting( - namespace=u'main', - module=u'main.conf.settings', - name=u'SIDE_BAR_SEARCH', - global_name=u'MAIN_SIDE_BAR_SEARCH', - default=False, - description=_(u'Controls whether the search functionality is provided by a sidebar widget or by a menu entry.') -) - register_setting( namespace=u'main', module=u'main.conf.settings', From 5d5d9e45b859a6d00d7b30b67474cb92aaa0e5af Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 15:44:22 -0400 Subject: [PATCH 015/783] Remove MAIN_SIDE_BAR_SEARCH from the documentation, update release notes for 1.1 --- docs/releases/1.1.rst | 4 ++++ docs/topics/settings.rst | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/docs/releases/1.1.rst b/docs/releases/1.1.rst index 113902eb01..9c21be0ebd 100644 --- a/docs/releases/1.1.rst +++ b/docs/releases/1.1.rst @@ -12,6 +12,10 @@ Overview What's new in Mayan EDMS v1.1 ============================= +* Removal of the MAIN_SIDE_BAR_SEARCH +* Views namespaces +* German language translation updates + Upgrading from a previous version ================================= diff --git a/docs/topics/settings.rst b/docs/topics/settings.rst index a551b30def..8238d22e46 100644 --- a/docs/topics/settings.rst +++ b/docs/topics/settings.rst @@ -485,15 +485,6 @@ Display extra information in the login screen. Main ==== -.. setting:: MAIN_SIDE_BAR_SEARCH - -**MAIN_SIDE_BAR_SEARCH** - -Default: ``False`` - -Controls whether the search functionality is provided by a sidebar widget or by a menu entry. - - .. setting:: MAIN_DISABLE_HOME_VIEW **MAIN_DISABLE_HOME_VIEW** From 76b2cdefcc0db154f482eda53ab3ecd91744ece0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 16:30:12 -0400 Subject: [PATCH 016/783] Move app url namespaces updates --- mayan/apps/acls/__init__.py | 6 ++-- mayan/apps/acls/links.py | 24 +++++++-------- mayan/apps/acls/views.py | 4 +-- mayan/apps/bootstrap/links.py | 26 ++++++++-------- mayan/apps/bootstrap/post_init.py | 2 +- mayan/apps/bootstrap/views.py | 10 +++---- mayan/apps/django_gpg/__init__.py | 2 +- mayan/apps/django_gpg/links.py | 12 ++++---- mayan/apps/document_indexing/__init__.py | 4 +-- mayan/apps/document_indexing/links.py | 30 +++++++++---------- mayan/apps/document_indexing/views.py | 12 ++++---- mayan/apps/dynamic_search/views.py | 4 +-- mayan/apps/folders/__init__.py | 12 ++++---- mayan/apps/folders/views.py | 4 +-- mayan/apps/history/links.py | 4 +-- mayan/apps/ocr/__init__.py | 6 ++-- mayan/apps/permissions/__init__.py | 6 ++-- mayan/apps/permissions/links.py | 16 +++++----- mayan/apps/permissions/views.py | 4 +-- mayan/apps/project_setup/api.py | 1 + mayan/apps/project_setup/links.py | 2 +- mayan/apps/project_tools/links.py | 2 +- mayan/apps/smart_settings/links.py | 2 +- mayan/apps/tags/__init__.py | 8 ++--- mayan/apps/user_management/__init__.py | 16 +++++----- mayan/apps/user_management/links.py | 32 ++++++++++---------- mayan/apps/user_management/views.py | 14 ++++----- mayan/urls.py | 38 ++++++++++++------------ 28 files changed, 152 insertions(+), 151 deletions(-) diff --git a/mayan/apps/acls/__init__.py b/mayan/apps/acls/__init__.py index e9de03155a..058d86a888 100644 --- a/mayan/apps/acls/__init__.py +++ b/mayan/apps/acls/__init__.py @@ -16,17 +16,17 @@ from .links import (acl_detail, acl_grant, acl_revoke, acl_holder_new, from .models import CreatorSingleton register_links(AccessHolder, [acl_detail]) -register_multi_item_links(['acl_detail'], [acl_grant, acl_revoke]) +register_multi_item_links(['acls:acl_detail'], [acl_grant, acl_revoke]) register_links([AccessObject], [acl_holder_new], menu_name='sidebar') register_setup(acl_setup_valid_classes) -register_links(['acl_setup_valid_classes', 'acl_class_acl_list', 'acl_class_new_holder_for', 'acl_class_acl_detail', 'acl_class_multiple_grant', 'acl_class_multiple_revoke'], [acl_class_list], menu_name='secondary_menu') +register_links(['acls:acl_setup_valid_classes', 'acls:acl_class_acl_list', 'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail', 'acls:acl_class_multiple_grant', 'acls:acl_class_multiple_revoke'], [acl_class_list], menu_name='secondary_menu') register_links(ClassAccessHolder, [acl_class_acl_detail]) register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for]) -register_multi_item_links(['acl_class_acl_detail'], [acl_class_grant, acl_class_revoke]) +register_multi_item_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke]) @receiver(post_migrate, dispatch_uid='create_creator_user') diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index ebd75d414c..4540e60aa8 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -3,16 +3,16 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import (ACLS_EDIT_ACL, ACLS_VIEW_ACL, ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL) -acl_list = {'text': _(u'ACLs'), 'view': 'acl_list', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} -acl_detail = {'text': _(u'details'), 'view': 'acl_detail', 'args': ['access_object.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_VIEW_ACL]} -acl_grant = {'text': _(u'grant'), 'view': 'acl_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_EDIT_ACL]} -acl_revoke = {'text': _(u'revoke'), 'view': 'acl_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_EDIT_ACL]} -acl_holder_new = {'text': _(u'New holder'), 'view': 'acl_holder_new', 'args': 'access_object.gid', 'famfam': 'user', 'permissions': [ACLS_EDIT_ACL]} +acl_list = {'text': _(u'ACLs'), 'view': 'acls:acl_list', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +acl_detail = {'text': _(u'details'), 'view': 'acls:acl_detail', 'args': ['access_object.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_VIEW_ACL]} +acl_grant = {'text': _(u'grant'), 'view': 'acls:acl_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_EDIT_ACL]} +acl_revoke = {'text': _(u'revoke'), 'view': 'acls:acl_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_EDIT_ACL]} +acl_holder_new = {'text': _(u'New holder'), 'view': 'acls:acl_holder_new', 'args': 'access_object.gid', 'famfam': 'user', 'permissions': [ACLS_EDIT_ACL]} -acl_setup_valid_classes = {'text': _(u'Default ACLs'), 'view': 'acl_setup_valid_classes', 'icon': 'lock.png', 'permissions': [ACLS_CLASS_VIEW_ACL], 'children_view_regex': [r'^acl_class', r'^acl_setup']} -acl_class_list = {'text': _(u'List of classes'), 'view': 'acl_setup_valid_classes', 'famfam': 'package', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_acl_list = {'text': _(u'ACLs for class'), 'view': 'acl_class_acl_list', 'args': 'object.gid', 'famfam': 'lock_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_acl_detail = {'text': _(u'details'), 'view': 'acl_class_acl_detail', 'args': ['access_object_class.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_new_holder_for = {'text': _(u'New holder'), 'view': 'acl_class_new_holder_for', 'args': 'object.gid', 'famfam': 'user', 'permissions': [ACLS_CLASS_EDIT_ACL]} -acl_class_grant = {'text': _(u'grant'), 'view': 'acl_class_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_CLASS_EDIT_ACL]} -acl_class_revoke = {'text': _(u'revoke'), 'view': 'acl_class_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_CLASS_EDIT_ACL]} +acl_setup_valid_classes = {'text': _(u'Default ACLs'), 'view': 'acls:acl_setup_valid_classes', 'icon': 'lock.png', 'permissions': [ACLS_CLASS_VIEW_ACL], 'children_view_regex': [r'^acl_class', r'^acl_setup']} +acl_class_list = {'text': _(u'List of classes'), 'view': 'acls:acl_setup_valid_classes', 'famfam': 'package', 'permissions': [ACLS_CLASS_VIEW_ACL]} +acl_class_acl_list = {'text': _(u'ACLs for class'), 'view': 'acls:acl_class_acl_list', 'args': 'object.gid', 'famfam': 'lock_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} +acl_class_acl_detail = {'text': _(u'details'), 'view': 'acls:acl_class_acl_detail', 'args': ['access_object_class.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} +acl_class_new_holder_for = {'text': _(u'New holder'), 'view': 'acls:acl_class_new_holder_for', 'args': 'object.gid', 'famfam': 'user', 'permissions': [ACLS_CLASS_EDIT_ACL]} +acl_class_grant = {'text': _(u'grant'), 'view': 'acls:acl_class_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_CLASS_EDIT_ACL]} +acl_class_revoke = {'text': _(u'revoke'), 'view': 'acls:acl_class_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_CLASS_EDIT_ACL]} diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index f0ec32fce8..7a48ebf9be 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -338,7 +338,7 @@ def acl_new_holder_for(request, obj, extra_context=None, navigation_object=None) return HttpResponseRedirect( u'%s?%s' % ( - reverse('acl_detail', args=[access_object.gid, access_holder.gid]), + reverse('acls:acl_detail', args=[access_object.gid, access_holder.gid]), urlencode(query_string) ) ) @@ -472,7 +472,7 @@ def acl_class_new_holder_for(request, access_object_class_gid): try: access_holder = ClassAccessHolder.get(form.cleaned_data['holder_gid']) - return HttpResponseRedirect(reverse('acl_class_acl_detail', args=[access_object_class.gid, access_holder.gid])) + return HttpResponseRedirect(reverse('acls:acl_class_acl_detail', args=[access_object_class.gid, access_holder.gid])) except ObjectDoesNotExist: raise Http404 else: diff --git a/mayan/apps/bootstrap/links.py b/mayan/apps/bootstrap/links.py index 3057c7bfd9..f070d50c89 100644 --- a/mayan/apps/bootstrap/links.py +++ b/mayan/apps/bootstrap/links.py @@ -8,16 +8,16 @@ from .permissions import (PERMISSION_BOOTSTRAP_VIEW, PERMISSION_BOOTSTRAP_CREATE PERMISSION_NUKE_DATABASE, PERMISSION_BOOTSTRAP_EXPORT, PERMISSION_BOOTSTRAP_IMPORT, PERMISSION_BOOTSTRAP_REPOSITORY_SYNC) -link_bootstrap_setup_tool = {'text': _(u'bootstrap'), 'view': 'bootstrap_setup_list', 'icon': 'lightning.png', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} -link_bootstrap_setup_list = {'text': _(u'bootstrap setup list'), 'view': 'bootstrap_setup_list', 'famfam': 'lightning', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} -link_bootstrap_setup_create = {'text': _(u'create new bootstrap setup'), 'view': 'bootstrap_setup_create', 'famfam': 'lightning_add', 'permissions': [PERMISSION_BOOTSTRAP_CREATE]} -link_bootstrap_setup_edit = {'text': _(u'edit'), 'view': 'bootstrap_setup_edit', 'args': 'object.pk', 'famfam': 'pencil', 'permissions': [PERMISSION_BOOTSTRAP_EDIT]} -link_bootstrap_setup_delete = {'text': _(u'delete'), 'view': 'bootstrap_setup_delete', 'args': 'object.pk', 'famfam': 'lightning_delete', 'permissions': [PERMISSION_BOOTSTRAP_DELETE]} -link_bootstrap_setup_view = {'text': _(u'details'), 'view': 'bootstrap_setup_view', 'args': 'object.pk', 'famfam': 'lightning', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} -link_bootstrap_setup_execute = {'text': _(u'execute'), 'view': 'bootstrap_setup_execute', 'args': 'object.pk', 'famfam': 'lightning_go', 'permissions': [PERMISSION_BOOTSTRAP_EXECUTE]} -link_bootstrap_setup_dump = {'text': _(u'dump current setup'), 'view': 'bootstrap_setup_dump', 'famfam': 'arrow_down', 'permissions': [PERMISSION_BOOTSTRAP_DUMP]} -link_bootstrap_setup_export = {'text': _(u'export'), 'view': 'bootstrap_setup_export', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_BOOTSTRAP_EXPORT]} -link_bootstrap_setup_import_from_file = {'text': _(u'import from file'), 'view': 'bootstrap_setup_import_from_file', 'famfam': 'folder', 'permissions': [PERMISSION_BOOTSTRAP_IMPORT]} -link_bootstrap_setup_import_from_url = {'text': _(u'import from URL'), 'view': 'bootstrap_setup_import_from_url', 'famfam': 'world', 'permissions': [PERMISSION_BOOTSTRAP_IMPORT]} -link_bootstrap_setup_repository_sync = {'text': _(u'sync with repository'), 'view': 'bootstrap_setup_repository_sync', 'famfam': 'world', 'permissions': [PERMISSION_BOOTSTRAP_REPOSITORY_SYNC]} -link_erase_database = {'text': _(u'erase database'), 'view': 'erase_database_view', 'icon': 'radioactivity.png', 'permissions': [PERMISSION_NUKE_DATABASE]} +link_bootstrap_setup_tool = {'text': _(u'bootstrap'), 'view': 'bootstrap:bootstrap_setup_list', 'icon': 'lightning.png', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} +link_bootstrap_setup_list = {'text': _(u'bootstrap setup list'), 'view': 'bootstrap:bootstrap_setup_list', 'famfam': 'lightning', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} +link_bootstrap_setup_create = {'text': _(u'create new bootstrap setup'), 'view': 'bootstrap:bootstrap_setup_create', 'famfam': 'lightning_add', 'permissions': [PERMISSION_BOOTSTRAP_CREATE]} +link_bootstrap_setup_edit = {'text': _(u'edit'), 'view': 'bootstrap:bootstrap_setup_edit', 'args': 'object.pk', 'famfam': 'pencil', 'permissions': [PERMISSION_BOOTSTRAP_EDIT]} +link_bootstrap_setup_delete = {'text': _(u'delete'), 'view': 'bootstrap:bootstrap_setup_delete', 'args': 'object.pk', 'famfam': 'lightning_delete', 'permissions': [PERMISSION_BOOTSTRAP_DELETE]} +link_bootstrap_setup_view = {'text': _(u'details'), 'view': 'bootstrap:bootstrap_setup_view', 'args': 'object.pk', 'famfam': 'lightning', 'permissions': [PERMISSION_BOOTSTRAP_VIEW]} +link_bootstrap_setup_execute = {'text': _(u'execute'), 'view': 'bootstrap:bootstrap_setup_execute', 'args': 'object.pk', 'famfam': 'lightning_go', 'permissions': [PERMISSION_BOOTSTRAP_EXECUTE]} +link_bootstrap_setup_dump = {'text': _(u'dump current setup'), 'view': 'bootstrap:bootstrap_setup_dump', 'famfam': 'arrow_down', 'permissions': [PERMISSION_BOOTSTRAP_DUMP]} +link_bootstrap_setup_export = {'text': _(u'export'), 'view': 'bootstrap:bootstrap_setup_export', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_BOOTSTRAP_EXPORT]} +link_bootstrap_setup_import_from_file = {'text': _(u'import from file'), 'view': 'bootstrap:bootstrap_setup_import_from_file', 'famfam': 'folder', 'permissions': [PERMISSION_BOOTSTRAP_IMPORT]} +link_bootstrap_setup_import_from_url = {'text': _(u'import from URL'), 'view': 'bootstrap:bootstrap_setup_import_from_url', 'famfam': 'world', 'permissions': [PERMISSION_BOOTSTRAP_IMPORT]} +link_bootstrap_setup_repository_sync = {'text': _(u'sync with repository'), 'view': 'bootstrap:bootstrap_setup_repository_sync', 'famfam': 'world', 'permissions': [PERMISSION_BOOTSTRAP_REPOSITORY_SYNC]} +link_erase_database = {'text': _(u'erase database'), 'view': 'bootstrap:erase_database_view', 'icon': 'radioactivity.png', 'permissions': [PERMISSION_NUKE_DATABASE]} diff --git a/mayan/apps/bootstrap/post_init.py b/mayan/apps/bootstrap/post_init.py index 16931f4aaa..ec6e56d518 100644 --- a/mayan/apps/bootstrap/post_init.py +++ b/mayan/apps/bootstrap/post_init.py @@ -20,7 +20,7 @@ from .models import BootstrapSetup register_links([BootstrapSetup], [link_bootstrap_setup_view, link_bootstrap_setup_edit, link_bootstrap_setup_delete, link_bootstrap_setup_execute, link_bootstrap_setup_export]) register_links([BootstrapSetup], [link_bootstrap_setup_list, link_bootstrap_setup_create, link_bootstrap_setup_dump, link_bootstrap_setup_import_from_file, link_bootstrap_setup_import_from_url, link_bootstrap_setup_repository_sync], menu_name='secondary_menu') -register_links(['bootstrap_setup_list', 'bootstrap_setup_create', 'bootstrap_setup_dump', 'bootstrap_setup_import_from_file', 'bootstrap_setup_import_from_url', 'bootstrap_setup_repository_sync'], [link_bootstrap_setup_list, link_bootstrap_setup_create, link_bootstrap_setup_dump, link_bootstrap_setup_import_from_file, link_bootstrap_setup_import_from_url, link_bootstrap_setup_repository_sync], menu_name='secondary_menu') +register_links(['bootstrap:bootstrap_setup_list', 'bootstrap:bootstrap_setup_create', 'bootstrap:bootstrap_setup_dump', 'bootstrap:bootstrap_setup_import_from_file', 'bootstrap:bootstrap_setup_import_from_url', 'bootstrap:bootstrap_setup_repository_sync'], [link_bootstrap_setup_list, link_bootstrap_setup_create, link_bootstrap_setup_dump, link_bootstrap_setup_import_from_file, link_bootstrap_setup_import_from_url, link_bootstrap_setup_repository_sync], menu_name='secondary_menu') FixtureMetadata(FIXTURE_METADATA_CREATED, generate_function=lambda fixture_instance: fixture_instance.created.strftime(DATETIME_STRING_FORMAT), read_function=lambda x: datetime.datetime.strptime(x, DATETIME_STRING_FORMAT), property_name='created') FixtureMetadata(FIXTURE_METADATA_EDITED, generate_function=lambda fixture_instance: now().strftime(DATETIME_STRING_FORMAT)) diff --git a/mayan/apps/bootstrap/views.py b/mayan/apps/bootstrap/views.py index ae6a4ade64..b52d808865 100644 --- a/mayan/apps/bootstrap/views.py +++ b/mayan/apps/bootstrap/views.py @@ -199,7 +199,7 @@ def bootstrap_setup_dump(request): else: bootstrap.save() messages.success(request, _(u'Bootstrap setup created successfully.')) - return HttpResponseRedirect(reverse('bootstrap_setup_list')) + return HttpResponseRedirect(reverse('bootstrap:bootstrap_setup_list')) else: form = BootstrapSetupForm_dump() @@ -239,7 +239,7 @@ def bootstrap_setup_import_from_file(request): try: BootstrapSetup.objects.import_from_file(request.FILES['file']) messages.success(request, _(u'Bootstrap setup imported successfully.')) - return HttpResponseRedirect(reverse('bootstrap_setup_list')) + return HttpResponseRedirect(reverse('bootstrap:bootstrap_setup_list')) except NotABootstrapSetup: messages.error(request, _(u'File is not a bootstrap setup.')) except Exception as exception: @@ -267,7 +267,7 @@ def bootstrap_setup_import_from_url(request): try: BootstrapSetup.objects.import_from_url(form.cleaned_data['url']) messages.success(request, _(u'Bootstrap setup imported successfully.')) - return HttpResponseRedirect(reverse('bootstrap_setup_list')) + return HttpResponseRedirect(reverse('bootstrap:bootstrap_setup_list')) except NotABootstrapSetup: messages.error(request, _(u'Data from URL is not a bootstrap setup.')) except Exception as exception: @@ -318,7 +318,7 @@ def erase_database_view(request): def bootstrap_setup_repository_sync(request): Permission.objects.check_permissions(request.user, [PERMISSION_BOOTSTRAP_REPOSITORY_SYNC]) - post_action_redirect = reverse('bootstrap_setup_list') + post_action_redirect = reverse('bootstrap:bootstrap_setup_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) @@ -330,7 +330,7 @@ def bootstrap_setup_repository_sync(request): except Exception as exception: messages.error(request, _(u'Bootstrap repository synchronization error: %(error)s') % {'error': exception}) - return HttpResponseRedirect(reverse('bootstrap_setup_list')) + return HttpResponseRedirect(reverse('bootstrap:bootstrap_setup_list')) context = { 'previous': previous, diff --git a/mayan/apps/django_gpg/__init__.py b/mayan/apps/django_gpg/__init__.py index 962788314c..575f7d6feb 100644 --- a/mayan/apps/django_gpg/__init__.py +++ b/mayan/apps/django_gpg/__init__.py @@ -10,7 +10,7 @@ from .links import (public_keys, key_delete, key_query, key_receive, key_setup) # register_links(['key_delete', 'key_private_list', 'key_public_list', 'key_query'], [private_keys, public_keys, key_query], menu_name='sidebar') -register_links(['key_delete', 'key_public_list', 'key_query'], [public_keys, key_query], menu_name='sidebar') +register_links(['django_gpg:key_delete', 'django_gpg:key_public_list', 'django_gpg:key_query'], [public_keys, key_query], menu_name='sidebar') register_links(Key, [key_delete]) register_links(KeyServerKey, [key_receive]) diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py index 4a64be1aa5..ac62415bb4 100644 --- a/mayan/apps/django_gpg/links.py +++ b/mayan/apps/django_gpg/links.py @@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE, PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE) -private_keys = {'text': _(u'private keys'), 'view': 'key_private_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW]} -public_keys = {'text': _(u'public keys'), 'view': 'key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW]} -key_delete = {'text': _(u'delete'), 'view': 'key_delete', 'args': ['object.fingerprint', 'object.type'], 'famfam': 'key_delete', 'permissions': [PERMISSION_KEY_DELETE]} -key_query = {'text': _(u'query keyservers'), 'view': 'key_query', 'famfam': 'zoom', 'permissions': [PERMISSION_KEYSERVER_QUERY]} -key_receive = {'text': _(u'import'), 'view': 'key_receive', 'args': 'object.keyid', 'famfam': 'key_add', 'keep_query': True, 'permissions': [PERMISSION_KEY_RECEIVE]} -key_setup = {'text': _(u'key management'), 'view': 'key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW], 'children_view_regex': [r'^key_']} +private_keys = {'text': _(u'private keys'), 'view': 'django_gpg:key_private_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW]} +public_keys = {'text': _(u'public keys'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW]} +key_delete = {'text': _(u'delete'), 'view': 'django_gpg:key_delete', 'args': ['object.fingerprint', 'object.type'], 'famfam': 'key_delete', 'permissions': [PERMISSION_KEY_DELETE]} +key_query = {'text': _(u'query keyservers'), 'view': 'django_gpg:key_query', 'famfam': 'zoom', 'permissions': [PERMISSION_KEYSERVER_QUERY]} +key_receive = {'text': _(u'import'), 'view': 'django_gpg:key_receive', 'args': 'object.keyid', 'famfam': 'key_add', 'keep_query': True, 'permissions': [PERMISSION_KEY_RECEIVE]} +key_setup = {'text': _(u'key management'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'famfam': 'key', 'icon': 'key.png', 'permissions': [PERMISSION_KEY_VIEW], 'children_view_regex': [r'^key_']} diff --git a/mayan/apps/document_indexing/__init__.py b/mayan/apps/document_indexing/__init__.py index 0e432a160d..7b1299f0e5 100644 --- a/mayan/apps/document_indexing/__init__.py +++ b/mayan/apps/document_indexing/__init__.py @@ -44,7 +44,7 @@ register_top_menu('indexes', document_index_main_menu_link) register_maintenance_links([rebuild_index_instances], namespace='document_indexing', title=_(u'Indexes')) -register_sidebar_template(['index_instance_list'], 'indexing_help.html') +register_sidebar_template(['indexing:index_instance_list'], 'indexing_help.html') register_links(IndexInstanceNode, [index_parent]) @@ -52,7 +52,7 @@ register_links(Document, [document_index_list], menu_name='form_header') register_setup(index_setup) -register_links([Index, 'index_setup_list', 'index_setup_create', 'template_node_edit', 'template_node_delete'], [index_setup_list, index_setup_create], menu_name='secondary_menu') +register_links([Index, 'indexing:index_setup_list', 'indexing:index_setup_create', 'indexing:template_node_edit', 'indexing:template_node_delete'], [index_setup_list, index_setup_create], menu_name='secondary_menu') register_links(Index, [index_setup_edit, index_setup_delete, index_setup_view, index_setup_document_types]) diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py index 59d4b7f4f3..b157a0a0de 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -20,23 +20,23 @@ def is_not_instance_root_node(context): return not context['object'].is_root_node() -index_setup = {'text': _(u'indexes'), 'view': 'index_setup_list', 'icon': 'tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'children_view_regex': [r'^index_setup', r'^template_node']} -index_setup_list = {'text': _(u'index list'), 'view': 'index_setup_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} -index_setup_create = {'text': _(u'create index'), 'view': 'index_setup_create', 'famfam': 'tab_add', 'permissions': [PERMISSION_DOCUMENT_INDEXING_CREATE]} -index_setup_edit = {'text': _(u'edit'), 'view': 'index_setup_edit', 'args': 'index.pk', 'famfam': 'tab_edit', 'permissions': [PERMISSION_DOCUMENT_INDEXING_EDIT]} -index_setup_delete = {'text': _(u'delete'), 'view': 'index_setup_delete', 'args': 'index.pk', 'famfam': 'tab_delete', 'permissions': [PERMISSION_DOCUMENT_INDEXING_DELETE]} -index_setup_view = {'text': _(u'tree template'), 'view': 'index_setup_view', 'args': 'index.pk', 'famfam': 'textfield', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} -index_setup_document_types = {'text': _(u'document types'), 'view': 'index_setup_document_types', 'args': 'index.pk', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_INDEXING_EDIT]} +index_setup = {'text': _(u'indexes'), 'view': 'indexing:index_setup_list', 'icon': 'tab.png', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'children_view_regex': [r'^index_setup', r'^template_node']} +index_setup_list = {'text': _(u'index list'), 'view': 'indexing:index_setup_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} +index_setup_create = {'text': _(u'create index'), 'view': 'indexing:index_setup_create', 'famfam': 'tab_add', 'permissions': [PERMISSION_DOCUMENT_INDEXING_CREATE]} +index_setup_edit = {'text': _(u'edit'), 'view': 'indexing:index_setup_edit', 'args': 'index.pk', 'famfam': 'tab_edit', 'permissions': [PERMISSION_DOCUMENT_INDEXING_EDIT]} +index_setup_delete = {'text': _(u'delete'), 'view': 'indexing:index_setup_delete', 'args': 'index.pk', 'famfam': 'tab_delete', 'permissions': [PERMISSION_DOCUMENT_INDEXING_DELETE]} +index_setup_view = {'text': _(u'tree template'), 'view': 'indexing:index_setup_view', 'args': 'index.pk', 'famfam': 'textfield', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} +index_setup_document_types = {'text': _(u'document types'), 'view': 'indexing:index_setup_document_types', 'args': 'index.pk', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_INDEXING_EDIT]} -template_node_create = {'text': _(u'new child node'), 'view': 'template_node_create', 'args': 'node.pk', 'famfam': 'textfield_add', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} -template_node_edit = {'text': _(u'edit'), 'view': 'template_node_edit', 'args': 'node.pk', 'famfam': 'textfield', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'condition': is_not_root_node} -template_node_delete = {'text': _(u'delete'), 'view': 'template_node_delete', 'args': 'node.pk', 'famfam': 'textfield_delete', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'condition': is_not_root_node} +template_node_create = {'text': _(u'new child node'), 'view': 'indexing:template_node_create', 'args': 'node.pk', 'famfam': 'textfield_add', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP]} +template_node_edit = {'text': _(u'edit'), 'view': 'indexing:template_node_edit', 'args': 'node.pk', 'famfam': 'textfield', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'condition': is_not_root_node} +template_node_delete = {'text': _(u'delete'), 'view': 'indexing:template_node_delete', 'args': 'node.pk', 'famfam': 'textfield_delete', 'permissions': [PERMISSION_DOCUMENT_INDEXING_SETUP], 'condition': is_not_root_node} -index_list = {'text': _(u'index list'), 'view': 'index_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]} +index_list = {'text': _(u'index list'), 'view': 'indexing:index_list', 'famfam': 'tab', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]} -index_parent = {'text': _(u'go up one level'), 'view': 'index_instance_node_view', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True, 'condition': is_not_instance_root_node} -document_index_list = {'text': _(u'indexes'), 'view': 'document_index_list', 'args': 'object.pk', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW, PERMISSION_DOCUMENT_VIEW]} +index_parent = {'text': _(u'go up one level'), 'view': 'indexing:index_instance_node_view', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True, 'condition': is_not_instance_root_node} +document_index_list = {'text': _(u'indexes'), 'view': 'indexing:document_index_list', 'args': 'object.pk', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW, PERMISSION_DOCUMENT_VIEW]} -document_index_main_menu_link = {'text': _('indexes'), 'famfam': 'tab', 'view': 'index_list', 'children_view_regex': [r'^index_[i,l]']} +document_index_main_menu_link = {'text': _('indexes'), 'famfam': 'tab', 'view': 'indexing:index_list', 'children_view_regex': [r'^index_[i,l]']} -rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')} +rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'indexing:rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')} diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index c987f105e0..b180b46f8a 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -69,7 +69,7 @@ def index_setup_create(request): index = form.save() apply_default_acls(index, request.user) messages.success(request, _(u'Index created successfully.')) - return HttpResponseRedirect(reverse('index_setup_list')) + return HttpResponseRedirect(reverse('indexing:index_setup_list')) else: form = IndexForm() @@ -92,7 +92,7 @@ def index_setup_edit(request, index_pk): if form.is_valid(): form.save() messages.success(request, _(u'Index edited successfully')) - return HttpResponseRedirect(reverse('index_setup_list')) + return HttpResponseRedirect(reverse('indexing:index_setup_list')) else: form = IndexForm(instance=index) @@ -113,7 +113,7 @@ def index_setup_delete(request, index_pk): except PermissionDenied: AccessEntry.objects.check_access(PERMISSION_DOCUMENT_INDEXING_DELETE, request.user, index) - post_action_redirect = reverse('index_setup_list') + post_action_redirect = reverse('indexing:index_setup_list') previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) @@ -211,7 +211,7 @@ def template_node_create(request, parent_pk): if form.is_valid(): node = form.save() messages.success(request, _(u'Index template node created successfully.')) - return HttpResponseRedirect(reverse('index_setup_view', args=[node.index.pk])) + return HttpResponseRedirect(reverse('indexing:index_setup_view', args=[node.index.pk])) else: form = IndexTemplateNodeForm(initial={'index': parent_node.index, 'parent': parent_node}) @@ -237,7 +237,7 @@ def template_node_edit(request, node_pk): if form.is_valid(): form.save() messages.success(request, _(u'Index template node edited successfully')) - return HttpResponseRedirect(reverse('index_setup_view', args=[node.index.pk])) + return HttpResponseRedirect(reverse('indexing:index_setup_view', args=[node.index.pk])) else: form = IndexTemplateNodeForm(instance=node) @@ -262,7 +262,7 @@ def template_node_delete(request, node_pk): except PermissionDenied: AccessEntry.objects.check_access(PERMISSION_DOCUMENT_INDEXING_EDIT, request.user, node.index) - post_action_redirect = reverse('index_setup_view', args=[node.index.pk]) + post_action_redirect = reverse('indexing:index_setup_view', args=[node.index.pk]) previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', '/'))) next = request.POST.get('next', request.GET.get('next', post_action_redirect if post_action_redirect else request.META.get('HTTP_REFERER', '/'))) diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index e2e78d2a3a..078edab596 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -76,7 +76,7 @@ def search(request, advanced=False): { 'form': form, 'title': _(u'advanced search'), - 'form_action': reverse('results'), + 'form_action': reverse('search:results'), 'submit_method': 'GET', 'search_results_limit': LIMIT, 'submit_label': _(u'Search'), @@ -110,4 +110,4 @@ def search(request, advanced=False): def search_again(request): query = urlparse.urlparse(request.META.get('HTTP_REFERER', u'/')).query - return HttpResponseRedirect('%s?%s' % (reverse('search_advanced'), query)) + return HttpResponseRedirect('%s?%s' % (reverse('search:search_advanced'), query)) diff --git a/mayan/apps/folders/__init__.py b/mayan/apps/folders/__init__.py index 3aa57639d0..1cf345aedb 100644 --- a/mayan/apps/folders/__init__.py +++ b/mayan/apps/folders/__init__.py @@ -15,21 +15,21 @@ from .permissions import (PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE, PERMISSION_FOLDER_REMOVE_DOCUMENT, PERMISSION_FOLDER_VIEW, PERMISSION_FOLDER_ADD_DOCUMENT) -register_multi_item_links(['folder_view'], [folder_document_multiple_remove]) +register_multi_item_links(['folders:folder_view'], [folder_document_multiple_remove]) register_links(Folder, [folder_view, folder_edit, folder_delete, folder_acl_list]) -register_links([Folder, 'folder_list', 'folder_create'], [folder_list, folder_create], menu_name='secondary_menu') +register_links([Folder, 'folders:folder_list', 'folders:folder_create'], [folder_list, folder_create], menu_name='secondary_menu') -register_top_menu(name='folders', link=folders_main_menu_link, children_views=['folder_list', 'folder_create', 'folder_edit', 'folder_delete', 'folder_view', 'folder_document_multiple_remove']) +register_top_menu(name='folders', link=folders_main_menu_link, children_views=['folders:folder_list', 'folders:folder_create', 'folders:folder_edit', 'folders:folder_delete', 'folders:folder_view', 'folders:folder_document_multiple_remove']) register_links(Document, [document_folder_list], menu_name='form_header') -register_sidebar_template(['folder_list'], 'folders_help.html') +register_sidebar_template(['folders:folder_list'], 'folders_help.html') -register_links(['document_folder_list', 'folder_add_document'], [folder_add_document], menu_name="sidebar") +register_links(['folders:document_folder_list', 'folders:folder_add_document'], [folder_add_document], menu_name="sidebar") -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [folder_add_multiple_documents]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'indexing:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [folder_add_multiple_documents]) class_permissions(Folder, [ PERMISSION_FOLDER_EDIT, diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index b5bdba962c..855eaa0e97 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -65,7 +65,7 @@ def folder_create(request): if created: apply_default_acls(folder, request.user) messages.success(request, _(u'Folder created successfully')) - return HttpResponseRedirect(reverse('folder_list')) + return HttpResponseRedirect(reverse('folders:folder_list')) else: messages.error(request, _(u'A folder named: %s, already exists.') % form.cleaned_data['title']) else: @@ -93,7 +93,7 @@ def folder_edit(request, folder_id): try: folder.save() messages.success(request, _(u'Folder edited successfully')) - return HttpResponseRedirect(reverse('folder_list')) + return HttpResponseRedirect(reverse('folders:folder_list')) except Exception as exception: messages.error(request, _(u'Error editing folder; %s') % exception) else: diff --git a/mayan/apps/history/links.py b/mayan/apps/history/links.py index fdc0fa6f24..125dfa69c9 100644 --- a/mayan/apps/history/links.py +++ b/mayan/apps/history/links.py @@ -4,5 +4,5 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import PERMISSION_HISTORY_VIEW -history_list = {'text': _(u'history'), 'view': 'history_list', 'famfam': 'book', 'icon': 'book.png', 'children_view_regex': [r'history_[l,v]']} -history_details = {'text': _(u'details'), 'view': 'history_view', 'famfam': 'book_open', 'args': 'object.pk', 'permissions': [PERMISSION_HISTORY_VIEW]} +history_list = {'text': _(u'history'), 'view': 'history:history_list', 'famfam': 'book', 'icon': 'book.png', 'children_view_regex': [r'history_[l,v]']} +history_details = {'text': _(u'details'), 'view': 'history:history_view', 'famfam': 'book_open', 'args': 'object.pk', 'permissions': [PERMISSION_HISTORY_VIEW]} diff --git a/mayan/apps/ocr/__init__.py b/mayan/apps/ocr/__init__.py index bb40657c05..1a7641c970 100644 --- a/mayan/apps/ocr/__init__.py +++ b/mayan/apps/ocr/__init__.py @@ -34,13 +34,13 @@ logger = logging.getLogger(__name__) register_links(Document, [submit_document]) -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [submit_document_multiple]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexing:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'document:document_list_recent', 'tags:tag_tagged_item_list'], [submit_document_multiple]) register_links(DocumentQueue, [document_queue_disable, document_queue_enable]) -register_multi_item_links(['queue_document_list'], [re_queue_multiple_document, queue_document_multiple_delete]) +register_multi_item_links(['ocr:queue_document_list'], [re_queue_multiple_document, queue_document_multiple_delete]) -register_links(['document_queue_disable', 'document_queue_enable', 'queue_document_list'], [queue_document_list], menu_name='secondary_menu') +register_links(['ocr:document_queue_disable', 'ocr:document_queue_enable', 'ocr:queue_document_list'], [queue_document_list], menu_name='secondary_menu') register_maintenance_links([all_document_ocr_cleanup], namespace='ocr', title=_(u'OCR')) diff --git a/mayan/apps/permissions/__init__.py b/mayan/apps/permissions/__init__.py index a291369159..18115b6b4f 100644 --- a/mayan/apps/permissions/__init__.py +++ b/mayan/apps/permissions/__init__.py @@ -13,10 +13,10 @@ from .links import (role_list, role_create, role_edit, role_members, role_permis role_delete, permission_grant, permission_revoke) register_links(Role, [role_edit, role_delete, role_permissions, role_members]) -register_links([Role, 'role_list', 'role_create'], [role_list, role_create], menu_name='secondary_menu') -register_multi_item_links(['role_permissions'], [permission_grant, permission_revoke]) +register_links([Role, 'permissions:role_list', 'permissions:role_create'], [role_list, role_create], menu_name='secondary_menu') +register_multi_item_links(['permissions:role_permissions'], [permission_grant, permission_revoke]) -permission_views = ['role_list', 'role_create', 'role_edit', 'role_members', 'role_permissions', 'role_delete'] +permission_views = ['permissions:role_list', 'permissions:role_create', 'permissions:role_edit', 'permissions:role_members', 'permissions:role_permissions', 'permissions:role_delete'] def user_post_save(sender, instance, **kwargs): diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py index db6ef05dc6..ebf60a038b 100644 --- a/mayan/apps/permissions/links.py +++ b/mayan/apps/permissions/links.py @@ -6,12 +6,12 @@ from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE) -role_list = {'text': _(u'roles'), 'view': 'role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']} -role_create = {'text': _(u'create new role'), 'view': 'role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]} -role_edit = {'text': _(u'edit'), 'view': 'role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]} -role_members = {'text': _(u'members'), 'view': 'role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]} -role_permissions = {'text': _(u'role permissions'), 'view': 'role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]} -role_delete = {'text': _(u'delete'), 'view': 'role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]} +role_list = {'text': _(u'roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']} +role_create = {'text': _(u'create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]} +role_edit = {'text': _(u'edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]} +role_members = {'text': _(u'members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]} +role_permissions = {'text': _(u'role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]} +role_delete = {'text': _(u'delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]} -permission_grant = {'text': _(u'grant'), 'view': 'permission_multiple_grant', 'famfam': 'key_add', 'permissions': [PERMISSION_PERMISSION_GRANT]} -permission_revoke = {'text': _(u'revoke'), 'view': 'permission_multiple_revoke', 'famfam': 'key_delete', 'permissions': [PERMISSION_PERMISSION_REVOKE]} +permission_grant = {'text': _(u'grant'), 'view': 'permissions:permission_multiple_grant', 'famfam': 'key_add', 'permissions': [PERMISSION_PERMISSION_GRANT]} +permission_revoke = {'text': _(u'revoke'), 'view': 'permissions:permission_multiple_revoke', 'famfam': 'key_delete', 'permissions': [PERMISSION_PERMISSION_REVOKE]} diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index 008e0e61b2..32be4e4a4e 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -32,7 +32,7 @@ class RoleCreateView(SingleObjectCreateView): form_class = RoleForm model = Role permissions_required = [PERMISSION_ROLE_CREATE] - success_url = reverse_lazy('role_list') + success_url = reverse_lazy('permissions:role_list') class RoleDeleteView(SingleObjectDeleteView): @@ -42,7 +42,7 @@ class RoleDeleteView(SingleObjectDeleteView): 'object_name': _(u'role'), 'form_icon': u'medal_gold_delete.png' } - success_url = reverse_lazy('role_list') + success_url = reverse_lazy('permissions:role_list') class RoleEditView(SingleObjectEditView): diff --git a/mayan/apps/project_setup/api.py b/mayan/apps/project_setup/api.py index 1d11179701..f1dd99a4b3 100644 --- a/mayan/apps/project_setup/api.py +++ b/mayan/apps/project_setup/api.py @@ -6,6 +6,7 @@ setup_items = [] def register_setup(link): + print "link", link setup_items.append(link) # Append the link's children_view_regex to the setup main menu children view regex diff --git a/mayan/apps/project_setup/links.py b/mayan/apps/project_setup/links.py index 60ca9359a7..68f16f5b3b 100644 --- a/mayan/apps/project_setup/links.py +++ b/mayan/apps/project_setup/links.py @@ -1,3 +1,3 @@ from django.utils.translation import ugettext_lazy as _ -link_setup = {'text': _(u'setup'), 'view': 'setup_list', 'famfam': 'cog'} +link_setup = {'text': _(u'setup'), 'view': 'project_setup:setup_list', 'famfam': 'cog'} diff --git a/mayan/apps/project_tools/links.py b/mayan/apps/project_tools/links.py index f14df29da1..64c83c698c 100644 --- a/mayan/apps/project_tools/links.py +++ b/mayan/apps/project_tools/links.py @@ -1,3 +1,3 @@ from django.utils.translation import ugettext_lazy as _ -link_tools = {'text': _(u'tools'), 'view': 'tools_list', 'famfam': 'wrench'} +link_tools = {'text': _(u'tools'), 'view': 'project_tools:tools_list', 'famfam': 'wrench'} diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py index b8a6251f6b..6d540ac7d9 100644 --- a/mayan/apps/smart_settings/links.py +++ b/mayan/apps/smart_settings/links.py @@ -5,4 +5,4 @@ def is_superuser(context): return context['request'].user.is_staff or context['request'].user.is_superuser -check_settings = {'text': _(u'settings'), 'view': 'setting_list', 'famfam': 'cog', 'icon': 'cog.png', 'condition': is_superuser, 'children_view_regex': [r'^setting_']} +check_settings = {'text': _(u'settings'), 'view': 'settings:setting_list', 'famfam': 'cog', 'icon': 'cog.png', 'condition': is_superuser, 'children_view_regex': [r'^setting_']} diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index 1fff0884ce..f0a8c68ebf 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -40,15 +40,15 @@ register_model_list_columns(Document, [ ]) register_links(Tag, [tag_tagged_item_list, tag_edit, tag_delete, tag_acl_list]) -register_multi_item_links(['tag_list'], [tag_multiple_delete]) -register_links([Tag, 'tag_list', 'tag_create'], [tag_list, tag_create], menu_name='secondary_menu') +register_multi_item_links(['tags:tag_list'], [tag_multiple_delete]) +register_links([Tag, 'tags:tag_list', 'tags:tag_create'], [tag_list, tag_create], menu_name='secondary_menu') register_top_menu('tags', link={'text': _(u'tags'), 'view': 'tags:tag_list', 'famfam': 'tag_blue'}, children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)']) register_links(Document, [tag_document_list], menu_name='form_header') -register_links(['document_tags', 'tag_remove', 'tag_multiple_remove', 'tag_attach'], [tag_attach], menu_name='sidebar') +register_links(['tags:document_tags', 'tags:tag_remove', 'tag_multiple_remove', 'tag_attach'], [tag_attach], menu_name='sidebar') register_multi_item_links(['document_tags'], [single_document_multiple_tag_remove]) -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [tag_multiple_attach, multiple_documents_selection_tag_remove]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [tag_multiple_attach, multiple_documents_selection_tag_remove]) class_permissions(Document, [ PERMISSION_TAG_ATTACH, diff --git a/mayan/apps/user_management/__init__.py b/mayan/apps/user_management/__init__.py index f442d68dc9..5a7502d2cf 100644 --- a/mayan/apps/user_management/__init__.py +++ b/mayan/apps/user_management/__init__.py @@ -11,18 +11,18 @@ from .links import (user_list, user_setup, user_edit, user_add, user_delete, group_multiple_delete, group_members) register_links(User, [user_edit, user_set_password, user_groups, user_delete]) -register_links([User, 'user_multiple_set_password', 'user_multiple_delete', 'user_list', 'user_add'], [user_list, user_add], menu_name=u'secondary_menu') -register_multi_item_links(['user_list'], [user_multiple_set_password, user_multiple_delete]) +register_links([User, 'user_management:user_multiple_set_password', 'user_management:user_multiple_delete', 'user_management:user_list', 'user_management:user_add'], [user_list, user_add], menu_name=u'secondary_menu') +register_multi_item_links(['user_management:user_list'], [user_multiple_set_password, user_multiple_delete]) register_links(Group, [group_edit, group_members, group_delete]) -register_links(['group_multiple_delete', 'group_delete', 'group_edit', 'group_list', 'group_add', 'group_members'], [group_list, group_add], menu_name=u'secondary_menu') -register_multi_item_links(['group_list'], [group_multiple_delete]) +register_links(['user_management:group_multiple_delete', 'user_management:group_delete', 'user_management:group_edit', 'user_management:group_list', 'user_management:group_add', 'user_management:group_members'], [group_list, group_add], menu_name=u'secondary_menu') +register_multi_item_links(['user_management:group_list'], [group_multiple_delete]) user_management_views = [ - 'user_list', 'user_edit', 'user_add', 'user_delete', - 'user_multiple_delete', 'user_set_password', - 'user_multiple_set_password', 'group_list', 'group_edit', 'group_add', - 'group_delete', 'group_multiple_delete', 'group_members' + 'user_management:user_list', 'user_management:user_edit', 'user_management:user_add', 'user_management:user_delete', + 'user_management:user_multiple_delete', 'user_management:user_set_password', + 'user_management:user_multiple_set_password', 'user_management:group_list', 'user_management:group_edit', 'user_management:group_add', + 'user_management:group_delete', 'user_management:group_multiple_delete', 'user_management:group_members' ] register_setup(user_setup) diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py index 941eb27b6c..e18b5eccbb 100644 --- a/mayan/apps/user_management/links.py +++ b/mayan/apps/user_management/links.py @@ -6,20 +6,20 @@ from .permissions import (PERMISSION_USER_CREATE, PERMISSION_USER_EDIT, PERMISSION_USER_VIEW, PERMISSION_USER_DELETE, PERMISSION_GROUP_CREATE, PERMISSION_GROUP_EDIT, PERMISSION_GROUP_VIEW, PERMISSION_GROUP_DELETE) -user_list = {'text': _(u'user list'), 'view': 'user_list', 'famfam': 'user', 'permissions': [PERMISSION_USER_VIEW]} -user_setup = {'text': _(u'users'), 'view': 'user_list', 'famfam': 'user', 'icon': 'user.png', 'permissions': [PERMISSION_USER_VIEW], 'children_view_regex': [r'^user_']} -user_edit = {'text': _(u'edit'), 'view': 'user_edit', 'args': 'object.id', 'famfam': 'user_edit', 'permissions': [PERMISSION_USER_EDIT]} -user_add = {'text': _(u'create new user'), 'view': 'user_add', 'famfam': 'user_add', 'permissions': [PERMISSION_USER_CREATE]} -user_delete = {u'text': _('delete'), 'view': 'user_delete', 'args': 'object.id', 'famfam': 'user_delete', 'permissions': [PERMISSION_USER_DELETE]} -user_multiple_delete = {u'text': _('delete'), 'view': 'user_multiple_delete', 'famfam': 'user_delete', 'permissions': [PERMISSION_USER_DELETE]} -user_set_password = {u'text': _('reset password'), 'view': 'user_set_password', 'args': 'object.id', 'famfam': 'lock_edit', 'permissions': [PERMISSION_USER_EDIT]} -user_multiple_set_password = {u'text': _('reset password'), 'view': 'user_multiple_set_password', 'famfam': 'lock_edit', 'permissions': [PERMISSION_USER_EDIT]} -user_groups = {'text': _(u'groups'), 'view': 'user_groups', 'args': 'object.id', 'famfam': 'group_link', 'permissions': [PERMISSION_USER_EDIT]} +user_list = {'text': _(u'user list'), 'view': 'user_management:user_list', 'famfam': 'user', 'permissions': [PERMISSION_USER_VIEW]} +user_setup = {'text': _(u'users'), 'view': 'user_management:user_list', 'famfam': 'user', 'icon': 'user.png', 'permissions': [PERMISSION_USER_VIEW], 'children_view_regex': [r'^user_']} +user_edit = {'text': _(u'edit'), 'view': 'user_management:user_edit', 'args': 'object.id', 'famfam': 'user_edit', 'permissions': [PERMISSION_USER_EDIT]} +user_add = {'text': _(u'create new user'), 'view': 'user_management:user_add', 'famfam': 'user_add', 'permissions': [PERMISSION_USER_CREATE]} +user_delete = {u'text': _('delete'), 'view': 'user_management:user_delete', 'args': 'object.id', 'famfam': 'user_delete', 'permissions': [PERMISSION_USER_DELETE]} +user_multiple_delete = {u'text': _('delete'), 'view': 'user_management:user_multiple_delete', 'famfam': 'user_delete', 'permissions': [PERMISSION_USER_DELETE]} +user_set_password = {u'text': _('reset password'), 'view': 'user_management:user_set_password', 'args': 'object.id', 'famfam': 'lock_edit', 'permissions': [PERMISSION_USER_EDIT]} +user_multiple_set_password = {u'text': _('reset password'), 'view': 'user_management:user_multiple_set_password', 'famfam': 'lock_edit', 'permissions': [PERMISSION_USER_EDIT]} +user_groups = {'text': _(u'groups'), 'view': 'user_management:user_groups', 'args': 'object.id', 'famfam': 'group_link', 'permissions': [PERMISSION_USER_EDIT]} -group_list = {'text': _(u'group list'), 'view': 'group_list', 'famfam': 'group', 'permissions': [PERMISSION_GROUP_VIEW]} -group_setup = {'text': _(u'groups'), 'view': 'group_list', 'famfam': 'group', 'icon': 'group.png', 'permissions': [PERMISSION_GROUP_VIEW], 'children_view_regex': [r'^group_']} -group_edit = {'text': _(u'edit'), 'view': 'group_edit', 'args': 'object.id', 'famfam': 'group_edit', 'permissions': [PERMISSION_GROUP_EDIT]} -group_add = {'text': _(u'create new group'), 'view': 'group_add', 'famfam': 'group_add', 'permissions': [PERMISSION_GROUP_CREATE]} -group_delete = {u'text': _('delete'), 'view': 'group_delete', 'args': 'object.id', 'famfam': 'group_delete', 'permissions': [PERMISSION_GROUP_DELETE]} -group_multiple_delete = {u'text': _('delete'), 'view': 'group_multiple_delete', 'famfam': 'group_delete', 'permissions': [PERMISSION_GROUP_DELETE]} -group_members = {'text': _(u'members'), 'view': 'group_members', 'args': 'object.id', 'famfam': 'group_link', 'permissions': [PERMISSION_GROUP_EDIT]} +group_list = {'text': _(u'group list'), 'view': 'user_management:group_list', 'famfam': 'group', 'permissions': [PERMISSION_GROUP_VIEW]} +group_setup = {'text': _(u'groups'), 'view': 'user_management:group_list', 'famfam': 'group', 'icon': 'group.png', 'permissions': [PERMISSION_GROUP_VIEW], 'children_view_regex': [r'^group_']} +group_edit = {'text': _(u'edit'), 'view': 'user_management:group_edit', 'args': 'object.id', 'famfam': 'group_edit', 'permissions': [PERMISSION_GROUP_EDIT]} +group_add = {'text': _(u'create new group'), 'view': 'user_management:group_add', 'famfam': 'group_add', 'permissions': [PERMISSION_GROUP_CREATE]} +group_delete = {u'text': _('delete'), 'view': 'user_management:group_delete', 'args': 'object.id', 'famfam': 'group_delete', 'permissions': [PERMISSION_GROUP_DELETE]} +group_multiple_delete = {u'text': _('delete'), 'view': 'user_management:group_multiple_delete', 'famfam': 'group_delete', 'permissions': [PERMISSION_GROUP_DELETE]} +group_members = {'text': _(u'members'), 'view': 'user_management:group_members', 'args': 'object.id', 'famfam': 'group_link', 'permissions': [PERMISSION_GROUP_EDIT]} diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 7115d88186..edd9b468a1 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -65,7 +65,7 @@ def user_edit(request, user_id): if form.is_valid(): form.save() messages.success(request, _(u'User "%s" updated successfully.') % user) - return HttpResponseRedirect(reverse('user_list')) + return HttpResponseRedirect(reverse('user_management:user_list')) else: form = UserForm(instance=user) @@ -87,7 +87,7 @@ def user_add(request): user.set_unusable_password() user.save() messages.success(request, _(u'User "%s" created successfully.') % user) - return HttpResponseRedirect(reverse('user_set_password', args=[user.pk])) + return HttpResponseRedirect(reverse('user_management:user_set_password', args=[user.pk])) else: form = UserForm() @@ -103,7 +103,7 @@ def user_delete(request, user_id=None, user_id_list=None): if user_id: users = [get_object_or_404(User, pk=user_id)] - post_action_redirect = reverse('user_list') + post_action_redirect = reverse('user_management:user_list') elif user_id_list: users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')] else: @@ -157,7 +157,7 @@ def user_set_password(request, user_id=None, user_id_list=None): if user_id: users = [get_object_or_404(User, pk=user_id)] - post_action_redirect = reverse('user_list') + post_action_redirect = reverse('user_management:user_list') elif user_id_list: users = [get_object_or_404(User, pk=user_id) for user_id in user_id_list.split(',')] else: @@ -273,7 +273,7 @@ def group_edit(request, group_id): if form.is_valid(): form.save() messages.success(request, _(u'Group "%s" updated successfully.') % group) - return HttpResponseRedirect(reverse('group_list')) + return HttpResponseRedirect(reverse('user_management:group_list')) else: form = GroupForm(instance=group) @@ -294,7 +294,7 @@ def group_add(request): if form.is_valid(): group = form.save() messages.success(request, _(u'Group "%s" created successfully.') % group) - return HttpResponseRedirect(reverse('group_list')) + return HttpResponseRedirect(reverse('user_management:group_list')) else: form = GroupForm() @@ -310,7 +310,7 @@ def group_delete(request, group_id=None, group_id_list=None): if group_id: groups = [get_object_or_404(Group, pk=group_id)] - post_action_redirect = reverse('group_list') + post_action_redirect = reverse('user_management:group_list') elif group_id_list: groups = [get_object_or_404(Group, pk=group_id) for group_id in group_id_list.split(',')] else: diff --git a/mayan/urls.py b/mayan/urls.py index e6d4e0fa75..13ffe881b7 100644 --- a/mayan/urls.py +++ b/mayan/urls.py @@ -13,31 +13,31 @@ urlpatterns = patterns('', url(r'^docs/', include('rest_framework_swagger.urls')), (r'^documents/', include('documents.urls', namespace='documents')), (r'^folders/', include('folders.urls', namespace='folders')), - (r'^search/', include('dynamic_search.urls')), - (r'^ocr/', include('ocr.urls')), - (r'^permissions/', include('permissions.urls')), + (r'^search/', include('dynamic_search.urls', namespace='search')), + (r'^ocr/', include('ocr.urls', namespace='ocr')), + (r'^permissions/', include('permissions.urls', namespace='permissions')), (r'^tags/', include('tags.urls', namespace='tags')), - (r'^comments/', include('document_comments.urls')), - (r'^user_management/', include('user_management.urls')), - (r'^settings/', include('smart_settings.urls')), + (r'^comments/', include('document_comments.urls', namespace='comments')), + (r'^user_management/', include('user_management.urls', namespace='user_management')), + (r'^settings/', include('smart_settings.urls', namespace='settings')), (r'^metadata/', include('metadata.urls', namespace='metadata')), (r'^linking/', include('linking.urls', namespace='linking')), - (r'^document_indexing/', include('document_indexing.urls')), - (r'^history/', include('history.urls')), - (r'^converter/', include('converter.urls')), + (r'^document_indexing/', include('document_indexing.urls', namespace='indexing')), + (r'^history/', include('history.urls', namespace='history')), + (r'^converter/', include('converter.urls', namespace='converter')), (r'^sources/', include('sources.urls', namespace='sources')), - (r'^project_setup/', include('project_setup.urls')), - (r'^project_tools/', include('project_tools.urls')), - (r'^acls/', include('acls.urls')), - (r'^document_acls/', include('document_acls.urls')), + (r'^project_setup/', include('project_setup.urls', namespace='project_setup')), + (r'^project_tools/', include('project_tools.urls', namespace='project_tools')), + (r'^acls/', include('acls.urls', namespace='acls')), + (r'^document_acls/', include('document_acls.urls', namespace='document_acls')), (r'^api/', include('rest_api.urls')), - (r'^gpg/', include('django_gpg.urls')), - (r'^documents/signatures/', include('document_signatures.urls')), + (r'^gpg/', include('django_gpg.urls', namespace='django_gpg')), + (r'^documents/signatures/', include('document_signatures.urls', namespace='signatures')), (r'^checkouts/', include('checkouts.urls', namespace='checkout')), - (r'^installation/', include('installation.urls')), - (r'^scheduler/', include('scheduler.urls')), - (r'^bootstrap/', include('bootstrap.urls')), - (r'^registration/', include('registration.urls')), + (r'^installation/', include('installation.urls', namespace='installation')), + (r'^scheduler/', include('scheduler.urls', namespace='scheduler')), + (r'^bootstrap/', include('bootstrap.urls', namespace='bootstrap')), + (r'^registration/', include('registration.urls', namespace='registration')), (r'^statistics/', include('statistics.urls', namespace='statistics')), ) From a32c36d727975d175ce2f92fe12baf6515ef5d00 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 17:27:33 -0400 Subject: [PATCH 017/783] Fix tag properties reference --- mayan/apps/tags/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 10d3a113c9..e1beda18bf 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -220,7 +220,7 @@ def tag_edit(request, tag_id): else: form = TagForm(initial={ 'name': tag.name, - 'color': tag.tagproperties_set.get().color + 'color': tag.properties.get().color }) return render_to_response('main/generic_form.html', { From 5559e55a65782dfa601f372e5b2402c47a8ecaf0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 17:27:52 -0400 Subject: [PATCH 018/783] Update converter url to include namespaces, move links to a separate module --- mayan/apps/converter/__init__.py | 9 +-------- mayan/apps/converter/links.py | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 mayan/apps/converter/links.py diff --git a/mayan/apps/converter/__init__.py b/mayan/apps/converter/__init__.py index 0ffd2288a8..c7dd144753 100644 --- a/mayan/apps/converter/__init__.py +++ b/mayan/apps/converter/__init__.py @@ -1,16 +1,9 @@ from __future__ import absolute_import -from django.utils.translation import ugettext_lazy as _ - from navigation.api import register_sidebar_template from project_tools.api import register_tool - -def is_superuser(context): - return context['request'].user.is_staff or context['request'].user.is_superuser - - -formats_list = {'text': _('file formats'), 'view': 'formats_list', 'famfam': 'pictures', 'icon': 'pictures.png', 'condition': is_superuser, 'children_view_regex': [r'formats_list']} +from .links import formats_list register_sidebar_template(['formats_list'], 'converter_file_formats_help.html') diff --git a/mayan/apps/converter/links.py b/mayan/apps/converter/links.py new file mode 100644 index 0000000000..0fbd763dad --- /dev/null +++ b/mayan/apps/converter/links.py @@ -0,0 +1,8 @@ +from django.utils.translation import ugettext_lazy as _ + + +def is_superuser(context): + return context['request'].user.is_staff or context['request'].user.is_superuser + + +formats_list = {'text': _('file formats'), 'view': 'converter:formats_list', 'famfam': 'pictures', 'icon': 'pictures.png', 'condition': is_superuser, 'children_view_regex': [r'formats_list']} From 77acb809b98f1653706e5ff79c2ab027897a759d Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 17:28:40 -0400 Subject: [PATCH 019/783] Update view references to include namespaces --- mayan/apps/document_acls/links.py | 2 +- mayan/apps/document_comments/__init__.py | 2 +- mayan/apps/document_comments/links.py | 8 ++++---- mayan/apps/document_signatures/__init__.py | 2 +- mayan/apps/document_signatures/links.py | 8 ++++---- mayan/apps/documents/links.py | 2 +- mayan/apps/documents/views.py | 2 +- mayan/apps/dynamic_search/models.py | 2 +- mayan/apps/history/models.py | 4 ++-- mayan/apps/history/views.py | 15 +++++++-------- mayan/apps/installation/__init__.py | 2 +- mayan/apps/installation/links.py | 6 +++--- mayan/apps/linking/__init__.py | 6 +++--- mayan/apps/linking/views.py | 6 +++--- mayan/apps/metadata/__init__.py | 12 ++++++------ mayan/apps/metadata/views.py | 8 ++++---- mayan/apps/ocr/links.py | 22 +++++++++++----------- mayan/apps/project_setup/api.py | 1 - mayan/apps/registration/links.py | 2 +- mayan/apps/scheduler/links.py | 2 +- 20 files changed, 56 insertions(+), 58 deletions(-) diff --git a/mayan/apps/document_acls/links.py b/mayan/apps/document_acls/links.py index 3c18710808..2e88554d06 100644 --- a/mayan/apps/document_acls/links.py +++ b/mayan/apps/document_acls/links.py @@ -4,4 +4,4 @@ from django.utils.translation import ugettext_lazy as _ from acls.permissions import ACLS_VIEW_ACL -acl_list = {'text': _(u'ACLs'), 'view': 'document_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} +acl_list = {'text': _(u'ACLs'), 'view': 'document_acls:document_acl_list', 'args': 'object.pk', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} diff --git a/mayan/apps/document_comments/__init__.py b/mayan/apps/document_comments/__init__.py index 5f11dda8e0..d208415876 100644 --- a/mayan/apps/document_comments/__init__.py +++ b/mayan/apps/document_comments/__init__.py @@ -34,7 +34,7 @@ register_model_list_columns(Comment, [ } ]) -register_links(['comments_for_document', 'comment_add', 'comment_delete', 'comment_multiple_delete'], [comment_add], menu_name='sidebar') +register_links(['comments:comments_for_document', 'comments:comment_add', 'comments:comment_delete', 'comments:comment_multiple_delete'], [comment_add], menu_name='sidebar') register_links(Comment, [comment_delete]) register_links(Document, [comments_for_document], menu_name='form_header') diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py index 588e03ea07..e9114c3d8f 100644 --- a/mayan/apps/document_comments/links.py +++ b/mayan/apps/document_comments/links.py @@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import (PERMISSION_COMMENT_CREATE, PERMISSION_COMMENT_DELETE, PERMISSION_COMMENT_VIEW) -comment_delete = {'text': _('delete'), 'view': 'comment_delete', 'args': 'object.pk', 'famfam': 'comment_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} -comment_multiple_delete = {'text': _('delete'), 'view': 'comment_multiple_delete', 'args': 'object.pk', 'famfam': 'comments_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} -comment_add = {'text': _('add comment'), 'view': 'comment_add', 'args': 'object.pk', 'famfam': 'comment_add', 'permissions': [PERMISSION_COMMENT_CREATE]} -comments_for_document = {'text': _('comments'), 'view': 'comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']} +comment_delete = {'text': _('delete'), 'view': 'comments:comment_delete', 'args': 'object.pk', 'famfam': 'comment_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} +comment_multiple_delete = {'text': _('delete'), 'view': 'comments:comment_multiple_delete', 'args': 'object.pk', 'famfam': 'comments_delete', 'permissions': [PERMISSION_COMMENT_DELETE]} +comment_add = {'text': _('add comment'), 'view': 'comments:comment_add', 'args': 'object.pk', 'famfam': 'comment_add', 'permissions': [PERMISSION_COMMENT_CREATE]} +comments_for_document = {'text': _('comments'), 'view': 'comments:comments_for_document', 'args': 'object.pk', 'famfam': 'comments', 'permissions': [PERMISSION_COMMENT_VIEW], 'children_view_regex': ['comment']} diff --git a/mayan/apps/document_signatures/__init__.py b/mayan/apps/document_signatures/__init__.py index a1daf2b36a..219e53e423 100644 --- a/mayan/apps/document_signatures/__init__.py +++ b/mayan/apps/document_signatures/__init__.py @@ -49,7 +49,7 @@ def document_post_save_hook(instance): register_links(Document, [document_verify], menu_name='form_header') -register_links(['document_verify', 'document_signature_upload', 'document_signature_download', 'document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar') +register_links(['document_signatures:document_verify', 'document_signatures:document_signature_upload', 'document_signatures:document_signature_download', 'document_signatures:document_signature_delete'], [document_signature_upload, document_signature_download, document_signature_delete], menu_name='sidebar') DocumentVersion.register_pre_open_hook(1, document_pre_open_hook) DocumentVersion.register_post_save_hook(1, document_post_save_hook) diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py index 9e438b0300..bf13d66bf7 100644 --- a/mayan/apps/document_signatures/links.py +++ b/mayan/apps/document_signatures/links.py @@ -19,7 +19,7 @@ def doesnt_have_detached_signature(context): return DocumentVersionSignature.objects.has_detached_signature(context['object']) is False -document_signature_delete = {'text': _(u'delete signature'), 'view': 'document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature} -document_signature_download = {'text': _(u'download signature'), 'view': 'document_signature_download', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_SIGNATURE_DOWNLOAD], 'conditional_disable': doesnt_have_detached_signature} -document_signature_upload = {'text': _(u'upload signature'), 'view': 'document_signature_upload', 'args': 'object.pk', 'famfam': 'pencil_add', 'permissions': [PERMISSION_SIGNATURE_UPLOAD], 'conditional_disable': has_embedded_signature} -document_verify = {'text': _(u'signatures'), 'view': 'document_verify', 'args': 'object.pk', 'famfam': 'text_signature', 'permissions': [PERMISSION_DOCUMENT_VERIFY]} +document_signature_delete = {'text': _(u'delete signature'), 'view': 'signatures:document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature} +document_signature_download = {'text': _(u'download signature'), 'view': 'signatures:document_signature_download', 'args': 'object.pk', 'famfam': 'disk', 'permissions': [PERMISSION_SIGNATURE_DOWNLOAD], 'conditional_disable': doesnt_have_detached_signature} +document_signature_upload = {'text': _(u'upload signature'), 'view': 'signatures:document_signature_upload', 'args': 'object.pk', 'famfam': 'pencil_add', 'permissions': [PERMISSION_SIGNATURE_UPLOAD], 'conditional_disable': has_embedded_signature} +document_verify = {'text': _(u'signatures'), 'view': 'signatures:document_verify', 'args': 'object.pk', 'famfam': 'text_signature', 'permissions': [PERMISSION_DOCUMENT_VERIFY]} diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index a7ba1173fe..c7b82ddb02 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -52,7 +52,7 @@ document_update_page_count = {'text': _(u'update office documents\' page count') document_clear_transformations = {'text': _(u'clear transformations'), 'view': 'documents:document_clear_transformations', 'args': 'object.id', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_multiple_clear_transformations = {'text': _(u'clear transformations'), 'view': 'documents:document_multiple_clear_transformations', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]} document_print = {'text': _(u'print'), 'view': 'documents:document_print', 'args': 'object.id', 'famfam': 'printer', 'permissions': [PERMISSION_DOCUMENT_VIEW]} -document_history_view = {'text': _(u'history'), 'view': 'history_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_HISTORY_VIEW]} +document_history_view = {'text': _(u'history'), 'view': 'history:history_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_HISTORY_VIEW]} document_missing_list = {'text': _(u'Find missing document files'), 'view': 'documents:document_missing_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_VIEW]} # Tools diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index f19c29c0d3..efa5def9eb 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -163,7 +163,7 @@ def document_delete(request, document_id=None, document_id_list=None): if document_id: documents = [get_object_or_404(Document, pk=document_id)] - post_action_redirect = reverse('document_list_recent') + post_action_redirect = reverse('documents:document_list_recent') elif document_id_list: documents = [get_object_or_404(Document, pk=document_id) for document_id in document_id_list.split(',')] else: diff --git a/mayan/apps/dynamic_search/models.py b/mayan/apps/dynamic_search/models.py index 1a257b8817..7e1af27dba 100644 --- a/mayan/apps/dynamic_search/models.py +++ b/mayan/apps/dynamic_search/models.py @@ -49,7 +49,7 @@ class RecentSearch(models.Model): super(RecentSearch, self).save(*args, **kwargs) def url(self): - view = 'results' if self.is_advanced() else 'search' + view = 'search:results' if self.is_advanced() else 'search:search' return '%s?%s' % (reverse(view), self.query) def is_advanced(self): diff --git a/mayan/apps/history/models.py b/mayan/apps/history/models.py index 3d5de9636a..05da0eb60e 100644 --- a/mayan/apps/history/models.py +++ b/mayan/apps/history/models.py @@ -9,6 +9,7 @@ from django.core import serializers from django.db import models from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ +from django.core.urlresolvers import reverse from .runtime_data import history_types_dict @@ -23,9 +24,8 @@ class HistoryType(models.Model): except KeyError: return u'obsolete history type: %s - %s' % (self.namespace, self.name) - @models.permalink def get_absolute_url(self): - return ('history_type_list', [self.pk]) + return reverse('history:history_type_list', args=[self.pk]) class Meta: ordering = ('namespace', 'name') diff --git a/mayan/apps/history/views.py b/mayan/apps/history/views.py index 2e000b086d..90dbf1330b 100644 --- a/mayan/apps/history/views.py +++ b/mayan/apps/history/views.py @@ -1,20 +1,19 @@ from __future__ import absolute_import -from django.shortcuts import render_to_response -from django.template import RequestContext -from django.utils.translation import ugettext_lazy as _ -from django.shortcuts import get_object_or_404 from django.contrib.contenttypes.models import ContentType +from django.core.exceptions import PermissionDenied from django.db.models.loading import get_model from django.http import Http404 -from django.core.exceptions import PermissionDenied +from django.shortcuts import get_object_or_404, render_to_response +from django.template import RequestContext +from django.utils.translation import ugettext_lazy as _ -from permissions.models import Permission -from common.utils import encapsulate from acls.models import AccessEntry +from common.utils import encapsulate +from permissions.models import Permission -from .models import History, HistoryType from .forms import HistoryDetailForm +from .models import History, HistoryType from .permissions import PERMISSION_HISTORY_VIEW from .widgets import history_entry_object_link diff --git a/mayan/apps/installation/__init__.py b/mayan/apps/installation/__init__.py index 56ff6fe18f..d83f958679 100644 --- a/mayan/apps/installation/__init__.py +++ b/mayan/apps/installation/__init__.py @@ -55,7 +55,7 @@ register_model_list_columns(Property, [ ]) register_links(PropertyNamespace, [link_namespace_details]) -register_links(['namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu') +register_links(['installation:namespace_list', PropertyNamespace], [link_namespace_list], menu_name='secondary_menu') register_tool(link_menu_link) diff --git a/mayan/apps/installation/links.py b/mayan/apps/installation/links.py index 42dac720f3..3ab19a85fd 100644 --- a/mayan/apps/installation/links.py +++ b/mayan/apps/installation/links.py @@ -4,6 +4,6 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import PERMISSION_INSTALLATION_DETAILS -link_menu_link = {'text': _(u'installation details'), 'view': 'namespace_list', 'icon': 'interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} -link_namespace_list = {'text': _(u'installation property namespaces'), 'view': 'namespace_list', 'famfam': 'layout', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} -link_namespace_details = {'text': _(u'details'), 'view': 'namespace_details', 'args': 'object.id', 'famfam': 'layout_link', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_menu_link = {'text': _(u'installation details'), 'view': 'installation:namespace_list', 'icon': 'interface_preferences.png', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_namespace_list = {'text': _(u'installation property namespaces'), 'view': 'installation:namespace_list', 'famfam': 'layout', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} +link_namespace_details = {'text': _(u'details'), 'view': 'installation:namespace_details', 'args': 'object.id', 'famfam': 'layout_link', 'permissions': [PERMISSION_INSTALLATION_DETAILS]} diff --git a/mayan/apps/linking/__init__.py b/mayan/apps/linking/__init__.py index d116e5f667..bbcd5a9bb9 100644 --- a/mayan/apps/linking/__init__.py +++ b/mayan/apps/linking/__init__.py @@ -17,13 +17,13 @@ from .permissions import (PERMISSION_SMART_LINK_VIEW, register_links(Document, [smart_link_instances_for_document], menu_name='form_header') register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list, smart_link_acl_list]) -register_links([SmartLink, 'smart_link_list', 'smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') +register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu') register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete]) -register_links(['smart_link_condition_list', 'smart_link_condition_create', 'smart_link_condition_edit', 'smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') +register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar') register_setup(smart_link_setup) -register_sidebar_template(['smart_link_list'], 'smart_links_help.html') +register_sidebar_template(['linking:smart_link_list'], 'smart_links_help.html') class_permissions(SmartLink, [ PERMISSION_SMART_LINK_VIEW, diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 6698854218..3ba0de7824 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -98,7 +98,7 @@ def smart_link_instances_for_document(request, document_id): smart_link_instances=smart_link_instances, current_document=document, links=[smart_link_instance_view_link] ), - 'form_action': reverse('smart_link_action'), + 'form_action': reverse('linking:smart_link_action'), 'submit_method': 'GET', } }] @@ -148,7 +148,7 @@ def smart_link_create(request): document_group = form.save() apply_default_acls(document_group, request.user) messages.success(request, _(u'Smart link: %s created successfully.') % document_group) - return HttpResponseRedirect(reverse('smart_link_list')) + return HttpResponseRedirect(reverse('linking:smart_link_list')) else: form = SmartLinkForm() @@ -249,7 +249,7 @@ def smart_link_condition_create(request, smart_link_pk): new_smart_link_condition.smart_link = smart_link new_smart_link_condition.save() messages.success(request, _(u'Smart link condition: "%s" created successfully.') % new_smart_link_condition) - return HttpResponseRedirect(reverse('smart_link_condition_list', args=[smart_link.pk])) + return HttpResponseRedirect(reverse('linking:smart_link_condition_list', args=[smart_link.pk])) else: form = SmartLinkConditionForm(initial={'smart_link': smart_link}) diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py index d3f8b15dad..be713ca6de 100644 --- a/mayan/apps/metadata/__init__.py +++ b/mayan/apps/metadata/__init__.py @@ -21,20 +21,20 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT, PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE, PERMISSION_METADATA_DOCUMENT_VIEW) -register_links(['metadata_add', 'metadata_edit', 'metadata_remove', 'metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') +register_links(['metadata:metadata_add', 'metadata:metadata_edit', 'metadata:metadata_remove', 'metadata:metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar') register_links(Document, [metadata_view], menu_name='form_header') -register_multi_item_links(['document_find_duplicates', 'folder_view', 'index_instance_node_view', 'document_type_document_list', 'search', 'results', 'document_group_view', 'document_list', 'document_list_recent', 'tag_tagged_item_list'], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove]) +register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [metadata_multiple_add, metadata_multiple_edit, metadata_multiple_remove]) register_links(MetadataType, [setup_metadata_type_edit, setup_metadata_type_delete]) -register_links([MetadataType, 'setup_metadata_type_list', 'setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu') +register_links([MetadataType, 'metadata:setup_metadata_type_list', 'metadata:setup_metadata_type_create'], [setup_metadata_type_list, setup_metadata_type_create], menu_name='secondary_menu') register_links(MetadataSet, [setup_metadata_set_edit, setup_metadata_set_members, setup_metadata_set_delete]) -register_links([MetadataSet, 'setup_metadata_set_list', 'setup_metadata_set_create'], [setup_metadata_set_list, setup_metadata_set_create], menu_name='secondary_menu') +register_links([MetadataSet, 'metadata:setup_metadata_set_list', 'metadata:setup_metadata_set_create'], [setup_metadata_set_list, setup_metadata_set_create], menu_name='secondary_menu') register_links(DocumentType, [setup_document_type_metadata]) -register_sidebar_template(['setup_metadata_type_list'], 'metadata_type_help.html') -register_sidebar_template(['setup_metadata_set_list'], 'metadata_set_help.html') +register_sidebar_template(['metadata:setup_metadata_type_list'], 'metadata_type_help.html') +register_sidebar_template(['metadata:setup_metadata_set_list'], 'metadata_set_help.html') register_setup(setup_metadata_type_list) register_setup(setup_metadata_set_list) diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index f54602c215..fd0fe6c893 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -157,7 +157,7 @@ def metadata_add(request, document_id=None, document_id_list=None): ) elif len(documents) > 1: return HttpResponseRedirect(u'%s?%s' % ( - reverse('metadata_multiple_edit'), + reverse('metadata:metadata_multiple_edit'), urlencode({'id_list': document_id_list, 'next': next})) ) @@ -311,7 +311,7 @@ def setup_metadata_type_edit(request, metadatatype_id): try: form.save() messages.success(request, _(u'Metadata type edited successfully')) - return HttpResponseRedirect(reverse('setup_metadata_type_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_type_list')) except Exception as exception: messages.error(request, _(u'Error editing metadata type; %s') % exception) pass @@ -334,7 +334,7 @@ def setup_metadata_type_create(request): if form.is_valid(): form.save() messages.success(request, _(u'Metadata type created successfully')) - return HttpResponseRedirect(reverse('setup_metadata_type_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_type_list')) else: form = MetadataTypeForm() @@ -474,7 +474,7 @@ def setup_metadata_set_create(request): if form.is_valid(): form.save() messages.success(request, _(u'Metadata set created successfully')) - return HttpResponseRedirect(reverse('setup_metadata_set_list')) + return HttpResponseRedirect(reverse('metadata:setup_metadata_set_list')) else: form = MetadataSetForm() diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 2cebdead18..411e961c0a 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/links.py @@ -6,17 +6,17 @@ from .permissions import (PERMISSION_OCR_DOCUMENT, PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE, PERMISSION_OCR_CLEAN_ALL_PAGES) -submit_document = {'text': _('submit to OCR queue'), 'view': 'submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -re_queue_document = {'text': _('re-queue'), 'view': 're_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -re_queue_multiple_document = {'text': _('re-queue'), 'view': 're_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} -queue_document_delete = {'text': _(u'delete'), 'view': 'queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} -queue_document_multiple_delete = {'text': _(u'delete'), 'view': 'queue_document_multiple_delete', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} +submit_document = {'text': _('submit to OCR queue'), 'view': 'ocr:submit_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +submit_document_multiple = {'text': _('submit to OCR queue'), 'view': 'ocr:submit_document_multiple', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +re_queue_document = {'text': _('re-queue'), 'view': 'ocr:re_queue_document', 'args': 'object.id', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +re_queue_multiple_document = {'text': _('re-queue'), 'view': 'ocr:re_queue_multiple_document', 'famfam': 'hourglass_add', 'permissions': [PERMISSION_OCR_DOCUMENT]} +queue_document_delete = {'text': _(u'delete'), 'view': 'ocr:queue_document_delete', 'args': 'object.id', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} +queue_document_multiple_delete = {'text': _(u'delete'), 'view': 'ocr:queue_document_multiple_delete', 'famfam': 'hourglass_delete', 'permissions': [PERMISSION_OCR_DOCUMENT_DELETE]} -document_queue_disable = {'text': _(u'stop queue'), 'view': 'document_queue_disable', 'args': 'queue.id', 'famfam': 'control_stop_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} -document_queue_enable = {'text': _(u'activate queue'), 'view': 'document_queue_enable', 'args': 'queue.id', 'famfam': 'control_play_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} +document_queue_disable = {'text': _(u'stop queue'), 'view': 'ocr:document_queue_disable', 'args': 'queue.id', 'famfam': 'control_stop_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} +document_queue_enable = {'text': _(u'activate queue'), 'view': 'ocr:document_queue_enable', 'args': 'queue.id', 'famfam': 'control_play_blue', 'permissions': [PERMISSION_OCR_QUEUE_ENABLE_DISABLE]} -all_document_ocr_cleanup = {'text': _(u'clean up pages content'), 'view': 'all_document_ocr_cleanup', 'famfam': 'text_strikethrough', 'permissions': [PERMISSION_OCR_CLEAN_ALL_PAGES], 'description': _(u'Runs a language filter to remove common OCR mistakes from document pages content.')} +all_document_ocr_cleanup = {'text': _(u'clean up pages content'), 'view': 'ocr:all_document_ocr_cleanup', 'famfam': 'text_strikethrough', 'permissions': [PERMISSION_OCR_CLEAN_ALL_PAGES], 'description': _(u'Runs a language filter to remove common OCR mistakes from document pages content.')} -queue_document_list = {'text': _(u'queue document list'), 'view': 'queue_document_list', 'famfam': 'hourglass', 'permissions': [PERMISSION_OCR_DOCUMENT]} -ocr_tool_link = {'text': _(u'OCR'), 'view': 'queue_document_list', 'famfam': 'hourglass', 'icon': 'text.png', 'permissions': [PERMISSION_OCR_DOCUMENT], 'children_view_regex': [r'queue_', r'document_queue']} +queue_document_list = {'text': _(u'queue document list'), 'view': 'ocr:queue_document_list', 'famfam': 'hourglass', 'permissions': [PERMISSION_OCR_DOCUMENT]} +ocr_tool_link = {'text': _(u'OCR'), 'view': 'ocr:queue_document_list', 'famfam': 'hourglass', 'icon': 'text.png', 'permissions': [PERMISSION_OCR_DOCUMENT], 'children_view_regex': [r'queue_', r'document_queue']} diff --git a/mayan/apps/project_setup/api.py b/mayan/apps/project_setup/api.py index f1dd99a4b3..1d11179701 100644 --- a/mayan/apps/project_setup/api.py +++ b/mayan/apps/project_setup/api.py @@ -6,7 +6,6 @@ setup_items = [] def register_setup(link): - print "link", link setup_items.append(link) # Append the link's children_view_regex to the setup main menu children view regex diff --git a/mayan/apps/registration/links.py b/mayan/apps/registration/links.py index 9c188473e6..ee0da876a8 100644 --- a/mayan/apps/registration/links.py +++ b/mayan/apps/registration/links.py @@ -9,4 +9,4 @@ def is_not_registered(context): return RegistrationSingleton.registration_state() is False -form_view = {'text': _('Registration'), 'view': 'form_view', 'famfam': 'telephone', 'condition': is_not_registered} +form_view = {'text': _('Registration'), 'view': 'registration:form_view', 'famfam': 'telephone', 'condition': is_not_registered} diff --git a/mayan/apps/scheduler/links.py b/mayan/apps/scheduler/links.py index 7190be22f9..a92431eb1a 100644 --- a/mayan/apps/scheduler/links.py +++ b/mayan/apps/scheduler/links.py @@ -4,4 +4,4 @@ from django.utils.translation import ugettext_lazy as _ from .permissions import PERMISSION_VIEW_JOB_LIST -job_list = {'text': _(u'interval job list'), 'view': 'job_list', 'icon': 'time.png', 'permissions': [PERMISSION_VIEW_JOB_LIST]} +job_list = {'text': _(u'interval job list'), 'view': 'scheduler:job_list', 'icon': 'time.png', 'permissions': [PERMISSION_VIEW_JOB_LIST]} From aaf8855403f4b80e4fedcc42812a23b2bc9d3381 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 6 Sep 2014 17:30:10 -0400 Subject: [PATCH 020/783] Add development branch to travis config file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 81ab2c70cc..242e1b4ec9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ after_success: branches: only: - master + - development notifications: email: recipients: From 7dfacc624cf106bca046ae53d5c035a5c9f06956 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 7 Sep 2014 22:20:33 -0400 Subject: [PATCH 021/783] Add namespace to tests views --- mayan/apps/documents/tests.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mayan/apps/documents/tests.py b/mayan/apps/documents/tests.py index 57830075aa..c2c514e8f4 100644 --- a/mayan/apps/documents/tests.py +++ b/mayan/apps/documents/tests.py @@ -155,12 +155,12 @@ class DocumentUploadFunctionalTestCase(TestCase): self.assertTrue(self.admin_user.is_authenticated()) # Create new webform source - response = self.client.post(reverse('setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) + response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) self.assertEqual(WebForm.objects.count(), 1) # Upload the test document with open(TEST_DOCUMENT_PATH) as file_descriptor: - response = self.client.post(reverse('upload_interactive'), {'file': file_descriptor}) + response = self.client.post(reverse('sources:upload_interactive'), {'file': file_descriptor}) self.assertEqual(Document.objects.count(), 1) self.document = Document.objects.all().first() @@ -174,7 +174,7 @@ class DocumentUploadFunctionalTestCase(TestCase): self.failUnlessEqual(self.document.page_count, 47) # Delete the document - response = self.client.post(reverse('document_delete', args=[self.document.pk])) + response = self.client.post(reverse('documents:document_delete', args=[self.document.pk])) self.assertEqual(Document.objects.count(), 0) def test_issue_25(self): @@ -187,12 +187,12 @@ class DocumentUploadFunctionalTestCase(TestCase): self.assertTrue(self.admin_user.is_authenticated()) # Create new webform source - response = self.client.post(reverse('setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) + response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) self.assertEqual(WebForm.objects.count(), 1) # Upload the test document with open(TEST_DOCUMENT_PATH) as file_descriptor: - response = self.client.post(reverse('upload_interactive'), {'file': file_descriptor, 'description': TEST_DOCUMENT_DESCRIPTION}) + response = self.client.post(reverse('sources:upload_interactive'), {'file': file_descriptor, 'description': TEST_DOCUMENT_DESCRIPTION}) self.assertEqual(Document.objects.count(), 1) document = Document.objects.all().first() @@ -205,7 +205,7 @@ class DocumentUploadFunctionalTestCase(TestCase): self.failUnlessEqual(document.description, '') # Test for issue 25 during editing - response = self.client.post(reverse('document_edit', args=[document.pk]), {'description': TEST_DOCUMENT_DESCRIPTION}) + response = self.client.post(reverse('documents:document_edit', args=[document.pk]), {'description': TEST_DOCUMENT_DESCRIPTION}) # Fetch document again and test description document = Document.objects.all().first() self.failUnlessEqual(document.description, TEST_DOCUMENT_DESCRIPTION) @@ -298,43 +298,43 @@ class DocumentsViewsFunctionalTestCase(TestCase): self.assertTrue(logged_in) self.assertTrue(self.admin_user.is_authenticated()) # Create new webform source - response = self.client.post(reverse('setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) + response = self.client.post(reverse('sources:setup_source_create', args=[SOURCE_CHOICE_WEB_FORM]), {'title': 'test', 'uncompress': 'n', 'enabled': True}) self.assertEqual(WebForm.objects.count(), 1) # Upload the test document with open(TEST_DOCUMENT_PATH) as file_descriptor: - response = self.client.post(reverse('upload_interactive'), {'file': file_descriptor}) + response = self.client.post(reverse('sources:upload_interactive'), {'file': file_descriptor}) self.assertEqual(Document.objects.count(), 1) self.document = Document.objects.first() def test_document_view(self): - response = self.client.get(reverse('document_list')) + response = self.client.get(reverse('documents:document_list')) self.assertEqual(response.status_code, 200) self.assertTrue('List of documents (1)' in response.content) # test document simple view - response = self.client.get(reverse('document_view_simple', args=[self.document.pk])) + response = self.client.get(reverse('documents:document_view_simple', args=[self.document.pk])) self.assertEqual(response.status_code, 200) self.assertTrue('Details for: mayan_11_1.pdf' in response.content) # test document advanced view - response = self.client.get(reverse('document_view_advanced', args=[self.document.pk])) + response = self.client.get(reverse('documents:document_view_advanced', args=[self.document.pk])) self.assertEqual(response.status_code, 200) self.assertTrue('Document properties for: mayan_11_1.pdf' in response.content) def test_document_type_views(self): # Check that there are no document types - response = self.client.get(reverse('document_type_list')) + response = self.client.get(reverse('documents:document_type_list')) self.assertEqual(response.status_code, 200) self.assertTrue('List of document types (0)' in response.content) # Create a document type - response = self.client.post(reverse('document_type_create'), data={'name': TEST_DOCUMENT_TYPE}, follow=True) + response = self.client.post(reverse('documents:document_type_create'), data={'name': TEST_DOCUMENT_TYPE}, follow=True) self.assertEqual(response.status_code, 200) self.assertTrue('Document type created successfully' in response.content) # Check that there is one document types - response = self.client.get(reverse('document_type_list')) + response = self.client.get(reverse('documents:document_type_list')) self.assertEqual(response.status_code, 200) self.assertTrue('List of document types (1)' in response.content) @@ -342,7 +342,7 @@ class DocumentsViewsFunctionalTestCase(TestCase): self.assertEqual(document_type.name, TEST_DOCUMENT_TYPE) # Edit the document type - response = self.client.post(reverse('document_type_edit', args=[document_type.pk]), data={'name': TEST_DOCUMENT_TYPE + 'partial'}, follow=True) + response = self.client.post(reverse('documents:document_type_edit', args=[document_type.pk]), data={'name': TEST_DOCUMENT_TYPE + 'partial'}, follow=True) self.assertEqual(response.status_code, 200) self.assertTrue('Document type edited successfully' in response.content) @@ -350,11 +350,11 @@ class DocumentsViewsFunctionalTestCase(TestCase): self.assertEqual(document_type.name, TEST_DOCUMENT_TYPE + 'partial') # Delete the document type - response = self.client.post(reverse('document_type_delete', args=[document_type.pk]), follow=True) + response = self.client.post(reverse('documents:document_type_delete', args=[document_type.pk]), follow=True) self.assertEqual(response.status_code, 200) self.assertTrue('Document type: {0} deleted successfully'.format(document_type.name) in response.content) # Check that there are no document types - response = self.client.get(reverse('document_type_list')) + response = self.client.get(reverse('documents:document_type_list')) self.assertEqual(response.status_code, 200) self.assertTrue('List of document types (0)' in response.content) From f5bef4b52db94a06db9b866db6acafbbf1e79636 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 9 Sep 2014 03:51:23 -0400 Subject: [PATCH 022/783] Add app url namespacing to the common and main apps, fix missing namespace in the registration app, remove explict reverse_lazy for the LOGIN_URL and LOGIN_REDIRECT_URL these are expected to be views or URLs (failover) --- mayan/apps/common/__init__.py | 4 ++-- mayan/apps/common/links.py | 10 +++++----- .../common/middleware/login_required_middleware.py | 5 +++-- mayan/apps/common/views.py | 4 ++-- mayan/apps/main/__init__.py | 2 +- mayan/apps/main/links.py | 6 +++--- mayan/apps/main/templates/main/base.html | 8 ++++---- mayan/apps/main/views.py | 2 +- mayan/apps/registration/__init__.py | 2 +- mayan/settings/base.py | 6 ++---- mayan/urls.py | 4 ++-- 11 files changed, 26 insertions(+), 27 deletions(-) diff --git a/mayan/apps/common/__init__.py b/mayan/apps/common/__init__.py index 01b7ad6bf7..a3db11709a 100644 --- a/mayan/apps/common/__init__.py +++ b/mayan/apps/common/__init__.py @@ -24,8 +24,8 @@ from .utils import validate_path logger = logging.getLogger(__name__) -register_links(['current_user_details', 'current_user_edit', 'password_change_view'], [link_current_user_details, link_current_user_edit, link_password_change], menu_name='secondary_menu') -register_links(['about_view', 'license_view', 'form_view'], [link_about, link_license], menu_name='secondary_menu') +register_links(['common:current_user_details', 'common:current_user_edit', 'common:password_change_view'], [link_current_user_details, link_current_user_edit, link_password_change], menu_name='secondary_menu') +register_links(['common:about_view', 'common:license_view', 'registration:form_view'], [link_about, link_license], menu_name='secondary_menu') register_top_menu('about', link_about, position=-1) diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py index 94e2913e0b..dda8088758 100644 --- a/mayan/apps/common/links.py +++ b/mayan/apps/common/links.py @@ -7,9 +7,9 @@ def has_usable_password(context): return context['request'].user.has_usable_password -link_password_change = {'text': _(u'change password'), 'view': 'password_change_view', 'famfam': 'computer_key', 'condition': has_usable_password} -link_current_user_details = {'text': _(u'user details'), 'view': 'current_user_details', 'famfam': 'vcard'} -link_current_user_edit = {'text': _(u'edit details'), 'view': 'current_user_edit', 'famfam': 'vcard_edit'} +link_password_change = {'text': _(u'change password'), 'view': 'common:password_change_view', 'famfam': 'computer_key', 'condition': has_usable_password} +link_current_user_details = {'text': _(u'user details'), 'view': 'common:current_user_details', 'famfam': 'vcard'} +link_current_user_edit = {'text': _(u'edit details'), 'view': 'common:current_user_edit', 'famfam': 'vcard_edit'} -link_about = {'text': _(u'about'), 'view': 'about_view', 'famfam': 'information'} -link_license = {'text': _(u'license'), 'view': 'license_view', 'famfam': 'script'} +link_about = {'text': _(u'about'), 'view': 'common:about_view', 'famfam': 'information'} +link_license = {'text': _(u'license'), 'view': 'common:license_view', 'famfam': 'script'} diff --git a/mayan/apps/common/middleware/login_required_middleware.py b/mayan/apps/common/middleware/login_required_middleware.py index 94331d32aa..d36e337f6d 100644 --- a/mayan/apps/common/middleware/login_required_middleware.py +++ b/mayan/apps/common/middleware/login_required_middleware.py @@ -4,10 +4,11 @@ import re from django.http import HttpResponseRedirect from django.conf import settings +from django.core.urlresolvers import reverse from ..conf.settings import ALLOW_ANONYMOUS_ACCESS -EXEMPT_URLS = [re.compile(settings.LOGIN_URL.lstrip('/'))] +EXEMPT_URLS = [re.compile(reverse(settings.LOGIN_URL).lstrip('/'))] if hasattr(settings, 'LOGIN_EXEMPT_URLS'): EXEMPT_URLS += [re.compile(expr) for expr in settings.LOGIN_EXEMPT_URLS] @@ -34,4 +35,4 @@ class LoginRequiredMiddleware: if not request.user.is_authenticated(): path = request.path_info.lstrip('/') if not any(m.match(path) for m in EXEMPT_URLS): - return HttpResponseRedirect(settings.LOGIN_URL) + return HttpResponseRedirect(reverse(settings.LOGIN_URL)) diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py index cf587c526d..d34089e3ed 100644 --- a/mayan/apps/common/views.py +++ b/mayan/apps/common/views.py @@ -181,7 +181,7 @@ def current_user_edit(request): Allow an user to edit his own details """ - next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('current_user_details')))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', reverse('common:current_user_details')))) if request.method == 'POST': form = UserForm(instance=request.user, data=request.POST) @@ -245,7 +245,7 @@ def password_change_view(request): request, extra_context=context, template_name='main/password_change_form.html', - post_change_redirect=reverse('password_change_done'), + post_change_redirect=reverse('common:password_change_done'), ) diff --git a/mayan/apps/main/__init__.py b/mayan/apps/main/__init__.py index 99dcf524a2..3cf6af8f27 100644 --- a/mayan/apps/main/__init__.py +++ b/mayan/apps/main/__init__.py @@ -11,7 +11,7 @@ from .conf.settings import DISABLE_HOME_VIEW from .links import admin_site, diagnostics, maintenance_menu, sentry if not DISABLE_HOME_VIEW: - register_top_menu('home', link={'text': _(u'home'), 'view': 'home', 'famfam': 'house'}, position=0) + register_top_menu('home', link={'text': _(u'home'), 'view': 'main:home', 'famfam': 'house'}, position=0) if 'django.contrib.admin' in settings.INSTALLED_APPS: register_setup(admin_site) diff --git a/mayan/apps/main/links.py b/mayan/apps/main/links.py index e21cb71386..aea406bf0d 100644 --- a/mayan/apps/main/links.py +++ b/mayan/apps/main/links.py @@ -5,7 +5,7 @@ def is_superuser(context): return context['request'].user.is_staff or context['request'].user.is_superuser -maintenance_menu = {'text': _(u'maintenance'), 'view': 'maintenance_menu', 'famfam': 'wrench', 'icon': 'wrench.png'} -diagnostics = {'text': _(u'diagnostics'), 'view': 'diagnostics', 'famfam': 'pill', 'icon': 'pill.png'} -sentry = {'text': _(u'sentry'), 'view': 'sentry', 'famfam': 'bug', 'icon': 'bug.png', 'condition': is_superuser} +maintenance_menu = {'text': _(u'maintenance'), 'view': 'main:maintenance_menu', 'famfam': 'wrench', 'icon': 'wrench.png'} +diagnostics = {'text': _(u'diagnostics'), 'view': 'main:diagnostics', 'famfam': 'pill', 'icon': 'pill.png'} +sentry = {'text': _(u'sentry'), 'view': 'main:sentry', 'famfam': 'bug', 'icon': 'bug.png', 'condition': is_superuser} admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboard', 'icon': 'keyboard.png', 'condition': is_superuser} diff --git a/mayan/apps/main/templates/main/base.html b/mayan/apps/main/templates/main/base.html index 7f91c4ff4b..2e4fb61895 100644 --- a/mayan/apps/main/templates/main/base.html +++ b/mayan/apps/main/templates/main/base.html @@ -148,7 +148,7 @@ {% else %} {% if not web_theme_hide_menus %}