Change icons

app/views/admin/ad_images/_form.html.erb

@@ -52,7 +52,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.select_fx') %>"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-star-thin"></i><%= t(:type) %></h3>
+					<h3 class="widget-title"><i class="icons-target"></i><%= t(:type) %></h3>
 					<div class="widget-content clear">
 						<%= f.select :link_open ,AdImage::LINK_OPEN_TYPES%>
 					</div>
@@ -72,7 +72,7 @@
 					<div class="widget-action clear">
 						<a class="action"><i class="icon-exclamation-sign icon-white tip" data-original-title="<%= t('ad.add_link') %>"></i></a>
 					</div>
-					<h3 class="widget-title"><i class="icons-landscape"></i><%= t(:link) %></h3>
+					<h3 class="widget-title"><i class="icons-link"></i><%= t(:link) %></h3>
 					<div class="widget-content clear">
 						<%= f.text_field :out_link ,:class=> 'span3',:placeholder => t('ad.chinese_2') %>
 					</div>

app/views/admin/dashboards/index.html.erb

@@ -3,7 +3,7 @@
 <% end -%>
 <div id="isotope">
     <div class="item element">
-        <h3><i class="icons-booklet"></i><%= t(:content) %></h3>
+        <h3><i class="icons-book-2"></i><%= t(:content) %></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_content) %></span><%= @module_app_contents_total %></p>
             <table class="table table-striped">
@@ -40,7 +40,7 @@
         </div>
     </div>
 <!--     <div class="item element">
-        <h3><i class="icons-member"></i><a href=""><%= t(:member) %></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:member) %></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_member) %></span>2,217</p>
             <table class="table table-striped">
@@ -111,7 +111,7 @@
         </div>
     </div>
     <div class="item element">
-        <h3><i class="icons-asset"></i><a href=""><%= t(:file_) %></a></a></h3>
+        <h3><i class="icons-"></i><a href=""><%= t(:file_) %></a></a></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:all_file) %></span>3,422</p>
             <table class="table table-striped">
@@ -445,7 +445,7 @@
 
 
     <div class="item element">
-        <h3><i class="icons-plane"></i><%= t(:traffic) %></h3>
+        <h3><i class="icons-airplane"></i><%= t(:traffic) %></h3>
         <div class="detail w-a h-a">
             <p class="totle"><span><%= t(:total_visitors) %></span><%= display_visitors %></p>
             <table class="table table-striped">
@@ -493,7 +493,7 @@
     </div>
 
     <div class="item element">
-        <h3><i class="icons-update"></i><%= t(:recent_update) %></h3>
+        <h3><i class="icons-cycle"></i><%= t(:recent_update) %></h3>
         <div class="detail noStatistics w-b h-a">
             <table class="table table-striped">
                 <thead>

app/views/admin/plugins/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/users_new_interface/_filter.html.erb

@@ -32,7 +32,7 @@
                         <a href="#" class="btn">Distinguished</a>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-category">
@@ -42,7 +42,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <div class="accordion-body collapse" id="collapse-tags">
@@ -52,7 +52,7 @@
                         <% end -%>
                     </div>
                     <div class="filter-clear">
-                        <a href="#" class="btn"><i class="icons-brush-large"></i><%= t(:clear)%></a>
+                        <a href="#" class="btn"><i class="icons-cycle"></i><%= t(:clear)%></a>
                     </div>
                 </div>
                 <% if params[:at].blank?  #header for index%>

app/views/admin/users_new_interface/_plugin_summary.html.erb

@@ -1,5 +1,5 @@
                 <div class="item element">
-                    <h3><i class="icons-booklet"></i>Module Name</h3>
+                    <h3><i class="icons-book-2"></i>Module Name</h3>
                     <div class="detail w-a h-a">
                         <table class="table table-striped">
                             <thead>

app/views/admin/users_new_interface/_side_bar.html.erb

