Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tidied up the MQ layout with more consistent tooltip and moving the c…
…ontainer count badge next to the profile name; the version becomes a tooltip to simplify the UI and keep the + button on the top right for adding a broker to either a group or profile (in the N+1 case)
  • Loading branch information
jstrachan committed Oct 8, 2013
1 parent 15e2bdf commit 19b3a25
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
12 changes: 7 additions & 5 deletions hawtio-web/src/main/webapp/app/fabric/html/brokers.html
Expand Up @@ -41,7 +41,7 @@
<span class="mq-group-name" title="Group: {{group.id}}">
<i class="icon-group"></i> {{group.id}}
</span>
<a ng-click="createBroker(group)" title="Create another broker configuration in this group">
<a ng-click="createBroker(group)" title="Create a new broker configuration in this group">
<i class="icon-plus"></i>
</a>
</div>
Expand All @@ -52,12 +52,14 @@
title="Profile for running one or more logical brokers" ng-show="profileMatchesFilter(profile)">

<div class="mq-profile-rectangle-label">
<span class="mq-profile-name">
<span class="mq-profile-name" title="profile: {{profile.id}} version: {{ profile.version}}">
<i class="icon-book green"></i>
<a href="" ng-click="showProfile(profile)" title="{{profile.id}} / {{ profile.version}}">{{profile.id}}</a> / {{profile.version}}
<a href="" ng-click="showProfile(profile)">{{profile.id}}</a>
<a href="" ng-click="createRequiredContainers(profile)" title="{{profile.requiredToolTip}}">
<span class="badge {{profile.requireStyle}}">{{profile.count}}</span>
</a>
</span>
<a class="mq-profile-create-container" href="" ng-click="createRequiredContainers(profile)" title="{{profile.requiredToolTip}}">
<span class="badge {{profile.requireStyle}}">{{profile.count}}</span>
<a class="mq-profile-create-broker" href="" ng-click="createBroker(group, profile)" title="Create a new broker configuration in this group and profile">
<i class="icon-plus"></i>
</a>
</div>
Expand Down
12 changes: 7 additions & 5 deletions hawtio-web/src/main/webapp/app/fabric/js/brokers.ts
Expand Up @@ -23,18 +23,20 @@ module Fabric {
};


$scope.createBroker = (group) => {
$scope.createBroker = (group, profile) => {
var args = {};
if (group) {
var profileId = group["profile"];
if (profileId) {
args["profile"] = profileId;
}
var groupId = group["id"];
if (groupId) {
args["group"] = groupId;
}
}
if (profile) {
var profileId = profile["id"];
if (profileId) {
args["profile"] = profileId;
}
}
$location.url("/fabric/createBroker").search(args);
};

Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/css/site-base.css
Expand Up @@ -2111,7 +2111,7 @@ i.mq-master {
display: block;
}

.mq-profile-rectangle-label .mq-profile-create-container {
.mq-profile-rectangle-label .mq-profile-create-broker {
position: absolute;
top: 0;
right: 0;
Expand Down

0 comments on commit 19b3a25

Please sign in to comment.