From d9501476591956517b6e2eb822767c10976afb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 23 Sep 2014 11:02:15 +0200 Subject: [PATCH] Fix bug #1069: Change 'Feauteres' for 'Modules' --- app/coffee/app.coffee | 4 ++-- app/coffee/modules/admin/project-profile.coffee | 6 +++--- app/coffee/modules/base.coffee | 2 +- app/coffee/modules/common.coffee | 2 +- ...min-project-features.jade => admin-project-modules.jade} | 6 +++--- .../views/modules/admin-submenu-project-profile.jade | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) rename app/partials/{admin-project-features.jade => admin-project-modules.jade} (96%) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 6b58b9c9..89f69274 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -68,8 +68,8 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade {templateUrl: "/partials/admin-project-profile.html"}) $routeProvider.when("/project/:pslug/admin/project-profile/default-values", {templateUrl: "/partials/admin-project-default-values.html"}) - $routeProvider.when("/project/:pslug/admin/project-profile/features", - {templateUrl: "/partials/admin-project-features.html"}) + $routeProvider.when("/project/:pslug/admin/project-profile/modules", + {templateUrl: "/partials/admin-project-modules.html"}) $routeProvider.when("/project/:pslug/admin/project-values/us-status", {templateUrl: "/partials/admin-project-values-us-status.html"}) $routeProvider.when("/project/:pslug/admin/project-values/us-points", diff --git a/app/coffee/modules/admin/project-profile.coffee b/app/coffee/modules/admin/project-profile.coffee index 9e19c9ff..0302ada6 100644 --- a/app/coffee/modules/admin/project-profile.coffee +++ b/app/coffee/modules/admin/project-profile.coffee @@ -133,10 +133,10 @@ module.directive("tgProjectProfile", ["$rootScope", "$log", "$tgRepo", "$tgConfi ############################################################################# -## Project Features Directive +## Project Modules Directive ############################################################################# -ProjectFeaturesDirective = ($rootscope, $log, $repo, $confirm, $loading) -> +ProjectModulesDirective = ($rootscope, $log, $repo, $confirm, $loading) -> link = ($scope, $el, $attrs) -> form = $el.find("form").checksley() submit = => @@ -178,4 +178,4 @@ ProjectFeaturesDirective = ($rootscope, $log, $repo, $confirm, $loading) -> return {link:link} -module.directive("tgProjectFeatures", ["$rootScope", "$log", "$tgRepo", "$tgConfirm", "$tgLoading", ProjectFeaturesDirective]) +module.directive("tgProjectModules", ["$rootScope", "$log", "$tgRepo", "$tgConfirm", "$tgLoading", ProjectModulesDirective]) diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee index 20ee06b7..1feb8e91 100644 --- a/app/coffee/modules/base.coffee +++ b/app/coffee/modules/base.coffee @@ -81,7 +81,7 @@ urls = { "project-admin-home": "/project/:project/admin/project-profile/details" "project-admin-project-profile-details": "/project/:project/admin/project-profile/details" "project-admin-project-profile-default-values": "/project/:project/admin/project-profile/default-values" - "project-admin-project-profile-features": "/project/:project/admin/project-profile/features" + "project-admin-project-profile-modules": "/project/:project/admin/project-profile/modules" "project-admin-project-values-us-status": "/project/:project/admin/project-values/us-status" "project-admin-project-values-us-points": "/project/:project/admin/project-values/us-points" "project-admin-project-values-task-status": "/project/:project/admin/project-values/task-status" diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee index d4fd3c65..11d3fa79 100644 --- a/app/coffee/modules/common.coffee +++ b/app/coffee/modules/common.coffee @@ -101,7 +101,7 @@ module.factory("$appTitle", AppTitle) ############################################################################# ## Get the appropiate section url for a project -## according to his enabled features and user permisions +## according to his enabled modules and user permisions ############################################################################# ProjectUrl = ($navurls) -> diff --git a/app/partials/admin-project-features.jade b/app/partials/admin-project-modules.jade similarity index 96% rename from app/partials/admin-project-features.jade rename to app/partials/admin-project-modules.jade index 1e29cc43..93b00df4 100644 --- a/app/partials/admin-project-features.jade +++ b/app/partials/admin-project-modules.jade @@ -4,12 +4,12 @@ block head title Taiga Your agile, free, and open source project management tool block content - div.wrapper(tg-project-features, ng-controller="ProjectProfileController as ctrl", - ng-init="section='admin'; sectionName='Features'") + div.wrapper(tg-project-modules, ng-controller="ProjectProfileController as ctrl", + ng-init="section='admin'; sectionName='Modules'") sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include views/modules/admin-menu - sidebar.menu-tertiary.sidebar(tg-admin-navigation="features") + sidebar.menu-tertiary.sidebar(tg-admin-navigation="modules") include views/modules/admin-submenu-project-profile section.main.admin-functionalities diff --git a/app/partials/views/modules/admin-submenu-project-profile.jade b/app/partials/views/modules/admin-submenu-project-profile.jade index b38d38f9..535a6b3f 100644 --- a/app/partials/views/modules/admin-submenu-project-profile.jade +++ b/app/partials/views/modules/admin-submenu-project-profile.jade @@ -12,7 +12,7 @@ section.admin-submenu a(href="", tg-nav="project-admin-project-profile-default-values:project=project.slug") span.title Default Values span.icon.icon-arrow-right - li#adminmenu-features - a(href="", tg-nav="project-admin-project-profile-features:project=project.slug") - span.title Features + li#adminmenu-modules + a(href="", tg-nav="project-admin-project-profile-modules:project=project.slug") + span.title Modules span.icon.icon-arrow-right