@@ -1,5 +1,5 @@
 <%= content_tag :li, :class => active_for_controllers('users_new_interface')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-member')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-user')+ content_tag(:span, t(:member)), admin_users_new_interface_index_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
       <%= content_tag :li, link_to((t(:all_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
       <%= content_tag :li, link_to((t(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') %>

app/views/admin/users_new_interface/edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/admin/users_new_interface/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

app/views/admin/users_new_interface/index_summary.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

app/views/admin/users_new_interface/index_thumbnail.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

app/views/admin/users_new_interface/new.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/admin/users_new_interface/plugin_dashbroad.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <div class="member-plugin">

app/views/admin/users_new_interface/show.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <%= render :partial => "js_and_css"%>

app/views/admin/users_new_interface/temp_edit.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <% content_for :page_specific_css do -%>

app/views/layouts/_guest_orbit_menu.erb

@@ -1,5 +1,5 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + t(:member), admin_users_new_interface_index_path %></li>
           </ul>

app/views/layouts/_member_orbit_menu.erb

@@ -1,7 +1,7 @@
           <a class="brand dropdown-toggle" data-toggle="dropdown" href="#">Orbit</a>
           <ul class="dropdown-menu">
               <li><%= link_to content_tag(:i, nil, :class => 'icons-gauge') + t(:dashboard_), admin_dashboards_path %></li>
-              <li><%= link_to content_tag(:i, nil, :class => 'icons-group') + t(:member), admin_users_new_interface_index_path %></li>
+              <li><%= link_to content_tag(:i, nil, :class => 'icons-users') + t(:member), admin_users_new_interface_index_path %></li>
 
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-content') + t(:content) %></li>
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member), admin_users_path %></li>

app/views/layouts/_orbit_bar.html.erb

@@ -9,12 +9,12 @@
       <% end -%>
     </div>
     <ul class="nav">
-      <li><%= link_to '', root_path, {'data-icon' => 'house'} %></li>
-      <!-- <li><%= link_to '', desktop_path, {'data-icon' => 'desktop'} %></li> -->
+      <li><a href="<%= root_path %>" data-icon="&#xe022;"></a></li>
+      <!-- <li><a href="<%= desktop_path %>" data-icon="&#xe060;"></a></li> -->
     </ul>
     <ul class="nav pull-right">
       <li class="dropdown language">
-      <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="earth"></a>
+      <a class="dropdown-toggle" href="#" data-toggle="dropdown" data-icon="&#xe054;"></a>
       <ul class="dropdown-menu language-menu">
         <% @site_in_use_locales.each do |locale| %>
           <%= content_tag :li, (link_to t(:_locale, :locale => locale), add_locale(remove_locale((referer rescue request.fullpath)), locale)), :class => (I18n.locale.eql?(locale.to_sym) ? 'active' : nil) %>
@@ -22,7 +22,7 @@
       </ul>
       </li>
       <li class="search clear" title="<%= t :search_google %>">
-      <a class="orbit-bar-search" href="#" data-icon="search"></a>
+      <a class="orbit-bar-search" href="#" data-icon="&#xe024;"></a>
       <form class="navbar-search" method="get" action="http://www.google.com/custom">
         <input type="hidden" name="client" value="pub-&amp" /> 
         <input type="hidden" name="ie" id="ie" value="utf-8" />
@@ -42,8 +42,8 @@
         </a>
         <ul class="dropdown-menu account-menu">
           <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-tools') + ' ' +  t(:account_setting), desktop_path+"#settings-account" %></li> -->
-          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-desktop') + ' ' +  t(:desktop), desktop_path %></li> -->
-          <li><%= link_to content_tag(:i, nil, :class => 'icons-outlog') + ' ' +  t(:logout), destroy_user_session_path %></li>
+          <!-- <li><%= link_to content_tag(:i, nil, :class => 'icons-screen') + ' ' +  t(:desktop), desktop_path %></li> -->
+          <li><%= link_to content_tag(:i, nil, :class => 'icons-logout') + ' ' +  t(:logout), destroy_user_session_path %></li>
           <li class="divider"></li>
           <li>
           <a href="#">
@@ -55,7 +55,7 @@
         </li>
       <% else %>
         <li class="dropdown bar-login">
-        <a class="dropdown-toggle orbit-bar-member" href="#" data-icon="inlog"></a>
+        <a class="dropdown-toggle orbit-bar-member" href="#" data-icon="&#xe076;"></a>
         <div class="dropdown-menu">
           <ul class="log">
             <li class="title hide"></li>

app/views/layouts/_side_bar_content.html.erb

@@ -17,7 +17,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('page_contexts') || active_for_app_auth('page_content') || active_for_ob_auths_object("PageContext")  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-page') + content_tag(:span, t(:page)), panel_page_content_back_end_page_contexts_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-newspaper') + content_tag(:span, t(:page)), panel_page_content_back_end_page_contexts_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('page_contexts')) do -%>
       <%= content_tag :li, link_to((t(:module_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_module_app_manager_auth_proc_path(ModuleApp.first(conditions: {key: "page_content"}))), :class => active_for_app_auth('page_content')  if (is_admin? rescue nil) %>
     <% end -%>

app/views/layouts/page_layout.html.erb

@@ -10,6 +10,7 @@
 	<![endif]-->
 	<%= page_stylesheets(@item).html_safe %>
 	<%= page_javascripts(@item).html_safe %>
+  <%= csrf_meta_tag %>
 </head>
 <body>
   <%= yield %>

app/views/mobile/_footer.mobile.erb

@@ -2,21 +2,18 @@
   <div data-role="navbar">
     <ul>
       <li>
-        <%= link_to mobile_dialog_copyright_path, {"data-transition" => "flip", "data-rel" => "dialog", "data-inline" => "true"} do %>
-          <i class="icons-information"></i>
-          <%= t('mobile.copyright') %>
+        <%= link_to root_path(mobile: 0), :rel => "external" do %>
+          <i class="icon-desktop"></i>
         <% end %>
       </li>
       <li>
         <%= link_to mobile_map_path, {"data-transition" => "flip"} do %>
           <i class="icons-location"></i>
-          <%= t('mobile.location') %>
         <% end %>
       </li>
       <li>
         <%= link_to mobile_dialog_contact_path, {"data-rel" => "dialog"} do %>
           <i class="icons-phone"></i>
-          <%= t('mobile.contact') %>
         <% end %>
       </li>
     </ul>

app/views/mobile/_header.mobile.erb

@@ -2,7 +2,7 @@
   <h1 class="openmenu">
     <%= image_tag asset_path('mobile/logo.png') %>
   </h1>
-  <i class="openmenu icons-arrow-bottom-e"></i>
+  <i class="openmenu icons-arrow-down-5"></i>
   <%= link_to mobile_dialog_language_path, {:class => "ui-btn-right language", "data-iconpos" => "notext", "data-icon" => "search", "data-rel" => "dialog"} do %>
     <i class="icons-earth"></i>
   <% end %>