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
This commit is contained in:
bee0005 2016-10-03 05:47:02 +00:00
commit 4def738485
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/home_helper.rb
View File

@ -94,4 +94,6 @@ module HomeHelper
return html return html
end end
def html_disk_file_table
end
end end

28
app/views/home/index.html.erb
View File

@ -134,8 +134,8 @@
<div class ="row"> <div class ="row">
<!-- node status --> <!-- node status -->
<div class="col-md-6 col-sm-6 col-xs-12"> <div class="col-md-4 col-sm-4 col-xs-12">
<div class="x_panel tile fixed_height_320" style="overflow-y:auto;"> <div class="x_panel">
<div class="x_title"> <div class="x_title">
<h2>Nodes Status</h2> <h2>Nodes Status</h2>
<ul class="nav navbar-right panel_toolbox"> <ul class="nav navbar-right panel_toolbox">
@ -153,7 +153,7 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content"> <div class="x_content tile fixed_height_200" style="overflow-y:auto;">
<div class="widget_summary"> <div class="widget_summary">
<div class="w_left w_25"> <div class="w_left w_25">
<span>Ping Connections / Total Node</span> <span>Ping Connections / Total Node</span>
@ -240,8 +240,9 @@
</div> </div>
<!-- /node status --> <!-- /node status -->
<div class="col-md-6 col-sm-6 col-xs-12"> <!-- -->
<div class="x_panel tile fixed_height_320" style="overflow-y:auto;"> <div class="col-md-4 col-sm-4 col-xs-12">
<div class="x_panel tile">
<div class="x_title"> <div class="x_title">
<h2>Nodes List</h2> <h2>Nodes List</h2>
<ul class="nav navbar-right panel_toolbox"> <ul class="nav navbar-right panel_toolbox">
@ -259,7 +260,7 @@
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="x_content" > <div class="x_content fixed_height_200" style="overflow-y:auto;">
<ul class="list-unstyled top_profiles" > <ul class="list-unstyled top_profiles" >
<% nodes = ssh_nodes %> <% nodes = ssh_nodes %>
@ -287,6 +288,20 @@
</div> </div>
</div> </div>
</div> </div>
<!-- disk usage -->
<div class="col-md-4 col-sm-4 col-xs-12">
<div class="panel panel-body">
<div class="x_title" id="disk_file_title_div">
<h2 style="width:130px">Disk usage</h2>
</div>
<div class="row" id="disk_file_div">
<%= raw html_disk_file_table %>
</div>
</div>
</div>
<!-- /disk usage -->
</div> </div>
<div class ="row"> <div class ="row">
@ -496,4 +511,3 @@ $(document).on("click", "#file_manager_div .rmdir", function(){
}) })
</script> </script>
<!-- /File manager functions --> <!-- /File manager functions -->