diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js index ae950e1..ee5bae3 100644 --- a/backend/src/appenlight/static/js/appenlight.js +++ b/backend/src/appenlight/static/js/appenlight.js @@ -2680,7 +2680,6 @@ angular.module('appenlight.components', [ 'appenlight.components.appenlightHeader' ]); angular.module('appenlight.directives', [ - 'appenlight.directives.appVersion', 'appenlight.directives.c3chart', 'appenlight.directives.confirmValidate', 'appenlight.directives.focus', @@ -2838,6 +2837,388 @@ function kickstartAE(initialUserData) { ;angular.module('appenlight.templates').run(['$templateCache', function($templateCache) { 'use strict'; + $templateCache.put('components/appenlight-app/appenlight-app.html', + "\n" + + "\n" + + "
\n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('components/appenlight-header/appenlight-header.html', + "\n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + + "\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/permissions/permissions.html', + "
\n" + + "
\n" + + "

Permissions

\n" + + "
\n" + + "
\n" + + "

Here you can set permissions for others to access your app data.

\n" + + "\n" + + "

For example you can let other staff member view or alter error reports.

\n" + + "\n" + + "
0\">\n" + + "

Group permissions

\n" + + "\n" + + "
    \n" + + "
  • \n" + + " {{ perm.self.group_name }}\n" + + "
    \n" + + " Resource owner\n" + + " \n" + + " {{ perm_name }}\n" + + "
      \n" + + "
    • No
    • \n" + + "
    • Yes
    • \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
  • \n" + + "
\n" + + "\n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + "
\n" + + " \n" + + " {{ permission }}\n" + + " \n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + "
\n" + + "\n" + + "
\n" + + "\n" + + "

User permissions

\n" + + "
\n" + + "
    \n" + + "
  • \n" + + " {{ perm.self.user_name }}\n" + + "
    \n" + + " Resource owner\n" + + " \n" + + " {{ perm_name }}\n" + + "
      \n" + + "
    • No
    • \n" + + "
    • Yes
    • \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
  • \n" + + "
\n" + + "
\n" + + "
\n" + + "

First enter username or full email of person you want to give access to (the person needs to be already registered in AppEnlight)

\n" + + "\n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + "
\n" + + " \n" + + " {{ permission }}\n" + + " \n" + + "
\n" + + "
\n" + + " \n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/plugin_config/plugin_config.html', + "
\n" + + "
Plugin: {{tmpl.name}}
\n" + + " \n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/postprocess_action/postprocess_action.html', + "
\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "
    \n" + + "
  • No
  • \n" + + "
  • Yes
  • \n" + + "
\n" + + "
\n" + + "
\n" + + "\n" + + "
\n" + + " \n" + + "\n" + + "
\n" + + " \n" + + "
\n" + + "\n" + + "  Save changes\n" + + "\n" + + "
\n" + + "
\n" + + "

Meeting following criteria:

\n" + + " \n" + + " {{ctrl.rule}}\n" + + " \n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/report_alert_action/report_alert_action.html', + "
\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "
    \n" + + "
  • No
  • \n" + + "
  • Yes
  • \n" + + "
\n" + + "
\n" + + "
\n" + + "\n" + + "
\n" + + " \n" + + " \n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "\n" + + "  Save changes\n" + + "\n" + + "
\n" + + "
\n" + + "

Channels:

\n" + + "
    \n" + + "
  • \n" + + " {{channel.channel_visible_value}}\n" + + "
    \n" + + " \n" + + " \n" + + "
      \n" + + "
    • No
    • \n" + + "
    • Yes
    • \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
  • \n" + + "
\n" + + "
\n" + + " \n" + + " Add Channel\n" + + "
\n" + + "
\n" + + " You need to create an alert channel before you can assign it to your rule.\n" + + "
\n" + + "\n" + + "
\n" + + "
\n" + + "

Meeting following criteria:

\n" + + " \n" + + " \n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/rule_read_only/rule_read_only.html', + "
\n" + + "\n" + + " \n" + + " {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" + + " \n" + + "\n" + + " \n" + + " is {{rule_ctrlr.ruleDefinitions.allOps[rule_ctrlr.rule.op]}} {{rule_ctrlr.rule.value}}\n" + + " \n" + + "\n" + + " \n" + + "

Subrules

\n" + + "
\n" + + "\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + " \n" + + "
\n" + + "
\n" + + "
\n" + + "\n" + + "
\n" + + "
\n" + ); + + + $templateCache.put('directives/rule/rule.html', + "
\n" + + "\n" + + "
\n" + + " \n" + + "
\n" + + "\n" + + "
\n" + + "\n" + + " \n" + + "\n" + + " \n" + + "\n" + + "
\n" + + "\n" + + " \n" + + "

Subrules

\n" + + "
\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + " \n" + + "
\n" + + "
\n" + + "
\n" + + "\n" + + " Add rule\n" + + "\n" + + "
\n" + + "
\n" + + " \n" + + " \n" + + "
    \n" + + "
  • No
  • \n" + + "
  • Yes
  • \n" + + "
\n" + + "
\n" + + "
\n" + + "
\n" + ); + + $templateCache.put('templates/admin/applications/applications_list.html', "\n" + "\n" + @@ -4835,131 +5216,17 @@ function kickstartAE(initialUserData) { " \n" + "\n" + "\n" - ); - - - $templateCache.put('templates/applications/parent_view.html', - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "
\n" - ); - - - $templateCache.put('templates/components/appenlight-app.html', - "\n" + - "\n" + - "
\n" + - "
\n" + - "
\n" - ); - - - $templateCache.put('templates/components/appenlight-header.html', - "\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - " \n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - "
\n" + - "
\n" + - "
\n" + + ); + + + $templateCache.put('templates/applications/parent_view.html', + "
\n" + + "
\n" + + "
\n" + "
\n" + + "\n" + + "
\n" + + "\n" + "
\n" ); @@ -5176,409 +5443,141 @@ function kickstartAE(initialUserData) { "
\n" + "

Newest errors (real-time)\n" + "

\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n" + - "\n" + - "
\n" + - "
\n" + - "\n" + - "

No new reports

\n" + - "\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "
\n" + - "
\n" + - "

Request breakdown over {{ index.timeSpan.label }}

\n" + - "
\n" + - "
\n" + - "

\n" + - " \n" + - "

\n" + - "\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - " \n" + - " {{view.view_name}}\n" + - " {{view.view_name}}\n" + - "\n" + - "
\n" + - " \n" + - " avg. response {{view.avg_response}}s in\n" + - " {{view.requests|numberToThousands}} requests\n" + - "\n" + - " \n" + - "    Latest reports:\n" + - " {{$index+1}}\n" + - " \n" + - " \n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "
\n" + - "
\n" + - "\n" + - "\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - " \n" + - "\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "
\n" + - "

\n" + - " Report groups trending over {{ index.timeSpan.label }}\n" + - "

\n" + - "
\n" + - "
\n" + - "

\n" + - " \n" + - "

\n" + - "\n" + - "

\n" + - " No reports found\n" + - "

\n" + - "\n" + - "
\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "\n" + - "
\n" + - "
\n" + - "

\n" + - " Most common slow calls over {{ index.timeSpan.label }}\n" + - "

\n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - " \n" + - "
\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "
\n" + - " {{call.occurences|numberToThousands}}\n" + - " \n" + - " {{call.statement}}\n" + - "
\n" + - " {{call.statement_type}}\n" + - " {{call.statement_subtype}}\n" + - " {{call.total_duration/call.occurences|round:2}}s\n" + - " \n" + - " Latest reports:\n" + - " {{$index+1}} \n" + - " \n" + - "
\n" + - "\n" + - "\n" + - "
\n" + - "
\n" + - "\n" + - "\n" + - "
\n" + - "\n" + - "
\n" + - " \n" + - " \n" + - "\n" - ); - - - $templateCache.put('templates/directives/permissions.html', - "
\n" + - "
\n" + - "

Permissions

\n" + - "
\n" + - "
\n" + - "

Here you can set permissions for others to access your app data.

\n" + - "\n" + - "

For example you can let other staff member view or alter error reports.

\n" + - "\n" + - "
0\">\n" + - "

Group permissions

\n" + - "\n" + - "
    \n" + - "
  • \n" + - " {{ perm.self.group_name }}\n" + - "
    \n" + - " Resource owner\n" + - " \n" + - " {{ perm_name }}\n" + - "
      \n" + - "
    • No
    • \n" + - "
    • Yes
    • \n" + - "
    \n" + - "
    \n" + - "
    \n" + - "
  • \n" + - "
\n" + - "\n" + - "
\n" + - "
\n" + - " \n" + - "
\n" + - "
\n" + - " \n" + - " {{ permission }}\n" + - " \n" + - "
\n" + - "
\n" + - " \n" + - "
\n" + - "
\n" + - "\n" + - "
\n" + - "\n" + - "

User permissions

\n" + - "
\n" + - "
    \n" + - "
  • \n" + - " {{ perm.self.user_name }}\n" + - "
    \n" + - " Resource owner\n" + - " \n" + - " {{ perm_name }}\n" + - "
      \n" + - "
    • No
    • \n" + - "
    • Yes
    • \n" + - "
    \n" + - "
    \n" + - "
    \n" + - "
  • \n" + - "
\n" + - "
\n" + - "
\n" + - "

First enter username or full email of person you want to give access to (the person needs to be already registered in AppEnlight)

\n" + - "\n" + - "
\n" + - "
\n" + - " \n" + - "
\n" + - "
\n" + - " \n" + - " {{ permission }}\n" + - " \n" + - "
\n" + - "
\n" + - " \n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" + - "
\n" - ); - - - $templateCache.put('templates/directives/plugin_config.html', - "
\n" + - "
Plugin: {{tmpl.name}}
\n" + - " \n" + - "
\n" + - "
\n" - ); - - - $templateCache.put('templates/directives/postprocess_action.html', - "
\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - "
    \n" + - "
  • No
  • \n" + - "
  • Yes
  • \n" + - "
\n" + - "
\n" + - "
\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + "\n" + - "
\n" + - " \n" + "\n" + - "
\n" + - " \n" + - "
\n" + + "
\n" + + "
\n" + "\n" + - "  Save changes\n" + + "

No new reports

\n" + "\n" + - "
\n" + - "
\n" + - "

Meeting following criteria:

\n" + - " \n" + - " {{ctrl.rule}}\n" + - " \n" + - "
\n" + - "
\n" - ); - - - $templateCache.put('templates/directives/report_alert_action.html', - "
\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - "
    \n" + - "
  • No
  • \n" + - "
  • Yes
  • \n" + - "
\n" + - "
\n" + - "
\n" + + "
\n" + + "
\n" + + "
\n" + + " \n" + "\n" + - "
\n" + - " \n" + - " \n" + - "
\n" + - "
\n" + - " \n" + - " \n" + + "
\n" + "\n" + - "  Save changes\n" + + "
\n" + + "
\n" + + "

Request breakdown over {{ index.timeSpan.label }}

\n" + + "
\n" + + "
\n" + + "

\n" + + " \n" + + "

\n" + "\n" + - "
\n" + - "
\n" + - "

Channels:

\n" + - "
    \n" + - "
  • \n" + - " {{channel.channel_visible_value}}\n" + - "
    \n" + - " \n" + - " \n" + - "
      \n" + - "
    • No
    • \n" + - "
    • Yes
    • \n" + - "
    \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
    \n" + + "
    \n" + + " \n" + + " {{view.view_name}}\n" + + " {{view.view_name}}\n" + + "\n" + + "
    \n" + + " \n" + + " avg. response {{view.avg_response}}s in\n" + + " {{view.requests|numberToThousands}} requests\n" + + "\n" + + " \n" + + "    Latest reports:\n" + + " {{$index+1}}\n" + " \n" + + " \n" + + "
    \n" + + "\n" + + "
    \n" + + "\n" + + "
    \n" + + "
    \n" + + "\n" + + "\n" + + "
    \n" + "
\n" + - " \n" + - " \n" + - "
\n" + - " \n" + - " Add Channel\n" + - "
\n" + - "
\n" + - " You need to create an alert channel before you can assign it to your rule.\n" + + "\n" + + "
\n" + + "\n" + "
\n" + "\n" + - "
\n" + - "
\n" + - "

Meeting following criteria:

\n" + - " \n" + - " \n" + - "
\n" + - "\n" - ); - - - $templateCache.put('templates/directives/rule_read_only.html', - "
\n" + + "
\n" + + "
\n" + "\n" + - " \n" + - " {{rule_ctrlr.readOnlyPossibleFields[rule_ctrlr.rule.field]}}\n" + - " \n" + + "
\n" + + "
\n" + + "

\n" + + " Report groups trending over {{ index.timeSpan.label }}\n" + + "

\n" + + "
\n" + + "
\n" + + "

\n" + + " \n" + + "

\n" + "\n" + - " \n" + - " is {{rule_ctrlr.ruleDefinitions.allOps[rule_ctrlr.rule.op]}} {{rule_ctrlr.rule.value}}\n" + - " \n" + + "

\n" + + " No reports found\n" + + "

\n" + "\n" + - " \n" + - "

Subrules

\n" + - "
\n" + + "
\n" + + "
\n" + + "
\n" + "\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - " \n" + "
\n" + - "
\n" + - "
\n" + "\n" + - " \n" + - "
\n" - ); - - - $templateCache.put('templates/directives/rule.html', - "
\n" + + "
\n" + "\n" + - "
\n" + - " \n" + - "
\n" + "\n" + - "
\n" + + "
\n" + + "
\n" + + "

\n" + + " Most common slow calls over {{ index.timeSpan.label }}\n" + + "

\n" + + "
\n" + + "
\n" + "\n" + - " \n" + + "
\n" + + " \n" + + "
\n" + "\n" + - " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "
\n" + + " {{call.occurences|numberToThousands}}\n" + + " \n" + + " {{call.statement}}\n" + + "
\n" + + " {{call.statement_type}}\n" + + " {{call.statement_subtype}}\n" + + " {{call.total_duration/call.occurences|round:2}}s\n" + + " \n" + + " Latest reports:\n" + + " {{$index+1}} \n" + + " \n" + + "
\n" + + "\n" + + "\n" + + "
\n" + + "
\n" + "\n" + - "
\n" + "\n" + - " \n" + - "

Subrules

\n" + - "
\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - " \n" + "
\n" + + "\n" + "
\n" + "
\n" + - "\n" + - " Add rule\n" + - "\n" + - "
\n" + - "
\n" + - " \n" + - " \n" + - "
    \n" + - "
  • No
  • \n" + - "
  • Yes
  • \n" + - "
\n" + - "
\n" + "
\n" + "
\n" ); @@ -7139,7 +7138,7 @@ function kickstartAE(initialUserData) { angular.module('appenlight.components.appenlightApp', []) .component('appenlightApp', { - templateUrl: 'templates/components/appenlight-app.html', + templateUrl: 'components/appenlight-app/appenlight-app.html', controller: AppEnlightAppController }); @@ -7209,7 +7208,7 @@ function AppEnlightFooterController(stateHolder, AeConfig){ angular.module('appenlight.components.appenlightHeader', []) .component('appenlightHeader', { - templateUrl: 'templates/components/appenlight-header.html', + templateUrl: 'components/appenlight-header/appenlight-header.html', controller: AppEnlightHeaderController }); @@ -11232,32 +11231,6 @@ function UserProfileController(userSelfResource) { // # services, and proprietary license terms, please see // # https://rhodecode.com/licenses/ -angular.module('appenlight.directives.appVersion', []). - directive('appVersion', ['version', function (version) { - return function (scope, elm, attrs) { - elm.text(version); - }; - }]) - -;// # Copyright (C) 2010-2016 RhodeCode GmbH -// # -// # This program is free software: you can redistribute it and/or modify -// # it under the terms of the GNU Affero General Public License, version 3 -// # (only), as published by the Free Software Foundation. -// # -// # This program is distributed in the hope that it will be useful, -// # but WITHOUT ANY WARRANTY; without even the implied warranty of -// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// # GNU General Public License for more details. -// # -// # You should have received a copy of the GNU Affero General Public License -// # along with this program. If not, see . -// # -// # This program is dual-licensed. If you wish to learn more about the -// # AppEnlight Enterprise Edition, including its added features, Support -// # services, and proprietary license terms, please see -// # https://rhodecode.com/licenses/ - // This code is inspired by https://github.com/jettro/c3-angular-sample/tree/master/js // License is MIT @@ -11746,7 +11719,7 @@ angular.module('appenlight.directives.permissionsForm',[]) possiblePermissions: '=', resource: '=' }, - templateUrl: 'templates/directives/permissions.html' + templateUrl: 'directives/permissions/permissions.html' } }) @@ -11777,7 +11750,7 @@ angular.module('appenlight.directives.pluginConfig', []).directive('pluginConfig section: '=' }, restrict: 'E', - templateUrl: 'templates/directives/plugin_config.html', + templateUrl: 'directives/plugin_config/plugin_config.html', controller: PluginConfig, controllerAs: 'plugin_ctrlr' }; @@ -11820,7 +11793,7 @@ angular.module('appenlight.directives.postProcessAction', []).directive('postPro controller:postProcessActionController, controllerAs:'ctrl', restrict: 'E', - templateUrl: 'templates/directives/postprocess_action.html' + templateUrl: 'directives/postprocess_action/postprocess_action.html' }; function postProcessActionController(){ var vm = this; @@ -11984,7 +11957,7 @@ angular.module('appenlight.directives.reportAlertAction', []).directive('reportA controller:reportAlertActionController, controllerAs:'ctrl', restrict: 'E', - templateUrl: 'templates/directives/report_alert_action.html' + templateUrl: 'directives/report_alert_action/report_alert_action.html' }; function reportAlertActionController(){ var vm = this; @@ -12100,7 +12073,7 @@ angular.module('appenlight.directives.ruleReadOnly', []).directive('ruleReadOnly config: "=" }, restrict: 'E', - templateUrl: 'templates/directives/rule_read_only.html', + templateUrl: 'directives/rule_read_only/rule_read_only.html', controller:RuleController, controllerAs:'rule_ctrlr' } @@ -12144,7 +12117,7 @@ angular.module('appenlight.directives.rule', []).directive('rule', function () { config: "=" }, restrict: 'E', - templateUrl: 'templates/directives/rule.html', + templateUrl: 'directives/rule/rule.html', controller:RuleController, controllerAs:'rule_ctrlr' }; diff --git a/frontend/src/app.js b/frontend/src/app.js index 3447bf0..67e4e21 100644 --- a/frontend/src/app.js +++ b/frontend/src/app.js @@ -45,7 +45,6 @@ angular.module('appenlight.components', [ 'appenlight.components.appenlightHeader' ]); angular.module('appenlight.directives', [ - 'appenlight.directives.appVersion', 'appenlight.directives.c3chart', 'appenlight.directives.confirmValidate', 'appenlight.directives.focus', diff --git a/frontend/src/templates/components/appenlight-app.html b/frontend/src/components/appenlight-app/appenlight-app.html similarity index 100% rename from frontend/src/templates/components/appenlight-app.html rename to frontend/src/components/appenlight-app/appenlight-app.html diff --git a/frontend/src/components/appenlight-app.js b/frontend/src/components/appenlight-app/appenlight-app.js similarity index 97% rename from frontend/src/components/appenlight-app.js rename to frontend/src/components/appenlight-app/appenlight-app.js index 7069032..cf7ae3c 100644 --- a/frontend/src/components/appenlight-app.js +++ b/frontend/src/components/appenlight-app/appenlight-app.js @@ -19,7 +19,7 @@ angular.module('appenlight.components.appenlightApp', []) .component('appenlightApp', { - templateUrl: 'templates/components/appenlight-app.html', + templateUrl: 'components/appenlight-app/appenlight-app.html', controller: AppEnlightAppController }); diff --git a/frontend/src/templates/components/appenlight-header.html b/frontend/src/components/appenlight-header/appenlight-header.html similarity index 100% rename from frontend/src/templates/components/appenlight-header.html rename to frontend/src/components/appenlight-header/appenlight-header.html diff --git a/frontend/src/components/appenlight-header.js b/frontend/src/components/appenlight-header/appenlight-header.js similarity index 98% rename from frontend/src/components/appenlight-header.js rename to frontend/src/components/appenlight-header/appenlight-header.js index 7342b98..0a1a097 100644 --- a/frontend/src/components/appenlight-header.js +++ b/frontend/src/components/appenlight-header/appenlight-header.js @@ -19,7 +19,7 @@ angular.module('appenlight.components.appenlightHeader', []) .component('appenlightHeader', { - templateUrl: 'templates/components/appenlight-header.html', + templateUrl: 'components/appenlight-header/appenlight-header.html', controller: AppEnlightHeaderController }); diff --git a/frontend/src/directives/app_version.js b/frontend/src/directives/app_version.js deleted file mode 100644 index 98273de..0000000 --- a/frontend/src/directives/app_version.js +++ /dev/null @@ -1,25 +0,0 @@ -// # Copyright (C) 2010-2016 RhodeCode GmbH -// # -// # This program is free software: you can redistribute it and/or modify -// # it under the terms of the GNU Affero General Public License, version 3 -// # (only), as published by the Free Software Foundation. -// # -// # This program is distributed in the hope that it will be useful, -// # but WITHOUT ANY WARRANTY; without even the implied warranty of -// # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// # GNU General Public License for more details. -// # -// # You should have received a copy of the GNU Affero General Public License -// # along with this program. If not, see . -// # -// # This program is dual-licensed. If you wish to learn more about the -// # AppEnlight Enterprise Edition, including its added features, Support -// # services, and proprietary license terms, please see -// # https://rhodecode.com/licenses/ - -angular.module('appenlight.directives.appVersion', []). - directive('appVersion', ['version', function (version) { - return function (scope, elm, attrs) { - elm.text(version); - }; - }]) diff --git a/frontend/src/templates/directives/permissions.html b/frontend/src/directives/permissions/permissions.html similarity index 100% rename from frontend/src/templates/directives/permissions.html rename to frontend/src/directives/permissions/permissions.html diff --git a/frontend/src/directives/permissions.js b/frontend/src/directives/permissions/permissions.js similarity index 99% rename from frontend/src/directives/permissions.js rename to frontend/src/directives/permissions/permissions.js index d32931c..7017cbc 100644 --- a/frontend/src/directives/permissions.js +++ b/frontend/src/directives/permissions/permissions.js @@ -212,6 +212,6 @@ angular.module('appenlight.directives.permissionsForm',[]) possiblePermissions: '=', resource: '=' }, - templateUrl: 'templates/directives/permissions.html' + templateUrl: 'directives/permissions/permissions.html' } }) diff --git a/frontend/src/templates/directives/plugin_config.html b/frontend/src/directives/plugin_config/plugin_config.html similarity index 100% rename from frontend/src/templates/directives/plugin_config.html rename to frontend/src/directives/plugin_config/plugin_config.html diff --git a/frontend/src/directives/plugin_config.js b/frontend/src/directives/plugin_config/plugin_config.js similarity index 97% rename from frontend/src/directives/plugin_config.js rename to frontend/src/directives/plugin_config/plugin_config.js index cf7b3cc..86152a5 100644 --- a/frontend/src/directives/plugin_config.js +++ b/frontend/src/directives/plugin_config/plugin_config.js @@ -25,7 +25,7 @@ angular.module('appenlight.directives.pluginConfig', []).directive('pluginConfig section: '=' }, restrict: 'E', - templateUrl: 'templates/directives/plugin_config.html', + templateUrl: 'directives/plugin_config/plugin_config.html', controller: PluginConfig, controllerAs: 'plugin_ctrlr' }; diff --git a/frontend/src/templates/directives/postprocess_action.html b/frontend/src/directives/postprocess_action/postprocess_action.html similarity index 100% rename from frontend/src/templates/directives/postprocess_action.html rename to frontend/src/directives/postprocess_action/postprocess_action.html diff --git a/frontend/src/directives/postprocess_action.js b/frontend/src/directives/postprocess_action/postprocess_action.js similarity index 99% rename from frontend/src/directives/postprocess_action.js rename to frontend/src/directives/postprocess_action/postprocess_action.js index 92bd1ea..ac77637 100644 --- a/frontend/src/directives/postprocess_action.js +++ b/frontend/src/directives/postprocess_action/postprocess_action.js @@ -27,7 +27,7 @@ angular.module('appenlight.directives.postProcessAction', []).directive('postPro controller:postProcessActionController, controllerAs:'ctrl', restrict: 'E', - templateUrl: 'templates/directives/postprocess_action.html' + templateUrl: 'directives/postprocess_action/postprocess_action.html' }; function postProcessActionController(){ var vm = this; diff --git a/frontend/src/templates/directives/report_alert_action.html b/frontend/src/directives/report_alert_action/report_alert_action.html similarity index 100% rename from frontend/src/templates/directives/report_alert_action.html rename to frontend/src/directives/report_alert_action/report_alert_action.html diff --git a/frontend/src/directives/report_alert_action.js b/frontend/src/directives/report_alert_action/report_alert_action.js similarity index 99% rename from frontend/src/directives/report_alert_action.js rename to frontend/src/directives/report_alert_action/report_alert_action.js index e94001a..586bc82 100644 --- a/frontend/src/directives/report_alert_action.js +++ b/frontend/src/directives/report_alert_action/report_alert_action.js @@ -30,7 +30,7 @@ angular.module('appenlight.directives.reportAlertAction', []).directive('reportA controller:reportAlertActionController, controllerAs:'ctrl', restrict: 'E', - templateUrl: 'templates/directives/report_alert_action.html' + templateUrl: 'directives/report_alert_action/report_alert_action.html' }; function reportAlertActionController(){ var vm = this; diff --git a/frontend/src/templates/directives/rule.html b/frontend/src/directives/rule/rule.html similarity index 100% rename from frontend/src/templates/directives/rule.html rename to frontend/src/directives/rule/rule.html diff --git a/frontend/src/directives/rule.js b/frontend/src/directives/rule/rule.js similarity index 98% rename from frontend/src/directives/rule.js rename to frontend/src/directives/rule/rule.js index bd9a8fb..a69c94c 100644 --- a/frontend/src/directives/rule.js +++ b/frontend/src/directives/rule/rule.js @@ -28,7 +28,7 @@ angular.module('appenlight.directives.rule', []).directive('rule', function () { config: "=" }, restrict: 'E', - templateUrl: 'templates/directives/rule.html', + templateUrl: 'directives/rule/rule.html', controller:RuleController, controllerAs:'rule_ctrlr' }; diff --git a/frontend/src/templates/directives/rule_read_only.html b/frontend/src/directives/rule_read_only/rule_read_only.html similarity index 100% rename from frontend/src/templates/directives/rule_read_only.html rename to frontend/src/directives/rule_read_only/rule_read_only.html diff --git a/frontend/src/directives/rule_read_only.js b/frontend/src/directives/rule_read_only/rule_read_only.js similarity index 97% rename from frontend/src/directives/rule_read_only.js rename to frontend/src/directives/rule_read_only/rule_read_only.js index 7fc3336..ae5d887 100644 --- a/frontend/src/directives/rule_read_only.js +++ b/frontend/src/directives/rule_read_only/rule_read_only.js @@ -28,7 +28,7 @@ angular.module('appenlight.directives.ruleReadOnly', []).directive('ruleReadOnly config: "=" }, restrict: 'E', - templateUrl: 'templates/directives/rule_read_only.html', + templateUrl: 'directives/rule_read_only/rule_read_only.html', controller:RuleController, controllerAs:'rule_ctrlr' }