diff --git a/app/admin_components/adf-admins/dreamfactory-admins.js b/app/admin_components/adf-admins/dreamfactory-admins.js index 69d827cd..0da72237 100644 --- a/app/admin_components/adf-admins/dreamfactory-admins.js +++ b/app/admin_components/adf-admins/dreamfactory-admins.js @@ -494,6 +494,7 @@ angular.module('dfAdmins', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) templateUrl: MOD_ADMIN_ASSET_PATH + 'views/df-access-by-tabs.html', link: function (scope, elem, attrs) { var currentUser = UserDataService.getCurrentUser(); + scope.accessByTabsLoaded = false; scope.subscription_required = !dfApplicationData.isGoldLicense(); scope.isRootAdmin = currentUser.is_root_admin; scope.widgetDescription = "Restricted admin. An auto-generated role will be created for this admin."; diff --git a/app/admin_components/adf-admins/views/df-access-by-tabs.html b/app/admin_components/adf-admins/views/df-access-by-tabs.html index c56c82c9..7295e175 100644 --- a/app/admin_components/adf-admins/views/df-access-by-tabs.html +++ b/app/admin_components/adf-admins/views/df-access-by-tabs.html @@ -1,6 +1,6 @@
- +

Access by tabs

@@ -31,10 +31,8 @@

Access by tabs

-
-
This feature requires a DreamFactory GOLD product subscription.
Email sales@dreamfactory.com or call +1-415-993-5877 for pricing - information. +
+

diff --git a/app/admin_components/adf-limit/views/df-manage-limits.html b/app/admin_components/adf-limit/views/df-manage-limits.html index cfd43170..57dbf0f6 100644 --- a/app/admin_components/adf-limit/views/df-manage-limits.html +++ b/app/admin_components/adf-limit/views/df-manage-limits.html @@ -196,8 +196,8 @@
-
-

This feature requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-reports/dreamfactory-reports.js b/app/admin_components/adf-reports/dreamfactory-reports.js index 792b93ff..93ad8f62 100644 --- a/app/admin_components/adf-reports/dreamfactory-reports.js +++ b/app/admin_components/adf-reports/dreamfactory-reports.js @@ -63,6 +63,14 @@ angular.module('dfReports', ['ngRoute', 'dfUtility', 'dfApplication', 'dfHelp']) text: '' }; + //HELP + $scope.dfLargeHelp = { + manageReports: { + title: 'Manage Service Reports', + text: 'Service reports tell you when each service was created, modified, and deleted.' + } + }; + // load data $scope.apiData = null; diff --git a/app/admin_components/adf-reports/views/df-manage-service-reports.html b/app/admin_components/adf-reports/views/df-manage-service-reports.html index f46c8448..8bf2f366 100644 --- a/app/admin_components/adf-reports/views/df-manage-service-reports.html +++ b/app/admin_components/adf-reports/views/df-manage-service-reports.html @@ -4,7 +4,7 @@
- + @@ -105,7 +105,7 @@
-
-

This feature will be available for root admin and requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-scheduler/views/df-manage-tasks.html b/app/admin_components/adf-scheduler/views/df-manage-tasks.html index cc6899a1..08d69317 100644 --- a/app/admin_components/adf-scheduler/views/df-manage-tasks.html +++ b/app/admin_components/adf-scheduler/views/df-manage-tasks.html @@ -101,8 +101,8 @@ data-api-data="apiData"> -
-

This feature requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-scripts/views/main.html b/app/admin_components/adf-scripts/views/main.html index dbc9f9f3..8fc66433 100644 --- a/app/admin_components/adf-scripts/views/main.html +++ b/app/admin_components/adf-scripts/views/main.html @@ -53,8 +53,8 @@ -
-

This feature requires a DreamFactory SILVER product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-services/views/df-service-config.html b/app/admin_components/adf-services/views/df-service-config.html index 093956cd..99905ea4 100644 --- a/app/admin_components/adf-services/views/df-service-config.html +++ b/app/admin_components/adf-services/views/df-service-config.html @@ -410,8 +410,8 @@
-
-

This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-services/views/df-service-definition.html b/app/admin_components/adf-services/views/df-service-definition.html index 55387645..a685b8c5 100644 --- a/app/admin_components/adf-services/views/df-service-definition.html +++ b/app/admin_components/adf-services/views/df-service-definition.html @@ -39,8 +39,8 @@ -
-

This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-services/views/df-service-info.html b/app/admin_components/adf-services/views/df-service-info.html index 684fa4a2..7e58ccc1 100644 --- a/app/admin_components/adf-services/views/df-service-info.html +++ b/app/admin_components/adf-services/views/df-service-info.html @@ -51,7 +51,7 @@ -
-

