Download as
Browse Code »

Commit 7e5a97ff9546ae3ed2ff1a563b3f2d4d02301b4b

Authored by Leandro Santos
2 parents 2e6aa13b 6edafc75
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

Merge branch 'next' into serpro-context

Showing 28 changed files with 128 additions and 90 deletions   Show diff stats
@@ -20,6 +20,11 @@ gem 'locale', '~> 2.0.5' @@ -20,6 +20,11 @@ gem 'locale', '~> 2.0.5'
20 gem 'whenever', :require => false 20 gem 'whenever', :require => false
21 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails' 21 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
22 22
  23 +group :assets do
  24 + gem 'uglifier', '>= 1.0.3'
  25 + gem 'sass-rails'
  26 +end
  27 +
23 group :production do 28 group :production do
24 gem 'dalli', '~> 2.7.0' 29 gem 'dalli', '~> 2.7.0'
25 end 30 end
app/assets/designs/icons 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../../public/designs/icons
0 \ No newline at end of file 2 \ No newline at end of file
app/assets/designs/themes 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../../public/designs/themes
0 \ No newline at end of file 2 \ No newline at end of file
app/assets/images 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../public/images
0 \ No newline at end of file 2 \ No newline at end of file
app/assets/javascripts 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../public/javascripts
0 \ No newline at end of file 2 \ No newline at end of file
app/assets/plugins 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../public/plugins
0 \ No newline at end of file 2 \ No newline at end of file
app/assets/stylesheets 0 → 120000
  Diff comments   View file @7e5a97f
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +../../public/stylesheets
0 \ No newline at end of file 2 \ No newline at end of file
app/helpers/application_helper.rb
  Diff comments   View file @7e5a97f
@@ -919,18 +919,6 @@ module ApplicationHelper @@ -919,18 +919,6 @@ module ApplicationHelper
919 end 919 end
920 end 920 end
921 921
922 - def icon_theme_stylesheet_path  
923 - icon_themes = []  
924 - theme_icon_themes = theme_option(:icon_theme) || []  
925 - for icon_theme in theme_icon_themes do  
926 - theme_path = "/designs/icons/#{icon_theme}/style.css"  
927 - if File.exists?(Rails.root.join('public', theme_path[1..-1]))  
928 - icon_themes << theme_path  
929 - end  
930 - end  
931 - icon_themes  
932 - end  
933 -  
934 def page_title 922 def page_title
935 CGI.escapeHTML( 923 CGI.escapeHTML(
936 (@page ? @page.title + ' - ' : '') + 924 (@page ? @page.title + ' - ' : '') +
app/helpers/layout_helper.rb
  Diff comments   View file @7e5a97f
@@ -28,12 +28,12 @@ module LayoutHelper @@ -28,12 +28,12 @@ module LayoutHelper
28 end 28 end
29 29
30 def noosfero_javascript 30 def noosfero_javascript
31 - plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten 31 + plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten
32 32
33 output = '' 33 output = ''
34 output += render 'layouts/javascript' 34 output += render 'layouts/javascript'
35 unless plugins_javascripts.empty? 35 unless plugins_javascripts.empty?
36 - output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}" 36 + output += javascript_include_tag *plugins_javascripts
37 end 37 end
38 output += theme_javascript_ng.to_s 38 output += theme_javascript_ng.to_s
39 output += javascript_tag 'render_all_jquery_ui_widgets()' 39 output += javascript_tag 'render_all_jquery_ui_widgets()'
@@ -42,30 +42,21 @@ module LayoutHelper @@ -42,30 +42,21 @@ module LayoutHelper
42 end 42 end
43 43
44 def noosfero_stylesheets 44 def noosfero_stylesheets
45 - standard_stylesheets = [  
46 - 'application',  
47 - 'search',  
48 - 'colorbox',  
49 - 'selectordie',  
50 - 'inputosaurus',  
51 - 'chat',  
52 - 'selectordie-theme',  
53 - pngfix_stylesheet_path,  
54 - ] + tokeninput_stylesheets  
55 plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin| 45 plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
56 - plugin.class.public_path('style.css') 46 + plugin.class.public_path('style.css', true)
57 } 47 }
58 global_css_pub = "/designs/themes/#{environment.theme}/global.css" 48 global_css_pub = "/designs/themes/#{environment.theme}/global.css"
59 global_css_at_fs = Rails.root.join 'public' + global_css_pub 49 global_css_at_fs = Rails.root.join 'public' + global_css_pub
60 50
61 output = [] 51 output = []
62 - output << stylesheet_link_tag(standard_stylesheets, :cache => 'cache/application') 52 + output << stylesheet_link_tag('application')
63 output << stylesheet_link_tag(template_stylesheet_path) 53 output << stylesheet_link_tag(template_stylesheet_path)
64 - output << stylesheet_link_tag(icon_theme_stylesheet_path) 54 + output << stylesheet_link_tag(*icon_theme_stylesheet_path)
65 output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path) 55 output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
66 unless plugins_stylesheets.empty? 56 unless plugins_stylesheets.empty?
67 - cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"  
68 - output << stylesheet_link_tag(plugins_stylesheets, :cache => cacheid) 57 + # FIXME: caching does not work with asset pipeline
  58 + #cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
  59 + output << stylesheet_link_tag(*plugins_stylesheets)
