saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ray's fixes for the file manager

This commit is contained in:
saurabhbhatia 2013-12-10 17:40:13 +08:00
parent 26c4d69e07
commit 2a41e90bc1
2 changed files with 380 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/lib/filemanager.css Normal file
View File

@ -0,0 +1,14 @@
body > section {
padding: 20px;
}
#panel_l {
width: 80%;
}
#panel_r {
width: 18%;
padding-left: 2%;
}
.nav-pills {
margin-bottom: 0;
padding: 20px 20px 0;
}

53
app/views/admin/assets/index.html.erb
View File

@ -11,7 +11,7 @@
position: relative; position: relative;
clear: both; clear: both;
overflow: hidden; overflow: hidden;
margin: 40px 0 15px; margin: 0 0 20px;
height: 254px; height: 254px;
border: 1px solid #d4d4d4; border: 1px solid #d4d4d4;
border-radius: 4px; border-radius: 4px;
@ -203,33 +203,49 @@
text-align: right; text-align: right;
} }
</style> </style>
<ul class="nav nav-tabs module-nav"> <%= stylesheet_link_tag "lib/filemanager"%>
<li class="active"> <%= stylesheet_link_tag "lib/main-forms"%>
<a href="#filemanager" data-toggle="tab">File Manager</a> <div class="form-horizontal main-forms">
</li> <fieldset>
<ul class="nav nav-pills">
<li class="active"><a href="#filemanager" data-toggle="tab">File Manager</a></li>
<li><a href="#upload" data-toggle="tab">Upload</a></li> <li><a href="#upload" data-toggle="tab">Upload</a></li>
</ul> </ul>
<div class="tab-content">
<div class="tab-pane fade in active" id="filemanager"> <div class="tab-pane fade in active" id="filemanager">
<a href="<%= admin_module_tags_path(:module_app_id => @module_app_id.to_s) %>"> Tag Management </a> <div class="input-area clearfix">
<div id="panel_l" style="width:200px;float:left;margin:5px 5px 5px 5px;"> <!-- <a href="<%= admin_module_tags_path(:module_app_id => @module_app_id.to_s) %>"> Tag Management </a> -->
<div id="panel_r" class="pull-right">
preview is here preview is here
</div> </div>
<div id="panel_r" class="tab-pane fade in active" style="width: 1200px;" > <div id="panel_l" class="tab-pane fade in active pull-left">
<table id="asset_sort_list" class="table main-list"> <table id="asset_sort_list" class="table main-list">
<thead> <thead>
<tr> <tr>
<th class="span1"></th> <th></th>
<th class="span4">Name</th> <th>Name</th>
<th class="span1-2">Size</th> <th>Size</th>
<th class="span1-2">Description</th> <th>Description</th>
<th class="span2">Tags</th> <th>Tags</th>
<th class="span1">Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody id="tbody_assets" class="sort-holder"> <tbody id="tbody_assets" class="sort-holder">
<%= render :partial => 'asset', :collection => @assets %> <%= render :partial => 'asset', :collection => @assets %>
</tbody> </tbody>
</table> </table>
<div class="pagination pagination-centered">
<ul>
<li><a href="#">«</a></li>
<li><a href="#">1</a></li>
<li><a href="#">2</a></li>
<li><a href="#">3</a></li>
<li><a href="#">4</a></li>
<li><a href="#">5</a></li>
<li><a href="#">»</a></li>
</ul>
</div>
</div>
</div> </div>
<div class="form-actions form-fixed pagination-right"> <div class="form-actions form-fixed pagination-right">
<button class="btn btn-primary" id="insert_btn" style="display:none;">Insert</button> <button class="btn btn-primary" id="insert_btn" style="display:none;">Insert</button>
@ -240,6 +256,7 @@
</div> </div>
</div> </div>
<div class="tab-pane fade" id="upload"> <div class="tab-pane fade" id="upload">
<div class="input-area">
<form action="<%= file_upload_admin_assets_path %>", id='fileupload'> <form action="<%= file_upload_admin_assets_path %>", id='fileupload'>
<!-- Redirect browsers with JavaScript disabled to the origin page --> <!-- Redirect browsers with JavaScript disabled to the origin page -->
<!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload --> <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
@ -301,10 +318,10 @@
</div> </div>
</form> </form>
</div> </div>
<div id="editform" class="modal hide fade"> </div>
</div>
<div id="editform" class="modal hide fade"></div>
</fieldset>
</div> </div>
<% content_for :page_specific_javascript do %> <% content_for :page_specific_javascript do %>