From 545513a96cc60fef1274403de210caec210cdc9b Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 11 Mar 2015 12:00:14 +0100 Subject: [PATCH 1/4] Refactoring menu structure --- app/coffee/app.coffee | 22 +++++++--- app/coffee/modules/base.coffee | 12 ++++-- app/partials/admin/admin-project-reports.jade | 27 ++++++++++++ .../admin-project-values-custom-fields.jade | 31 ++++++++++++++ .../admin/admin-project-values-issue.jade | 41 ------------------- .../admin/admin-project-values-points.jade | 15 +++++++ .../admin-project-values-priorities.jade | 15 +++++++ .../admin-project-values-severities.jade | 15 +++++++ .../admin/admin-project-values-status.jade | 25 +++++++++++ .../admin/admin-project-values-task.jade | 26 ------------ .../admin/admin-project-values-types.jade | 15 +++++++ .../admin/admin-project-values-us.jade | 31 -------------- app/partials/includes/modules/admin-menu.jade | 2 +- .../admin-submenu-project-profile.jade | 4 ++ .../modules/admin-submenu-project-values.jade | 33 +++++++++++---- .../admin/admin-custom-attributes.jade | 2 +- .../modules/admin/project-points.jade | 2 +- .../modules/admin/project-status.jade | 2 +- .../modules/admin/project-us-status.jade | 2 +- 19 files changed, 201 insertions(+), 121 deletions(-) create mode 100644 app/partials/admin/admin-project-reports.jade create mode 100644 app/partials/admin/admin-project-values-custom-fields.jade delete mode 100644 app/partials/admin/admin-project-values-issue.jade create mode 100644 app/partials/admin/admin-project-values-points.jade create mode 100644 app/partials/admin/admin-project-values-priorities.jade create mode 100644 app/partials/admin/admin-project-values-severities.jade create mode 100644 app/partials/admin/admin-project-values-status.jade delete mode 100644 app/partials/admin/admin-project-values-task.jade create mode 100644 app/partials/admin/admin-project-values-types.jade delete mode 100644 app/partials/admin/admin-project-values-us.jade 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 From 07e12e27b0c538daa41a6b1a8ddfedb9dfb00f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 12 Mar 2015 08:50:37 +0100 Subject: [PATCH 2/4] Style refactor for admin reorganization --- app/styles/layout/admin-project-values.scss | 2 +- .../admin/admin-custom-attributes.scss | 12 ++++-- app/styles/modules/admin/project-values.scss | 9 +++- app/styles/modules/common/colors-table.scss | 43 +++++++++++-------- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/app/styles/layout/admin-project-values.scss b/app/styles/layout/admin-project-values.scss index a7b44b10..749d7178 100644 --- a/app/styles/layout/admin-project-values.scss +++ b/app/styles/layout/admin-project-values.scss @@ -24,7 +24,7 @@ background: $whitish; display: flex; justify-content: space-between; - padding: .5rem 1rem; + padding: .8em 1rem; text-transform: uppercase; h2 { margin: 0; diff --git a/app/styles/modules/admin/admin-custom-attributes.scss b/app/styles/modules/admin/admin-custom-attributes.scss index d110cf23..a6ba34fa 100644 --- a/app/styles/modules/admin/admin-custom-attributes.scss +++ b/app/styles/modules/admin/admin-custom-attributes.scss @@ -4,26 +4,31 @@ } .custom-fields-table { + margin-bottom: 2em; .row { border-bottom: 0; padding: .5rem 0; - } .table-header { @extend %bold; - border-bottom: 1px solid $gray-light; + border-bottom: 3px solid $whitish; .custom-name span, .custom-description span { padding-left: 1.1rem; } } .table-body { + form:last-child { + .row { + border: 0; + } + } .row:hover { background: rgba($fresh-taiga, .05); cursor: move; transition: background .2s linear; .icon-drag-v, - .custom-options-wrapper { + .custom-options { opacity: 1; transition: opacity .2s linear; } @@ -72,6 +77,7 @@ flex-basis: 100px; flex-grow: 0; flex-shrink: 0; + opacity: 0; text-align: center; a { color: $gray-light; diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss index 9f96b6ee..e8920a8f 100644 --- a/app/styles/modules/admin/project-values.scss +++ b/app/styles/modules/admin/project-values.scss @@ -21,9 +21,16 @@ .project-values-header { @extend %bold; - border-bottom: 2px solid $gray-light; + border-bottom: 3px solid $whitish; } .project-values-body { + form { + &:last-child { + .project-values-row { + border: 0; + } + } + } .project-values-row { &:hover { background: lighten($green-taiga, 60%); diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss index 1da52861..f84a0d6e 100644 --- a/app/styles/modules/common/colors-table.scss +++ b/app/styles/modules/common/colors-table.scss @@ -2,7 +2,7 @@ .table-header { @extend %medium; @extend %bold; - border-bottom: 2px solid $gray-light; + border-bottom: 3px solid $whitish; &:hover { background: transparent; } @@ -10,17 +10,40 @@ padding-left: 50px; } } + form { + &:last-child { + .row { + border: 0; + } + } + } .row { align-items: center; + border-bottom: 1px solid $whitish; display: flex; justify-content: center; padding: 1rem; &:hover { + background: lighten($green-taiga, 60%); + cursor: move; + transition: background .2s ease-in; + .icon { + opacity: 1; + transition: opacity .2s ease-in; + } .options-column { opacity: 1; transition: opacity .3s linear; } } + &:last-child { + border: 0; + } + &.edition { + .current-color { + cursor: pointer; + } + } &.edition, &.new-value { padding-left: 50px; @@ -28,11 +51,6 @@ &.hidden { display: none; } - &.edition { - .current-color { - cursor: pointer; - } - } .color-column { flex-basis: 60px; flex-grow: 1; @@ -86,18 +104,7 @@ opacity: 1; } } - .table-main { - border-bottom: 1px solid $whitish; - .row:hover { - background: lighten($green-taiga, 60%); - cursor: move; - transition: background .2s ease-in; - .icon { - opacity: 1; - transition: opacity .2s ease-in; - } - } - } + .current-color { background-color: $gray-light; border-radius: 2px; From 361299119260c69fab93f6155d45edf991171aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 12 Mar 2015 10:07:57 +0100 Subject: [PATCH 3/4] Reports page styles --- app/partials/admin/admin-project-reports.jade | 7 +++++-- .../includes/modules/admin/project-csv.jade | 14 ++++++-------- app/styles/modules/admin/project-csv.scss | 4 +++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade index 09d45a54..3bf447e8 100644 --- a/app/partials/admin/admin-project-reports.jade +++ b/app/partials/admin/admin-project-reports.jade @@ -1,5 +1,5 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", - ng-init="section='admin'; sectionName='Export'") + ng-init="section='admin'; sectionName='Reports'") sidebar.menu-secondary.sidebar(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu @@ -9,7 +9,7 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", section.main.admin-common(tg-project-export) header include ../includes/components/mainTitle - p.admin-subtitle Export your project data in CSV format. + p.admin-subtitle Export your project data in CSV format and make your own reports - var csvType = "US"; - var controller = "CsvExporterUserstoriesController"; @@ -25,3 +25,6 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", - var controller = "CsvExporterIssuesController"; div.admin-attributes-section include ../includes/modules/admin/project-csv + a.help-button(href="https://taiga.io/support/csv-reports/", target="_blank") + span.icon.icon-help + span How to use this on my own spreadsheet? diff --git a/app/partials/includes/modules/admin/project-csv.jade b/app/partials/includes/modules/admin/project-csv.jade index 16948073..57b644c5 100644 --- a/app/partials/includes/modules/admin/project-csv.jade +++ b/app/partials/includes/modules/admin/project-csv.jade @@ -1,20 +1,18 @@ section.project-csv(ng-controller='#{controller} as ctrl', tg-select-input-text) div.project-values-title - h2 Export #{csvType} Data - span (.csv format) + h2 #{csvType} reports a.button.button-gray(title="Download #{csvType} CSV", ng-href="{{csvUrl}}", ng-show="csvUrl") span Download CSV p Get all information about your project #{csvType}. Save all your data to a .csv file and open it in your favourite text editor or spreadsheet. You will be able to visualize and analize all your data easily. + div.csv-regenerate-field .field-with-options input(type="text", placeholder="Please regenerate CSV url", readonly, ng-model="csvUrl") .option-wrapper.select-input-content .icon.icon-copy a(href="", title="Regenerate CSV url", ng-click="ctrl.regenerateUuid()") - span.icon.icon-reload - span Regenerate - - a.help-button(href="https://taiga.io/support/csv-reports/", target="_blank") - span.icon.icon-help - span How to use this on my own spreadsheet? + span.icon.icon-plus(ng-hide="csvUrl") + span(ng-hide="csvUrl") Generate URL + span.icon.icon-reload(ng-Show="csvUrl") + span(ng-Show="csvUrl") Regenerate diff --git a/app/styles/modules/admin/project-csv.scss b/app/styles/modules/admin/project-csv.scss index 079fb53c..e6f16a08 100644 --- a/app/styles/modules/admin/project-csv.scss +++ b/app/styles/modules/admin/project-csv.scss @@ -1,4 +1,5 @@ .project-csv { + margin-bottom: 2.5rem; .project-values-title { margin-bottom: 1rem; } @@ -10,8 +11,9 @@ margin-bottom: 1rem; a { @extend %small; + min-width: 110px; } - span:first-child { + .icon { margin-right: .3rem; } } From 506210c29216334cc213302e8cc6c145b153f7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Thu, 12 Mar 2015 11:52:07 +0100 Subject: [PATCH 4/4] Project reports text organization --- app/partials/admin/admin-project-reports.jade | 4 +++- app/partials/includes/modules/admin/project-csv.jade | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade index 3bf447e8..a066b767 100644 --- a/app/partials/admin/admin-project-reports.jade +++ b/app/partials/admin/admin-project-reports.jade @@ -9,7 +9,9 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", section.main.admin-common(tg-project-export) header include ../includes/components/mainTitle - p.admin-subtitle Export your project data in CSV format and make your own reports + p.admin-subtitle Export your project data in CSV format and make your own reports. + + p Download a CSV file or copy the generated URL and open it in your favourite text editor or spreadsheet to make your own project data reports. You will be able to visualize and analize all your data easily. - var csvType = "US"; - var controller = "CsvExporterUserstoriesController"; diff --git a/app/partials/includes/modules/admin/project-csv.jade b/app/partials/includes/modules/admin/project-csv.jade index 57b644c5..b3f89b4e 100644 --- a/app/partials/includes/modules/admin/project-csv.jade +++ b/app/partials/includes/modules/admin/project-csv.jade @@ -4,8 +4,6 @@ section.project-csv(ng-controller='#{controller} as ctrl', tg-select-input-text a.button.button-gray(title="Download #{csvType} CSV", ng-href="{{csvUrl}}", ng-show="csvUrl") span Download CSV - p Get all information about your project #{csvType}. Save all your data to a .csv file and open it in your favourite text editor or spreadsheet. You will be able to visualize and analize all your data easily. - div.csv-regenerate-field .field-with-options input(type="text", placeholder="Please regenerate CSV url", readonly, ng-model="csvUrl")