69 end 60 end
70 if File.exists? global_css_at_fs 61 if File.exists? global_css_at_fs
71 output << stylesheet_link_tag(global_css_pub) 62 output << stylesheet_link_tag(global_css_pub)
@@ -74,14 +65,6 @@ module LayoutHelper @@ -74,14 +65,6 @@ module LayoutHelper
74 output.join "\n" 65 output.join "\n"
75 end 66 end
76 67
77 - def pngfix_stylesheet_path  
78 - 'iepngfix/iepngfix.css' #TODO: deprecate it  
79 - end  
80 -  
81 - def tokeninput_stylesheets  
82 - ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']  
83 - end  
84 -  
85 def noosfero_layout_features 68 def noosfero_layout_features
86 render :file => 'shared/noosfero_layout_features' 69 render :file => 'shared/noosfero_layout_features'
87 end 70 end
@@ -99,7 +82,7 @@ module LayoutHelper @@ -99,7 +82,7 @@ module LayoutHelper
99 icon_themes = [] 82 icon_themes = []
100 theme_icon_themes = theme_option(:icon_theme) || [] 83 theme_icon_themes = theme_option(:icon_theme) || []
101 for icon_theme in theme_icon_themes do 84 for icon_theme in theme_icon_themes do
102 - theme_path = "/designs/icons/#{icon_theme}/style.css" 85 + theme_path = "designs/icons/#{icon_theme}/style.css"
103 if File.exists?(Rails.root.join('public', theme_path)) 86 if File.exists?(Rails.root.join('public', theme_path))
104 icon_themes << theme_path 87 icon_themes << theme_path
105 end 88 end
@@ -112,7 +95,7 @@ module LayoutHelper @@ -112,7 +95,7 @@ module LayoutHelper
112 end 95 end
113 96
114 def theme_stylesheet_path 97 def theme_stylesheet_path
115 - theme_path + '/style.css' 98 + "/assets#{theme_path}/style.css"
116 end 99 end
117 100
118 def layout_template 101 def layout_template
app/helpers/macros_helper.rb
  Diff comments   View file @7e5a97f
@@ -42,7 +42,9 @@ module MacrosHelper @@ -42,7 +42,9 @@ module MacrosHelper
42 [macro.configuration[:js_files]].flatten.map { |js| plugins_javascripts << macro.plugin.public_path(js) } 42 [macro.configuration[:js_files]].flatten.map { |js| plugins_javascripts << macro.plugin.public_path(js) }
43 end 43 end
44 end 44 end
45 - javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? 45 + unless plugins_javascripts.empty?
  46 + javascript_include_tag *plugins_javascripts
  47 + end
46 end 48 end
47 49
48 def macro_css_files 50 def macro_css_files
app/views/layouts/_javascript.html.erb
  Diff comments   View file @7e5a97f
