Skip to content
This repository has been archived by the owner on Feb 23, 2018. It is now read-only.

Commit

Permalink
Merge branch 'niehs-development' of gitlab.niehs.nih.gov:conwaymc/met…
Browse files Browse the repository at this point in the history
…alnx-web into niehs-development
  • Loading branch information
Hetal Patel committed Jan 24, 2018
2 parents fdbd8bf + 58f2d41 commit 4f90ce6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@

<body>

<div layout:fragment="content">
<div layout:fragment="content" aria-labelledby="dashboardPageTitle">
<div class="row">
<div class="col-xs-12">
<h1 class="page-header pull-left" th:text="#{dashboard.page.title}"></h1>
<a id="dashboard-page-title" href="#" class="page-hint pull-left"><i class="fa fa-question-circle"></i></a>
<h1 id="dashboardPageTitle" class="page-header pull-left" th:text="#{dashboard.page.title}"></h1>
<a id="dashboard-page-title" href="#" class="page-hint pull-left" aria-label="page help"><i class="fa fa-question-circle"></i></a>
</div>
</div>
<div class="row">
Expand Down Expand Up @@ -128,12 +128,12 @@ <h4 class="">Storage Usage</h4>
</div>
<i class="fa fa-user col-xs-3 cardIcon"></i>
<div class="col-xs-7 col-md-6">
<a th:href="@{ ${urlMap.URL_USERS_MANAGEMENT} }">
<a th:href="@{ ${urlMap.URL_USERS_MANAGEMENT} }" aria-label="user management">
<h5><span th:text="#{ card.users.title }"></span> (<span th:text="${ totalNumberOfUsers }"></span>)</h5>
</a>
</div>
<a type="button" class="col-xs-1 btn btn-link pull-right"
th:href="@{ ${urlMap.URL_USERS_MANAGEMENT+urlMap.URL_ADD_USER} }">
th:href="@{ ${urlMap.URL_USERS_MANAGEMENT+urlMap.URL_ADD_USER} }" aria-label="user management">
<i class="fa fa-plus" data-toggle="tooltip" data-placement="top" th:title="#{dashboard.card.add.user}"></i>
</a>
</div>
Expand All @@ -147,13 +147,13 @@ <h5><span th:text="#{ card.users.title }"></span> (<span th:text="${ totalNumber
</div>
<i class="fa fa-group col-xs-3 cardIcon"></i>
<div class="col-xs-7 col-md-6">
<a th:href="@{ ${urlMap.URL_GROUPS_MANAGEMENT} }">
<a th:href="@{ ${urlMap.URL_GROUPS_MANAGEMENT} }" aria-label="group management">
<h5><span th:text="#{ card.groups.title }"></span> (<span th:text="${ totalNumberOfGroups }"></span>)</h5>

</a>
</div>
<a type="button" class="col-xs-1 btn btn-link pull-right"
th:href="@{ ${urlMap.URL_GROUPS_MANAGEMENT+urlMap.URL_ADD_GROUP} }">
th:href="@{ ${urlMap.URL_GROUPS_MANAGEMENT+urlMap.URL_ADD_GROUP} }" aria-label="add group">
<i class="fa fa-plus" data-toggle="tooltip" data-placement="top" th:title="#{dashboard.card.add.group}"></i>
</a>
</div>
Expand All @@ -170,12 +170,12 @@ <h5><span th:text="#{ card.groups.title }"></span> (<span th:text="${ totalNumbe
<i class="fa fa-user fa-stack-1x"></i>
</span>
<div class="col-xs-7 col-md-6">
<a th:href="@{ ${urlMap.URL_USER_PROFILE_MANAGEMENT} }">
<a th:href="@{ ${urlMap.URL_USER_PROFILE_MANAGEMENT} }" aria-label="user profile management">
<h5><span th:text="#{ card.profiles.title }"></span> (<span th:text="${ totalNumberOfProfiles }"></span>)</h5>

</a>
</div>
<a type="button" class="col-xs-1 btn btn-link pull-right"
<a type="button" class="col-xs-1 btn btn-link pull-right" aria-label="add user profile"
th:href="@{ ${urlMap.URL_ADD_USER_PROFILE} }">
<i class="fa fa-plus" data-toggle="tooltip" data-placement="top" th:title="#{dashboard.card.add.profile}"></i>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
~ limitations under the License.
-->

<th:block th:fragment="msiPackageVersionFrag">
<th:block th:fragment="msiPackageVersionFrag" aria-labelledby="msiPackageVersionTitle">
<div class="panel panel-default">
<div class="panel-body">
<h4 class="" th:text="#{dashboard.panel.mlx.msi.title}"></h4>
<h4 id="msiPackageVersionTitle" class="" th:text="#{dashboard.panel.mlx.msi.title}"></h4>
<p><span>Supported version: </span><span th:text="${msiAPIVersionSupported}"></span></p>

<div class="col-xs-12 bg-warning" th:if="${msiGridInfo.isThereAnyPkgNotSupported() or msiGridInfo.isThereAnyPkgMissing()}" role="alert">
Expand All @@ -28,7 +28,7 @@ <h4 class="" th:text="#{dashboard.panel.mlx.msi.title}"></h4>
</p>

<p>
<a tabindex="0" role="button" class="pull-right btn btn-link" data-toggle="popover" id="mlxMsiCard" th:text="#{dashboard.card.msi.view.details}"></a>
<a tabindex="0" role="button" class="pull-right btn btn-link" data-toggle="popover" id="mlxMsiCard" th:text="#{dashboard.card.msi.view.details}" aria-label="view msi details"></a>
</p>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h4 class="">Other Devices</h4>
<table class="table" th:if="${nonResourceServers}">
<tr th:each="nonResourceServer : ${nonResourceServers}">
<td>
<a th:href="@{'/dashboard/detail/' + ${nonResourceServer.hostname} + '/' }" th:text="${nonResourceServer.hostname}"></a>
<a th:href="@{'/dashboard/detail/' + ${nonResourceServer.hostname} + '/' }" th:text="${nonResourceServer.hostname}" aria-label="${nonResourceServer.hostname}></a>
<small th:text="${nonResourceServer.ip}"></small>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
~ limitations under the License.
-->

<th:block th:fragment="serversList">
<th:block th:fragment="serversList" aria-labelledby="irodsServersTitle">
<div class="panel panel-default">
<div class="panel-body">
<h4 class="">iRODS Servers</h4>
<h4 id="irodsServersTitle" class="">iRODS Servers</h4>

<table class="dashboardServersList" width="100%">
<tr th:each="server : ${servers}">
<td>
<img alt="Server" class="dashboard-server-icon"
th:src="@{${ '/images/Server-' + server.machineStatus + '.png' }}" />
</td>
<td>
<a th:href="@{'/dashboard/detail/' + ${server.hostname} + '/' }" th:text="${server.hostname}"></a>
<a th:href="@{'/dashboard/detail/' + ${server.hostname} + '/' }" th:text="${server.hostname}" aria-label="server details"></a>
<small th:text="${server.ip}"></small>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
~ limitations under the License.
-->

<th:block th:fragment="systemHealth">
<th:block th:fragment="systemHealth" aria-labelledby="systemHealthTitle">
<div class="panel panel-default" id="systemHealthPanel">
<div class="panel-heading">
<h3 class="panel-title">System Health</h3>
<h3 id="systemHealthTitle" class="panel-title">System Health</h3>
</div>
<div class="panel-body">
<b>Overall Status:</b> <span id="systemHealthSum"></span>
Expand Down

0 comments on commit 4f90ce6

Please sign in to comment.