diff --git a/updatefiles/accessibility/orbit_bar/index.html.erb b/updatefiles/accessibility/orbit_bar/index.html.erb
index 9cda88b..1da36f8 100644
--- a/updatefiles/accessibility/orbit_bar/index.html.erb
+++ b/updatefiles/accessibility/orbit_bar/index.html.erb
@@ -12,7 +12,7 @@
<%= form_tag "/sessions?locale=#{locale.to_s}", method: "post", :class => "container" do |f| %>
@@ -47,12 +47,12 @@
<% end %>
-
-
+ <% if(current_site.is_hidden_orbit_bar && !current_site.orbit_bar_background_color.blank? rescue false) %>
+
+ <% end %>
<% if current_user.nil?%>
@@ -345,3 +355,130 @@
set validLocales(v){return false}
};
+ <% if current_site.is_hidden_orbit_bar %>
+
+
+ <% end %>
+
\ No newline at end of file
diff --git a/updatefiles/accessibility/orbit_bar/index_mobile.html.erb b/updatefiles/accessibility/orbit_bar/index_mobile.html.erb
index 17c5a6b..3562d28 100644
--- a/updatefiles/accessibility/orbit_bar/index_mobile.html.erb
+++ b/updatefiles/accessibility/orbit_bar/index_mobile.html.erb
@@ -13,7 +13,7 @@
<%= form_tag "/sessions?locale=#{locale.to_s}", method: "post", :class => "container" do |f| %>
@@ -44,12 +44,12 @@
<% end %>
-
-
+ >
+
>
-
- <%
+ >
+
+ <%
google_search_cx = current_site.search['sitesearch'] rescue nil
is_google_seach_cx = google_search_cx =~ /^[0-9]+\:[0-9A-Za-z]+$/
if !google_search_cx.blank? and is_google_seach_cx
%>
- -
-
<% end %>
- -
+
- >
<% if current_site.enable_language_options %>
<% if @site_in_use_locales.count > 1 || current_site.enable_zh_cn %>
<% zh_cn_added = 0 %>
<% locale = session[:zh_cn] ? :zh_cn : I18n.locale %>
- Language
-
+ >Language
+ >
<% @site_in_use_locales.each do |l| %>
<%
case l
@@ -141,12 +148,12 @@
end
%>
<% if l.to_s == I18n.locale.to_s and !session['zh_cn'] %>
- - ">
+
- " <%=(current_site.orbit_bar_submenu_text_color.blank? rescue true) ? nil : "style=color:#{current_site.orbit_bar_submenu_text_color}!important;"%>>
<%= t((l==:zh_tw ? :zh_tw_ : :_locale ), :locale => l) %>
<% else %>
- ">
- <%= t((l==:zh_tw ? :zh_tw_ : :_locale ), :locale => l) %>
+ ><%= t((l==:zh_tw ? :zh_tw_ : :_locale ), :locale => l) %>
<% end %>
<% if current_site.enable_zh_cn and zh_cn_added == 0 and !request.path.include?("/admin/") %>
@@ -158,7 +165,7 @@
<% else %>
-
- <%= t(:zh_cn, :locale => :zh_tw) %>
+ ><%= t(:zh_cn, :locale => :zh_tw) %>
<% end %>
<% end %>
@@ -168,32 +175,32 @@
<% end %>
<% if !current_user.nil? %>
- -
- <%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %>
- <%= t(:logout) %>
+
-
+ <%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %>
+ ><%= t(:logout) %>
- - <%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' %>
- - <%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' %>
+ - <%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' , style: ((current_site.orbit_bar_submenu_text_color.blank? rescue true) ? nil : "color:#{current_site.orbit_bar_submenu_text_color};") %>
+ - <%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' , style: ((current_site.orbit_bar_submenu_text_color.blank? rescue true) ? nil : "color:#{current_site.orbit_bar_submenu_text_color};") %>
<% if current_user.is_admin? && params[:is_frontend_view] == "true" %>
-
<% if params[:editmode] == "on" %>
" style="color:red;">Edit Mode Off
<% else %>
- ">Edit Mode On
+ " <%=(current_site.orbit_bar_submenu_text_color.blank? rescue true) ? nil : "style=color:#{current_site.orbit_bar_submenu_text_color};"%>>Edit Mode On
<% end %>
<% end %>
-
- <%= t(:logout) %>
+ ><%= t(:logout) %>
<% else %>
- -
+
-
/accesskey" title="Login">:::
-
- <%= t(:login) %>
-
+ >
+ <%= t(:login) %>
+
<% end %>
@@ -201,13 +208,13 @@
-
+ >
-
<% if current_site.enable_language_options %>
<% if @site_in_use_locales.count > 1 || current_site.enable_zh_cn %>
<% zh_cn_added = 0 %>
<% locale = session[:zh_cn] ? :zh_cn : I18n.locale %>
- Language
+ >Language
<% @site_in_use_locales.each do |l| %>
<%
@@ -247,7 +254,7 @@
<% if !current_user.nil? %>
-
- <%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %>
+ ><%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %>
- <%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' + t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' %>
- <%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' + t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' %>
@@ -268,7 +275,7 @@
<% else %>
-
/accesskey" title="Login">:::
-
+ >
@@ -279,6 +286,9 @@
+ <% if(current_site.is_hidden_orbit_bar && !current_site.orbit_bar_background_color.blank? rescue false) %>
+
+ <% end %>
-
+ <% if current_site.is_hidden_orbit_bar %>
+
+
+ <% end %>
+