developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing CSS and removed useless bad gems that cause error

This commit is contained in:
Manson Wang 2014-01-13 15:43:51 +08:00
parent 304bf0d445
commit bba0e436d9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -66,11 +66,11 @@ gem "impressionist",'1.2.0'
#gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git' #gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
gem 'redis','>= 2.1.1' gem 'redis','>= 2.1.1'
gem 'chinese_pinyin', '0.4.1' # gem 'chinese_pinyin', '0.4.1'
# add rmmseg if you need search by segment words # add rmmseg if you need search by segment words
gem 'rmmseg-cpp-huacnlee', '0.2.9' gem 'rmmseg-cpp-huacnlee', '0.2.9'
gem 'redis-namespace' gem 'redis-namespace'
gem 'redis-search' # gem 'redis-search'
gem 'syslog-logger' gem 'syslog-logger'
gem "recaptcha", :require => "recaptcha/rails" gem "recaptcha", :require => "recaptcha/rails"

6
app/helpers/application_helper.rb
View File

@ -192,9 +192,9 @@ module ApplicationHelper
def page_stylesheets(page, edit=nil) def page_stylesheets(page, edit=nil)
stylesheets = '' stylesheets = ''
stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n" stylesheets << "<link href='#{asset_path 'orbit_bar_bootstrap'}' rel='stylesheet' type='text/css' />\n"
# stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset stylesheets << "<link href='#{page.design.css_reset.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_reset
# stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n" stylesheets << "<link href='#{asset_path 'banner_nav.css'}' rel='stylesheet' type='text/css' />\n"
# stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n" stylesheets << "<link href='#{asset_path 'default_widget.css'}' rel='stylesheet' type='text/css' />\n"
stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default stylesheets << "<link href='#{page.design.css_default.file.url}' rel='stylesheet' type='text/css' />\n" if page.design.css_default
theme = page.design.themes.detect{ |d| d.id == page.theme_id } theme = page.design.themes.detect{ |d| d.id == page.theme_id }
stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme stylesheets << "<link href='#{theme.file.url}' rel='stylesheet' type='text/css' />\n" if theme