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 2C969200BA0 for ; Fri, 14 Oct 2016 23:04:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2B267160AE3; Fri, 14 Oct 2016 21:04:28 +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 C7CCD160B05 for ; Fri, 14 Oct 2016 23:04:25 +0200 (CEST) Received: (qmail 26770 invoked by uid 500); 14 Oct 2016 21:04:22 -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 26202 invoked by uid 99); 14 Oct 2016 21:04:22 -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, 14 Oct 2016 21:04:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 70530EF79F; Fri, 14 Oct 2016 21:04:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akovalenko@apache.org To: commits@ambari.apache.org Date: Fri, 14 Oct 2016 21:04:36 -0000 Message-Id: <70682a6746a740fb804ddfb5a9afe3e6@git.apache.org> In-Reply-To: <3f476f0f59c34be18b46dc29338cac3b@git.apache.org> References: <3f476f0f59c34be18b46dc29338cac3b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/23] ambari git commit: AMBARI-18573. Migration to Bootstrap3 framework (akovalenko) archived-at: Fri, 14 Oct 2016 21:04:28 -0000 http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popup.hbs b/ambari-web/app/templates/common/modal_popup.hbs index 1d67a41..67801f1 100644 --- a/ambari-web/app/templates/common/modal_popup.hbs +++ b/ambari-web/app/templates/common/modal_popup.hbs @@ -17,46 +17,55 @@ }} -
+
{{view.paginationInfo}}
-
- {{view view.paginationFirst}} - {{view view.paginationLeft}} - {{view view.paginationRight}} - {{view view.paginationLast}} -
+ {{view view.pagination4Btns}} {{/if}} {{else}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs index 766c6e6..88d8eaf 100644 --- a/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs +++ b/ambari-web/app/templates/common/modal_popups/cluster_check_dialog.hbs @@ -17,7 +17,7 @@ }}
{{#if view.isAllPassed}} -  {{t admin.stackVersions.version.upgrade.upgradeOptions.preCheck.allPassed.msg}} +  {{t admin.stackVersions.version.upgrade.upgradeOptions.preCheck.allPassed.msg}} {{/if}} {{#if view.fails.length}} {{#if view.failTitle}} @@ -30,7 +30,7 @@ {{/if}}
{{#each item in view.fails}} -  {{item.UpgradeChecks.check}} +  {{item.UpgradeChecks.check}} 
{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}
{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}
{{/each}}
@@ -48,7 +48,7 @@ {{/if}}
{{#each item in view.bypass}} -  {{item.UpgradeChecks.check}} +  {{item.UpgradeChecks.check}} 
{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}
{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}
{{/each}}
@@ -65,7 +65,7 @@ {{/if}}
{{#each item in view.warnings}} -  {{item.UpgradeChecks.check}} +  {{item.UpgradeChecks.check}} 
{{t popup.clusterCheck.reason}}{{item.UpgradeChecks.reason}}
{{t popup.clusterCheck.failedOn}}{{item.UpgradeChecks.failed_on}}
{{/each}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs b/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs index d99d2a3..c813bb1 100644 --- a/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs +++ b/ambari-web/app/templates/common/modal_popups/confirmation_feedback.hbs @@ -20,11 +20,15 @@
{{#if view.parentView.additionalWarningMsg}}
-
+
{{view.parentView.additionalWarningMsg}}
{{/if}} {{#if view.parentView.putInMaintenance}} - +
+ +
{{/if}} - http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs index 6a2d93b..fe78c2d 100644 --- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs +++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs @@ -29,10 +29,10 @@ {{t common.configGroup}} {{t common.fileName}} -
+
{{t popup.dependent.configs.table.currentValue}}
-
+
{{t popup.dependent.configs.table.recommendedValue}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs index 0115fe5..3ae2e3e 100644 --- a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs @@ -28,7 +28,7 @@ {{/each}} {{else}} -
    +
      {{#each item in view.items}}
    • {{item}}
      • {{/each}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs index 722e578..87fff79 100644 --- a/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/invalid_KDC_popup.hbs @@ -22,24 +22,20 @@
      -
      - {{view Ember.TextField valueBinding="view.parentView.principal" class="form-control"}} -
      + {{view Ember.TextField valueBinding="view.parentView.principal" class="form-control"}}
      -
      - {{view Ember.TextField type="password" valueBinding="view.parentView.password" class="form-control"}} -
      + {{view Ember.TextField type="password" valueBinding="view.parentView.password" class="form-control"}}
      -
      +
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs index 65a5f99..4014aac 100644 --- a/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/log_tail_popup.hbs @@ -22,15 +22,15 @@ {{view.content.filePath}}
      - + {{t common.copy}} - + {{t common.open}} - + {{t popup.logTail.openInLogSearch}}
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/logs_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/logs_popup.hbs b/ambari-web/app/templates/common/modal_popups/logs_popup.hbs index 5d2551b..bb62e35 100644 --- a/ambari-web/app/templates/common/modal_popups/logs_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/logs_popup.hbs @@ -19,9 +19,9 @@
      {{t common.copy}} + class="glyphicon glyphicon-copy"> {{t common.copy}} {{t common.open}} + class="glyphicon glyphicon-external-link"> {{t common.open}}
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs b/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs index 43f71e2..c1ef0e8 100644 --- a/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/prompt_popup.hbs @@ -17,15 +17,17 @@ }}
      -
      - +
      + {{#if view.text}} + + {{/if}}

      {{view.title}}

      {{view.description}}

      -
      +
      {{view.label}}   {{view Em.TextField class="prompt-input" valueBinding="view.parentView.inputValue"}} {{#if view.parentView.isChanged}} - @@ -33,7 +35,7 @@ {{/if}}
      {{#if view.parentView.isInvalid}} - {{view.parentView.errorMessage}} + {{view.parentView.errorMessage}} {{/if}}
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs b/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs index 7e4abb4..397369d 100644 --- a/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs +++ b/ambari-web/app/templates/common/modal_popups/widget_browser_footer.hbs @@ -18,10 +18,13 @@
      {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}} - +
      + +
      +
      {{/isAuthorized}} -
      \ No newline at end of file +
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs index 6b452a2..3f76a0a 100644 --- a/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/widget_browser_popup.hbs @@ -23,7 +23,7 @@
      {{/isAuthorized}} @@ -41,17 +41,17 @@ {{#if view.isWidgetEmptyList}}
      {{t dashboard.widgets.browser.noWidgets}}
      {{else}} -
      +
      {{#each widget in view.filteredContent}} -
      -
      +
      +
      -
      +

      {{widget.widgetName}}

      {{#if widget.isShared}} - {{/if}}

      @@ -61,7 +61,7 @@
      {{#if widget.added}} {{else}}
      -
      -
      -
      -
      +
      +
      +
      +
      -
      {{task.progress}}%
      +
      {{task.progress}}%
      {{#if task.showRetry}} - + {{t common.retry}} {{/if}} {{#if task.showRollback}} - + {{t common.rollBack}} {{/if}} {{#if task.showSkip}} - + {{t common.skip}} {{/if}} @@ -71,7 +71,7 @@ {{/if}}
      {{#if view.showBackButton}} - + {{/if}}
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/rolling_restart_view.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/rolling_restart_view.hbs b/ambari-web/app/templates/common/rolling_restart_view.hbs index 92dff500..c090ee3 100644 --- a/ambari-web/app/templates/common/rolling_restart_view.hbs +++ b/ambari-web/app/templates/common/rolling_restart_view.hbs @@ -36,17 +36,17 @@ - - + + - + - + @@ -71,7 +71,7 @@ {{view App.SpinnerView}} {{/if}} {{#if view.errors}} -
      +
        {{#each error in view.errors}}
      • {{error}}
        • @@ -80,7 +80,7 @@
      {{/if}} {{#if view.warnings}} -
      +
        {{#each warning in view.warnings}}
      • {{warning}}
        • http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/selectable_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/selectable_popup.hbs b/ambari-web/app/templates/common/selectable_popup.hbs index c95e3fa..270461a 100644 --- a/ambari-web/app/templates/common/selectable_popup.hbs +++ b/ambari-web/app/templates/common/selectable_popup.hbs @@ -19,13 +19,13 @@
        - {{t common.copy}} + {{t common.copy}}
        - +
        {{content}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/settings.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/settings.hbs b/ambari-web/app/templates/common/settings.hbs index 953d5ff..6c2a95c 100644 --- a/ambari-web/app/templates/common/settings.hbs +++ b/ambari-web/app/templates/common/settings.hbs @@ -20,10 +20,12 @@

        {{t app.settings.categories.general}}

        - +
        + +

        {{t app.settings.categories.locale}}

        @@ -35,7 +37,7 @@ optionLabelPath="content.label" optionValuePath="content.value" selectionBinding="view.parentView.selectedTimezone" - class="group-select select-group-box" + class="group-select select-group-box form-control" }}
        http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/time_range.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/time_range.hbs b/ambari-web/app/templates/common/time_range.hbs index d925caf..d1885bc 100644 --- a/ambari-web/app/templates/common/time_range.hbs +++ b/ambari-web/app/templates/common/time_range.hbs @@ -17,7 +17,7 @@ }}
        - {{t common.timeRange}} + {{t common.timeRange}}
          {{#each preset in view.presets}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/gauge_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs b/ambari-web/app/templates/common/widget/gauge_widget.hbs index 16a03ee..83d4a49 100644 --- a/ambari-web/app/templates/common/widget/gauge_widget.hbs +++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs @@ -16,19 +16,19 @@ * limitations under the License. }} -
          +
          {{#if view.isLoaded}} - - + + -
          {{view.content.widgetName}}
          +
          {{view.content.widgetName}}
          {{#if controller.isAmbariMetricsInstalled}} - + - + {{/if}}
          http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/graph_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs index e92678a..9784a83 100644 --- a/ambari-web/app/templates/common/widget/graph_widget.hbs +++ b/ambari-web/app/templates/common/widget/graph_widget.hbs @@ -16,22 +16,22 @@ * limitations under the License. }} -
          +
          {{#if view.isLoaded}} - - + + -
          {{view.content.widgetName}}
          +
          {{view.content.widgetName}}
          - + {{#if controller.isAmbariMetricsInstalled}} - + - + {{/if}} {{view view.exportMetricsMenuView}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/heatmap_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/heatmap_widget.hbs b/ambari-web/app/templates/common/widget/heatmap_widget.hbs index 17e7ee9..02b30c7 100644 --- a/ambari-web/app/templates/common/widget/heatmap_widget.hbs +++ b/ambari-web/app/templates/common/widget/heatmap_widget.hbs @@ -17,17 +17,17 @@ }}
          -
          +

          {{view.content.widgetName}}   {{#unless view.isLoaded}} - + {{view App.SpinnerView}} {{/unless}}

          -
          +
          {{#each rack in view.racks}}
          {{view App.MainChartsHeatmapRackView rackBinding="rack" }} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/number_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs b/ambari-web/app/templates/common/widget/number_widget.hbs index 8932a7d..42d6aa0 100644 --- a/ambari-web/app/templates/common/widget/number_widget.hbs +++ b/ambari-web/app/templates/common/widget/number_widget.hbs @@ -16,19 +16,19 @@ * limitations under the License. }} -
          +
          {{#if view.isLoaded}} - - + + -
          {{view.content.widgetName}}
          +
          {{view.content.widgetName}}
          {{#if controller.isAmbariMetricsInstalled}} - + - + {{/if}}
          http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/common/widget/template_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs b/ambari-web/app/templates/common/widget/template_widget.hbs index 7b174de..aeebdcf 100644 --- a/ambari-web/app/templates/common/widget/template_widget.hbs +++ b/ambari-web/app/templates/common/widget/template_widget.hbs @@ -16,19 +16,19 @@ * limitations under the License. }} -
          +
          {{#if view.isLoaded}} - - + + -
          {{view.content.widgetName}}
          +
          {{view.content.widgetName}}
          {{#if controller.isAmbariMetricsInstalled}} - + - + {{/if}}
          http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/experimental.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/experimental.hbs b/ambari-web/app/templates/experimental.hbs index 5fec5ca..862fa16 100644 --- a/ambari-web/app/templates/experimental.hbs +++ b/ambari-web/app/templates/experimental.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -
          +

          Ambari's Experimental Functionality

          Important Changes made here are neither tested nor supported by Ambari @@ -49,15 +49,15 @@

      {{t common.restart}}{{view Ember.TextField valueBinding="view.batchSize" class="span1"}}{{view.batchSizeMessage}}{{view Ember.TextField valueBinding="view.batchSize" class="form-control input-sm"}}{{view.batchSizeMessage}}
      {{t rollingrestart.dialog.msg.timegap.prefix}}{{view Ember.TextField valueBinding="view.interBatchWaitTimeSeconds" class="span1"}}{{view Ember.TextField valueBinding="view.interBatchWaitTimeSeconds" class="form-control input-sm"}} {{t rollingrestart.dialog.msg.timegap.suffix}}
      {{t rollingrestart.dialog.msg.toleration.prefix}}{{view Ember.TextField valueBinding="view.tolerateSize" class="span1"}}{{view Ember.TextField valueBinding="view.tolerateSize" class="form-control input-sm"}} {{t rollingrestart.dialog.msg.toleration.suffix}}
      -
      - +
      +
      {{#isAuthorized "CLUSTER.MANAGE_USER_PERSISTED_DATA"}} -
      +

      Reset UI state locally and on the server @@ -66,12 +66,12 @@ {{/isAuthorized}}

      {{else}} -
      +
      No application supports found. Please login to Ambari and revisit this page.
      {{/if}} {{else}} -
      +
      No application found. Please login to Ambari and revisit this page.
      {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/installer.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/installer.hbs b/ambari-web/app/templates/installer.hbs index 56ec202..4089fb1 100644 --- a/ambari-web/app/templates/installer.hbs +++ b/ambari-web/app/templates/installer.hbs @@ -23,9 +23,9 @@ {{else}}
      -
      -
      -
      +
      +
      +
        @@ -44,7 +44,7 @@
      -
      +
      {{outlet}}
      http://git-wip-us.apache.org/repos/asf/ambari/blob/2a77e39c/ambari-web/app/templates/login.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/login.hbs b/ambari-web/app/templates/login.hbs index ceb56c0..b3037ea 100644 --- a/ambari-web/app/templates/login.hbs +++ b/ambari-web/app/templates/login.hbs @@ -17,17 +17,23 @@ }} {{#unless isServerClientVersionMismatch}} -