UniqueSoft/gluster-web-interface
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/oss2016summer/gluster-web-interface

Browse Source 
Conflicts:
	app/views/home/index.html.erb
This commit is contained in:
kyg516 2016-10-03 15:57:30 +09:00
commit a6c6c8b488
5 changed files with 116 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/views/node/detail.html.erb
View File

@ -70,6 +70,33 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2><i class="fa fa-align-left"></i> Node List</h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Settings 1</a>
</li>
<li><a href="#">Settings 2</a>
</li>
</ul>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="x_content tile" style="overflow-y:auto; min-height:227px;">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="x_panel">
<div class="x_title">
@ -111,9 +138,9 @@
<td><i class="fa fa-close red"></i></td>
<% end %>
<% if node["gluster"].eql? "on" %>
<td><i class="fa fa-circle-o green"></i>Attached</td>
<td><i class="fa fa-circle-o green"></i> Attached</td>
<% else %>
<td><i class="fa fa-close red"></i>Not operational</td>
<td><i class="fa fa-close red"></i> Not operational</td>
<% end %>
<th scope="row"> <a href="/node/detail/<%= node["id"] %>"><%= node["host_name"] %></a></th>
<td><%= node["host_ip"] %></td>
@ -126,8 +153,7 @@
</div>
</div>
</div>
<div class="col-md-12 col-sm-12 col-xs-12">
<div class="col-md-6 col-sm-6 col-xs-6">
<div class="x_panel">
<div class="x_title">
<h2><i class="fa fa-info-circle"></i> Node Detail</h2>
@ -155,20 +181,35 @@
<div class="item form-group">
<label for="password" class="control-label col-md-3">Ping : </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<label class="control-label col-md-7 col-xs-12" ><%=node["ping"]%></label>
<% if node["ping"].eql? "true" %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-circle-o green"></i></label>
<% else %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-close red"></i></label>
<% end %>
<!--<label class="control-label col-md-7 col-xs-12" ><%=node["ping"]%></label>-->
</div>
</div>
<% if node["ping"].eql? "true" %>
<div class="item form-group">
<label for="password" class="control-label col-md-3">SSH Connection : </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<label class="control-label col-md-7 col-xs-12" ><%=node["ssh"]%></label>
<% if node["ssh"].eql? "on" %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-circle-o green"></i></label>
<% else %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-close red"></i></label>
<% end %>
<!--<label class="control-label col-md-7 col-xs-12" ><%=node["ssh"]%></label>-->
</div>
</div>
<div class="item form-group">
<label for="password" class="control-label col-md-3">Gluster Connection : </label>
<div class="col-md-6 col-sm-6 col-xs-12">
<label class="control-label col-md-7 col-xs-12" ><%=node["gluster"]%></label>
<% if node["gluster"].eql? "on" %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-circle-o green"></i></label>
<% else %>
<label class="control-label col-md-7 col-xs-12" ><i class="fa fa-close red"></i></label>
<% end %>
<!--<label class="control-label col-md-7 col-xs-12" ><%=node["gluster"]%></label>-->
</div>
</div>
@ -227,6 +268,7 @@
</div>
</div>
<!--<div class="ln_solid"></div>-->
<br>
<div class="form-group">
<div class="col-md-6 col-md-offset-3">
<button type="submit" class="btn btn-success">Update</button>

58
app/views/node/index.html.erb
View File

@ -70,6 +70,36 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2><i class="fa fa-align-left"></i> Node List</h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Settings 1</a>
</li>
<li><a href="#">Settings 2</a>
</li>
</ul>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="x_content tile" style="overflow-y:auto; min-height:228px;">
<div class="bs-example" data-example-id="simple-jumbotron">
<div class="jumbotron">
<p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="x_panel">
<div class="x_title">
@ -111,9 +141,9 @@
<td><i class="fa fa-close red"></i></td>
<% end %>
<% if node["gluster"].eql? "on" %>
<td><i class="fa fa-circle-o green"></i>Attached</td>
<td><i class="fa fa-circle-o green"></i> Attached</td>
<% else %>
<td><i class="fa fa-close red"></i>Not operational</td>
<td><i class="fa fa-close red"></i> Not operational</td>
<% end %>
<th scope="row"> <a href="/node/detail/<%= node["id"] %>"><%= node["host_name"] %></a></th>
<td><%= node["host_ip"] %></td>
@ -126,6 +156,30 @@
</div>
</div>
</div>
<div class="col-md-6 col-sm-6 col-xs-12">
<div class="x_panel">
<div class="x_title">
<h2><i class="fa fa-info-circle"></i> Node Detail <small>Click host name</small></h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Settings 1</a>
</li>
<li><a href="#">Settings 2</a>
</li>
</ul>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
</div>
</div>
</div>
</div>
</div>
<!-- /page content -->

6
vendor/assets/components/gentelella/production/css/custom.css vendored
View File

@ -358,6 +358,12 @@ body {
.fixed_height_200 {
height: 200px;
}
.fixed_height_230 {
height: 230px;
}
.fixed_height_300 {
height: 300px;
}
.overflow_hidden {
overflow: hidden
}

2
vendor/assets/components/gentelella/production/general_elements.html vendored
View File

@ -1020,7 +1020,7 @@
<li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a>
</li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a>
</li>
</li>Daily active users
<li role="presentation" class="divider"></li>
<li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a>
</li>

4
vendor/assets/components/gentelella/production/less/custom.css vendored
View File

@ -430,6 +430,10 @@ body {
height: 200px;
}
.fixed_height_220 {
height: 220px;
}
.overflow_hidden {
overflow: hidden
}