Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 669A92009F3 for ; Fri, 20 May 2016 13:10:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6563D1609AF; Fri, 20 May 2016 11:10:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 61C5D160A0E for ; Fri, 20 May 2016 13:10:43 +0200 (CEST) Received: (qmail 34184 invoked by uid 500); 20 May 2016 11:10:42 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 34175 invoked by uid 99); 20 May 2016 11:10:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 May 2016 11:10:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7AC5CE032D; Fri, 20 May 2016 11:10:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pallavkul@apache.org To: commits@ambari.apache.org Message-Id: <1bda6f66f6d947999ea04723144e2d63@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-16771. View URLs: UX edits #4 (pallavkul) Date: Fri, 20 May 2016 11:10:42 +0000 (UTC) archived-at: Fri, 20 May 2016 11:10:44 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 3822217cd -> e6c2bfbe2 AMBARI-16771. View URLs: UX edits #4 (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e6c2bfbe Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6c2bfbe Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6c2bfbe Branch: refs/heads/branch-2.4 Commit: e6c2bfbe25ecfc64cb85b463e6d539e5b60c8a6e Parents: 3822217 Author: Pallav Kulshreshtha Authored: Fri May 20 16:39:08 2016 +0530 Committer: Pallav Kulshreshtha Committed: Fri May 20 16:40:18 2016 +0530 ---------------------------------------------------------------------- .../controllers/ambariViews/ViewsEditCtrl.js | 20 +++++++++++++++++++- .../ui/admin-web/app/scripts/i18n.config.js | 5 ++--- .../resources/ui/admin-web/app/styles/main.css | 4 ++++ .../admin-web/app/views/ambariViews/edit.html | 8 ++++---- .../app/views/ambariViews/listTable.html | 2 +- .../app/views/ambariViews/listUrls.html | 4 ++-- .../ui/admin-web/app/views/urls/create.html | 8 ++++---- .../ui/admin-web/app/views/urls/edit.html | 4 ++-- 8 files changed, 38 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js index 2b1fb3b..6066f74 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js @@ -18,7 +18,7 @@ 'use strict'; angular.module('ambariAdminConsole') - .controller('ViewsEditCtrl', ['$scope', '$routeParams', 'RemoteCluster', 'Cluster', 'View', 'Alert', 'PermissionLoader', 'PermissionSaver', 'ConfirmationModal', '$location', 'UnsavedDialog', '$translate', function($scope, $routeParams, RemoteCluster, Cluster, View, Alert, PermissionLoader, PermissionSaver, ConfirmationModal, $location, UnsavedDialog, $translate) { + .controller('ViewsEditCtrl', ['$scope','$route', '$templateCache', '$routeParams', 'RemoteCluster', 'Cluster', 'View', 'Alert', 'PermissionLoader', 'PermissionSaver', 'ConfirmationModal', '$location', 'UnsavedDialog', '$translate', function($scope, $route, $templateCache , $routeParams, RemoteCluster, Cluster, View, Alert, PermissionLoader, PermissionSaver, ConfirmationModal, $location, UnsavedDialog, $translate) { var $t = $translate.instant; $scope.identity = angular.identity; $scope.isConfigurationEmpty = true; @@ -432,6 +432,24 @@ angular.module('ambariAdminConsole') }); }; + $scope.deleteShortURL = function(shortUrlName) { + ConfirmationModal.show( + $t('common.delete', { + term: $t('urls.url') + }), + $t('common.deleteConfirmation', { + instanceType: $t('urls.url').toLowerCase(), + instanceName: '"' + shortUrlName + '"' + }) + ).then(function() { + View.deleteUrl(shortUrlName).then(function() { + var currentPageTemplate = $route.current.templateUrl; + $templateCache.remove(currentPageTemplate); + $route.reload(); + }); + }); + }; + $scope.$on('$locationChangeStart', function(event, targetUrl) { if( $scope.settingsForm.$dirty || $scope.propertiesForm.$dirty){ UnsavedDialog().then(function(action) { http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js index 3ed2687..02af3aa 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js @@ -145,8 +145,8 @@ angular.module('ambariAdminConsole') 'clusterRenamed': 'The cluster has been renamed to {{clusterName}}.', 'remoteClusterRegistered': 'The cluster has been registered as {{clusterName}}.', 'cannotRenameCluster': 'Cannot rename cluster to {{clusterName}}', - 'tooShort': 'Too short', - 'tooLong': 'Too long', + 'minimumTwoChars': 'Minimum length is 2 characters.', + 'maxTwentyFiveChars': 'Maximum length is 25 characters.', 'onlyText': 'Only lowercase alphanumeric characters are allowed.', 'onlyAnScore': 'Invalid input, only alphanumerics allowed eg: My_default_view', 'passwordRequired':'Password Required', @@ -222,7 +222,6 @@ angular.module('ambariAdminConsole') 'pending': 'Pending...', 'deploying': 'Deploying...', 'properties': 'properties', - 'urlCreate':'Create new URL', 'urlDelete':'Delete URL', 'clusterPermissions': { http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index bbd8a7c..b15c5ae 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -1090,6 +1090,10 @@ button.btn.btn-xs{ word-wrap:break-word; } +a.alert-link, a.alert-link:hover, a.alert-link:visited{ + color: #a94442; +} + .alert-info { background-color: #E6F1F6; border-color: #D2D9DD; http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html index 3a69a50..a0bd138 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html @@ -84,15 +84,15 @@
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html index 2481d59..bc441cd 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listTable.html @@ -16,7 +16,7 @@ * limitations under the License. --> -
+
  1. {{'common.views' | translate}}
    2. http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html index e0b8a4e..4654147 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/listUrls.html @@ -16,7 +16,7 @@ * limitations under the License. --> -
    +
    @@ -25,7 +25,7 @@
- {{'views.urlCreate' | translate}} + {{'urls.createNewUrl' | translate}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/create.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/create.html index c98ec3e..a01024d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/create.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/create.html @@ -29,8 +29,8 @@
{{'common.alerts.fieldIsRequired' | translate}}
-
{{'common.alerts.tooShort' | translate}}
-
{{'common.alerts.tooLong' | translate}}
+
{{'common.alerts.minimumTwoChars' | translate}}
+
{{'common.alerts.maxTwentyFiveChars' | translate}}
@@ -58,8 +58,8 @@ /main/view/{{chomp(url.selectedView)}}/
{{'common.alerts.fieldIsRequired' | translate}}
-
{{'common.alerts.tooShort' | translate}}
-
{{'common.alerts.tooLong' | translate}}
+
{{'common.alerts.minimumTwoChars' | translate}}
+
{{'common.alerts.maxTwentyFiveChars' | translate}}
{{'common.alerts.onlyText' | translate}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e6c2bfbe/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/edit.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/edit.html index 9e0ef4c..1d0ff8c 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/urls/edit.html @@ -60,8 +60,8 @@ /main/view/{{url.view_instance_common_name}}/
{{'common.alerts.fieldIsRequired' | translate}}
-
{{'common.alerts.tooShort' | translate}}
-
{{'common.alerts.tooLong' | translate}}
+
{{'common.alerts.minimumTwoChars' | translate}}
+
{{'common.alerts.maxTwentyFiveChars' | translate}}
{{'common.alerts.onlyText' | translate}}