You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/07/20 11:22:13 UTC
[ambari] branch branch-2.7 updated: AMBARI-24321 Fix background
colors on pages
This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new c8af6cc AMBARI-24321 Fix background colors on pages
c8af6cc is described below
commit c8af6cc29a814cf3bc67d7d4fb40047fdb70cdce
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Fri Jul 20 12:49:56 2018 +0300
AMBARI-24321 Fix background colors on pages
---
.../app/templates/main/admin/serviceAccounts.hbs | 22 ++-
.../main/admin/stack_upgrade/services.hbs | 189 +++++++++++----------
2 files changed, 108 insertions(+), 103 deletions(-)
diff --git a/ambari-web/app/templates/main/admin/serviceAccounts.hbs b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
index b4d46bb..5859133 100644
--- a/ambari-web/app/templates/main/admin/serviceAccounts.hbs
+++ b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
@@ -15,19 +15,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-<div class="admin-misc">
- <h4>{{t admin.misc.header}}</h4>
+<div class="admin-misc container-wrap-table">
+ <div class="row">
+ <h2 class="table-title col-sm-4">{{t admin.misc.header}}</h2>
+ </div>
{{#if controller.dataIsLoaded}}
{{#if controller.users}}
- <div class="row col-md-6">
- <table class="table table-hover">
- <thead>
+ <div class="row">
+ <div class="col-md-6">
+ <table class="table table-hover">
+ <thead>
<tr>
<th>{{t common.name}}</th>
<th>{{t common.value}}</th>
</tr>
- </thead>
- <tbody>
+ </thead>
+ <tbody>
{{#each user in controller.users}}
{{#if user.isVisible}}
<tr>
@@ -36,8 +39,9 @@
</tr>
{{/if}}
{{/each}}
- </tbody>
- </table>
+ </tbody>
+ </table>
+ </div>
</div>
{{else}}
<p>{{t admin.misc.nothingToShow}}</p>
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
index f1c61f9..34e4235 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
@@ -17,107 +17,108 @@
}}
-<div class="row">
- <h2 class="table-title col-sm-1">{{t common.stack}}</h2>
-</div>
-<table class="table table-hover">
- <thead>
- <tr>
- <th>{{t common.service}}</th>
- <th>{{t common.version}}</th>
- <th>{{t common.status}}</th>
- <th>{{t common.description}}</th>
- </tr>
- </thead>
- <tbody>
- {{#each service in view.services}}
+<div class="container-wrap-table">
+ <div class="row">
+ <h2 class="table-title col-sm-1">{{t common.stack}}</h2>
+ </div>
+ <table class="table table-hover">
+ <thead>
<tr>
- <td class="service-display-name">{{service.displayName}}</td>
- <td class="service-stack-version">{{service.serviceVersionDisplay}}</td>
- <td class="stack-version-state">
- {{#if service.isInstalled}}
- <span class="label label-success">{{t common.installed}}</span>
- {{else}}
- <a {{bindAttr class=":path-link view.isAddServiceAvailable::not-active-link"}} {{action goToAddService service.serviceName target="view"}}>
- {{t services.service.add}}</a>
- {{/if}}
- </td>
- <td class="service-description">{{{service.comments}}}</td>
+ <th>{{t common.service}}</th>
+ <th>{{t common.version}}</th>
+ <th>{{t common.status}}</th>
+ <th>{{t common.description}}</th>
</tr>
+ </thead>
+ <tbody>
+ {{#each service in view.services}}
+ <tr>
+ <td class="service-display-name">{{service.displayName}}</td>
+ <td class="service-stack-version">{{service.serviceVersionDisplay}}</td>
+ <td class="stack-version-state">
+ {{#if service.isInstalled}}
+ <span class="label label-success">{{t common.installed}}</span>
+ {{else}}
+ <a {{bindAttr class=":path-link view.isAddServiceAvailable::not-active-link"}} {{action goToAddService service.serviceName target="view"}}>
+ {{t services.service.add}}</a>
+ {{/if}}
+ </td>
+ <td class="service-description">{{{service.comments}}}</td>
+ </tr>
{{/each}}
- </tbody>
-</table>
+ </tbody>
+ </table>
-{{#unless App.stackVersionsAvailable}}
+ {{#unless App.stackVersionsAvailable}}
- <div class="header">
- <strong>{{t admin.cluster.repositories.repositories}}</strong>
- </div>
- <ul class="nav nav-tabs">
- <li class="active">
- <a href="javascript:void(null);">{{view.allRepositoriesGroups.stackVersion}}</a>
- </li>
- </ul>
+ <div class="header">
+ <strong>{{t admin.cluster.repositories.repositories}}</strong>
+ </div>
+ <ul class="nav nav-tabs">
+ <li class="active">
+ <a href="javascript:void(null);">{{view.allRepositoriesGroups.stackVersion}}</a>
+ </li>
+ </ul>
- <div class="admin-cluster">
- <div class="repositories-table">
- <div class="thead">
- <div class="th os-th">{{t common.os}}</div>
- <div class="th name-th">{{t common.name}}</div>
- <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
- </div>
- <div class="tbody">
- {{#each repoGroup in view.allRepositoriesGroups}}
- <div class="trow">
- <div class="os-td">
- <label>
- <span class="os">{{repoGroup.name}}</span>
- </label>
- </div>
- <div style="width:89%">
- {{#each repository in repoGroup.repositories}}
- <div class="sub-trow">
- <div class="name-td">{{repository.repoId}}</div>
- <!--edit mode for current url-->
- {{#if repository.onEdit}}
- <div {{bindAttr class=":url-td repository.empty-error:textfield-error repository.invalid-error:textfield-error"}}>
- {{view Ember.TextField valueBinding="repository.baseUrl" class="form-control"}}
- </div>
- <div class="clear-td">
- {{#if repository.clearAll}}
- <a {{action "clearGroupLocalRepository" repository target="view" }}>
- <i class="glyphicon glyphicon-remove-sign"></i>
+ <div class="admin-cluster">
+ <div class="repositories-table">
+ <div class="thead">
+ <div class="th os-th">{{t common.os}}</div>
+ <div class="th name-th">{{t common.name}}</div>
+ <div class="th url-th">{{t installer.step1.advancedRepo.localRepo.column.baseUrl}}</div>
+ </div>
+ <div class="tbody">
+ {{#each repoGroup in view.allRepositoriesGroups}}
+ <div class="trow">
+ <div class="os-td">
+ <label>
+ <span class="os">{{repoGroup.name}}</span>
+ </label>
+ </div>
+ <div style="width:89%">
+ {{#each repository in repoGroup.repositories}}
+ <div class="sub-trow">
+ <div class="name-td">{{repository.repoId}}</div>
+ <!--edit mode for current url-->
+ {{#if repository.onEdit}}
+ <div {{bindAttr class=":url-td repository.empty-error:textfield-error repository.invalid-error:textfield-error"}}>
+ {{view Ember.TextField valueBinding="repository.baseUrl" class="form-control"}}
+ </div>
+ <div class="clear-td">
+ {{#if repository.clearAll}}
+ <a {{action "clearGroupLocalRepository" repository target="view" }}>
+ <i class="glyphicon glyphicon-remove-sign"></i>
+ </a>
+ {{/if}}
+ </div>
+ <div class="edit-buttons-td">
+ <a class="btn btn-default" {{action doCancel repository target="view"}}>{{t common.cancel}}</a>
+ </div>
+ <div class="edit-buttons-td">
+ {{#if repository.empty-error}}
+ <a class="btn btn-primary" disabled="disabled">{{t common.save}}</a>
+ {{else}}
+ <a class="btn btn-primary" {{action saveRepoUrls repository target="view"}}>{{t common.save}}</a>
+ {{/if}}
+ </div>
+ <!--non-edit mode for current url-->
+ {{else}}
+ <div class="url-text-td">
+ {{repository.baseUrl}}
+ </div>
+ <div class="edit-td">
+ <a {{action "onEditClick" repository target="view" }}>
+ <i class="glyphicon glyphicon-edit"></i> {{t common.edit}}
</a>
- {{/if}}
- </div>
- <div class="edit-buttons-td">
- <a class="btn btn-default" {{action doCancel repository target="view"}}>{{t common.cancel}}</a>
- </div>
- <div class="edit-buttons-td">
- {{#if repository.empty-error}}
- <a class="btn btn-primary" disabled="disabled">{{t common.save}}</a>
- {{else}}
- <a class="btn btn-primary" {{action saveRepoUrls repository target="view"}}>{{t common.save}}</a>
- {{/if}}
- </div>
- <!--non-edit mode for current url-->
- {{else}}
- <div class="url-text-td">
- {{repository.baseUrl}}
- </div>
- <div class="edit-td">
- <a {{action "onEditClick" repository target="view" }}>
- <i class="glyphicon glyphicon-edit"></i> {{t common.edit}}
- </a>
- </div>
- {{/if}}
- </div>
- {{/each}}
+ </div>
+ {{/if}}
+ </div>
+ {{/each}}
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ </div>
</div>
</div>
- </div>
-
-{{/unless}}
\ No newline at end of file
+ {{/unless}}
+</div>