From e75d1f23ea712907d35c33326c77b0e63b8c7da5 Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Sun, 14 Jul 2013 12:36:49 -0400 Subject: [PATCH] assets pipeline --- app/assets/javascripts/base.js | 6 +++++ .../{default.css => default.css.erb} | 12 +++++----- .../stylesheets/wiki.css.erb | 22 +++++++++---------- app/views/layouts/_base.html.haml | 4 ++-- app/views/stylesheets/color.css.erb | 1 - config/routes.rb | 3 +-- 6 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 app/assets/javascripts/base.js rename app/assets/stylesheets/{default.css => default.css.erb} (91%) rename app/{views => assets}/stylesheets/wiki.css.erb (95%) diff --git a/app/assets/javascripts/base.js b/app/assets/javascripts/base.js new file mode 100644 index 0000000..d476166 --- /dev/null +++ b/app/assets/javascripts/base.js @@ -0,0 +1,6 @@ +//= require lib/prototype +//= require lib/effects +//= require lib/controls +//= require lib/dragdrop +//= require lib/event-selectors +//= require application diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css.erb similarity index 91% rename from app/assets/stylesheets/default.css rename to app/assets/stylesheets/default.css.erb index 3c0dc1f..a1f723a 100644 --- a/app/assets/stylesheets/default.css +++ b/app/assets/stylesheets/default.css.erb @@ -39,7 +39,7 @@ ol, dl, ul { } .content ul li { - background-image: url(/images/bullet.gif); + background-image: url(<%= App.base_path %>/assets/images/bullet.gif); background-position: 0px 7px; background-repeat: no-repeat; padding-left: 15px; @@ -107,7 +107,7 @@ body { } #header { - background-image: url(/images/header_bg.png); + background-image: url(<%= App.base_path %>/assets/images/header_bg.png); background-position: top; background-repeat: repeat-x; background-color: #069; @@ -178,7 +178,7 @@ body { #footer { display: none; - background-image: url(/images/footer_bg.png); + background-image: url(<%= App.base_path %>/assets/images/footer_bg.png); background-position: top; background-repeat: repeat-x; background-color: #000; @@ -360,14 +360,14 @@ h4.title { } .repositorio .mime_plain_text { - background-image: url(/images/tango/text-x-generic.png); + background-image: url(<%= App.base_path %>/assets/images/tango/text-x-generic.png); } .repositorio .mime_presentation { - background-image: url(/images/tango/x-office-presentation.png); + background-image: url(<%= App.base_path %>/assets/images/tango/x-office-presentation.png); } body { - ackground-image: url(/prototype/line.png); + ackground-image: url(<%= App.base_path %>/prototype/line.png); } diff --git a/app/views/stylesheets/wiki.css.erb b/app/assets/stylesheets/wiki.css.erb similarity index 95% rename from app/views/stylesheets/wiki.css.erb rename to app/assets/stylesheets/wiki.css.erb index 0073c7b..a5a63f6 100644 --- a/app/views/stylesheets/wiki.css.erb +++ b/app/assets/stylesheets/wiki.css.erb @@ -38,7 +38,7 @@ ul ul, ol ol { } .box ul li { - background-image: url(<%= App.base_path %>/images/bullet.gif); + background-image: url(<%= App.base_path %>/assets/bullet.gif); background-position: 0px 7px; background-repeat: no-repeat; padding-left: 15px; @@ -126,13 +126,13 @@ body { #wrapper { margin: 0em -9px; padding: 0px 9px; - background-image: url(<%= App.base_path %>/images/bg_body.png); + background-image: url(<%= App.base_path %>/assets/bg_body.png); background-repeat: repeat-x; background-color: #f4f4f4; } #header { - background-image: url(<%= App.base_path %>/images/header_bg.png); + background-image: url(<%= App.base_path %>/assets/header_bg.png); background-position: top; background-repeat: repeat-x; color: #eee; @@ -287,7 +287,7 @@ body { } .specialDay { - background-image: url(<%= App.base_path %>/images/bg_day.gif); + background-image: url(<%= App.base_path %>/assets/bg_day.gif); cursor: pointer; } @@ -449,12 +449,12 @@ h4.title, h1.title { line-height: 18px; } -.repositorio .mime_plain_text { background-image: url(<%= App.base_path %>/images/tango/text-x-generic.png); } -.repositorio .mime_presentation { background-image: url(<%= App.base_path %>/images/tango/x-office-presentation.png); } -.repositorio .mime_document { background-image: url(<%= App.base_path %>/images/tango/x-office-document.png); } -.repositorio .mime_binary { background-image: url(<%= App.base_path %>/images/tango/application-x-executable.png); } -.repositorio .mime_zip { background-image: url(<%= App.base_path %>/images/tango/package-x-generic.png); } -.repositorio .mime_folder { background-image: url(<%= App.base_path %>/images/tango/folder.png); } +.repositorio .mime_plain_text { background-image: url(<%= App.base_path %>/assets/tango/text-x-generic.png); } +.repositorio .mime_presentation { background-image: url(<%= App.base_path %>/assets/tango/x-office-presentation.png); } +.repositorio .mime_document { background-image: url(<%= App.base_path %>/assets/tango/x-office-document.png); } +.repositorio .mime_binary { background-image: url(<%= App.base_path %>/assets/tango/application-x-executable.png); } +.repositorio .mime_zip { background-image: url(<%= App.base_path %>/assets/tango/package-x-generic.png); } +.repositorio .mime_folder { background-image: url(<%= App.base_path %>/assets/tango/folder.png); } .spinner { float: right; @@ -573,7 +573,7 @@ textarea { #wiki_preview { - background-image: url(<%= App.base_path %>/images/rascunho.png); + background-image: url(<%= App.base_path %>/assets/rascunho.png); border: 2px solid #e4e4e4; padding: 10px; overflow: auto; diff --git a/app/views/layouts/_base.html.haml b/app/views/layouts/_base.html.haml index 37f193e..718c919 100644 --- a/app/views/layouts/_base.html.haml +++ b/app/views/layouts/_base.html.haml @@ -7,7 +7,7 @@ %meta{'name' => 'robots', :content => 'noindex,nofollow'} %meta{'http-equiv' => 'Content-Type', 'content' => 'text/html; charset=UTF-8'} - %link{'href' => "#{App.base_path}/stylesheets/cache/wiki.css", 'rel' => 'Stylesheet', 'type' => 'text/css'} + = stylesheet_link_tag :wiki %link{'href' => "#{App.base_path}/favicon.ico", 'rel' => 'icon', 'type' => 'image/vnd.microsoft.icon'} %link#css_color{'href' => "#{App.base_path}/stylesheets/cache/color.#{@color}.css", 'rel' => 'Stylesheet', 'type' => %'text/css'} @@ -19,7 +19,7 @@ %script{:type => 'text/javascript'} == BASE_PATH = "#{App.base_path}"; - /= javascript_include_merged :base + = javascript_include_tag :base %body{'onload' => 'javascript: startup()'} #wrapper diff --git a/app/views/stylesheets/color.css.erb b/app/views/stylesheets/color.css.erb index 1d6eb99..ce04eea 100644 --- a/app/views/stylesheets/color.css.erb +++ b/app/views/stylesheets/color.css.erb @@ -1,5 +1,4 @@ <% color = App.color_schemes[@color] || App.color_schemes[App.default_color] %> - a { color: <%= color[1] %>; } diff --git a/config/routes.rb b/config/routes.rb index dcf3bc8..678dcd8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -86,8 +86,7 @@ WikiUFC::Application.routes.draw do match '/dashboard' => 'users#dashboard', :as => :dashboard match '/dashboard/:secret.:format' => 'users#dashboard', :as => :formatted_dashboard - # Stylesheets - match 'stylesheets/cache/:action.:format' => 'stylesheets#index' + ## Stylesheets match 'stylesheets/cache/:action.:color.:format' => 'stylesheets#index' # Mudancas recentes global