Merge branch 'next' into stable

Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb

Merge branch 'next' into stable
Conflicts: app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb
Victor Costa
2 parents 0b3b2bf5 6edafc75
Showing 28 changed files with 128 additions and 92 deletions Show diff stats
Gemfile
app/assets/designs/icons
app/assets/designs/themes
app/assets/images
app/assets/javascripts
app/assets/plugins
app/assets/stylesheets
app/helpers/application_helper.rb
app/helpers/layout_helper.rb
app/helpers/macros_helper.rb
app/views/layouts/_javascript.html.erb
app/views/layouts/application.html.erb
app/views/layouts/slideshow.html.erb
config/application.rb
config/environments/production.rb
config/routes.rb
db/schema.rb
gitignore.example
lib/noosfero/plugin.rb
plugins/pjax/public/javascripts/pjax.js
@@ -21,6 +21,11 @@ gem &#39;locale&#39;,                   &#39;~&gt; 2.0.5&#39;
 gem 'whenever', :require => false
 gem 'eita-jrails', '>= 0.9.5', :require => 'jrails'
+group :assets do
+  gem 'uglifier', '>= 1.0.3'
+  gem 'sass-rails'
+end
+
 group :production do
   gem 'dalli', '~> 2.7.0'
 end
@@ -0,0 +1 @@
+../../../public/designs/icons
 \ No newline at end of file
@@ -0,0 +1 @@
+../../../public/designs/themes
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/images
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/javascripts
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/plugins
 \ No newline at end of file
@@ -0,0 +1 @@
+../../public/stylesheets
 \ No newline at end of file
@@ -929,18 +929,6 @@ module ApplicationHelper
     end
   end
