diff --git a/app/locales/taiga/locale-en.json b/app/locales/taiga/locale-en.json index 94a8f031..194cf93e 100644 --- a/app/locales/taiga/locale-en.json +++ b/app/locales/taiga/locale-en.json @@ -225,6 +225,7 @@ "CODE_BLOCK_SAMPLE_TEXT": "Your text here...", "PREVIEW_BUTTON": "Preview", "EDIT_BUTTON": "Edit", + "ATTACH_FILE_HELP": "Attach files by dragging & dropping on the textarea above.", "MARKDOWN_HELP": "Markdown syntax help" }, "PERMISIONS_CATEGORIES": { diff --git a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade index 9419d1e9..8131593f 100644 --- a/app/modules/navigation-bar/dropdown-user/dropdown-user.jade +++ b/app/modules/navigation-bar/dropdown-user/dropdown-user.jade @@ -52,7 +52,7 @@ div.navbar-dropdown.dropdown-user translate="PROJECT.NAVIGATION.FEEDBACK") li a( - href="https://taiga.io/support/", + href="https://tree.taiga.io/support/", target="_blank", title="{{'PROJECT.NAVIGATION.HELP_TITLE' | translate}}", translate="PROJECT.NAVIGATION.HELP") diff --git a/app/modules/navigation-bar/navigation-bar.jade b/app/modules/navigation-bar/navigation-bar.jade index 828b055a..22d1e2da 100644 --- a/app/modules/navigation-bar/navigation-bar.jade +++ b/app/modules/navigation-bar/navigation-bar.jade @@ -16,7 +16,7 @@ nav.navbar(ng-if="vm.isEnabledHeader") include ../../svg/logo.svg a( - href="https://taiga.io/support/", + href="https://tree.taiga.io/support/", target="_blank", title="{{'PROJECT.NAVIGATION.HELP_TITLE' | translate}}", translate="PROJECT.NAVIGATION.HELP" diff --git a/app/modules/profile/profile-hints/profile-hints.controller.coffee b/app/modules/profile/profile-hints/profile-hints.controller.coffee index 69992e28..11991f95 100644 --- a/app/modules/profile/profile-hints/profile-hints.controller.coffee +++ b/app/modules/profile/profile-hints/profile-hints.controller.coffee @@ -20,10 +20,10 @@ class ProfileHints HINTS: [ { #hint1 - url: "https://taiga.io/support/import-export-projects/" + url: "https://tree.taiga.io/support/admin/import-export-projects/" }, { #hint2 - url: "https://taiga.io/support/custom-fields/" + url: "https://tree.taiga.io/support/admin/custom-fields/" }, { #hint3 }, diff --git a/app/partials/admin/admin-project-export.jade b/app/partials/admin/admin-project-export.jade index 7ab4997f..de21492d 100644 --- a/app/partials/admin/admin-project-export.jade +++ b/app/partials/admin/admin-project-export.jade @@ -1,7 +1,9 @@ doctype html -div.wrapper(ng-controller="ProjectProfileController as ctrl", - ng-init="section='admin'; sectionName='ADMIN.PROJECT_EXPORT.TITLE'") +div.wrapper( + ng-controller="ProjectProfileController as ctrl" + ng-init="section='admin'; sectionName='ADMIN.PROJECT_EXPORT.TITLE'" +) tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="project-profile") @@ -16,7 +18,10 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", p.admin-subtitle(translate="ADMIN.PROJECT_EXPORT.SUBTITLE") div.admin-project-export-buttons - a.button-green.button-export(href="", title="{{ 'ADMIN.PROJECT_EXPORT.EXPORT_BUTTON_TITLE' | translate }}") + a.button-green.button-export( + href="" + title="{{ 'ADMIN.PROJECT_EXPORT.EXPORT_BUTTON_TITLE' | translate }}" + ) span(translate="ADMIN.PROJECT_EXPORT.EXPORT_BUTTON") div.admin-project-export-result.hidden @@ -25,6 +30,9 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", h3.result-title p.result-message - a.help-button(href="https://taiga.io/support/import-export-projects/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/admin/import-export-projects/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.HELP") diff --git a/app/partials/admin/admin-project-profile.jade b/app/partials/admin/admin-project-profile.jade index 61516d24..9f17597b 100644 --- a/app/partials/admin/admin-project-profile.jade +++ b/app/partials/admin/admin-project-profile.jade @@ -129,7 +129,8 @@ div.wrapper( ng-model="project.is_private" ng-value="false" ) - label.trans-button(for="private-project") {{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT' | translate }} + label.trans-button(for="private-project") + {{ 'ADMIN.PROJECT_PROFILE.PUBLIC_PROJECT' | translate }} div.privacy-option input.privacy-project( @@ -140,10 +141,11 @@ div.wrapper( ng-model="project.is_private" ng-value="true" ) - label.trans-button(for="public-project") {{'ADMIN.PROJECT_PROFILE.PRIVATE_PROJECT' | translate }} + label.trans-button(for="public-project") + {{'ADMIN.PROJECT_PROFILE.PRIVATE_PROJECT' | translate }} a.private-or-public( - href="https://taiga.io/support/whats-the-difference-between-public-and-private-projects/" + href="https://tree.taiga.io/support/frequently-asked-questions/whats-the-difference-between-public-and-private-projects/" target="_blank" ) tg-svg( diff --git a/app/partials/admin/admin-project-reports.jade b/app/partials/admin/admin-project-reports.jade index b6bf41c5..1ad4c439 100644 --- a/app/partials/admin/admin-project-reports.jade +++ b/app/partials/admin/admin-project-reports.jade @@ -1,7 +1,9 @@ doctype html -div.wrapper(ng-controller="ProjectProfileController as ctrl", - ng-init="section='admin'; sectionName='ADMIN.REPORTS.TITLE'") +div.wrapper( + ng-controller="ProjectProfileController as ctrl", + ng-init="section='admin'; sectionName='ADMIN.REPORTS.TITLE'" +) tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="project-profile") include ../includes/modules/admin-menu @@ -21,6 +23,9 @@ div.wrapper(ng-controller="ProjectProfileController as ctrl", div.admin-attributes-section(tg-csv-issue) div - a.help-button(href="https://taiga.io/support/csv-reports/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/admin/csv-reports/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.REPORTS.HELP") diff --git a/app/partials/admin/admin-third-parties-bitbucket.jade b/app/partials/admin/admin-third-parties-bitbucket.jade index 73a02bec..0aaa5f9b 100644 --- a/app/partials/admin/admin-third-parties-bitbucket.jade +++ b/app/partials/admin/admin-third-parties-bitbucket.jade @@ -1,7 +1,10 @@ doctype html -div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as ctrl", - ng-init="section='admin'") +div.wrapper.roles( + tg-bitbucket-webhooks + ng-controller="BitbucketController as ctrl", + ng-init="section='admin'" +) tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="third-parties") @@ -15,24 +18,51 @@ div.wrapper.roles(tg-bitbucket-webhooks, ng-controller="BitbucketController as c form fieldset label(for="secret-key", translate="ADMIN.THIRD_PARTIES.SECRET_KEY") - input(type="text", name="secret-key", ng-model="bitbucket.secret", placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}", id="secret-key") + input( + id="secret-key" + type="text" + name="secret-key" + ng-model="bitbucket.secret" + placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}" + ) fieldset .select-input-text(tg-select-input-text) div label(for="payload-url", translate="ADMIN.THIRD_PARTIES.PAYLOAD_URL") .field-with-option - input(type="text", ng-model="bitbucket.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url") + input( + id="payload-url" + type="text" + name="payload-url" + readonly="readonly" + ng-model="bitbucket.webhooks_url" + placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}" + ) .option-wrapper.select-input-content tg-svg(svg-icon="icon-clipboard") .help-copy(translate="COMMON.COPY_TO_CLIPBOARD") fieldset label(for="valid-origin-ips", translate="ADMIN.THIRD_PARTIES.VALID_IPS") - input(type="text", name="valid-origin-ips", tg-valid-origin-ips, ng-model="bitbucket.valid_origin_ips", placeholder="{{'ADMIN.BITBUCKET.INFO_VERIFYING_IP' | translate}}", id="valid-origin-ips") + input( + id="valid-origin-ips" + type="text" + name="valid-origin-ips" + tg-valid-origin-ips + ng-model="bitbucket.valid_origin_ips" + placeholder="{{'ADMIN.BITBUCKET.INFO_VERIFYING_IP' | translate}}" + ) - button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE") + button.button-green.submit-button( + type="submit" + title="{{'COMMON.SAVE' | translate}}" + translate="COMMON.SAVE" + ) - a.help-button(href="https://taiga.io/support/bitbucket-integration/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/integrations/bitbucket-integration/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.HELP") diff --git a/app/partials/admin/admin-third-parties-github.jade b/app/partials/admin/admin-third-parties-github.jade index c779633b..f406c1da 100644 --- a/app/partials/admin/admin-third-parties-github.jade +++ b/app/partials/admin/admin-third-parties-github.jade @@ -1,7 +1,10 @@ doctype html -div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl", - ng-init="section='admin'") +div.wrapper.roles( + tg-github-webhooks + ng-controller="GithubController as ctrl", + ng-init="section='admin'" +) tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu @@ -14,20 +17,40 @@ div.wrapper.roles(tg-github-webhooks, ng-controller="GithubController as ctrl", form fieldset label(for="secret-key", translate="ADMIN.THIRD_PARTIES.SECRET_KEY") - input(type="text", name="secret-key", ng-model="github.secret", placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}", id="secret-key") + input( + id="secret-key" + type="text" + name="secret-key" + ng-model="github.secret" + placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}" + ) fieldset .select-input-text(tg-select-input-text) div label(for="payload-url", translate="ADMIN.THIRD_PARTIES.PAYLOAD_URL") .field-with-option - input(type="text", ng-model="github.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url") + input( + id="payload-url" + type="text" + name="payload-url" + readonly="readonly" + ng-model="github.webhooks_url" + placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}" + ) .option-wrapper.select-input-content tg-svg(svg-icon="icon-clipboard") .help-copy(translate="COMMON.COPY_TO_CLIPBOARD") - button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE") + button.button-green.submit-button( + type="submit" + title="{{'COMMON.SAVE' | translate}}" + translate="COMMON.SAVE" + ) - a.help-button(href="https://taiga.io/support/github-integration/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/integrations/github-integration/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.HELP") diff --git a/app/partials/admin/admin-third-parties-gitlab.jade b/app/partials/admin/admin-third-parties-gitlab.jade index 6f91a62d..a8950fd1 100644 --- a/app/partials/admin/admin-third-parties-gitlab.jade +++ b/app/partials/admin/admin-third-parties-gitlab.jade @@ -1,7 +1,10 @@ doctype html -div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl", - ng-init="section='admin'") +div.wrapper.roles( + tg-gitlab-webhooks + ng-controller="GitlabController as ctrl" + ng-init="section='admin'" +) tg-project-menu sidebar.menu-secondary.sidebar.settings-nav(tg-admin-navigation="third-parties") include ../includes/modules/admin-menu @@ -14,24 +17,51 @@ div.wrapper.roles(tg-gitlab-webhooks, ng-controller="GitlabController as ctrl", form fieldset label(for="secret-key", translate="ADMIN.THIRD_PARTIES.SECRET_KEY") - input(type="text", name="secret-key", ng-model="gitlab.secret", placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}", id="secret-key") + input( + id="secret-key" + type="text" + name="secret-key" + ng-model="gitlab.secret" + placeholder="{{'ADMIN.THIRD_PARTIES.SECRET_KEY' | translate}}" + ) fieldset .select-input-text(tg-select-input-text) div label(for="payload-url", translate="ADMIN.THIRD_PARTIES.PAYLOAD_URL") .field-with-option - input(type="text", ng-model="gitlab.webhooks_url", name="payload-url", readonly="readonly", placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}", id="payload-url") + input( + id="payload-url" + type="text" + name="payload-url" + readonly="readonly" + ng-model="gitlab.webhooks_url" + placeholder="{{'ADMIN.THIRD_PARTIES.PAYLOAD_URL' | translate}}" + ) .option-wrapper.select-input-content tg-svg(svg-icon="icon-clipboard") .help-copy(translate="COMMON.COPY_TO_CLIPBOARD") fieldset label(for="valid-origin-ips", translate="ADMIN.THIRD_PARTIES.VALID_IPS") - input(type="text", name="valid-origin-ips", tg-valid-origin-ips, ng-model="gitlab.valid_origin_ips", placeholder="{{'ADMIN.GITLAB.INFO_VERIFYING_IP' | translate}}", id="valid-origin-ips") + input( + id="valid-origin-ips" + type="text" + name="valid-origin-ips" + tg-valid-origin-ips + ng-model="gitlab.valid_origin_ips" + placeholder="{{'ADMIN.GITLAB.INFO_VERIFYING_IP' | translate}}" + ) - button.button-green.submit-button(type="submit", title="{{'COMMON.SAVE' | translate}}", translate="COMMON.SAVE") + button.button-green.submit-button( + type="submit" + title="{{'COMMON.SAVE' | translate}}" + translate="COMMON.SAVE" + ) - a.help-button(href="https://taiga.io/support/gitlab-integration/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/integrations/gitlab-integration/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.HELP") diff --git a/app/partials/admin/admin-third-parties-webhooks.jade b/app/partials/admin/admin-third-parties-webhooks.jade index 774a6569..0246727f 100644 --- a/app/partials/admin/admin-third-parties-webhooks.jade +++ b/app/partials/admin/admin-third-parties-webhooks.jade @@ -14,7 +14,11 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", p.admin-subtitle(translate="ADMIN.WEBHOOKS.SUBTITLE") div.webhooks-options - a.button-green.hidden.add-webhook(href="", title="{{'ADMIN.WEBHOOKS.ADD_NEW' | translate}}", translate="ADMIN.WEBHOOKS.ADD_NEW") + a.button-green.hidden.add-webhook( + href="" + title="{{'ADMIN.WEBHOOKS.ADD_NEW' | translate}}" + translate="ADMIN.WEBHOOKS.ADD_NEW" + ) section.webhooks-table.basic-table div.table-header @@ -27,7 +31,13 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", div.edition-mode.hidden form.row fieldset.webhook-service - input(type="text", name="name", placeholder="{{'ADMIN.WEBHOOKS.TYPE_NAME' | translate}}", data-required="true", ng-model="webhook.name") + input( + type="text" + name="name" + data-required="true" + ng-model="webhook.name" + placeholder="{{'ADMIN.WEBHOOKS.TYPE_NAME' | translate}}" + ) div.webhook-url div.webhook-url-inputs fieldset @@ -65,7 +75,12 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", span(ng-bind="webhook.name") div.webhook-url span(ng-bind="webhook.url") - a.show-history.toggle-history(href="", title="{{'ADMIN.WEBHOOKS.SHOW_HISTORY_TITLE' | translate}}", ng-show="webhook.logs_counter", translate="ADMIN.WEBHOOKS.SHOW_HISTORY") + a.show-history.toggle-history( + href="" + title="{{'ADMIN.WEBHOOKS.SHOW_HISTORY_TITLE' | translate}}" + ng-show="webhook.logs_counter" + translate="ADMIN.WEBHOOKS.SHOW_HISTORY" + ) div.webhook-options div.webhook-options-wrapper @@ -80,7 +95,10 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", div.history-single-wrapper(ng-repeat="log in webhook.logs") div.history-single div - span.history-response-icon(ng-class="log.validStatus ? 'history-success' : 'history-error'", title="{{log.status}}") + span.history-response-icon( + ng-class="log.validStatus ? 'history-success' : 'history-error'" + title="{{log.status}}" + ) span.history-date(ng-bind="log.prettyDate") a.toggle-log(href="") tg-svg(svg-icon="icon-arrow-down") @@ -88,7 +106,11 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", div.history-single-response div.history-single-request-header span(translate="ADMIN.WEBHOOKS.REQUEST") - a.resend-request(href="", title="{{'ADMIN.WEBHOOKS.RESEND_REQUEST' | translate}}", data-log="{{log.id}}") + a.resend-request( + href="" + title="{{'ADMIN.WEBHOOKS.RESEND_REQUEST' | translate}}" + data-log="{{log.id}}" + ) tg-svg(svg-icon="icon-reload") span(translate="ADMIN.WEBHOOKS.RESEND_REQUEST") div.history-single-request-body @@ -108,19 +130,41 @@ div.wrapper.roles(ng-controller="WebhooksController as ctrl", form.new-webhook-form.row.hidden fieldset.webhook-service - input(type="text", name="name", placeholder="{{'ADMIN.WEBHOOKS.TYPE_NAME' | translate}}", data-required="true", ng-model="newValue.name") + input( + type="text" + name="name" + data-required="true" + ng-model="newValue.name" + placeholder="{{'ADMIN.WEBHOOKS.TYPE_NAME' | translate}}" + ) div.webhook-url div.webhook-url-inputs fieldset - input(type="text", name="url", data-type="url", placeholder="{{'ADMIN.WEBHOOKS.TYPE_PAYLOAD_URL' | translate}}", data-required="true", ng-model="newValue.url") + input( + type="text" + name="url" + data-type="url" + data-required="true" + ng-model="newValue.url" + placeholder="{{'ADMIN.WEBHOOKS.TYPE_PAYLOAD_URL' | translate}}" + ) fieldset - input(type="text", name="key", placeholder="{{'ADMIN.WEBHOOKS.TYPE_SERVICE_SECRET' | translate}}", data-required="true", ng-model="newValue.key") + input( + type="text" + name="key" + placeholder="{{'ADMIN.WEBHOOKS.TYPE_SERVICE_SECRET' | translate}}" + data-required="true" + ng-model="newValue.key" + ) div.webhook-options a.add-new(href="", title="{{'ADMIN.WEBHOOKS.SAVE' | translate}}") tg-svg(svg-icon="icon-save") a.cancel-new(href="", title="{{'ADMIN.WEBHOOKS.CANCEL' | translate}}") tg-svg(svg-icon="icon-close") - a.help-button(href="https://taiga.io/support/webhooks/", target="_blank") + a.help-button( + href="https://tree.taiga.io/support/integrations/webhooks/" + target="_blank" + ) tg-svg(svg-icon="icon-question") span(translate="ADMIN.HELP") diff --git a/app/partials/common/components/wysiwyg.jade b/app/partials/common/components/wysiwyg.jade index 237dbfa9..3ed85550 100644 --- a/app/partials/common/components/wysiwyg.jade +++ b/app/partials/common/components/wysiwyg.jade @@ -1,6 +1,10 @@ mixin wysihelp div.wysiwyg-help - span.drag-drop-help Attach files by dragging & dropping on the textarea above. - a.help-markdown(href="https://taiga.io/support/taiga-markdown-syntax/", target="_blank", title="{{'COMMON.WYSIWYG.MARKDOWN_HELP' | translate}}") + span.drag-drop-help(translate="COMMON.WYSIWYG.ATTACH_FILE_HELP") + a.help-markdown( + href="https://tree.taiga.io/support/misc/taiga-markdown-syntax/" + target="_blank" + title="{{'COMMON.WYSIWYG.MARKDOWN_HELP' | translate}}" + ) tg-svg(svg-icon="icon-question") span(translate="COMMON.WYSIWYG.MARKDOWN_HELP")