This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. +
+
diff --git a/app/admin_components/adf-utility/dreamfactory-utility.js b/app/admin_components/adf-utility/dreamfactory-utility.js index fa99a688..2c813f3f 100644 --- a/app/admin_components/adf-utility/dreamfactory-utility.js +++ b/app/admin_components/adf-utility/dreamfactory-utility.js @@ -2712,6 +2712,26 @@ angular.module('dfUtility', ['dfApplication']) } }]) + .directive('dfPaywall', ['MOD_UTILITY_ASSET_PATH', function (MOD_UTILITY_ASSET_PATH) { + return { + restrict: 'E', + scope: { + serviceName: '=?', + licenseType: '=?' + }, + templateUrl: MOD_UTILITY_ASSET_PATH + 'views/df-paywall.html', + + link: function (scope, elem, attrs) { + scope.$watch('serviceName', function (newValue, oldValue) { + if (scope.serviceName) { + scope.$emit('hitPaywall', newValue); + + } + }); + } + } + }]) + // Helps merge objects. Supports deep merge. Many modules // need this .service('dfObjectService', [ diff --git a/app/admin_components/adf-utility/views/df-paywall.html b/app/admin_components/adf-utility/views/df-paywall.html new file mode 100644 index 00000000..e05d770e --- /dev/null +++ b/app/admin_components/adf-utility/views/df-paywall.html @@ -0,0 +1,2 @@ +

This feature requires a DreamFactory {{ licenseType }} product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. + diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index 7191ccfb..7925040f 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -824,4 +824,27 @@ angular.module('dreamfactoryApp') e.stopPropagation(); $scope.confirmLoginErrorMsg = errMsg.data.error.message; }); + }]) + + .controller('PaywallCtrl', ['$scope', '$http', 'UserDataService', 'SystemConfigDataService', function($scope, $http, UserDataService, SystemConfigDataService) { + + $scope.$on('hitPaywall', function (e, data) { + $scope.sendRequest(data); + }); + + $scope.sendRequest = function(serviceName) { + var data = { + email: UserDataService.getCurrentUser().email, + ip_address: SystemConfigDataService.getSystemConfig().client.ip_address, + service_name: serviceName + }; + + var req = { + method: 'POST', + url: 'https://updates.dreamfactory.com/api/paywall', + data: JSON.stringify(data) + }; + + $http(req).then(); + }; }]); diff --git a/dist/admin_components/adf-admins/views/df-access-by-tabs.html b/dist/admin_components/adf-admins/views/df-access-by-tabs.html index f75c2a5b..eb151223 100644 --- a/dist/admin_components/adf-admins/views/df-access-by-tabs.html +++ b/dist/admin_components/adf-admins/views/df-access-by-tabs.html @@ -1 +1 @@ -

Access by tabs

{{ widgetDescription }}

This feature requires a DreamFactory GOLD product subscription.
Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.

\ No newline at end of file +

Access by tabs

{{ widgetDescription }}

\ No newline at end of file diff --git a/dist/admin_components/adf-limit/views/df-manage-limits.html b/dist/admin_components/adf-limit/views/df-manage-limits.html index 9e68fd19..d2aef384 100644 --- a/dist/admin_components/adf-limit/views/df-manage-limits.html +++ b/dist/admin_components/adf-limit/views/df-manage-limits.html @@ -24,4 +24,4 @@ -->
{{field.label}}
{{obj.record.id}}
{{obj.record.name}}
{{obj.record.type}}
{{obj.record.rate + ' / ' + obj.record.period}}
{{ obj.record.limit_cache_by_limit_id[0].attempts + ' / ' + obj.record.limit_cache_by_limit_id[0].max }}
{{obj.record.user_by_user_id.name}}
{{obj.record.service_by_service_id.name}}
{{obj.record.role_by_role_id.name }}
Active Inactive

This feature requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
\ No newline at end of file + 'progress-bar-danger' : obj.record.limit_cache_by_limit_id[0].percent >= 90 }" role="progressbar" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: {{ obj.record.limit_cache_by_limit_id[0].percent }}%">
{{ obj.record.limit_cache_by_limit_id[0].attempts + ' / ' + obj.record.limit_cache_by_limit_id[0].max }}
{{obj.record.user_by_user_id.name}}
{{obj.record.service_by_service_id.name}}
{{obj.record.role_by_role_id.name }}
Active Inactive
\ No newline at end of file diff --git a/dist/admin_components/adf-reports/views/df-manage-service-reports.html b/dist/admin_components/adf-reports/views/df-manage-service-reports.html index 788a03a7..81c55fb5 100644 --- a/dist/admin_components/adf-reports/views/df-manage-service-reports.html +++ b/dist/admin_components/adf-reports/views/df-manage-service-reports.html @@ -1 +1 @@ -
{{field.label}}
{{obj.record.id}}
{{obj.record.created_date}} UTC
{{obj.record.service_id}}
{{obj.record.service_name}}
{{obj.record.user_email}}
{{obj.record.action}}
{{obj.record.request_verb}}

