Rebase fix
This commit is contained in:
parent
a44123f074
commit
6443b9ee53
|
@ -261,6 +261,11 @@ h6.page-title {
|
|||
height: 46px;
|
||||
}
|
||||
|
||||
.nodesbox-header .checkbox {
|
||||
padding-left: 68px;
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.nodebox {
|
||||
width: 172px;
|
||||
/* height: 226px; */
|
||||
|
@ -274,10 +279,68 @@ h6.page-title {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
/*
|
||||
.nodebox:hover {box-shadow: 0 0px 6px rgba(0,0,0,.2), inset 0px 0px 0px rgba(255,255,255,.0); cursor: pointer;}
|
||||
*/
|
||||
.node-select {
|
||||
display: block;
|
||||
width: 172px;
|
||||
height: 86px;
|
||||
float: left;
|
||||
margin-left: -1px;
|
||||
margin-top: -85px;
|
||||
border-radius: 4px;
|
||||
line-height: 52px;
|
||||
font-size: 60px;
|
||||
text-align: center;
|
||||
padding: 0px 0px 0px 5px;
|
||||
color: rgba(255,255,255,0.85);
|
||||
cursor: pointer;
|
||||
}
|
||||
.node-install-uncheck:hover {
|
||||
background-color: rgba(0, 100, 38, 0.25);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 0px 6px rgba(0,0,0,.3),
|
||||
inset 0px 0px 0px rgba(255,255,255,.0);
|
||||
cursor: pointer;
|
||||
}
|
||||
.node-install-uncheck .node-select {
|
||||
display: none;
|
||||
}
|
||||
.node-install-check:hover {
|
||||
background-color: rgba(0, 100, 38, 0.15);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 0px 6px rgba(0,0,0,.3),
|
||||
inset 0px 0px 0px rgba(255,255,255,.0);
|
||||
cursor: pointer;
|
||||
}
|
||||
.node-install-check .node-select {
|
||||
display: block;
|
||||
background-color: rgba(0, 100, 38, 0.25);
|
||||
}
|
||||
|
||||
.node-delete-uncheck:hover {
|
||||
background-color: rgba(121, 0, 0, 0.25);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 0px 6px rgba(0,0,0,.3),
|
||||
inset 0px 0px 0px rgba(255,255,255,.0);
|
||||
cursor: pointer;
|
||||
}
|
||||
.node-delete-uncheck .node-select {
|
||||
display: none;
|
||||
}
|
||||
.node-delete-check:hover {
|
||||
background-color: rgba(121, 0, 0, 0.25);
|
||||
cursor: pointer;
|
||||
box-shadow: 0 0px 6px rgba(0,0,0,.3),
|
||||
inset 0px 0px 0px rgba(255,255,255,.0);
|
||||
cursor: pointer;
|
||||
}
|
||||
.node-delete-check .node-select {
|
||||
display: block;
|
||||
background-color: rgba(121, 0, 0, 0.25);
|
||||
}
|
||||
|
||||
.breaker {
|
||||
margin: 0px 20px 20px 20px;
|
||||
}
|
||||
|
||||
.node-name {
|
||||
height: 33px;
|
||||
|
@ -353,23 +416,17 @@ h6.page-title {
|
|||
|
||||
|
||||
.assigned {
|
||||
height: 114px !important;
|
||||
height: 114px !important;
|
||||
border: 1px solid #afafaf;
|
||||
}
|
||||
|
||||
.unassigned {
|
||||
height: 86px !important;
|
||||
height: 86px !important;
|
||||
border: 1px solid #afafaf;
|
||||
}
|
||||
.unassigned:hover {
|
||||
background-color: rgba(121, 0, 0, 0.25);
|
||||
box-shadow: 0 0px 6px rgba(0,0,0,.2),
|
||||
inset 0px 0px 0px rgba(255,255,255,.0);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.unassigned > .node-status {
|
||||
display: none;
|
||||
.unassigned > .nodestatus {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.node-hardware {
|
||||
|
|
|
@ -1,9 +1,137 @@
|
|||
<h3>Add <%= role %> nodes</h3>
|
||||
<div class="roles-block-row nodesbox-header">
|
||||
<div class="span10"><h3>Add <%= role %> nodes</h3></div>
|
||||
<div class="span2 pull-right"><label class="checkbox"><input type="checkbox"> Select all</label></div>
|
||||
</div>
|
||||
|
||||
<br><br><br><br>
|
||||
<div class="roles-block-row">
|
||||
|
||||
<button class="btn">Select All</button>
|
||||
<button class="btn">Clear Selection</button>
|
||||
<button class="btn btn-discard">Discard Changes</button>
|
||||
<button class="btn btn-save">Save Changes</button>
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-hp node-install-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-dell node-install-check">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-virtualbox node-install-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-vmware node-install-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-vmware node-install-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-vmware node-install-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-ok"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
|
||||
</div>
|
||||
<!-- End Roles Block -->
|
||||
|
||||
<hr class="breaker">
|
||||
|
||||
<div class="roles-block-row">
|
||||
<div class="span10"> </div>
|
||||
<div class="span1 pull-right"><div class="btn btn-success">Apply</div></div>
|
||||
<div class="span1 pull-right"><div class="btn">Cancel</div></div>
|
||||
</div>
|
||||
|
||||
<!-- Start Roles Block Header -->
|
||||
<div class="roles-block-row nodesbox-header">
|
||||
<div class="span10"><h3>Delete Nodes from Compute</h3></div>
|
||||
<div class="span2 pull-right"><label class="checkbox"><input type="checkbox"> Select all</label></div>
|
||||
</div>
|
||||
<!-- End Roles Block Header -->
|
||||
|
||||
<!-- Start Nodes Block -->
|
||||
<div class="roles-block-row">
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-vmware node-delete-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-virtualbox node-delete-check">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-dell node-delete-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-hp node-delete-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-dell node-delete-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
<!-- Start Node -->
|
||||
<div class="span2 nodebox unassigned manufacturer-dell node-delete-uncheck">
|
||||
<div class="node-name">Long Long Long Long Node Name Long</div>
|
||||
<div class="node-hardware"><ul><li>CPU: 40</li><li>HDD: 44 TB</li><li>RAM: 64 GB</li></ul></div>
|
||||
<div class="node-select"><i class="icon-cancel"></i></div>
|
||||
</div>
|
||||
<!-- End Node -->
|
||||
|
||||
|
||||
</div>
|
||||
<!-- End Roles Block -->
|
||||
|
||||
<hr class="breaker">
|
||||
|
||||
<div class="roles-block-row">
|
||||
<div class="span10"> </div>
|
||||
<div class="span1 pull-right"><div class="btn btn-success btn-save">Apply</div></div>
|
||||
<div class="span1 pull-right"><div class="btn btn-discard">Cancel</div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue