From 4d5e31c5958e06663a6ee252021606d299ec85ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hinrik=20=C3=96rn=20Sigur=C3=B0sson?= Date: Tue, 13 Mar 2012 17:05:07 +0000 Subject: [PATCH] Fix loading of some CSS assets --- app/views/layouts/basic.html.erb | 2 +- app/views/layouts/basic_origin.html.erb | 2 +- app/views/layouts/better_reykjavik.html.erb | 2 +- app/views/layouts/core.html.erb | 1 - app/views/layouts/core_gg.html.erb | 1 - app/views/layouts/core_org.html.erb | 1 - app/views/layouts/home.html.erb | 2 +- app/views/layouts/your_priorities.html.erb | 2 +- app/views/portal/index.html.erb | 2 +- app/views/portal/portlets/_process_most_popular_videos.html.erb | 2 +- app/views/priorities/_form.html.erb | 2 +- app/views/process_speech_videos/search.html.erb | 2 +- 12 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/views/layouts/basic.html.erb b/app/views/layouts/basic.html.erb index b94a083f..10d75dd9 100644 --- a/app/views/layouts/basic.html.erb +++ b/app/views/layouts/basic.html.erb @@ -10,7 +10,7 @@ <%= render :partial => "shared/priority_processes_head" if controller_name.index("process") %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> - <%= stylesheet_link_tag "jquery.keypad" %> + <%= stylesheet_link_tag "jquery.keypad.css" %> <%= javascript_include_tag "jquery.keypad.min.js" %> <% end %> <% if controller_name == "priorities" and action_name == "show" %> diff --git a/app/views/layouts/basic_origin.html.erb b/app/views/layouts/basic_origin.html.erb index 39337c79..03be7a75 100644 --- a/app/views/layouts/basic_origin.html.erb +++ b/app/views/layouts/basic_origin.html.erb @@ -13,7 +13,7 @@ <% end %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> - <%= stylesheet_link_tag "jquery.keypad" %> + <%= stylesheet_link_tag "jquery.keypad.css" %> <%= javascript_include_tag "jquery.keypad.min.js" %> <% end %> <% if controller_name == "priorities" and action_name == "show" %> diff --git a/app/views/layouts/better_reykjavik.html.erb b/app/views/layouts/better_reykjavik.html.erb index cc31184d..2df586ae 100644 --- a/app/views/layouts/better_reykjavik.html.erb +++ b/app/views/layouts/better_reykjavik.html.erb @@ -13,7 +13,7 @@ end %> <%= javascript_include_tag "check-browser.js", "skuggathing" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> - <%= stylesheet_link_tag "jquery.keypad" %> + <%= stylesheet_link_tag "jquery.keypad.css" %> <%= javascript_include_tag "jquery.keypad.min.js", "check-browser.js" %> <% end %> <%= tr8n_scripts_tag %> diff --git a/app/views/layouts/core.html.erb b/app/views/layouts/core.html.erb index aa30148d..619399d8 100644 --- a/app/views/layouts/core.html.erb +++ b/app/views/layouts/core.html.erb @@ -7,7 +7,6 @@ <%= render :partial => "shared/head" %> <%= render :partial => "shared/javascripts" %> <%= render :partial => "shared/priority_processes_head" if controller_name.index("process") %> - <%= stylesheet_link_tag :all, :cache => true %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> <%= javascript_include_tag "jquery.keypad.min.js" %> diff --git a/app/views/layouts/core_gg.html.erb b/app/views/layouts/core_gg.html.erb index 705769c7..30d470b3 100644 --- a/app/views/layouts/core_gg.html.erb +++ b/app/views/layouts/core_gg.html.erb @@ -6,7 +6,6 @@ <%= render :partial => "shared/head" %> <%= render :partial => "shared/javascripts" %> <%= render :partial => "shared/priority_processes_head" if controller_name.index("process") %> - <%= stylesheet_link_tag :all, :cache => true %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> <%= javascript_include_tag "jquery.keypad.min.js" %> diff --git a/app/views/layouts/core_org.html.erb b/app/views/layouts/core_org.html.erb index d0170754..0d247c15 100644 --- a/app/views/layouts/core_org.html.erb +++ b/app/views/layouts/core_org.html.erb @@ -7,7 +7,6 @@ <%= render :partial => "shared/head" %> <%= render :partial => "shared/javascripts" %> <%= render :partial => "shared/priority_processes_head" if controller_name.index("process") %> -<%= stylesheet_link_tag :all, :cache => true %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> <%= javascript_include_tag "jquery.keypad.min.js" %> diff --git a/app/views/layouts/home.html.erb b/app/views/layouts/home.html.erb index 15606a4b..9b97ba08 100644 --- a/app/views/layouts/home.html.erb +++ b/app/views/layouts/home.html.erb @@ -13,7 +13,7 @@ <% end %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> - <%= stylesheet_link_tag "jquery.keypad" %> + <%= stylesheet_link_tag "jquery.keypad.css" %> <%= javascript_include_tag "jquery.keypad.min.js" %> <% end %> <% if controller_name == "priorities" and action_name == "show" %> diff --git a/app/views/layouts/your_priorities.html.erb b/app/views/layouts/your_priorities.html.erb index 69c0be9e..1d2f06b7 100644 --- a/app/views/layouts/your_priorities.html.erb +++ b/app/views/layouts/your_priorities.html.erb @@ -12,7 +12,7 @@ <% end %> <%= javascript_include_tag "skuggathing.js" unless controller_name=="priority_processes" %> <% if ["users","sessions"].include?(controller_name) %> - <%= stylesheet_link_tag "jquery.keypad" %> + <%= stylesheet_link_tag "jquery.keypad.css" %> <%= javascript_include_tag "jquery.keypad.min.js" %> <% end %> <% if controller_name == "priorities" and action_name == "show" %> diff --git a/app/views/portal/index.html.erb b/app/views/portal/index.html.erb index c94492a6..d709866f 100644 --- a/app/views/portal/index.html.erb +++ b/app/views/portal/index.html.erb @@ -1,4 +1,4 @@ -<%= stylesheet_link_tag "fg.menu" %> +<%= stylesheet_link_tag "fg.menu.css" %> <%= stylesheet_link_tag "portal" %> <%= javascript_include_tag "fg.menu.js" %> <%= javascript_include_tag "portal.js" %> diff --git a/app/views/portal/portlets/_process_most_popular_videos.html.erb b/app/views/portal/portlets/_process_most_popular_videos.html.erb index 14fc2eb5..ec97d908 100644 --- a/app/views/portal/portlets/_process_most_popular_videos.html.erb +++ b/app/views/portal/portlets/_process_most_popular_videos.html.erb @@ -1,6 +1,6 @@ <% cache(["portlets_process_most_popular_videos",locale,Partner.current_id,@inline_translations_enabled], :expires_in => 45.seconds) do -%> <%= javascript_include_tag 'jquery.cluetip.js' %> -<%= stylesheet_link_tag 'jquery.cluetip' %> +<%= stylesheet_link_tag 'jquery.cluetip.css' %> <% @top_videos = ProcessSpeechVideo.top(9) %> <% if @top_videos.length > 0 %> diff --git a/app/views/priorities/_form.html.erb b/app/views/priorities/_form.html.erb index 1097756c..53068e72 100644 --- a/app/views/priorities/_form.html.erb +++ b/app/views/priorities/_form.html.erb @@ -1,5 +1,5 @@ <%= javascript_include_tag "jquery.qtip.min.js" %> -<%= stylesheet_link_tag "jquery.qtip.min" %> +<%= stylesheet_link_tag "jquery.qtip.min.css" %> <% if current_partner and current_partner.message_for_new_priority %> <%= render :partial=>"/shared/top_message_box", :locals=> {:message_text => current_partner.message_for_new_priority.html_safe} %> diff --git a/app/views/process_speech_videos/search.html.erb b/app/views/process_speech_videos/search.html.erb index bed56112..582c1234 100644 --- a/app/views/process_speech_videos/search.html.erb +++ b/app/views/process_speech_videos/search.html.erb @@ -5,7 +5,7 @@ <% end %> <%= javascript_include_tag 'jquery.cluetip.js' %> -<%= stylesheet_link_tag 'jquery.cluetip' %> +<%= stylesheet_link_tag 'jquery.cluetip.css' %>

<%=tr("Search results for", "view/process_speech_videos/search")%>: <%=params[:search_query] %> <%= params[:priority_id] ? "- #{Priority.find(params[:priority_id]).name}" : ""%>

<% if @process_speech_videos.length > 0%>