diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index 2e6311fc..0f099adc 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -89,12 +89,22 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, $tgEven {templateUrl: "admin/admin-project-modules.html"}) $routeProvider.when("/project/:pslug/admin/project-profile/export", {templateUrl: "admin/admin-project-export.html"}) - $routeProvider.when("/project/:pslug/admin/project-values/us", - {templateUrl: "admin/admin-project-values-us.html"}) - $routeProvider.when("/project/:pslug/admin/project-values/task", - {templateUrl: "admin/admin-project-values-task.html"}) - $routeProvider.when("/project/:pslug/admin/project-values/issue", - {templateUrl: "admin/admin-project-values-issue.html"}) + $routeProvider.when("/project/:pslug/admin/project-profile/reports", + {templateUrl: "admin/admin-project-reports.html"}) + + $routeProvider.when("/project/:pslug/admin/project-values/status", + {templateUrl: "admin/admin-project-values-status.html"}) + $routeProvider.when("/project/:pslug/admin/project-values/points", + {templateUrl: "admin/admin-project-values-points.html"}) + $routeProvider.when("/project/:pslug/admin/project-values/priorities", + {templateUrl: "admin/admin-project-values-priorities.html"}) + $routeProvider.when("/project/:pslug/admin/project-values/severities", + {templateUrl: "admin/admin-project-values-severities.html"}) + $routeProvider.when("/project/:pslug/admin/project-values/types", + {templateUrl: "admin/admin-project-values-types.html"}) + $routeProvider.when("/project/:pslug/admin/project-values/custom-fields", + {templateUrl: "admin/admin-project-values-custom-fields.html"}) + $routeProvider.when("/project/:pslug/admin/memberships", {templateUrl: "admin/admin-memberships.html"}) # Admin - Roles diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee index 5f324796..8c762e77 100644 --- a/app/coffee/modules/base.coffee +++ b/app/coffee/modules/base.coffee @@ -84,9 +84,15 @@ urls = { "project-admin-project-profile-default-values": "/project/:project/admin/project-profile/default-values" "project-admin-project-profile-modules": "/project/:project/admin/project-profile/modules" "project-admin-project-profile-export": "/project/:project/admin/project-profile/export" - "project-admin-project-values-us": "/project/:project/admin/project-values/us" - "project-admin-project-values-task": "/project/:project/admin/project-values/task" - "project-admin-project-values-issue": "/project/:project/admin/project-values/issue" + "project-admin-project-profile-reports": "/project/:project/admin/project-profile/reports" + + "project-admin-project-values-status": "/project/:project/admin/project-values/status" + "project-admin-project-values-points": "/project/:project/admin/project-values/points" + "project-admin-project-values-priorities": "/project/:project/admin/project-values/priorities" + "project-admin-project-values-severities": "/project/:project/admin/project-values/severities" + "project-admin-project-values-types": "/project/:project/admin/project-values/types" + "project-admin-project-values-custom-fields": "/project/:project/admin/project-values/custom-fields" + "project-admin-memberships": "/project/:project/admin/memberships" "project-admin-roles": "/project/:project/admin/roles" "project-admin-third-parties-webhooks": "/project/:project/admin/third-parties/webhooks" diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade new file mode 100644 index 00000000..09d45a54 --- /dev/null +++ b/app/partials/admin/admin-project-reports.jade @@ -0,0 +1,27 @@ +div.wrapper(ng-controller="ProjectProfileController as ctrl", + ng-init="section='admin'; sectionName='Export'") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="reports") + include ../includes/modules/admin-submenu-project-profile + + section.main.admin-common(tg-project-export) + header + include ../includes/components/mainTitle + p.admin-subtitle Export your project data in CSV format. + + - var csvType = "US"; + - var controller = "CsvExporterUserstoriesController"; + div.admin-attributes-section + include ../includes/modules/admin/project-csv + + - var csvType = "Task"; + - var controller = "CsvExporterTasksController"; + div.admin-attributes-section + include ../includes/modules/admin/project-csv + + - var csvType = "Issues"; + - var controller = "CsvExporterIssuesController"; + div.admin-attributes-section + include ../includes/modules/admin/project-csv diff --git a/app/partials/admin/admin-project-values-custom-fields.jade b/app/partials/admin/admin-project-values-custom-fields.jade new file mode 100644 index 00000000..ddc03dfc --- /dev/null +++ b/app/partials/admin/admin-project-values-custom-fields.jade @@ -0,0 +1,31 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-custom-fields") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the custom fields for your user stories, tasks and issues + + div.admin-attributes-section(tg-project-custom-attributes, + ng-controller="ProjectCustomAttributesController as ctrl", + ng-init="type='userstory';") + - var customFieldSectionTitle = "User stories custom fields" + - var customFieldButtonTitle = "Add a custom field in user stories" + include ../includes/modules/admin/admin-custom-attributes + + div.admin-attributes-section(tg-project-custom-attributes, + ng-controller="ProjectCustomAttributesController as ctrl", + ng-init="type='task';") + - var customFieldSectionTitle = "Tasks custom fields" + - var customFieldButtonTitle = "Add a custom field in tasks" + include ../includes/modules/admin/admin-custom-attributes + + div.admin-attributes-section(tg-project-custom-attributes, + ng-controller="ProjectCustomAttributesController as ctrl", + ng-init="type='issue';") + - var customFieldSectionTitle = "Issues custom fields" + - var customFieldButtonTitle = "Add a custom field in issues" + include ../includes/modules/admin/admin-custom-attributes diff --git a/app/partials/admin/admin-project-values-issue.jade b/app/partials/admin/admin-project-values-issue.jade deleted file mode 100644 index 4b414726..00000000 --- a/app/partials/admin/admin-project-values-issue.jade +++ /dev/null @@ -1,41 +0,0 @@ -div.wrapper(ng-controller="ProjectValuesSectionController") - sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") - include ../includes/modules/admin-menu - - sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-issue") - include ../includes/modules/admin-submenu-project-values - - section.main.admin-common.admin-attributes - include ../includes/components/mainTitle - p.admin-subtitle Specify the column headers that you will use to classify Issues - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='issue-statuses'; sectionName='Status'", - type="issue-statuses") - include ../includes/modules/admin/project-status - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='priorities'; sectionName='Priorities'; objName='priority'", - type="priorities") - include ../includes/modules/admin/project-types - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='severities'; sectionName='Severities'; objName='severity'", - type="severities") - include ../includes/modules/admin/project-types - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='issues'; type='issue-types'; sectionName='Types'; objName='type'", - type="issue-types") - include ../includes/modules/admin/project-types - - div.admin-attributes-section(tg-project-custom-attributes, - ng-controller="ProjectCustomAttributesController as ctrl", - ng-init="type='issue';") - - var customFieldButtonTitle = "Add a custom field in tasks" - include ../includes/modules/admin/admin-custom-attributes - - - var csvType = "Issues"; - - var controller = "CsvExporterIssuesController"; - div.admin-attributes-section - include ../includes/modules/admin/project-csv diff --git a/app/partials/admin/admin-project-values-points.jade b/app/partials/admin/admin-project-values-points.jade new file mode 100644 index 00000000..64ef3fb1 --- /dev/null +++ b/app/partials/admin/admin-project-values-points.jade @@ -0,0 +1,15 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-points") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the points your user stories could be estimated to + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='userstories'; type='points'; sectionName='Us points'", + type="points") + include ../includes/modules/admin/project-points diff --git a/app/partials/admin/admin-project-values-priorities.jade b/app/partials/admin/admin-project-values-priorities.jade new file mode 100644 index 00000000..4e0c5098 --- /dev/null +++ b/app/partials/admin/admin-project-values-priorities.jade @@ -0,0 +1,15 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-priorities") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the priorities your issues will have + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='issues'; type='priorities'; sectionName='Issue priorities'; objName='priority'", + type="priorities") + include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-severities.jade b/app/partials/admin/admin-project-values-severities.jade new file mode 100644 index 00000000..507ff930 --- /dev/null +++ b/app/partials/admin/admin-project-values-severities.jade @@ -0,0 +1,15 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-severities") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the severities your issues will have + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='issues'; type='severities'; sectionName='Issue severities'; objName='severity'", + type="severities") + include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-status.jade b/app/partials/admin/admin-project-values-status.jade new file mode 100644 index 00000000..5f6e8876 --- /dev/null +++ b/app/partials/admin/admin-project-values-status.jade @@ -0,0 +1,25 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-status") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the statuses your user stories, tasks and issues will go through + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='userstories'; type='userstory-statuses'; sectionName='Us Statuses'", + type="userstory-statuses") + include ../includes/modules/admin/project-us-status + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='tasks'; type='task-statuses'; sectionName='Task Statuses'", + type="task-statuses") + include ../includes/modules/admin/project-status + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='issues'; type='issue-statuses'; sectionName='Issue Statuses'", + type="issue-statuses") + include ../includes/modules/admin/project-status diff --git a/app/partials/admin/admin-project-values-task.jade b/app/partials/admin/admin-project-values-task.jade deleted file mode 100644 index 62e1d191..00000000 --- a/app/partials/admin/admin-project-values-task.jade +++ /dev/null @@ -1,26 +0,0 @@ -div.wrapper(ng-controller="ProjectValuesSectionController") - sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") - include ../includes/modules/admin-menu - - sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-task") - include ../includes/modules/admin-submenu-project-values - - section.main.admin-common.admin-attributes - include ../includes/components/mainTitle - p.admin-subtitle Specify the column headers that you will use to classify Tasks related to each User Stories - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='tasks'; type='task-statuses'; sectionName='Task Statuses'", - type="task-statuses") - include ../includes/modules/admin/project-status - - div.admin-attributes-section(tg-project-custom-attributes, - ng-controller="ProjectCustomAttributesController as ctrl", - ng-init="type='task';") - - var customFieldButtonTitle = "Add a custom field in tasks" - include ../includes/modules/admin/admin-custom-attributes - - - var csvType = "Task"; - - var controller = "CsvExporterTasksController"; - div.admin-attributes-section - include ../includes/modules/admin/project-csv diff --git a/app/partials/admin/admin-project-values-types.jade b/app/partials/admin/admin-project-values-types.jade new file mode 100644 index 00000000..2f033b29 --- /dev/null +++ b/app/partials/admin/admin-project-values-types.jade @@ -0,0 +1,15 @@ +div.wrapper(ng-controller="ProjectValuesSectionController") + sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") + include ../includes/modules/admin-menu + + sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-types") + include ../includes/modules/admin-submenu-project-values + + section.main.admin-common.admin-attributes + include ../includes/components/mainTitle + p.admin-subtitle Specify the types your user stories could be estimated to + + div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", + ng-init="section='admin'; resource='issues'; type='issue-types'; sectionName='Issue types'; objName='type'", + type="issue-types") + include ../includes/modules/admin/project-types diff --git a/app/partials/admin/admin-project-values-us.jade b/app/partials/admin/admin-project-values-us.jade deleted file mode 100644 index 807d53fd..00000000 --- a/app/partials/admin/admin-project-values-us.jade +++ /dev/null @@ -1,31 +0,0 @@ -div.wrapper(ng-controller="ProjectValuesSectionController") - sidebar.menu-secondary.sidebar(tg-admin-navigation="project-values") - include ../includes/modules/admin-menu - - sidebar.menu-tertiary.sidebar(tg-admin-navigation="values-us") - include ../includes/modules/admin-submenu-project-values - - section.main.admin-common.admin-attributes - include ../includes/components/mainTitle - p.admin-subtitle Specify the column headers that you will use to classify User Stories - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='userstories'; type='userstory-statuses'; sectionName='Us Statuses'", - type="userstory-statuses") - include ../includes/modules/admin/project-us-status - - div.admin-attributes-section(tg-project-values, ng-controller="ProjectValuesController as ctrl", - ng-init="section='admin'; resource='userstories'; type='points'; sectionName='Us points'", - type="points") - include ../includes/modules/admin/project-points - - div.admin-attributes-section(tg-project-custom-attributes, - ng-controller="ProjectCustomAttributesController as ctrl", - ng-init="type='userstory';") - - var customFieldButtonTitle = "Add a custom field in tasks" - include ../includes/modules/admin/admin-custom-attributes - - - var csvType = "US"; - - var controller = "CsvExporterUserstoriesController"; - div.admin-attributes-section - include ../includes/modules/admin/project-csv diff --git a/app/partials/includes/modules/admin-menu.jade b/app/partials/includes/modules/admin-menu.jade index 858ec8a8..0a4cb08e 100644 --- a/app/partials/includes/modules/admin-menu.jade +++ b/app/partials/includes/modules/admin-menu.jade @@ -9,7 +9,7 @@ section.admin-menu span.title Project span.icon.icon-arrow-right li#adminmenu-project-values - a(href="", tg-nav="project-admin-project-values-us:project=project.slug") + a(href="", tg-nav="project-admin-project-values-status:project=project.slug") span.title Attributes span.icon.icon-arrow-right li#adminmenu-memberships diff --git a/app/partials/includes/modules/admin-submenu-project-profile.jade b/app/partials/includes/modules/admin-submenu-project-profile.jade index e9522a86..30be41da 100644 --- a/app/partials/includes/modules/admin-submenu-project-profile.jade +++ b/app/partials/includes/modules/admin-submenu-project-profile.jade @@ -20,3 +20,7 @@ section.admin-submenu a(href="", tg-nav="project-admin-project-profile-export:project=project.slug") span.title Export span.icon.icon-arrow-right + li#adminmenu-reports + a(href="", tg-nav="project-admin-project-profile-reports:project=project.slug") + span.title Reports + span.icon.icon-arrow-right diff --git a/app/partials/includes/modules/admin-submenu-project-values.jade b/app/partials/includes/modules/admin-submenu-project-values.jade index 1370e797..57df5300 100644 --- a/app/partials/includes/modules/admin-submenu-project-values.jade +++ b/app/partials/includes/modules/admin-submenu-project-values.jade @@ -4,17 +4,32 @@ section.admin-submenu nav ul - li#adminmenu-values-us - a(href="", tg-nav="project-admin-project-values-us:project=project.slug") - span.title US + li#adminmenu-values-status + a(href="", tg-nav="project-admin-project-values-status:project=project.slug") + span.title Status span.icon.icon-arrow-right - li#adminmenu-values-task - a(href="", tg-nav="project-admin-project-values-task:project=project.slug") - span.title Task + li#adminmenu-values-points + a(href="", tg-nav="project-admin-project-values-points:project=project.slug") + span.title Points span.icon.icon-arrow-right - li#adminmenu-values-issue - a(href="", tg-nav="project-admin-project-values-issue:project=project.slug") - span.title Issue + li#adminmenu-values-priorities + a(href="", tg-nav="project-admin-project-values-priorities:project=project.slug") + span.title Priorities + span.icon.icon-arrow-right + + li#adminmenu-values-severities + a(href="", tg-nav="project-admin-project-values-severities:project=project.slug") + span.title Severities + span.icon.icon-arrow-right + + li#adminmenu-values-types + a(href="", tg-nav="project-admin-project-values-types:project=project.slug") + span.title Types + span.icon.icon-arrow-right + + li#adminmenu-values-custom-fields + a(href="", tg-nav="project-admin-project-values-custom-fields:project=project.slug") + span.title Custom fields span.icon.icon-arrow-right diff --git a/app/partials/includes/modules/admin/admin-custom-attributes.jade b/app/partials/includes/modules/admin/admin-custom-attributes.jade index 4b550b9b..09186600 100644 --- a/app/partials/includes/modules/admin/admin-custom-attributes.jade +++ b/app/partials/includes/modules/admin/admin-custom-attributes.jade @@ -1,6 +1,6 @@ section.custom-fields-table.basic-table div.project-values-title - h2 Custom fields + h2 #{customFieldSectionTitle} a.button.button-gray.show-add-new.js-add-custom-field-button(href="", title="#{customFieldButtonTitle}") span Add custom field diff --git a/app/partials/includes/modules/admin/project-points.jade b/app/partials/includes/modules/admin/project-points.jade index e23b531b..70ecb29c 100644 --- a/app/partials/includes/modules/admin/project-points.jade +++ b/app/partials/includes/modules/admin/project-points.jade @@ -1,7 +1,7 @@ section.project-values-table div.project-values-title - h2 Points + h2(ng-bind="sectionName") a.button.button-gray.show-add-new(href="", title="Add New") span Add new point diff --git a/app/partials/includes/modules/admin/project-status.jade b/app/partials/includes/modules/admin/project-status.jade index ba9c2117..4e90d97d 100644 --- a/app/partials/includes/modules/admin/project-status.jade +++ b/app/partials/includes/modules/admin/project-status.jade @@ -1,6 +1,6 @@ section.colors-table.admin-status-table div.project-values-title - h2 Status + h2(ng-bind="sectionName") a.button.button-gray.show-add-new(href="", title="Add New") span Add new status diff --git a/app/partials/includes/modules/admin/project-us-status.jade b/app/partials/includes/modules/admin/project-us-status.jade index a0954c6b..f9f2a8ba 100644 --- a/app/partials/includes/modules/admin/project-us-status.jade +++ b/app/partials/includes/modules/admin/project-us-status.jade @@ -1,7 +1,7 @@ section.project-us-status div.project-values-title - h2 Status + h2(ng-bind="sectionName") a.button.button-gray.show-add-new(href="", title="Add New") span Add new status