gluttonberg-core 2.6.0 → 2.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -425,7 +425,6 @@ var AssetBrowser = {
425
425
  });
426
426
  var url = $("#assetsDialog form#asset_search_form").attr("action");
427
427
  url += ".json?" + $("#assetsDialog form#asset_search_form").serialize()
428
- // $.getJSON(url, null, AssetBrowser.handleJSON);
429
428
  $.getJSON(url, null, function(json){
430
429
  $("#search_tab_results").html(json.markup);
431
430
  $("#search_tab_results").find("a").click(AssetBrowser.click);
@@ -486,7 +485,6 @@ var AssetBrowser = {
486
485
  AssetBrowser.close();
487
486
  }
488
487
  });
489
- //auto_save_asset_for_gallery(AssetBrowser.actualLink.attr("data_url") , id )
490
488
  }
491
489
  }
492
490
 
@@ -73,7 +73,6 @@ module Gluttonberg
73
73
  # controller/action. If there is it renders a link to the help
74
74
  # controller.
75
75
  def contextual_help
76
-
77
76
  if Help.help_available?(:controller => params[:controller], :page => params[:action])
78
77
  content_tag(
79
78
  :p,
@@ -399,8 +398,6 @@ module ActionView
399
398
  object.published_at = Time.zone.now if object.published_at.blank?
400
399
  html = "<fieldset id='publish_meta'><div class='publishing_block' > "
401
400
  html += select( :state, options_for_select(@@workflow_states , val), {} , :class => "publishing_state" )
402
- # html += content_tag(:p , self.datetime_select("published_at" , {:prompt => {:day => 'Day', :month => 'Month', :year => 'Year'} , :order => [:day , :month , :year] }, :class => "span2") , :class => "published_at" )
403
- #
404
401
  html += datetime_field("published_at")
405
402
  html += "</div></fieldset>"
406
403
 
@@ -433,10 +430,8 @@ module ActionView
433
430
  time = self.object.send(field_name).strftime("%I:%M %p")
434
431
  end
435
432
  html += text_field_tag("#{unique_field_name}_date" , date , date_field_html_opts )
436
- # html += "<span class='date'>DD/MM/YYYY</span>"
437
433
  html += " "
438
434
  html += text_field_tag("#{unique_field_name}_time" , time , time_field_html_opts )
439
- # html += "<span class='date time'>HH:MM AM/PM</span>"
440
435
  html += self.hidden_field("#{field_name}" , :class => "#{unique_field_name}")
441
436
  html += "<span class='help-block'><span class='span2'>DD/MM/YYYY</span> <span class='span2'>HH:MM AM/PM</span></span>"
442
437
  html += "<label class='error #{unique_field_name}_error'></label>"
@@ -14,12 +14,12 @@
14
14
  %link{:href => "/assets/gb_360player.css", :rel => "stylesheet"}
15
15
  %link{:href => "/assets/gb_admin-override.css", :rel => "stylesheet"}
16
16
 
17
-
18
17
  = javascript_include_tag "jquery-1-7-1", "gb_bootstrap", "gb_bootstrap-datepicker", "jquery-dimensions-min" , "jquery-ui-1-8-23-custom-min" , "jquery-validate" , "gb_jquery-dragTree" , "rails" , "gb_tags" , "gb_jeditable" , "gb_ajaxfileupload" , "gb_expander" , "/assets/jcrop/js/jquery-Jcrop-min", "gb_berniecode-animator" , "gb_soundmanager2-jsmin", "gb_360player"
19
18
 
20
19
  = wysiwyg_js_css_link_tag
21
20
  = javascript_include_tag "gb_application" , :charset => "utf-8"
22
21
  = custom_javascript_include_tag
22
+ = custom_stylesheet_link_tag
23
23
 
24
24
  :css
25
25
  body {
@@ -82,4 +82,4 @@
82
82
  &copy;
83
83
  %a{:href => "http://freerangefuture.com", :target => "_blank"}
84
84
  Freerange Future
85
- 2012
85
+ #{Time.now.year}
@@ -57,8 +57,8 @@ class Gluttonberg::InstallerGenerator < Rails::Generators::Base
57
57
  application %{
58
58
  # Gluttonberg Related config
59
59
 
60
-
61
60
  # config.cms_based_public_css = false
61
+ # config.custom_css_for_cms = false
62
62
  # config.custom_js_for_cms = false
63
63
  config.localize = false
64
64
  # By Default gluttonberg applications are localized. If you do not want localized application then uncomment following line.
@@ -74,7 +74,7 @@ class Gluttonberg::InstallerGenerator < Rails::Generators::Base
74
74
  config.thumbnails = {
75
75
  :jwysiwyg_image => {:label => "Thumb for jwysiwyg", :filename => "_jwysiwyg_image", :geometry => "250x200"}
76
76
  }
77
-
77
+ config.filter_parameters += [:password_confirmation]
78
78
 
79
79
  }
80
80
 
@@ -9,7 +9,7 @@ namespace :gluttonberg do
9
9
  task :create_thumbnails => :environment do
10
10
  category = Gluttonberg::AssetCategory.find( :first , :conditions =>{ :name => "image" } )
11
11
  if category
12
- assets = category.assets #Asset.all
12
+ assets = category.assets
13
13
  assets.each do |asset|
14
14
  p "Generating thumbnails for #{asset.file_name}"
15
15
  if !File.exist?(asset.tmp_location_on_disk) && !File.exist?(asset.tmp_original_file_on_disk)
@@ -1,3 +1,3 @@
1
1
  module Gluttonberg
2
- VERSION = "2.6.0"
2
+ VERSION = "2.6.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gluttonberg-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.0
4
+ version: 2.6.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2013-04-04 00:00:00.000000000 Z
15
+ date: 2013-04-10 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: authlogic