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

New rss.js from Harry and fix html form for assets

This commit is contained in:
chris2tof 2011-12-29 19:45:21 +08:00 committed by Christophe Vilayphiou
parent 68ad208777
commit b04d845a5a
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/rss.js
View File

@ -429,7 +429,7 @@ modalWindow : function(settings,callbackFn){
tempwidth=maxwidth; tempwidth=maxwidth;
rgWLeft=(rgmaskWidth-tempwidth)/2; rgWLeft=(rgmaskWidth-tempwidth)/2;
} }
tempwidth+=25; tempwidth=parseInt(tempwidth)+25;
$rss("#rgWindow").empty().show(); $rss("#rgWindow").empty().show();
var closebtn = ""; var closebtn = "";
if(closeBtn) if(closeBtn)
@ -508,7 +508,7 @@ modalWindowUpdate : function(settings,callbackFn){
tempwidth=maxwidth; tempwidth=maxwidth;
rgWLeft=(rgmaskWidth-tempwidth)/2; rgWLeft=(rgmaskWidth-tempwidth)/2;
} }
tempwidth+=25; tempwidth=parseInt(tempwidth)+25;
$rss("#rgContent").empty(); $rss("#rgContent").empty();
$rss("#rgWindow").animate({"width":tempwidth+"px","height":tempheight+"px",top:rgWTop+"px", left:rgWLeft+"px"},500,function(){$rss("#rgContent").css("height",tempheight+"px").html(dhtml)}); $rss("#rgWindow").animate({"width":tempwidth+"px","height":tempheight+"px",top:rgWTop+"px", left:rgWLeft+"px"},500,function(){$rss("#rgContent").css("height",tempheight+"px").html(dhtml)});
$rss("#rgwindow_temp_div").remove(); $rss("#rgwindow_temp_div").remove();

10
app/views/admin/assets/_edit.html.erb
View File

@ -1,12 +1,16 @@
<div id='pop_up_content' class="main2"> <div id='pop_up_content' class="main2">
<h1><%= t('editing_asset') %></h1> <h1><%= t('editing_asset') %></h1>
<%= form_for @asset, :url => admin_asset_path(@asset), :html => {:id => 'ajaxForm', :multipart => true } do |f| %> <%= form_for @asset, :url => admin_asset_path(@asset), :html => {:id => (is_html ? nil : 'ajaxForm'), :multipart => true } do |f| %>
<%= f.error_messages %> <%= f.error_messages %>
<%= render :partial => "form", :locals => { :f => f } %> <%= render :partial => "form", :locals => { :f => f } %>
<div class="button_bar"> <div class="button_bar">
<%= link_back if is_html %> <% if is_html %>
<a id='submit_button'><%= t(:update) %></a> <%= link_back %>
<%= f.submit t(:edit) %>
<% else %>
<a id='submit_button'><%= t(:edit) %></a>
<% end %>
</div> </div>
<% end %> <% end %>
</div> </div>

8
app/views/admin/assets/_new.html.erb
View File

@ -1,12 +1,16 @@
<div id='pop_up_content' class="main2"> <div id='pop_up_content' class="main2">
<h1><%= t('admin.new_asset') %></h1> <h1><%= t('admin.new_asset') %></h1>
<%= form_for :asset, :url => admin_assets_path, :html => {:id => 'ajaxForm', :multipart => true }, :remote => true do |f| %> <%= form_for :asset, :url => admin_assets_path, :html => {:id => (is_html ? nil : 'ajaxForm'), :multipart => true }, :remote => true do |f| %>
<%= f.error_messages %> <%= f.error_messages %>
<%= render :partial => "form", :locals => { :f => f } %> <%= render :partial => "form", :locals => { :f => f } %>
<div class="button_bar"> <div class="button_bar">
<%= link_back if is_html %> <% if is_html %>
<%= link_back %>
<%= f.submit t(:create) %>
<% else %>
<a id='submit_button'><%= t(:create) %></a> <a id='submit_button'><%= t(:create) %></a>
<% end %>
</div> </div>
<% end %> <% end %>
</div> </div>