developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tp

This commit is contained in:
Harry Bomrah 2012-08-06 20:10:38 +08:00 committed by chris
parent aef1bfaba3
commit 263cf130e2
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/assets_controller.rb
View File

@ -35,7 +35,7 @@ class Admin::AssetsController < OrbitBackendController
respond_to do |format| respond_to do |format|
format.js { format.js {
if params[:uploader] if params[:uploader]
render 'create' render "create"
else else
render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil} render 'js/remove_pop_up_and_reload_content', :locals => {:function => 'replaceWith', :id => "asset_#{@asset.id}", :value => @asset, :values => nil, :partial => 'admin/assets/asset', :locals => nil}
end end

1
app/views/admin/assets/create.js.erb
View File

File diff suppressed because one or more lines are too long

4
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendored
View File

@ -25,10 +25,10 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
.rgp textarea { overflow: auto; } .rgp textarea { overflow: auto; }
.rg a, .rgp a { .rg a, .rgp a {
text-decoration: none; text-decoration: none;
color: #555; /*color: #555;*/
outline: none; outline: none;
} }
.rg a:hover { color: #333; } /*.rg a:hover { color: #333; }*/
.rg img { display: block; border: none; width: 120px; height: 90px; } .rg img { display: block; border: none; width: 120px; height: 90px; }
.rgmask { background: #000; width: 100%; position: fixed; top: 0; left: 0; } .rgmask { background: #000; width: 100%; position: fixed; top: 0; left: 0; }