-  def icon_theme_stylesheet_path
-    icon_themes = []
-    theme_icon_themes = theme_option(:icon_theme) || []
-    for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
-      if File.exists?(Rails.root.join('public', theme_path[1..-1]))
-        icon_themes << theme_path
-      end
-    end
-    icon_themes
-  end
-
   def page_title
     CGI.escapeHTML(
       (@page ? @page.title + ' - ' : '') +
@@ -28,12 +28,12 @@ module LayoutHelper
   end
   def noosfero_javascript
-    plugins_javascripts = @plugins.map { |plugin| [plugin.js_files].flatten.map { |js| plugin.class.public_path(js) } }.flatten
+    plugins_javascripts = @plugins.flat_map{ |plugin| plugin.js_files.map{ |js| plugin.class.public_path(js, true) } }.flatten
     output = ''
     output += render 'layouts/javascript'
     unless plugins_javascripts.empty?
-      output += javascript_include_tag plugins_javascripts, :cache => "cache/plugins-#{Digest::MD5.hexdigest plugins_javascripts.to_s}"
+      output += javascript_include_tag *plugins_javascripts
     end
     output += theme_javascript_ng.to_s
     output += javascript_tag 'render_all_jquery_ui_widgets()'
@@ -42,31 +42,21 @@ module LayoutHelper
   end
   def noosfero_stylesheets
-    standard_stylesheets = [
-      'application',
-      'search',
-      'colorbox',
-      'selectordie',
-      'inputosaurus',
-      'chat',
-      'selectordie-theme',
-      'block-store',
-      pngfix_stylesheet_path,
-    ] + tokeninput_stylesheets
     plugins_stylesheets = @plugins.select(&:stylesheet?).map { |plugin|
-      plugin.class.public_path('style.css')
+      plugin.class.public_path('style.css', true)
     }
     global_css_pub = "/designs/themes/#{environment.theme}/global.css"
     global_css_at_fs = Rails.root.join 'public' + global_css_pub
     output = []
-    output << stylesheet_link_tag(standard_stylesheets, :cache => 'cache/application')
+    output << stylesheet_link_tag('application')
     output << stylesheet_link_tag(template_stylesheet_path)
-    output << stylesheet_link_tag(icon_theme_stylesheet_path)
+    output << stylesheet_link_tag(*icon_theme_stylesheet_path)
     output << stylesheet_link_tag(jquery_ui_theme_stylesheet_path)
     unless plugins_stylesheets.empty?
-      cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
-      output << stylesheet_link_tag(plugins_stylesheets, :cache => cacheid)
+      # FIXME: caching does not work with asset pipeline
+      #cacheid = "cache/plugins-#{Digest::MD5.hexdigest plugins_stylesheets.to_s}"
+      output << stylesheet_link_tag(*plugins_stylesheets)
     end
     if File.exists? global_css_at_fs
       output << stylesheet_link_tag(global_css_pub)
@@ -75,14 +65,6 @@ module LayoutHelper
     output.join "\n"
   end
-  def pngfix_stylesheet_path
-    'iepngfix/iepngfix.css' #TODO: deprecate it
-  end
-
-  def tokeninput_stylesheets
-    ['token-input', 'token-input-facebook', 'token-input-mac', 'token-input-facet']
-  end
-
   def noosfero_layout_features
     render :file => 'shared/noosfero_layout_features'
   end
@@ -100,7 +82,7 @@ module LayoutHelper
     icon_themes = []
     theme_icon_themes = theme_option(:icon_theme) || []
     for icon_theme in theme_icon_themes do
-      theme_path = "/designs/icons/#{icon_theme}/style.css"
+      theme_path = "designs/icons/#{icon_theme}/style.css"
       if File.exists?(Rails.root.join('public', theme_path))
         icon_themes << theme_path
       end
@@ -113,7 +95,7 @@ module LayoutHelper
   end
   def theme_stylesheet_path
-    theme_path + '/style.css'
+    "/assets#{theme_path}/style.css"
   end
   def layout_template
@@ -42,7 +42,9 @@ module MacrosHelper
         [macro.configuration[:js_files]].flatten.map { |js| plugins_javascripts << macro.plugin.public_path(js) }
       end
     end
-    javascript_include_tag(plugins_javascripts, :cache => 'cache/plugins-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty?
+    unless plugins_javascripts.empty?
+      javascript_include_tag *plugins_javascripts
+    end
   end
   def macro_css_files
-<%= javascript_include_tag 'jquery-2.1.1.min', 'jquery-migrate-1.2.1', 'jrails', 'rails.js',
-  'jquery.cycle.all.min.js', 'jquery.colorbox-min.js',
-  'jquery-ui-1.10.4/js/jquery-ui-1.10.4.min', 'jquery.scrollTo', 'jquery.form.js', 'jquery-validation/jquery.validate',
-  'jquery.cookie', 'jquery.ba-bbq.min.js', 'reflection', 'jquery.tokeninput', 'jquery.typewatch', 'jquery.textchange',
-  'jquery-timepicker-addon/dist/jquery-ui-timepicker-addon', 'inputosaurus.js', 'select-or-die/_src/selectordie',
-  'slick.js',
-  # noosfero libraries
-  'application.js', 'modal.js', 'block-store.js',
-  'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
-  :cache => 'cache/application' %>
+<%= javascript_include_tag 'application.js' %>
 <% language = FastGettext.locale %>
 <% %w{messages methods}.each do |type| %>
@@ -21,7 +21,7 @@
       import_controller_stylesheets(:themed_source => true)
     %>
     <%= stylesheet_link_tag template_stylesheet_path %>
-    <%= stylesheet_link_tag icon_theme_stylesheet_path %>
+    <%= stylesheet_link_tag *icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
     <%# Add custom tags/styles/etc via content_for %>
@@ -11,7 +11,7 @@
     %></title>
     <%= stylesheet_import "slideshow" %>
-    <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose', :cache => 'cache/slideshow' %>
+    <%= javascript_include_tag 'jquery-2.1.1.min', 'sliderjs', 'pikachoose' %>
     <script type="text/javascript">
       $(document).ready(function (){
         $("#slideshow").PikaChoose({
@@ -90,11 +90,25 @@ module Noosfero
     config.active_record.whitelist_attributes = true
     # Enable the asset pipeline
-    config.assets.enabled = false
+    config.assets.enabled = true
+
+    # don't let rails prepend app/assets to config.assets.paths
+    # as we are doing it
+    config.paths['app/assets'] = ''
+
+    config.assets.paths =
+      Dir.glob("app/assets/plugins/*/{,stylesheets,javascripts}") +
+      Dir.glob("app/assets/{,stylesheets,javascripts}") +
+      # no precedence over core
+      Dir.glob("app/assets/designs/{icons,themes,user_themes}/*")
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.sass.preferred_syntax = :scss
+    config.sass.cache = true
+    config.sass.line_comments = false
+
     def noosfero_session_secret
       require 'fileutils'
       target_dir = File.join(File.dirname(__FILE__), '../tmp')
@@ -14,12 +14,15 @@ Noosfero::Application.configure do
   # Compress JavaScripts and CSS
   config.assets.compress = true
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
   # Generate digests for assets URLs
   config.assets.digest = true
+  # pre-compile every asset
+  config.assets.precompile = Dir.glob("app/assets/**/*").map do |file|
+    next unless File.exists?(file) and File.file?(file)
+    File.basename file
+  end.compact
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
@@ -52,7 +52,6 @@ Noosfero::Application.routes.draw do
   # categories index
   match 'cat/*category_path' => 'search#category_index', :as => :category
-  match 'assets/:asset(/*category_path)' => 'search#assets', :as => :assets
   # search
   match 'search(/:action(/*category_path))', :controller => 'search'
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150223180806) do
+ActiveRecord::Schema.define(:version => 20150408231524) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -263,6 +263,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150223180806) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
+    t.text     "settings"
   end
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -22,8 +22,12 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
+
+public/assets
+.sass-cache
 public/javascripts/cache*
 public/stylesheets/cache*
+
 public/plugins
 db/development.db
 db/production.db
@@ -150,8 +150,8 @@ class Noosfero::Plugin
       self.name.underscore.gsub('_plugin','')
     end
-    def public_path(file = '')
-      File.join('/plugins', public_name, file)
+    def public_path file = '', relative=false
+      File.join "#{if relative then '' else  '/' end}plugins", public_name, file
     end
     def root_path
@@ -8,7 +8,7 @@ pjax = {
   themes: {},
   load: function() {
-    var target = jQuery('#content');
+    var target = jQuery('#wrap-1');
     var content = jQuery('#content-inner');
     var loadingTarget = jQuery('#content');
@@ -52,7 +52,7 @@ pjax = {
       from_state = this.current_state || this.initial_state;
     if (state.layout_template != from_state.layout_template) {
-      var lt_css = jQuery('head link[href^="/designs/templates"]');
+      var lt_css = jQuery('head link[href*="designs/templates"]');
       lt_css.attr('href', lt_css.attr('href').replace(/templates\/.+\/stylesheets/, 'templates/'+state.layout_template+'/stylesheets'));
     }
@@ -78,7 +78,7 @@ pjax = {
       return !pjax.css_loaded('/designs/themes/'+state.theme.id+'/style.css');
     });
-    var css = jQuery('head link[href^="/designs/themes/'+from_state.theme.id+'/style"]');
+    var css = jQuery('head link[href*="designs/themes/'+from_state.theme.id+'/style"]');
     css.attr('href', css.attr('href').replace(/themes\/.+\/style/, 'themes/'+state.theme.id+'/style'));
     jQuery('head link[rel="shortcut icon"]').attr('href', state.theme.favicon);
@@ -88,7 +88,7 @@ pjax = {
     jQuery('#navigation ul').html(state.theme.extra_navigation);
     jQuery('#theme-footer').html(state.theme.footer);
-    jQuery('head script[src^="/designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
+    jQuery('head script[src*="designs/themes/'+from_state.theme.id+'/theme.js"]').remove();
     if (state.theme.js_src) {
       var script = document.createElement('script');
       script.type = 'text/javascript', script.src = state.theme.js_src;
 <%
-  update_js = render(:file => "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
+  update_js = render(file: "#{Rails.root}/public/designs/themes/#{current_theme}/pjax_update.js.erb").to_json rescue nil
 %>
 <title><%= h page_title %></title>
-<%= render :file => "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
+<%= render file: "#{Rails.root}/public/designs/themes/#{current_theme}/layouts/_content.html.erb" rescue
     render "layouts/content" %>
 <%= javascript_tag do %>
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
+/*
+* third party libraries
+*= require jquery-2.1.1.min.js
+*= require jquery-migrate-1.2.1.js
+*= require jquery.cycle.all.min.js
+*= require jquery.colorbox-min.js
+*= require jquery-ui-1.10.4/js/jquery-ui-1.10.4.min.js
+*= require jquery.scrollTo.js
+*= require jquery.form.js
+*= require jquery-validation/jquery.validate.js
+*= require jquery.cookie.js
+*= require jquery.ba-bbq.min.js
+*= require jquery.tokeninput.js
+*= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
+*= require inputosaurus.js
+*= require reflection.js
+*= require rails.js
+*= require jrails.js
+* noosfero libraries
+*= require_self
+*= require modal.js
+* views speficics
+*= require add-and-join.js
+*= require report-abuse.js
+*= require manage-products.js
+*= require catalog.js
+*= require autogrow.js
+*/
 // scope for noosfero stuff
 noosfero = {
@@ -6,7 +6,7 @@
 b {
 	color:#000080;
-} 
+}
 /* comments */
 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 {
 	color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
 	color:gray;
 	font-weight:normal;
 }
- /* attributes */ 
+ /* attributes */
 s, s b, span s u, span s cite, strong span s {
 	color:#5656fa ;
 	font-weight:normal;
 }
- /* strings */ 
+ /* strings */
 strong s,strong s b, strong s u, strong s cite {
 	color:#009900;
 	font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
  /* Syntax */
 strong a, strong a u {
 	color:#0000FF;
-	font-weight:;
 }
  /* Native Keywords */
 strong u {
@@ -58,7 +57,7 @@ em {
 	color:#800080;
 	font-style:normal;
 }
- /* script */ 
+ /* script */
 ins {
 	color:#800000;
 	font-weight:bold;
@@ -68,4 +67,4 @@ ins {
 cite, s cite {
 	color:red;
 	font-weight:bold;
-}
 \ No newline at end of file
+}
 /*
- * CodePress color styles for ASP-VB syntax highlighting 
+ * CodePress color styles for ASP-VB syntax highlighting
  * By Martin D. Kirk
  */
 /* tags */
 b {
 	color:#000080;
-} 
+}
 /* comments */
 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 {
 	color:gray;
@@ -17,12 +17,12 @@ strong dfn, strong dfn a,strong dfn var, strong dfn a u, strong dfn u{
 	color:gray;
 	font-weight:normal;
 }
- /* attributes */ 
+ /* attributes */
 s, s b, span s u, span s cite, strong span s {
 	color:#5656fa ;
 	font-weight:normal;
 }
- /* strings */ 
+ /* strings */
 strong s,strong s b, strong s u, strong s cite {
 	color:#009900;
 	font-weight:normal;
@@ -34,7 +34,6 @@ strong ins{
  /* Syntax */
 strong a, strong a u {
 	color:#0000FF;
-	font-weight:;
 }
  /* Native Keywords */
 strong u {
@@ -58,7 +57,7 @@ em {
 	color:#800080;
 	font-style:normal;
 }
- /* script */ 
+ /* script */
 ins {
 	color:#800000;
 	font-weight:bold;
@@ -68,4 +67,4 @@ ins {
 cite, s cite {
 	color:red;
 	font-weight:bold;
-}
 \ No newline at end of file
+}
@@ -1,5 +0,0 @@
-/*! jQuery UI - v1.10.4 - 2014-04-02
-* http://jqueryui.com
-* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
-
-undefined
 \ No newline at end of file
+/*
+ * thidparty libraries
+ *= require colorbox
+ *= require selectordie
+ *= require selectordie-theme
+ *= require inputosaurus
+ *= require token-input
+ *= require token-input-facebook
+ *= require token-input-mac
+ *= require token-input-facet
+ * noosfero libraries
+ *= require_self
+ *= require iepngfix/iepngfix
+ * views specifics
+ *= require chat
+ *= require search
+ */
+
 /* browser fixes */
 img:-moz-broken {
@@ -4403,7 +4421,8 @@ h1#agenda-title {
 #groups-list li {
   display: block;
   list-style: none;
-  margin-bottom: 20px background-color: #B8CFE7;
+  margin-bottom: 20px;
+  background-color: #B8CFE7;
 }
 #groups-list li .vcard {
@@ -6918,8 +6937,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 }
 .fetching-overlay {
-  position: absolute; 
-  top: 0px; 
+  position: absolute;
+  top: 0px;
   left: 0px;
   right: 0px;
   bottom: 0px;
@@ -563,7 +563,8 @@ li.search-product-item {
 }
 li.search-product-item {
   display:block;
-  float:none overflow:visible;
+  float:none;
+  overflow:visible;
   padding:10px 0;
   margin:10px 0;
   border-bottom:1px solid #ccc;
@@ -463,13 +463,13 @@ class ApplicationHelperTest &lt; ActionView::TestCase
   should 'base theme uses default icon theme' do
     stubs(:current_theme).returns('base')
-    assert_equal "/designs/icons/default/style.css", icon_theme_stylesheet_path.first
+    assert_equal "designs/icons/default/style.css", icon_theme_stylesheet_path.first
   end
   should 'base theme uses config to specify more then an icon theme' do
     stubs(:current_theme).returns('base')
-    assert_includes icon_theme_stylesheet_path, "/designs/icons/default/style.css"
-    assert_includes icon_theme_stylesheet_path, "/designs/icons/pidgin/style.css"
+    assert_includes icon_theme_stylesheet_path, "designs/icons/default/style.css"
+    assert_includes icon_theme_stylesheet_path, "designs/icons/pidgin/style.css"
   end
   should 'not display active field if only required' do
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../../public/designs/icons
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../../public/designs/themes
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/images
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/javascripts
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/plugins
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+../../public/stylesheets
0	\ No newline at end of file	2	\ No newline at end of file
	@@ -929,18 +929,6 @@ module ApplicationHelper		@@ -929,18 +929,6 @@ module ApplicationHelper
929	end	929	end
930	end	930	end
931		931
932	- def icon_theme_stylesheet_path
933	- icon_themes = []
934	- theme_icon_themes = theme_option(:icon_theme) \|\| []
935	- for icon_theme in theme_icon_themes do
936	- theme_path = "/designs/icons/#{icon_theme}/style.css"
937	- if File.exists?(Rails.root.join('public', theme_path[1..-1]))
938	- icon_themes << theme_path
939	- end
940	- end
941	- icon_themes
942	- end
943	-
944	def page_title	932	def page_title
945	CGI.escapeHTML(	933	CGI.escapeHTML(
946	(@page ? @page.title + ' - ' : '') +	934	(@page ? @page.title + ' - ' : '') +
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	- 'slick.js',
7	- # noosfero libraries
8	- 'application.js', 'modal.js', 'block-store.js',
9	- 'add-and-join', 'report-abuse', 'catalog', 'manage-products', 'autogrow',
10	- :cache => 'cache/application' %>	1	+<%= javascript_include_tag 'application.js' %>
11		2
12	<% language = FastGettext.locale %>	3	<% language = FastGettext.locale %>
13	<% %w{messages methods}.each do \|type\| %>	4	<% %w{messages methods}.each do \|type\| %>
	@@ -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 %>
	@@ -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({