This feature will be available for root admin and requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
\ No newline at end of file +
{{field.label}}
{{obj.record.id}}
{{obj.record.created_date}} UTC
{{obj.record.service_id}}
{{obj.record.service_name}}
{{obj.record.user_email}}
{{obj.record.action}}
{{obj.record.request_verb}}
\ No newline at end of file diff --git a/dist/admin_components/adf-scheduler/views/df-manage-tasks.html b/dist/admin_components/adf-scheduler/views/df-manage-tasks.html index a2d84f66..8cd1ca34 100644 --- a/dist/admin_components/adf-scheduler/views/df-manage-tasks.html +++ b/dist/admin_components/adf-scheduler/views/df-manage-tasks.html @@ -1 +1 @@ -
{{field.label}}
-
{{value}}

This feature requires a DreamFactory GOLD product subscription.

Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
\ No newline at end of file +
{{field.label}}
-
{{value}}
\ No newline at end of file diff --git a/dist/admin_components/adf-scripts/views/main.html b/dist/admin_components/adf-scripts/views/main.html index e06d74df..34f89755 100644 --- a/dist/admin_components/adf-scripts/views/main.html +++ b/dist/admin_components/adf-scripts/views/main.html @@ -1 +1 @@ -
  • The Free Hosted Edition of DreamFactory does not support Server Side Scripting. Please install DreamFactory on your cloud or server for this capability. Click here to download the open source software package.

    This feature requires a DreamFactory SILVER product subscription.

    Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
    \ No newline at end of file +
  • The Free Hosted Edition of DreamFactory does not support Server Side Scripting. Please install DreamFactory on your cloud or server for this capability. Click here to download the open source software package.
    \ No newline at end of file diff --git a/dist/admin_components/adf-services/views/df-service-config.html b/dist/admin_components/adf-services/views/df-service-config.html index 2eace331..36012de9 100644 --- a/dist/admin_components/adf-services/views/df-service-config.html +++ b/dist/admin_components/adf-services/views/df-service-config.html @@ -1 +1 @@ -
  • The IP address for your DreamFactory instance is {{ apiData.environment.server.ip }}. If you have trouble accessing your service through DreamFactory make sure the service allows connections from this IP address.
    Service: Repository: Branch/Tag: Path:
    Values
    {{ part.label }}
    {{ field.object.key.label }}
    {{ field.object.value.label }}

    This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

    Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
    \ No newline at end of file +
  • The IP address for your DreamFactory instance is {{ apiData.environment.server.ip }}. If you have trouble accessing your service through DreamFactory make sure the service allows connections from this IP address.
    Service: Repository: Branch/Tag: Path:
    Values
    {{ part.label }}
    {{ field.object.key.label }}
    {{ field.object.value.label }}
    \ No newline at end of file diff --git a/dist/admin_components/adf-services/views/df-service-definition.html b/dist/admin_components/adf-services/views/df-service-definition.html index d3ae9b81..da54a84f 100644 --- a/dist/admin_components/adf-services/views/df-service-definition.html +++ b/dist/admin_components/adf-services/views/df-service-definition.html @@ -1 +1 @@ -

    This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

    Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
    \ No newline at end of file +
    \ No newline at end of file diff --git a/dist/admin_components/adf-services/views/df-service-info.html b/dist/admin_components/adf-services/views/df-service-info.html index a04beb9b..531ce71a 100644 --- a/dist/admin_components/adf-services/views/df-service-info.html +++ b/dist/admin_components/adf-services/views/df-service-info.html @@ -1 +1 @@ -



    This feature requires a DreamFactory {{selectedSchema.subscription_required}} product subscription.

    Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information.
    \ No newline at end of file +


    \ No newline at end of file diff --git a/dist/admin_components/adf-utility/views/df-paywall.html b/dist/admin_components/adf-utility/views/df-paywall.html new file mode 100644 index 00000000..f08dc7d8 --- /dev/null +++ b/dist/admin_components/adf-utility/views/df-paywall.html @@ -0,0 +1 @@ +

    This feature requires a DreamFactory {{ licenseType }} product subscription.

    Email sales@dreamfactory.com or call +1-415-993-5877 for pricing information. \ No newline at end of file diff --git a/dist/index.html b/dist/index.html index 64c0f126..c0d7dfde 100644 --- a/dist/index.html +++ b/dist/index.html @@ -2,7 +2,7 @@

    You are using an outdated browser. Please upgrade your browser to improve your experience.