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

widget title and page title fixed for page

This commit is contained in:
Harry Bomrah 2014-10-13 18:04:51 +08:00
parent c4cd4fd707
commit 24a07a5780
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/lib/items/items.js.erb
View File

@ -219,7 +219,8 @@ var Items = function(){
select.append("<option value='" + layout + "'>" + layout + "</option>");
}else if(typeof layout.length == "undefined"){
do_select = true;
select.append("<option value='" + layout.filename + "' data-image='" + layout.thumbnail + "'>" + layout.name + "</option>");
var name = (layout.name[data.locale] ? layout.name[data.locale] : layout.name);
select.append("<option value='" + layout.filename + "' data-image='" + layout.thumbnail + "'>" + name + "</option>");
}
})
controlDiv.html(select);

4
app/controllers/pages_controller.rb
View File

@ -175,9 +175,9 @@ class PagesController < ApplicationController
categories = categories.nil? ? [] : categories
if module_app.data_count.nil?
render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>false}}.to_json
render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>false}, "locale" => I18n.locale.to_s}.to_json
else
render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>true,"start"=>module_app.data_count.begin, "end" => module_app.data_count.end}}.to_json
render :json => {"categories" => categories, "tags" => module_app.tags,"roles" => roles,"layouts" => (get_layouts module_app.key),"data_count" => {"present"=>true,"start"=>module_app.data_count.begin, "end" => module_app.data_count.end}, "locale" => I18n.locale.to_s}.to_json
end
end

2
app/views/page_parts/_widget_form.html.erb
View File

@ -4,7 +4,7 @@
<% if @widget_types.first.kind_of?(Hash) %>
<select name="page_part[sub_parts_attributes][<%= @select_number %>][widget_type]" id="page_layout" class="select2">
<% @widget_types.each do |lt| %>
<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"] %></option>
<option value="<%= lt["filename"] %>" <%= ((lt["filename"] == @subpart.widget_type ? "selected=selected" : "") rescue nil) %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"][I18n.locale.to_s] rescue lt["name"] %></option>
<% end %>
</select>
<script type="text/javascript">

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

@ -124,7 +124,7 @@
<% if @layout_types.first.kind_of?(Hash) %>
<select name="page[layout]" id="page_layout" class="select2">
<% @layout_types.each do |lt| %>
<option value="<%= lt["filename"] %>" <%= (lt["filename"] == @page.layout ? "selected=selected" : "") %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"] %></option>
<option value="<%= lt["filename"] %>" <%= (lt["filename"] == @page.layout ? "selected=selected" : "") %> data-image="<%= lt["thumbnail"] %>"><%= lt["name"][I18n.locale.to_s] rescue lt["name"] %></option>
<% end %>
</select>
<script type="text/javascript">