app/views/components/lolita/configuration/tab/files/_upload_script.html.erb in lolita-file-upload-0.4.0 vs app/views/components/lolita/configuration/tab/files/_upload_script.html.erb in lolita-file-upload-0.4.1

- old
+ new

@@ -1,13 +1,11 @@ - <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/overcast/jquery-ui.css" type="text/css" /> - <link rel="stylesheet" href="/assets/lolita/upload/jquery.ui.plupload.css" type="text/css" /> - - <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/jquery-ui.min.js" type="text/javascript"></script> - <script type="text/javascript" src="/assets/lolita/upload/plupload.full.js"></script> - <script type="text/javascript" src="/assets/lolita/upload/jquery.ui.plupload.js"></script> + <%= stylesheet_link_tag "lolita/upload/jquery-ui/overcast/jquery-ui-1.8.16.custom.css" %> + <%= stylesheet_link_tag "lolita/upload/application.css" %> + <%= javascript_include_tag "jquery-ui" %> + <%= javascript_include_tag "lolita/upload/application.js" %> <% unless Lolita.locale.to_s.downcase=="en" %> - <script type="text/javascript" src="/assets/lolita/upload/I18n/<%=Lolita.locale%>.js"></script> + <%= javascript_include_tag "lolita/upload/I18n/#{Lolita.locale}.js"%> <% end %> <script type="text/javascript"> $(function(){ $("#<%=container%>").plupload({ // General settings @@ -40,10 +38,10 @@ headers:{ "X-CSRF-Token": $("meta[name='csrf-token']").attr("content") }, // Flash settings - flash_swf_url : '/assets/lolita/upload/plupload.flash.swf', + flash_swf_url : "<%=asset_path("lolita/upload/plupload.flash.swf")%>", init:{ FileUploaded:function(uploader, file, info){ <% if tab.association_type == :many %> $("#file_list_for_<%=tab.association.name%>>tbody").append(info.response) <% else %>