Update volume/info -> volume/index, Add volume create button
This commit is contained in:
parent
47d03b832a
commit
d5e65393f7
@ -1,7 +1,7 @@
|
|||||||
class VolumeController < ApplicationController
|
class VolumeController < ApplicationController
|
||||||
helper_method :file_directory
|
helper_method :file_directory
|
||||||
|
|
||||||
def info
|
def index
|
||||||
@conf_list = get_conf
|
@conf_list = get_conf
|
||||||
project_path = String.new
|
project_path = String.new
|
||||||
@conf_list.each do |t|
|
@conf_list.each do |t|
|
||||||
|
@ -15,13 +15,13 @@
|
|||||||
<ul class="nav side-menu">
|
<ul class="nav side-menu">
|
||||||
<li><a><i class="fa fa-home"></i> Home <span class="fa fa-chevron-down"></span></a>
|
<li><a><i class="fa fa-home"></i> Home <span class="fa fa-chevron-down"></span></a>
|
||||||
<ul class="nav child_menu" style="display: none">
|
<ul class="nav child_menu" style="display: none">
|
||||||
<li><a href="/dashboard">Dashboard</a>
|
<li><a href="/home/index">Dashboard</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><a><i class="fa fa-edit"></i> Volume <span class="fa fa-chevron-down"></span></a>
|
<li><a><i class="fa fa-edit"></i> Volume <span class="fa fa-chevron-down"></span></a>
|
||||||
<ul class="nav child_menu" style="display: none">
|
<ul class="nav child_menu" style="display: none">
|
||||||
<li><a href="/volume/info">Control</a>
|
<li><a href="/volume/index">Control</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
@ -38,58 +38,16 @@
|
|||||||
<ul id="menu1" class="dropdown-menu list-unstyled msg_list" role="menu">
|
<ul id="menu1" class="dropdown-menu list-unstyled msg_list" role="menu">
|
||||||
<li>
|
<li>
|
||||||
<a>
|
<a>
|
||||||
<span class="image">
|
<span class="image">
|
||||||
<%= image_tag "img.jpg" %>
|
<%= image_tag "img.jpg" %>
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
<span>John Smith</span>
|
<span>John Smith</span>
|
||||||
<span class="time">3 mins ago</span>
|
<span class="time">3 mins ago</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="message">
|
<span class="message">
|
||||||
Film festivals used to be do-or-die moments for movie makers. They were where...
|
Film festivals used to be do-or-die moments for movie makers. They were where...
|
||||||
</span>
|
</span>
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a>
|
|
||||||
<span class="image">
|
|
||||||
<%= image_tag "img.jpg" %>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
<span>John Smith</span>
|
|
||||||
<span class="time">3 mins ago</span>
|
|
||||||
</span>
|
|
||||||
<span class="message">
|
|
||||||
Film festivals used to be do-or-die moments for movie makers. They were where...
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a>
|
|
||||||
<span class="image">
|
|
||||||
<%= image_tag "img.jpg" %>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
<span>John Smith</span>
|
|
||||||
<span class="time">3 mins ago</span>
|
|
||||||
</span>
|
|
||||||
<span class="message">
|
|
||||||
Film festivals used to be do-or-die moments for movie makers. They were where...
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a>
|
|
||||||
<span class="image">
|
|
||||||
<%= image_tag "img.jpg" %>
|
|
||||||
</span>
|
|
||||||
<span>
|
|
||||||
<span>John Smith</span>
|
|
||||||
<span class="time">3 mins ago</span>
|
|
||||||
</span>
|
|
||||||
<span class="message">
|
|
||||||
Film festivals used to be do-or-die moments for movie makers. They were where...
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
|
@ -6,13 +6,10 @@
|
|||||||
<h3>Volume</h3>
|
<h3>Volume</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="title_right">
|
<div class="title_right">
|
||||||
<div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">
|
<div class="col-md-5 col-sm-5 col-xs-12 pull-right">
|
||||||
<div class="input-group">
|
<button class="btn btn-primary pull-right" onclick="volume_create">
|
||||||
<input type="text" class="form-control" placeholder="Search for...">
|
Create
|
||||||
<span class="input-group-btn">
|
</button>
|
||||||
<button class="btn btn-default" type="button">Go!</button>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -29,7 +26,7 @@
|
|||||||
<li><a class="collapse-link"><i <%if t!=@volumes[0]%> class="fa fa-chevron-down" <%else%> class="fa fa-chevron-up" <%end%> ></i></a>
|
<li><a class="collapse-link"><i <%if t!=@volumes[0]%> class="fa fa-chevron-down" <%else%> class="fa fa-chevron-up" <%end%> ></i></a>
|
||||||
</li>
|
</li>
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
|
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
|
||||||
<ul class="dropdown-menu" role="menu">
|
<ul class="dropdown-menu" role="menu">
|
||||||
<li><a href="#">Settings 1</a>
|
<li><a href="#">Settings 1</a>
|
||||||
</li>
|
</li>
|
||||||
@ -37,7 +34,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li><a class="close-link"><i class="fa fa-close"></i></a>
|
<li><a class="close-link" style="display:none;"><i class="fa fa-close"></i></a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="clearfix"></div>
|
<div class="clearfix"></div>
|
||||||
@ -114,6 +111,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- /page content -->
|
<!-- /page content -->
|
||||||
|
|
||||||
|
|
||||||
|
<!-- data table handler -->
|
||||||
<script>
|
<script>
|
||||||
var handleDataTableButtons = function() {
|
var handleDataTableButtons = function() {
|
||||||
"use strict";
|
"use strict";
|
||||||
@ -155,6 +154,7 @@
|
|||||||
TableManageButtons.init();
|
TableManageButtons.init();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<!-- file manager functions -->
|
||||||
<script>
|
<script>
|
||||||
function change_upper(directory){
|
function change_upper(directory){
|
||||||
if(directory != "/"){
|
if(directory != "/"){
|
||||||
@ -226,3 +226,10 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<!-- volume functions -->
|
||||||
|
<script>
|
||||||
|
function volume_create() {
|
||||||
|
|
||||||
|
}
|
||||||
|
</script>
|
@ -1,7 +1,7 @@
|
|||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
get 'peer/index'
|
get 'peer/index'
|
||||||
|
|
||||||
get 'volume/info'
|
get 'volume/index'
|
||||||
|
|
||||||
get 'home/index'
|
get 'home/index'
|
||||||
|
|
||||||
@ -10,14 +10,17 @@ Rails.application.routes.draw do
|
|||||||
# See how all your routes lay out with "rake routes".
|
# See how all your routes lay out with "rake routes".
|
||||||
|
|
||||||
# You can have the root of your site routed with "root"
|
# You can have the root of your site routed with "root"
|
||||||
root 'plainpage#index'
|
root 'plainpage#index'
|
||||||
|
|
||||||
get 'index' => 'plainpage#index'
|
get 'index' => 'plainpage#index'
|
||||||
|
|
||||||
get 'volume/info' => 'volume#info'
|
get 'volume/index' => 'volume#index'
|
||||||
get 'peer/index' => 'peer#index'
|
|
||||||
post 'file_upload' => 'volume#file_upload'
|
get 'peer/index' => 'peer#index'
|
||||||
post 'volume/changeDir' => 'volume#checkDir'
|
|
||||||
|
post 'file_upload' => 'volume#file_upload'
|
||||||
|
|
||||||
|
post 'volume/changeDir' => 'volume#checkDir'
|
||||||
|
|
||||||
# Example of regular route:
|
# Example of regular route:
|
||||||
# get 'products/:id' => 'catalog#view'
|
# get 'products/:id' => 'catalog#view'
|
||||||
|
Loading…
Reference in New Issue
Block a user