Skip to content

Commit

Permalink
Finish up and fix #587, open specific issues for any outliers
Browse files Browse the repository at this point in the history
  • Loading branch information
@gashcrumb
gashcrumb committed Oct 14, 2013
1 parent bdd7137 commit 4e1e194
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 28 deletions.
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/fabric/html/container.html
View file
Expand Up @@ -63,7 +63,7 @@ <h2 style="display: inline-block; margin: 0"><i ng-class="statusIcon()"></i> Con
</div>


<div class="row-fluid">
<div class="row-fluid container-details">

<div class="span4 offset1 container-profile-settings">
<dl class="dl-horizontal container-detail-profiles">
Expand Down
9 changes: 1 addition & 8 deletions hawtio-web/src/main/webapp/app/fabric/html/createContainer.html
View file
@@ -1,14 +1,7 @@
<div class="controller-section" ng-controller="Fabric.CreateContainerController">

<div class="fabric-page-header row-fluid">
<div class="span4">
<h2>Create New Container</h2>
</div>
<!--
<div class="pull-left">
<a class='btn' ng-href="#/fabric/view"><i class='icon-remove'></i> Cancel</a>
</div>
-->
<h2 class="inline-block">Create New Container</h2>
<div class="pull-right">
<button class='btn' hawtio-submit='create_container'
ng-disabled="!forms.create_container.$valid">
Expand Down
25 changes: 16 additions & 9 deletions hawtio-web/src/main/webapp/app/fabric/html/editFeatures.html
View file
Expand Up @@ -2,7 +2,7 @@

<div class="features fabric-page-header row-fluid">
<div class="pull-left">
<h2 class="inline">Profile: {{profileId}} : Features</h2>
<h2 class="inline">Edit {{profileId}} Features</h2>
</div>
<div class="pull-right">
<a class="btn" ng-disabled="deletingFeatures.length == 0 && addingFeatures.length == 0" href="" ng-click="save()"><i class="icon-save"></i> Save</a>
Expand Down Expand Up @@ -42,17 +42,24 @@ <h6>Feature Repositories</h6>
</div>
</div>

<div class="row-fluid">
<div class="row-fluid edit-feature-lists">
<div class="span6">

<p ng-show="selectedRepoFeatures && selectedRepoFeatures.length > 0">
<div class="features-toolbar">
<h6>Features</h6>
<input type="text" class="search-query" placeholder="Filter..." ng-model="featureGridOptions.filterOptions.filterText">
<i class="icon-remove clickable" title="Clear Filter" ng-click="featureGridOptions.filterOptions.filterText = ''"></i>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="" class="btn" ng-click="addSelectedFeatures(false)" ng-disabled="selectedRepoSelectedFeatures.length == 0"><i class="icon-plus"></i> Add</a>
<a href="" class="btn" ng-click="addSelectedFeatures(true)" ng-disabled="selectedRepoSelectedFeatures.length == 0"><i class="icon-plus"></i> Add With Version</a>
<div class="row-fluid">
<div class="pull-left">
<div class="section-filter">
<input type="text" class="search-query" placeholder="Filter..." ng-model="featureGridOptions.filterOptions.filterText">
<i class="icon-remove clickable" title="Clear Filter" ng-click="featureGridOptions.filterOptions.filterText = ''"></i>
</div>
</div>
<div class="pull-right">
<a href="" class="btn" ng-click="addSelectedFeatures(false)" ng-disabled="selectedRepoSelectedFeatures.length == 0"><i class="icon-plus"></i> Add</a>
<a href="" class="btn" ng-click="addSelectedFeatures(true)" ng-disabled="selectedRepoSelectedFeatures.length == 0"><i class="icon-plus"></i> Add With Version</a>
</div>
</div>
</div>

<div style="height: 450px" ng-grid="featureGridOptions"></div>
Expand All @@ -65,7 +72,7 @@ <h6>Features</h6>
<table class="table table-striped">
<thead>
<tr>
<th>Profile Features<th>
<th>Profile Features</th>
</tr>
</thead>
<tbody>
Expand All @@ -83,7 +90,7 @@ <h6>Features</h6>
<table class="table table-striped">
<thead>
<tr>
<th>Inherited Features<th>
<th>Inherited Features</th>
</tr>
</thead>
<tbody>
Expand Down
70 changes: 67 additions & 3 deletions hawtio-web/src/main/webapp/css/site-base.css
View file
Expand Up @@ -1562,6 +1562,12 @@ input[type="checkbox"].ng-invalid {
.fabric-page-header {
border-bottom: 1px solid #d4d4d4;
}

.fabric-page-header h2.inline-block {
margin-top: 0;
margin-bottom: 0;
}

.create-container-body {
margin-top: 10px;
}
Expand Down Expand Up @@ -1788,13 +1794,13 @@ dd.file-list {
.container-status-dashboard {
text-align: center;
display: table-cell;
min-width: 139px;
min-width: 144px;
}

.container-status-dashboard i {
position: relative;
left: -2px;
font-size: 127px;
left: 0px;
font-size: 133px;
}

.status-icon {
Expand Down Expand Up @@ -2583,9 +2589,67 @@ i.expandable-indicator.folder {
}
}

/* Start 800x600 Optimzations */

@media(max-width: 849px) {

.page-padded {
padding-left: 5px;
padding-right: 5px;
}

.wiki-fixed {
margin-left: 0 !important;
margin-right: 0 !important;
}

.wiki-fixed .row-fluid .span9 {
margin-left: 9px;
}

.container-details > [class*=" offset"] {
display: none;
}

.container-details > .span4.offset1 {
width: 100%;
float: inherit;
display: block;
margin-left: 2px;
margin-right: 2px;
}

.container-details > .span5.offset1 {
width: 100%;
float: inherit;
display: block;
margin-left: 2px;
margin-right: 2px;
}

.create-container-body > [class^="span"] {
width: 100%;
float: inherit;
display: block;
margin-left: 2px;
margin-right: 2px;
}

.create-container-body > [class^="span"]:first-child {
margin-bottom: 15px;
}

.features-toolbar .pull-left {
margin-bottom: 10px;
}

.edit-feature-lists > [class^="span"] {
width: 49%;
float: inherit;
display: inline-block;
margin-left: 0;
margin-right: 0;
}

}
/* End 800x600 optimizations */
15 changes: 8 additions & 7 deletions hawtio-web/src/main/webapp/css/site-branding.css
View file
Expand Up @@ -7,14 +7,7 @@ input, button, select, textarea {
}

html, body {
/*
min-height: 800px;
*/
min-width: 850px;
font-size: 13.5px;
/*
height: 100%;
*/
}

small {
Expand Down Expand Up @@ -713,6 +706,14 @@ div.wiki-fixed[ng-controller] .row-fluid .span12 .nav.nav-tabs li a {
padding-right: 20px;
}

@media(max-width: 849px) {
.controller-section {
padding-left: 5px;
padding-right: 5px;
}

}

#jmxtree {
margin-left: 20px;
}
Expand Down

0 comments on commit 4e1e194

Please sign in to comment.