alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

back to in use locales for pages and links

This commit is contained in:
Harry Bomrah 2014-10-24 15:15:13 +08:00
parent a81f7576b6
commit 50582cdbd8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/pages_controller.rb
View File

@ -392,8 +392,8 @@ class PagesController < ApplicationController
p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: [:en, :zh_tw],external_url_translations: [:en, :zh_tw]) p = params.require(:page).permit(:number, :page_type, :page_id, :module, :layout, :parent_page, :data_count, :enabled_for_mobile, :member_sort_position, enabled_for_sitemap: [], enabled_for: [], menu_enabled_for: [], categories: [], tags: [], role_status: [], name_translations: [:en, :zh_tw],external_url_translations: [:en, :zh_tw])
p["url"] = @url p["url"] = @url
if p["external_url_translations"] if p["external_url_translations"]
p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present?
p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present?
end end
p p
end end
@ -407,8 +407,8 @@ class PagesController < ApplicationController
p["enabled_for_sitemap"] = p["enabled_for_sitemap"] || [] p["enabled_for_sitemap"] = p["enabled_for_sitemap"] || []
p["enabled_for_mobile"] = p["enabled_for_mobile"] || 0 p["enabled_for_mobile"] = p["enabled_for_mobile"] || 0
if p["external_url_translations"] if p["external_url_translations"]
p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") p["external_url_translations"]["en"] = p["external_url_translations"]["en"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["en"].present?
p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") p["external_url_translations"]["zh_tw"] = p["external_url_translations"]["zh_tw"].sub("http://" + request.host_with_port,"") if p["external_url_translations"]["zh_tw"].present?
end end
p p
end end

4
app/views/pages/_form.html.erb
View File

@ -11,7 +11,7 @@
<% end %> <% end %>
</div> </div>
<div class="control-group"> <div class="control-group">
<% @site_valid_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<%= f.label :locale, "#{t(:title)} #{t(locale)}" %> <%= f.label :locale, "#{t(:title)} #{t(locale)}" %>
<div class="controls"> <div class="controls">
<%= f.fields_for :name_translations do |n| %> <%= f.fields_for :name_translations do |n| %>
@ -170,7 +170,7 @@
<div class="control-group" id="enable-menu"> <div class="control-group" id="enable-menu">
<div class="controls"> <div class="controls">
<label class="control-label"><%= t(:is_published) %> :</label> <label class="control-label"><%= t(:is_published) %> :</label>
<% @site_valid_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> /> <input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> />
<%= t(locale.to_s) %> <%= t(locale.to_s) %>

6
app/views/pages/_form_link.html.erb
View File

@ -16,7 +16,7 @@
</div> </div>
<div class="control-group"> <div class="control-group">
<% @site_valid_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="control-label"><%= "#{t(:title)} #{t(locale)}" %></label> <label class="control-label"><%= "#{t(:title)} #{t(locale)}" %></label>
<div class="controls"> <div class="controls">
<%= f.fields_for :name_translations do |n| %> <%= f.fields_for :name_translations do |n| %>
@ -26,7 +26,7 @@
<% end %> <% end %>
</div> </div>
<div class="control-group"> <div class="control-group">
<% @site_valid_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="control-label"><%= "#{t(:url)} #{t(locale)}" %></label> <label class="control-label"><%= "#{t(:url)} #{t(locale)}" %></label>
<div class="controls"> <div class="controls">
<%= f.fields_for :external_url_translations do |n| %> <%= f.fields_for :external_url_translations do |n| %>
@ -50,7 +50,7 @@
<div class="control-group" id="enable-menu"> <div class="control-group" id="enable-menu">
<div class="controls"> <div class="controls">
<label class="control-label"><%= t(:is_published) %> :</label> <label class="control-label"><%= t(:is_published) %> :</label>
<% @site_valid_locales.each do |locale| %> <% @site_in_use_locales.each do |locale| %>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> /> <input type="checkbox" name="page[enabled_for][]" value="<%= locale.to_s %>" class="main-enable-parent" for="<%= "checkbox_for_#{locale}" %>" <%= "checked" if @page.enabled_for.include? locale.to_s %> />
<%= t(locale.to_s) %> <%= t(locale.to_s) %>