<%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %>
diff --git a/app/views/admin/pages/_frontend_setting.html.erb b/app/views/admin/pages/_frontend_setting.html.erb
new file mode 100644
index 00000000..4e639272
--- /dev/null
+++ b/app/views/admin/pages/_frontend_setting.html.erb
@@ -0,0 +1,3 @@
+<% if show_default_widget_setting_panel %>
+<%= render :partial=>'admin/page_parts/widget_setting',:locals=>{:object=>object,:f=>f} %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb
index aecf04c7..8bd76634 100644
--- a/app/views/admin/pages/edit.html.erb
+++ b/app/views/admin/pages/edit.html.erb
@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag "admin/default_widget_setting" %>
<% content_for :sidebar do %>
<%= render 'admin/items/site_map_left_bar' %>
<% end -%>
diff --git a/app/views/admin/pages/reload_front_end_setting.js.erb b/app/views/admin/pages/reload_front_end_setting.js.erb
new file mode 100644
index 00000000..ea5cb336
--- /dev/null
+++ b/app/views/admin/pages/reload_front_end_setting.js.erb
@@ -0,0 +1,8 @@
+<% if show_default_widget_setting_panel %>
+ // $('#app_page_tag').html("<%= j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
+
+ $('#frontend_setting').html("<%= j render :partial => 'admin/page_parts/default_widget_style_panel',:locals=>{:object=>@page} %>");
+ $('#frontend_setting').append("<%= j render :partial => 'admin/page_parts/default_widget_setting',:locals=>{:object=>@page} %>");
+ <% else %>
+ $('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/admin/pages/reload_frontend_pages.js.erb b/app/views/admin/pages/reload_frontend_pages.js.erb
new file mode 100644
index 00000000..8af0f8d5
--- /dev/null
+++ b/app/views/admin/pages/reload_frontend_pages.js.erb
@@ -0,0 +1,24 @@
+
+$('#app_page_category').html("<%= j render :partial => 'admin/page_parts/widget_data_source_category' ,:locals=>{:object=>@page}%>");
+$('#app_page_tag').html("<%= j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
+
+<% if !@module_app.app_pages.blank? %>
+ $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', options_for_select(@app_frontend_urls, @app_frontend_urls.first)) %>");
+ <%else %>
+ $('#app_page_url').html("<%= t('default_widget.no_support_setting')%>");
+<% end %>
+
+<% if @app_frontend_urls.first =='default_widget' %>
+ $('#app_page_frontend_style').html("<%= escape_javascript(select 'page', 'frontend_style', @module_app.widgets[@frontend_path]) if !@frontend_path.blank? %>");
+ <% else %>
+ $('#app_page_frontend_style').html("<%= t('default_widget.no_support_setting')%>");
+<% end %>
+
+<% if show_default_widget_setting_panel %>
+ $('#app_page_tag').html("<%= j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
+
+ $('#frontend_setting').html("<%= j render :partial => 'admin/page_parts/default_widget_style_panel',:locals=>{:object=>@page} %>");
+ $('#frontend_setting').append("<%= j render :partial => 'admin/page_parts/default_widget_setting',:locals=>{:object=>@page} %>");
+ <% else %>
+ $('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
+<% end %>
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index a79e7897..68c750dd 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -153,6 +153,7 @@ zh_tw:
default_widget:
no_support_setting: 沒有可以使用的設定
no_value: 不設定（全部）
+ fields_: 前台輸出欄位
fields_order: 輸出欄位順序
fields_style: 輸出欄位樣式
select_module_app: 外掛模組選擇
diff --git a/config/routes.rb b/config/routes.rb
index 0d51680a..3c74c1e7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -82,6 +82,8 @@ Orbit::Application.routes.draw do
member do
get 'delete'
get 'reload_themes'
+ get 'reload_after_module_changed',:action=>'reload_frontend_pages'
+ get 'reload_after_list_changed',:action=> 'reload_front_end_setting'
end
end
@@ -101,14 +103,13 @@ Orbit::Application.routes.draw do
match 'remove_manager/:app_manager_id' ,:action=> 'remove_manager',:via => "delete",:as =>:remove_manager
match 'remove_sub_manager/:app_sub_manager_id' ,:action=> 'remove_sub_manager',:via => "delete",:as =>:remove_sub_manager
- get 'reload_frontend_pages'
end
end
resources :page_parts do
member do
- get 'reload_widgets'
- get 'reload_widget_styles'
+ get 'reload_after_module_changed',:action=>'reload_widgets'
+ get 'reload_after_list_changed',:action=> 'reload_widget_styles'
get 'reload_r_tag_options'
end
end
diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb
index 1075fe75..d6bafdd3 100644
--- a/lib/parsers/parser_common.rb
+++ b/lib/parsers/parser_common.rb
@@ -184,15 +184,21 @@ module ParserCommon
# page_contents
def parse_contents_edit(body, page, edit=nil)
public_r_tags = []
+ url = ''
body.css('.page_content').each do |content|
ret = ''
category = params[:category_id].blank? ? page[:category] : params[:category_id]
tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id]
if (content["main"] == "true" && !page.module_app.nil?)
- ret << "
"
+ if page.app_frontend_url == 'default_widget'
+ url = "/panel/orbit_app/widget/#{page.frontend_style}?inner=true"
+ else
+ url = "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}"
+ end
+ ret << "
"
else
part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
part_title = part.title rescue nil
@@ -213,7 +219,7 @@ module ParserCommon
raise ModuleAppError,"PagePart can't find ModuleApp" if part.module_app.nil?
"/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true"
end
- options = "&part_id=#{part.id}&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}"
+ options = "&part_id=#{part.id}&category_id=#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=#{!part[:tag].blank? ? part[:tag] : tag}&page=#{params[:page]}&search_query=#{params[:search_query]}&part_title=#{Rack::Utils.escape(part_title).gsub("+", "%20") rescue nil}&item_type=page_part"
ret << "
"
when 'public_r_tag'
ret << "
"
diff --git a/lib/parsers/parser_front_end.rb b/lib/parsers/parser_front_end.rb
index 246e6c20..36aa172b 100644
--- a/lib/parsers/parser_front_end.rb
+++ b/lib/parsers/parser_front_end.rb
@@ -95,11 +95,18 @@ module ParserFrontEnd
# page_contents
def parse_contents(body, page, edit=nil, locale)
public_r_tags = []
+ url = ''
body.css('.page_content').each do |content|
ret = ''
if (content["main"] == "true" && !page.module_app.nil?)
- url = "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true"
- options = "&page_id=#{page.id}&category_id=\#{category}&tag_id=\#{tag}&preview=\#{params[:preview]}&page_main=\#{params[:page_main]}&search_query=\#{params[:search_query]}&name=\#{params[:name]}"
+ if page.app_frontend_url == 'default_widget'
+ url = "/panel/orbit_app/widget/#{page.frontend_style}?inner=true"
+ else
+ "/panel/#{page.module_app.key}/front_end/#{page.app_frontend_url}\#{(\"/\" + params[:id]) if params[:id] && !params[:id].eql?(page.id.to_s)}\#{(\"/\" + params[:controller_action]) if params[:controller_action] && params[:id]}?inner=true"
+ end
+
+
+ options = "&page_id=#{page.id}&category_id=\#{category}&tag_id=\#{tag}&preview=\#{params[:preview]}&page_main=\#{params[:page_main]}&search_query=\#{params[:search_query]}&name=\#{params[:name]}&item_type=page"
ret << "
"
else
part = page.page_parts.detect{ |p| p.name.to_s == content['name'].to_s } rescue nil
@@ -116,7 +123,7 @@ module ParserFrontEnd
else
"/panel/\#{part.module_app.key}/widget/\#{part.widget_path}?inner=true"
end
- options = "&part_id=\#{part.id}&category_id=\#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=\#{!part[:tag].blank? ? part[:tag] : tag}&page=\#{params[:page]}&search_query=\#{params[:search_query]}&part_title=\#{Rack::Utils.escape(part_title).gsub(\"\+\", \"\%20\") rescue nil}"
+ options = "&part_id=\#{part.id}&category_id=\#{!part[:category].blank? ? part[:category].blank? : category}&tag_id=\#{!part[:tag].blank? ? part[:tag] : tag}&page=\#{params[:page]}&search_query=\#{params[:search_query]}&part_title=\#{Rack::Utils.escape(part_title).gsub(\"\+\", \"\%20\") rescue nil}&item_type=page_part"
ret << "