Skip to content

Commit

Permalink
Fix loading of some CSS assets
Browse files Browse the repository at this point in the history
  • Loading branch information
hinrik committed Mar 13, 2012
1 parent d5b0e57 commit 4d5e31c
Show file tree
Hide file tree
Showing 12 changed files with 9 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/views/layouts/basic.html.erb
Expand Up @@ -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" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/basic_origin.html.erb
Expand Up @@ -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" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/better_reykjavik.html.erb
Expand Up @@ -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 %>
Expand Down
1 change: 0 additions & 1 deletion app/views/layouts/core.html.erb
Expand Up @@ -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" %>
Expand Down
1 change: 0 additions & 1 deletion app/views/layouts/core_gg.html.erb
Expand Up @@ -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" %>
Expand Down
1 change: 0 additions & 1 deletion app/views/layouts/core_org.html.erb
Expand Up @@ -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" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/home.html.erb
Expand Up @@ -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" %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/your_priorities.html.erb
Expand Up @@ -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" %>
Expand Down
2 changes: 1 addition & 1 deletion 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" %>
Expand Down
@@ -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 %>
<table>
Expand Down
2 changes: 1 addition & 1 deletion 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} %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/process_speech_videos/search.html.erb
Expand Up @@ -5,7 +5,7 @@
<% end %>
<%= javascript_include_tag 'jquery.cluetip.js' %>
<%= stylesheet_link_tag 'jquery.cluetip' %>
<%= stylesheet_link_tag 'jquery.cluetip.css' %>

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

0 comments on commit 4d5e31c

Please sign in to comment.