Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'dev' of github.com:hulihanapplications/Opal into dev

  • Loading branch information...
commit 238d497f806a8ae5104f53def686f3c255298f67 2 parents 4969ff2 + 5b11139
Hulihan Applications authored
6 app/models/page.rb
View
@@ -66,9 +66,9 @@ def validate_redirection_url
end
# return group ids as ints
- def group_ids
- self["group_ids"].collect{|o|o.to_i}
- end
+ #def group_ids
+ # self["group_ids"].collect{|o|o.to_i}
+ #end
def model_name(count = 1) # return human name of instance
I18n.t("activerecord.models.#{(self.page_type.capitalize + "Page").underscore}", :count => count, :default => Page.model_name)
2  app/views/browse/index.html.erb
View
@@ -2,7 +2,7 @@
homepage = Page.find_by_name("home")
homepage_sidebar = Page.system.find_by_name("home_page_sidebar")
homepage_subpages = homepage.pages.display_in_menu.published.in_order
- show_sidebar = homepage_subpages.size > 0 || !homepage_sidebar.content.blank?
+ show_sidebar = homepage_subpages.size > 0 || (homepage_sidebar && !homepage_sidebar.content.blank?)
%>
<% content_for :side do %>
6 config/application.rb
View
@@ -6,9 +6,9 @@
# you've limited to :test, :development, or :production.
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
- Bundler.require *Rails.groups(:assets => %w(development test))
+ #Bundler.require *Rails.groups(:assets => %w(development test))
# If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
+ Bundler.require(:default, :assets, Rails.env)
end
module Opal
@@ -60,7 +60,7 @@ class Application < Rails::Application
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
-
+
# Application Name
def name
I18n.t("name", :default => String.new)
6 config/environments/production.rb
View
@@ -32,7 +32,7 @@
#
# bundle exec rake assets:precompile RAILS_ENV=production
#
- config.assets.compile = false
+ config.assets.compile = true
# Compress JavaScripts and CSS
config.assets.compress = true
@@ -41,7 +41,7 @@
config.assets.digest = true
# Disable delivery errors, bad email addresses will be ignored
- # config.action_mailer.raise_delivery_errors = false
+ config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = { :host => "localhost" }
# Deprecation notices
@@ -55,4 +55,4 @@
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation can not be found)
config.i18n.fallbacks = true
-end
+end
1  config/locales/en.yml
View
@@ -332,7 +332,6 @@ en:
delete: Are you sure you want to delete this?
delete_user: Are you sure you want to delete this user? Everything this user has ever created will be deleted also! If you don't want this to happen, you could disable their account instead.
item_delete: Are you sure you want to delete this %{item}?
- install_sample_data: "Install Sample Data? (Example Items, Categories, Users)"
activerecord:
# System Records/Objects
records:
1  db/schema.rb
View
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
2  vendor/gems/opal/lib/opal/version.rb
View
@@ -1,3 +1,3 @@
module Opal
- VERSION = "0.8.2" unless defined?(::Opal::VERSION)
+ VERSION = "0.9.0" unless defined?(::Opal::VERSION)
end
Please sign in to comment.
Something went wrong with that request. Please try again.