fix bug: welcome_tip is undefined

179309463 · Apr 17, 2015 · 0e0b1dd · 0e0b1dd
1 parent ca60f42
commit 0e0b1dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/views/admin/site_settings/show.html.haml b/app/views/admin/site_settings/show.html.haml
@@ -8,6 +8,11 @@
         = text_field_tag 'settings[site_name]', @settings.site_name, :class => 'form-control'
         %span.help-block 必填
 
+      .form-group
+        = label_tag 'settings[welcome_tip]', '欢迎提示'
+        = text_field_tag 'settings[welcome_tip]', @settings.welcome_tip, :class => 'form-control'
+        %span.help-block 网站欢迎提示，显示在首页话题列表上方
+
       .form-group
         = label_tag 'settings[short_intro]', '简短介绍'
         = text_field_tag 'settings[short_intro]', @settings.short_intro, :class => 'form-control'

diff --git a/config/initializers/siteconf.rb b/config/initializers/siteconf.rb
@@ -4,6 +4,7 @@
 Siteconf.defaults[:ga_id] = '' # Google Analytics ID
 Siteconf.defaults[:default_search_engine] = 'google' # 默认搜索引擎，可从下面的搜索引擎列表中选择
 Siteconf.defaults[:seo_description] = 'Rabel - 新一代简洁社区软件' # SEO 描述
+Siteconf.defaults[:welcome_tip] = '欢迎访问<strong>Rabel</strong>'
 Siteconf.defaults[:short_intro] = '新一代简洁社区软件' # 网站简短介绍, 显示在右侧边栏
 Siteconf.defaults[:footer] = '<p>&copy; 2012 Rabel</p>'
 Siteconf.defaults[:custom_css] = '' # 全局自定义CSS