1 -<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1', 'jrails', 'rails.js',  
2 - 'jquery.cycle.all.min.js', 'jquery.colorbox-min.js',  
3 - 'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',  
4 - 'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',  
5 - 'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie',  
6 - # noosfero libraries  
7 - 'application.js', 'modal.js',  
8 - 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',  
9 - :cache => 'cache/application' %> 1 +<%= javascript_include_tag 'application.js' %>
10 2
11 <% language = FastGettext.locale %> 3 <% language = FastGettext.locale %>
12 <% %w{messages methods}.each do |type| %> 4 <% %w{messages methods}.each do |type| %>
app/views/layouts/application.html.erb
  Diff comments   View file @7e5a97f
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 import_controller_stylesheets(:themed_source => true) 21 import_controller_stylesheets(:themed_source => true)
22 %> 22 %>
23 <%= stylesheet_link_tag template_stylesheet_path %> 23 <%= stylesheet_link_tag template_stylesheet_path %>
24 - <%= stylesheet_link_tag icon_theme_stylesheet_path %> 24 + <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
25 <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %> 25 <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
26 26
27 <%# Add custom tags/styles/etc via content_for %> 27 <%# Add custom tags/styles/etc via content_for %>
app/views/layouts/slideshow.html.erb
  Diff comments   View file @7e5a97f
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 %></title> 11 %></title>
12 12
13 <%= stylesheet_import "slideshow" %> 13 <%= stylesheet_import "slideshow" %>
14 - <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose', :cache => 'cache/slideshow' %> 14 + <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose' %>
15 <script type="text/javascript"> 15 <script type="text/javascript">
16 $(document).ready(function (){ 16 $(document).ready(function (){
17 $("#slideshow").PikaChoose({ 17 $("#slideshow").PikaChoose({
config/application.rb
  Diff comments   View file @7e5a97f
@@ -88,11 +88,25 @@ module Noosfero @@ -88,11 +88,25 @@ module Noosfero
88 config.active_record.whitelist_attributes = true 88 config.active_record.whitelist_attributes = true
89 89
90 # Enable the asset pipeline 90 # Enable the asset pipeline
91 - config.assets.enabled = false 91 + config.assets.enabled = true
  92 +
  93 + # don't let rails prepend app/assets to config.assets.paths
  94 + # as we are doing it
  95 + config.paths['app/assets'] = ''
  96 +
  97 + config.assets.paths =
  98 + Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
  99 + Dir.glob("app/assets/{,stylesheets,javascripts}") +
  100 + # no precedence over core
  101 + Dir.glob("app/assets/designs/{icons,themes,user_themes}/*")
92 102
93 # Version of your assets, change this if you want to expire all your assets 103 # Version of your assets, change this if you want to expire all your assets
94 config.assets.version = '1.0' 104 config.assets.version = '1.0'
95 105
  106 + config.sass.preferred_syntax = :scss
  107 + config.sass.cache = true
  108 + config.sass.line_comments = false
  109 +
96 def noosfero_session_secret 110 def noosfero_session_secret
97 require 'fileutils' 111 require 'fileutils'
98 target_dir = File.join(File.dirname(__FILE__), '../tmp') 112 target_dir = File.join(File.dirname(__FILE__), '../tmp')
config/environments/production.rb
  Diff comments   View file @7e5a97f
@@ -14,12 +14,15 @@ Noosfero::Application.configure do @@ -14,12 +14,15 @@ Noosfero::Application.configure do
14 # Compress JavaScripts and CSS 14 # Compress JavaScripts and CSS
15 config.assets.compress = true 15 config.assets.compress = true
16 16
17 - # Don't fallback to assets pipeline if a precompiled asset is missed  
18 - config.assets.compile = false  
19 -  
20 # Generate digests for assets URLs 17 # Generate digests for assets URLs
21 config.assets.digest = true 18 config.assets.digest = true
22 19
  20 + # pre-compile every asset
  21 + config.assets.precompile = Dir.glob("app/assets/**/*").map do |file|
  22 + next unless File.exists?(file) and File.file?(file)
  23 + File.basename file
  24 + end.compact
  25 +
23 # Defaults to nil and saved in location specified by config.assets.prefix 26 # Defaults to nil and saved in location specified by config.assets.prefix
24 # config.assets.manifest = YOUR_PATH 27 # config.assets.manifest = YOUR_PATH
25 28
config/routes.rb
  Diff comments   View file @7e5a97f
@@ -52,7 +52,6 @@ Noosfero::Application.routes.draw do @@ -52,7 +52,6 @@ Noosfero::Application.routes.draw do
52 52
53 # categories index 53 # categories index
54 match 'cat/*category_path' => 'search#category_index', :as => :category 54 match 'cat/*category_path' => 'search#category_index', :as => :category
55 - match 'assets/:asset(/*category_path)' => 'search#assets', :as => :assets  
56 # search 55 # search
57 match 'search(/:action(/*category_path))', :controller => 'search' 56 match 'search(/:action(/*category_path))', :controller => 'search'
58 57
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # 11 #
12 # It's strongly recommended to check this file into your version control system. 12 # It's strongly recommended to check this file into your version control system.
13 13
14 -ActiveRecord::Schema.define(:version => 20150223180806) do 14 +ActiveRecord::Schema.define(:version => 20150408231524) do
15 15
16 create_table "abuse_reports", :force => true do |t| 16 create_table "abuse_reports", :force => true do |t|
17 t.integer "reporter_id" 17 t.integer "reporter_id"
@@ -263,6 +263,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150223180806) do @@ -263,6 +263,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150223180806) do
263 t.string "source_type" 263 t.string "source_type"
264 t.string "user_agent" 264 t.string "user_agent"
265 t.string "referrer" 265 t.string "referrer"
  266 + t.text "settings"
266 end 267 end
267 268
268 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam" 269 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
gitignore.example
  Diff comments   View file @7e5a97f
@@ -22,8 +22,12 @@ public/user_themes @@ -22,8 +22,12 @@ public/user_themes
22 public/designs/themes/default 22 public/designs/themes/default
23 public/designs/themes/* 23 public/designs/themes/*
24 public/designs/icons/default 24 public/designs/icons/default
  25 +
  26 +public/assets
  27 +.sass-cache
25 public/javascripts/cache* 28 public/javascripts/cache*
26 public/stylesheets/cache* 29 public/stylesheets/cache*
  30 +
27 public/plugins 31 public/plugins
28 db/development.db 32 db/development.db
29 db/production.db 33 db/production.db
lib/noosfero/plugin.rb
  Diff comments   View file @7e5a97f
@@ -150,8 +150,8 @@ class Noosfero::Plugin @@ -150,8 +150,8 @@ class Noosfero::Plugin
150 self.name.underscore.gsub('_plugin','') 150 self.name.underscore.gsub('_plugin','')
151 end 151 end
152 152
153 - def public_path(file = '')  
154 - File.join('/plugins', public_name, file) 153 + def public_path file = '', relative=false
  154 + File.join "#{if relative then '' else '/' end}plugins", public_name, file
155 end 155 end
156 156
157 def root_path 157 def root_path
plugins/pjax/public/javascripts/pjax.js
  Diff comments   View file @7e5a97f
@@ -8,7 +8,7 @@ pjax = { @@ -8,7 +8,7 @@ pjax = {
8 themes: {}, 8 themes: {},
9 9
10 load: function() { 10 load: function() {
11 - var target = jQuery('#content'); 11 + var target = jQuery('#wrap-1');
12 var content = jQuery('#content-inner'); 12 var content = jQuery('#content-inner');
13 var loadingTarget = jQuery('#content'); 13 var loadingTarget = jQuery('#content');
14 14
@@ -52,7 +52,7 @@ pjax = { @@ -52,7 +52,7 @@ pjax = {
52 from_state = this.current_state || this.initial_state; 52 from_state = this.current_state || this.initial_state;
53 53
54 if (state.layout_template != from_state.layout_template) { 54 if (state.layout_template != from_state.layout_template) {
55 - var lt_css = jQuery('head link[href^="/designs/templates"]'); 55 + var lt_css = jQuery('head link[href*="designs/templates"]');
56 lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets')); 56 lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets'));
57 } 57 }
58 58
@@ -78,7 +78,7 @@ pjax = { @@ -78,7 +78,7 @@ pjax = {
78 return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css'); 78 return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css');
79 }); 79 });
80 80
81 - var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]'); 81 + var css = jQuery('head link[href*="designs/themes/'+from_state.theme.id+'/style"]');
82 css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style')); 82 css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style'));
83 83
84 jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon); 84 jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon);
@@ -88,7 +88,7 @@ pjax = { @@ -88,7 +88,7 @@ pjax = {
88 jQuery('#navigation ul').html(state.theme.extra_navigation); 88 jQuery('#navigation ul').html(state.theme.extra_navigation);
89 jQuery('#theme-footer').html(state.theme.footer); 89 jQuery('#theme-footer').html(state.theme.footer);
90 90
91 - jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove(); 91 + jQuery('head script[src*="designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
92 if (state.theme.js_src) { 92 if (state.theme.js_src) {
93 var script = document.createElement('script'); 93 var script = document.createElement('script');
94 script.type = 'text/javascript', script.src = state.theme.js_src; 94 script.type = 'text/javascript', script.src = state.theme.js_src;
plugins/pjax/views/layouts/pjax.html.erb
  Diff comments   View file @7e5a97f
1 <% 1 <%
2 - update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil 2 + update_js = render(file: "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
3 %> 3 %>
4 4
5 <title><%= h page_title %></title> 5 <title><%= h page_title %></title>
6 6
7 -<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue 7 +<%= render file: "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
8 render "layouts/content" %> 8 render "layouts/content" %>
9 9
10 <%= javascript_tag do %> 10 <%= javascript_tag do %>
public/javascripts/application.js
  Diff comments   View file @7e5a97f
1 // Place your application-specific JavaScript functions and classes here 1 // Place your application-specific JavaScript functions and classes here
2 // This file is automatically included by javascript_include_tag :defaults 2 // This file is automatically included by javascript_include_tag :defaults
  3 +/*
  4 +* third party libraries
  5 +*= require jquery-2.1.1.min.js
  6 +*= require jquery-migrate-1.2.1.js
  7 +*= require jquery.cycle.all.min.js
  8 +*= require jquery.colorbox-min.js
  9 +*= require jquery-ui-1.10.4/js/jquery-ui-1.10.4.min.js
  10 +*= require jquery.scrollTo.js
  11 +*= require jquery.form.js
  12 +*= require jquery-validation/jquery.validate.js
  13 +*= require jquery.cookie.js
  14 +*= require jquery.ba-bbq.min.js
  15 +*= require jquery.tokeninput.js
  16 +*= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
  17 +*= require inputosaurus.js
  18 +*= require reflection.js
  19 +*= require rails.js
  20 +*= require jrails.js
  21 +* noosfero libraries
  22 +*= require_self
  23 +*= require modal.js
  24 +* views speficics
  25 +*= require add-and-join.js
  26 +*= require report-abuse.js
  27 +*= require manage-products.js
  28 +*= require catalog.js
  29 +*= require autogrow.js
  30 +*/
3 31
4 // scope for noosfero stuff 32 // scope for noosfero stuff
5 noosfero = { 33 noosfero = {
public/javascripts/codepress/languages/asp.css
  Diff comments   View file @7e5a97f
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 6
7 b { 7 b {
8 color:#000080; 8 color:#000080;
9 -} 9 +}
10 /* comments */ 10 /* comments */
11 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u { 11 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
12 color:gray; 12 color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{ @@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
17 color:gray; 17 color:gray;
18 font-weight:normal; 18 font-weight:normal;
19 } 19 }
20 - /* attributes */ 20 + /* attributes */
21 s, s b, span s u, span s cite, strong span s { 21 s, s b, span s u, span s cite, strong span s {
22 color:#5656fa ; 22 color:#5656fa ;
23 font-weight:normal; 23 font-weight:normal;
24 } 24 }
25 - /* strings */ 25 + /* strings */
26 strong s,strong s b, strong s u, strong s cite { 26 strong s,strong s b, strong s u, strong s cite {
27 color:#009900; 27 color:#009900;
28 font-weight:normal; 28 font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{ @@ -34,7 +34,6 @@ strong ins{
34 /* Syntax */ 34 /* Syntax */
35 strong a, strong a u { 35 strong a, strong a u {
36 color:#0000FF; 36 color:#0000FF;
37 - font-weight:;  
38 } 37 }
39 /* Native Keywords */ 38 /* Native Keywords */
40 strong u { 39 strong u {
@@ -58,7 +57,7 @@ em { @@ -58,7 +57,7 @@ em {
58 color:#800080; 57 color:#800080;
59 font-style:normal; 58 font-style:normal;
60 } 59 }
61 - /* script */ 60 + /* script */
62 ins { 61 ins {
63 color:#800000; 62 color:#800000;
64 font-weight:bold; 63 font-weight:bold;
@@ -68,4 +67,4 @@ ins { @@ -68,4 +67,4 @@ ins {
68 cite, s cite { 67 cite, s cite {
69 color:red; 68 color:red;
70 font-weight:bold; 69 font-weight:bold;
71 -}  
72 \ No newline at end of file 70 \ No newline at end of file
  71 +}
public/javascripts/codepress/languages/vbscript.css
  Diff comments   View file @7e5a97f
1 /* 1 /*
2 - * CodePress color styles for ASP-VB syntax highlighting 2 + * CodePress color styles for ASP-VB syntax highlighting
3 * By Martin D. Kirk 3 * By Martin D. Kirk
4 */ 4 */
5 5
6 /* tags */ 6 /* tags */
7 b { 7 b {
8 color:#000080; 8 color:#000080;
9 -} 9 +}
10 /* comments */ 10 /* comments */
11 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u { 11 big, big b, big em, big ins, big s, strong i, strong i b, strong i s, strong i u, strong i a, strong i a u, strong i s u {
12 color:gray; 12 color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{ @@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
17 color:gray; 17 color:gray;
18 font-weight:normal; 18 font-weight:normal;
19 } 19 }
20 - /* attributes */ 20 + /* attributes */
21 s, s b, span s u, span s cite, strong span s { 21 s, s b, span s u, span s cite, strong span s {
22 color:#5656fa ; 22 color:#5656fa ;
23 font-weight:normal; 23 font-weight:normal;
24 } 24 }
25 - /* strings */ 25 + /* strings */
26 strong s,strong s b, strong s u, strong s cite { 26 strong s,strong s b, strong s u, strong s cite {
27 color:#009900; 27 color:#009900;
28 font-weight:normal; 28 font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{ @@ -34,7 +34,6 @@ strong ins{
34 /* Syntax */ 34 /* Syntax */
35 strong a, strong a u { 35 strong a, strong a u {
36 color:#0000FF; 36 color:#0000FF;
37 - font-weight:;  
38 } 37 }
39 /* Native Keywords */ 38 /* Native Keywords */
40 strong u { 39 strong u {
@@ -58,7 +57,7 @@ em { @@ -58,7 +57,7 @@ em {
58 color:#800080; 57 color:#800080;
59 font-style:normal; 58 font-style:normal;
60 } 59 }
61 - /* script */ 60 + /* script */
62 ins { 61 ins {
63 color:#800000; 62 color:#800000;
64 font-weight:bold; 63 font-weight:bold;
@@ -68,4 +67,4 @@ ins { @@ -68,4 +67,4 @@ ins {
68 cite, s cite { 67 cite, s cite {
69 color:red; 68 color:red;
70 font-weight:bold; 69 font-weight:bold;
71 -}  
72 \ No newline at end of file 70 \ No newline at end of file
  71 +}
public/javascripts/jquery-ui-1.10.4/development-bundle/themes/base/minified/jquery.ui.theme.min.css
View file @2e6aa13
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -/*! jQuery UI - v1.10.4 - 2014-04-02  
2 -* http://jqueryui.com  
3 -* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */  
4 -  
5 -undefined  
6 \ No newline at end of file 0 \ No newline at end of file
public/stylesheets/application.css
  Diff comments   View file @7e5a97f
  1 +/*
  2 + * thidparty libraries
  3 + *= require colorbox
  4 + *= require selectordie
  5 + *= require selectordie-theme
  6 + *= require inputosaurus
  7 + *= require token-input
  8 + *= require token-input-facebook
  9 + *= require token-input-mac
  10 + *= require token-input-facet
  11 + * noosfero libraries
  12 + *= require_self
  13 + *= require iepngfix/iepngfix
  14 + * views specifics
  15 + *= require chat
  16 + *= require search
  17 + */
  18 +
1 /* browser fixes */ 19 /* browser fixes */
2 20
3 img:-moz-broken { 21 img:-moz-broken {
@@ -4414,7 +4432,8 @@ h1#agenda-title { @@ -4414,7 +4432,8 @@ h1#agenda-title {
4414 #groups-list li { 4432 #groups-list li {
4415 display: block; 4433 display: block;
4416 list-style: none; 4434 list-style: none;
4417 - margin-bottom: 20px background-color: #B8CFE7; 4435 + margin-bottom: 20px;
  4436 + background-color: #B8CFE7;
4418 } 4437 }
4419 4438
4420 #groups-list li .vcard { 4439 #groups-list li .vcard {
@@ -6919,8 +6938,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6919,8 +6938,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6919 } 6938 }
6920 6939
6921 .fetching-overlay { 6940 .fetching-overlay {
6922 - position: absolute;  
6923 - top: 0px; 6941 + position: absolute;
  6942 + top: 0px;
6924 left: 0px; 6943 left: 0px;
6925 right: 0px; 6944 right: 0px;
6926 bottom: 0px; 6945 bottom: 0px;
public/stylesheets/search.css
  Diff comments   View file @7e5a97f
@@ -563,7 +563,8 @@ li.search-product-item { @@ -563,7 +563,8 @@ li.search-product-item {
563 } 563 }
564 li.search-product-item { 564 li.search-product-item {
565 display:block; 565 display:block;
566 - float:none overflow:visible; 566 + float:none;
  567 + overflow:visible;
567 padding:10px 0; 568 padding:10px 0;
568 margin:10px 0; 569 margin:10px 0;
569 border-bottom:1px solid #ccc; 570 border-bottom:1px solid #ccc;
test/unit/application_helper_test.rb
  Diff comments   View file @7e5a97f
@@ -463,13 +463,13 @@ class ApplicationHelperTest &lt; ActionView::TestCase @@ -463,13 +463,13 @@ class ApplicationHelperTest &lt; ActionView::TestCase
463 463
464 should 'base theme uses default icon theme' do 464 should 'base theme uses default icon theme' do
465 stubs(:current_theme).returns('base') 465 stubs(:current_theme).returns('base')
466 - assert_equal "/designs/icons/default/style.css", icon_theme_stylesheet_path.first 466 + assert_equal "designs/icons/default/style.css", icon_theme_stylesheet_path.first
467 end 467 end
468 468
469 should 'base theme uses config to specify more then an icon theme' do 469 should 'base theme uses config to specify more then an icon theme' do
470 stubs(:current_theme).returns('base') 470 stubs(:current_theme).returns('base')
471 - assert_includes icon_theme_stylesheet_path, "/designs/icons/default/style.css"  
472 - assert_includes icon_theme_stylesheet_path, "/designs/icons/pidgin/style.css" 471 + assert_includes icon_theme_stylesheet_path, "designs/icons/default/style.css"
  472 + assert_includes icon_theme_stylesheet_path, "designs/icons/pidgin/style.css"
473 end 473 end
474 474
475 should 'not display active field if only required' do 475 should 'not display active field if only required' do