From 24f15db2fa9ca7cc467d7528f581825bdfe8ea5c Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 2 Apr 2014 15:29:37 +0800 Subject: [PATCH] added frontend folder and revert back .gitignore file --- .gitignore | 1 - Gemfile | 4 +- app/helpers/pages_helper.rb | 1 + app/views/frontend/News_layout.html.erb | 83 +++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 app/views/frontend/News_layout.html.erb diff --git a/.gitignore b/.gitignore index a14435c..5112e49 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,3 @@ /tmp /Gemfile.lock -/app/views/frontend/* diff --git a/Gemfile b/Gemfile index 5e65b2a..fdc72f6 100644 --- a/Gemfile +++ b/Gemfile @@ -14,8 +14,8 @@ gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .js.coffee assets and views gem 'coffee-rails', '~> 4.0.0' -gem 'announcement', git: 'git@gitlab.tp.rulingcom.com:saurabh/announcement-test.git' -# gem 'announcement', path: "/Volumes/MyData/github/orbit4.5/announcement" +# gem 'announcement', git: 'git@gitlab.tp.rulingcom.com:saurabh/announcement-test.git' +gem 'announcement', path: "/Volumes/MyData/github/orbit4.5/announcement" # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb index bd9072c..77c45e9 100644 --- a/app/helpers/pages_helper.rb +++ b/app/helpers/pages_helper.rb @@ -11,6 +11,7 @@ module PagesHelper doc.to_html end + def render_widget_for_frontend(controller_name, widget_method, widget_file) file = File.open(File.join(Rails.root, 'app', 'templates', "#{Template::KEY}", 'modules', "#{controller_name}", "_#{widget_file}.html.erb")) doc = Nokogiri::HTML(file, nil, "UTF-8") diff --git a/app/views/frontend/News_layout.html.erb b/app/views/frontend/News_layout.html.erb new file mode 100644 index 0000000..9ee851e --- /dev/null +++ b/app/views/frontend/News_layout.html.erb @@ -0,0 +1,83 @@ + + + + + + + +Orbit Classic + + + + + + + + + + +
+ +
+ +
+
+

Chinese params test

+
Chinese params test body
+
+
+ + + + +
+ + +
+ +
+ +