Compare commits
No commits in common. "1227_preferences_title_fix_bernie" and "development" have entirely different histories.
1227_prefe
...
developmen
|
@ -187,13 +187,13 @@
|
||||||
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
|
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
|
||||||
<% if @site.default_image.file.present?%>
|
<% if @site.default_image.file.present?%>
|
||||||
<span class="btn btn-file">
|
<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>
|
</span>
|
||||||
<%= f.check_box :remove_default_image %>
|
<%= f.check_box :remove_default_image %>
|
||||||
<%= t(:remove) %> OrbitBar Logo
|
<%= t(:remove) %> OrbitBar Logo
|
||||||
<%else%>
|
<%else%>
|
||||||
<span class="btn btn-file">
|
<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>
|
</span>
|
||||||
<%end%>
|
<%end%>
|
||||||
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
|
<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>
|
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
|
||||||
<% if @site.favicon.file.present?%>
|
<% if @site.favicon.file.present?%>
|
||||||
<span class="btn btn-file">
|
<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>
|
</span>
|
||||||
<%= f.check_box :remove_favicon %>
|
<%= f.check_box :remove_favicon %>
|
||||||
<%= t(:remove) %> <%= t('preferences.favicon') %>
|
<%= t(:remove) %> <%= t('preferences.favicon') %>
|
||||||
<%else%>
|
<%else%>
|
||||||
<span class="btn btn-file">
|
<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>
|
</span>
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|
||||||
|
|
|
@ -349,7 +349,6 @@ en:
|
||||||
preference: Preference
|
preference: Preference
|
||||||
preferences:
|
preferences:
|
||||||
backend_open: All users can visit backend pages
|
backend_open: All users can visit backend pages
|
||||||
change: Change
|
|
||||||
classification: Classification
|
classification: Classification
|
||||||
frontend_open: "If Checked, the frontend will be open for all users."
|
frontend_open: "If Checked, the frontend will be open for all users."
|
||||||
favicon: Favicon
|
favicon: Favicon
|
||||||
|
@ -362,7 +361,6 @@ en:
|
||||||
nav_enabled: Enable Sidebar Sub Nav
|
nav_enabled: Enable Sidebar Sub Nav
|
||||||
openness: Openness
|
openness: Openness
|
||||||
orbitbar_theme: OrbitBar Theme
|
orbitbar_theme: OrbitBar Theme
|
||||||
select_image: Select Image
|
|
||||||
sidebar_nav: Sidebar Nav
|
sidebar_nav: Sidebar Nav
|
||||||
system_email: System Email
|
system_email: System Email
|
||||||
preview: Preview
|
preview: Preview
|
||||||
|
|
|
@ -353,19 +353,17 @@ zh_tw:
|
||||||
preference: 系統偏好
|
preference: 系統偏好
|
||||||
preferences:
|
preferences:
|
||||||
backend_open: 開啟後台給所有使用者
|
backend_open: 開啟後台給所有使用者
|
||||||
change: 更改
|
|
||||||
classification: 類別
|
classification: 類別
|
||||||
frontend_open: "設定後, 前台將會開放給所有使用者."
|
frontend_open: "設定後, 前台將會開放給所有使用者."
|
||||||
favicon: 偏好圖示
|
favicon: 偏好圖示
|
||||||
icon: 圖示
|
icon: 圖示
|
||||||
language: 語系設定
|
language: 語系
|
||||||
lang_detection: 開啟使用者語系偵測
|
lang_detection: 開啟使用者語系偵測
|
||||||
lang_enabled: 開啟語系
|
lang_enabled: 開啟語系
|
||||||
lang_default: 預設語系
|
lang_default: 預設語系
|
||||||
nav_enabled: 開啟側欄導引
|
nav_enabled: 開啟側欄導引
|
||||||
openness: 權限開放
|
openness: 權限開放
|
||||||
orbitbar_theme: OrbitBar佈景主題
|
orbitbar_theme: OrbitBar版型
|
||||||
select_image: 選擇圖片
|
|
||||||
sidebar_nav: 側欄導引
|
sidebar_nav: 側欄導引
|
||||||
system_email: 系統信箱
|
system_email: 系統信箱
|
||||||
profile: 基本資料
|
profile: 基本資料
|
||||||
|
|
Loading…
Reference in New Issue