saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: saurabh:1227_preferences_title_fix_bernie
Branches Tags
saurabh:development
saurabh:1231_survey_default_input_fix_bernie
saurabh:1227_preferences_title_fix_bernie
saurabh:1227_search_engine_translation_fix_bernie
saurabh:1224_mobile_setting_translations_bernie
..
compare: saurabh:development
Branches Tags
saurabh:1231_survey_default_input_fix_bernie
saurabh:1227_preferences_title_fix_bernie
saurabh:1227_search_engine_translation_fix_bernie
saurabh:development
saurabh:1224_mobile_setting_translations_bernie

No commits in common. "1227_preferences_title_fix_bernie" and "development" have entirely different histories.
1227_prefe ... developmen

3 changed files with 6 additions and 10 deletions
Show Stats Expand all files Collapse all files

8
app/views/admin/sites/preference.html.erb
View File

@ -187,13 +187,13 @@
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
<% if @site.default_image.file.present?%>
<span class="btn btn-file">
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.change') %>
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.change') %>
</span>
<%= f.check_box :remove_default_image %>
<%= t(:remove) %> OrbitBar Logo
<%else%>
<span class="btn btn-file">
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.select_image') %>
<%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.select_image') %>
</span>
<%end%>
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
@ -216,13 +216,13 @@
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
<% if @site.favicon.file.present?%>
<span class="btn btn-file">
<%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.change') %>
<%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.change') %>
</span>
<%= f.check_box :remove_favicon %>
<%= t(:remove) %> <%= t('preferences.favicon') %>
<%else%>
<span class="btn btn-file">
<%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('preferences.select_image') %>
<%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %><%= t('mobile_setting.select_image') %>
</span>
<%end%>

2
config/locales/en.yml
View File

@ -349,7 +349,6 @@ en:
preference: Preference
preferences:
backend_open: All users can visit backend pages
change: Change
classification: Classification
frontend_open: "If Checked, the frontend will be open for all users."
favicon: Favicon
@ -362,7 +361,6 @@ en:
nav_enabled: Enable Sidebar Sub Nav
openness: Openness
orbitbar_theme: OrbitBar Theme
select_image: Select Image
sidebar_nav: Sidebar Nav
system_email: System Email
preview: Preview

6
config/locales/zh_tw.yml
View File

@ -353,19 +353,17 @@ zh_tw:
preference: 系統偏好
preferences:
backend_open: 開啟後台給所有使用者
change: 更改
classification: 類別
frontend_open: "設定後, 前台將會開放給所有使用者."
favicon: 偏好圖示
icon: 圖示
language: 語系設定
language: 語系
lang_detection: 開啟使用者語系偵測
lang_enabled: 開啟語系
lang_default: 預設語系
nav_enabled: 開啟側欄導引
openness: 權限開放
orbitbar_theme: OrbitBar佈景主題
select_image: 選擇圖片
orbitbar_theme: OrbitBar版型
sidebar_nav: 側欄導引
system_email: 系統信箱
profile: 基本資料