disable all sorted_tags

app/controllers/admin/tags_controller.rb

@@ -2,16 +2,10 @@ class Admin::TagsController < OrbitBackendController
   before_filter :force_order_for_visitor,:only=>[:index]
   before_filter :force_order_for_user,:except => [:index]
   before_filter :for_app_sub_manager,:except => [:index]
-  
-
-  # layout 'new_admin'
-  # before_filter :authenticate_user!
-  # before_filter :is_admin?
   # before_filter :set_module_app
    
   def index
-    get_tags
+    @tags = get_tags
-    @module_app_id = @module_app.id rescue nil
   end
 
   def new
@@ -23,12 +17,7 @@ class Admin::TagsController < OrbitBackendController
   end
 
   def create
-    if params[:tag][:module_app_id].blank?
+    @tag = @module_app ? @module_app.tags.create(params[:tag]) : Tag.create(params[:tag])
-      @tag = Tag.create(params[:tag])
-    else
-      module_app = ModuleApp.find(params[:tag][:module_app_id])
-      @tag = eval("#{module_app.key.camelize}Tag").create(params[:tag])
-    end
   end
 
   def update
@@ -47,15 +36,12 @@ class Admin::TagsController < OrbitBackendController
   protected
   
   def get_tags
-    @tags = (@module_app ?  @module_app.tags : Tag.all)
+    @tags = @module_app.blank? ? Tag.all : @module_app.tags
   end
 
   def setup_vars
-    @app_key = request.env['HTTP_REFERER'].split('/')[4]
+    @module_app = ModuleApp.find(params[:module_app_id]) if params[:module_app_id]
-    if @app_key
+    @module_app_id = @module_app.id rescue nil
-      @app_key.gsub!(/[?].*/, '')
-      @module_app = ModuleApp.first(conditions: {:key => @app_key})
-    end
   end
   
 end

app/controllers/orbit_backend_controller.rb

@@ -1,6 +1,7 @@
 class OrbitBackendController < ApplicationController
   include OrbitCoreLib::AppBackendUtility
   include OrbitCoreLib::PermissionUtility
+  include OrbitTag::Tagging
   include AdminHelper
   include ApplicationHelper
   
@@ -60,6 +61,20 @@ class OrbitBackendController < ApplicationController
             when :referenced_in
               objects = get_objects_from_referenced_objects(object_class.relations[option].class_name.constantize, objects, "#{option}_id")
           end
+        elsif option.eql?('tags')
+          tag_array = @module_app.tags.inject([]){ |result, value|
+            result << [value.name, value]
+          }
+          params[:direction].eql?('asc') ? tag_array.sort : tag_array.sort.reverse!
+          sorted_objects = Array.new
+          tag_array.each do |x|
+            taggings = x[1].taggings
+            taggings.each {|tagging| sorted_objects << tagging.taggable }
+          end
+          # debugger
+          sorted_objects.flatten!
+          sorted_objects.uniq!
+          objects = get_with_nil(objects, option, sorted_objects)
         end 
       end
     end

app/helpers/admin/frontend_widget_interface.rb

@@ -4,7 +4,7 @@ protected
   def get_categories_and_tags
     unless @selected[:module_app].nil?
       @categories = @selected[:module_app].get_categories 
-      @tags = @selected[:module_app].get_tags
+      @tags = @selected[:module_app].tags
     end
   end
 
@@ -55,4 +55,4 @@ protected
   end
 
 
-end
+end

app/models/asset.rb

@@ -21,7 +21,8 @@ class Asset
   before_save :clean_tags
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
 
   protected

app/models/module_app.rb

@@ -8,6 +8,8 @@ class ModuleApp
   field :title
   field :sidebar_order,type: Integer,default: 0
 
+  has_many :tags, as: :module_tag, dependent: :destroy
+
   def refetch_setting!(reg)
     # %w{module_label category base_url version organization author intro update_info create_date}.each  do |field|
     #   self[field.to_sym] =  reg.send field 
@@ -118,10 +120,6 @@ class ModuleApp
   
   has_one :app_auth,dependent: :delete
 
-  def get_tags
-    get_registration.get_tags
-  end
-
   def get_categories
     get_registration.get_categories
   end
@@ -133,5 +131,9 @@ class ModuleApp
   def get_registration
     OrbitApp::Module::Registration.find_by_key(key)
   end
+
+  def self.find_by_key(key)
+    self.where(key: key)[0] rescue nil
+  end
   
 end

app/models/sub_role_tag.rb

@@ -1,4 +1,3 @@
 class SubRoleTag < ProtoTag
   has_and_belongs_to_many :sub_roles
-
 end

app/models/tag.rb

@@ -10,10 +10,13 @@ class Tag
   
   is_impressionable :counter_cache => { :column_name => :view_count }
   
-  field :key
+  field :name, localize: true
   field :view_count, :type => Integer, :default => 0
   field :cloud_view_count, :type => Integer, :default => 0
 
+  belongs_to :module_tag, polymorphic: true
+  has_many :taggings, dependent: :destroy
+
   #field :cloud_amper,:type: Integer,:default=> 0 
 
   def self.sorted_for_cloud

app/models/tagging.rb

@@ -0,0 +1,9 @@
+class Tagging
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :to_destroy, default: false
+
+  belongs_to :tag
+  belongs_to :taggable, polymorphic: true
+end

app/views/admin/assets/_asset.html.erb

@@ -17,7 +17,7 @@
 		<div class="label-group">
 			<div class="label-td">
 				<% asset.sorted_tags.each do |tag| %>
-					<span class="label label-tags"><%= tag[I18n.locale] %></span>
+					<span class="label label-tags"><%= tag.name %></span>
 				<% end %>
 			</div>
 		</div>

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

@@ -25,7 +25,7 @@
         <% @tags.each do |tag| %>
             <%= content_tag :label, :class => "checkbox inline" do -%>
                 <%= check_box_tag 'asset[tag_ids][]', tag.id, @asset.tag_ids.include?(tag.id) %>
-                <%= tag[I18n.locale] %>
+                <%= tag.name %>
                 <%= hidden_field_tag 'asset[tag_ids][]', '' %>
             <% end %>
         <% end %>

app/views/admin/attributes/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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
             <%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

app/views/admin/attributes/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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

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

@@ -40,7 +40,7 @@
         </div>
     </div>
 <!--     <div class="item element">
-        <h3><i class="icons-"></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">

app/views/admin/page_parts/_widget_data_source_tag.html.erb

@@ -13,7 +13,7 @@
         <%= nil_checkbox_button(object,:tag) %>
         <%= content_tag_for(:label, @tags,:class=>"radio inline") do |tag|%>
           <%= check_box_tag("#{field_name}[tag][]", tag.id,  tag_checked_value(object,tag.id),:class=>'select_option'  ) %>
-          <%= tag[I18n.locale]%>
+          <%= tag.name%>
         <% end if @tags%>
     </fieldset>
   <% else %>

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

@@ -1,6 +1,6 @@
 
 <% 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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 <div class="subnav">

app/views/admin/roles/add_sub_role.html.erb

@@ -1,6 +1,6 @@
 
 <% 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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/roles/edit_sub_role.html.erb

@@ -1,6 +1,6 @@
 
 <% 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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/roles/role_field.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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 			
 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

app/views/admin/roles/sub_role.html.erb

@@ -1,7 +1,7 @@
 <% # encoding: utf-8 %>
 
 <% 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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 

app/views/admin/roles/sub_role_field.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-group', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
 <% end %>
 
 		<%= form_for @attribute,:url => eval("admin_#{@attribute_type}_path(@attribute)") ,:class=> "form-horizontal" do |f| %>

app/views/admin/tags/_add.html.erb

@@ -1,7 +1,9 @@
 <%= form_for :tag, :url => admin_tags_path, :remote => true, :html => {:id => 'tag_form'} do |f| %>
-	<% @site_valid_locales.each do |locale| %>
+  <%= f.fields_for :name_translations do |f| %>
-	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+  	<% @site_valid_locales.each do |locale| %>
-	<% end %>
+  	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
-	<%= f.hidden_field :module_app_id, :value => @module_app_id %>
+  	<% end %>
+  <% end %>
+	<%= hidden_field_tag :module_app_id, @module_app_id %>
 	<%= f.submit t(:add) %>
 <% end %>

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

@@ -1,7 +1,9 @@
 <%= form_for :tag, :url => admin_tag_path(tag), :method => :put, :remote => true do |f| %>
-	<% @site_valid_locales.each do |locale| %>
+  <%= f.fields_for :name_translations do |f| %>
-	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+    <% @site_valid_locales.each do |locale| %>
-	<% end %>
+      <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale, value: @tag.name_translations[locale] %>
-	<%= f.hidden_field :module_app_id, :value => tag.module_app_id %>
+    <% end %>
+  <% end %>
+  <%= hidden_field_tag :module_app_id, @module_app_id %>
 	<%= f.submit t(:update_) %>
 <% end %>

app/views/admin/tags/_tag.html.erb

@@ -3,11 +3,11 @@
 	<i class="icons-tag"></i>
 	<% @site_valid_locales.each do |locale| %>
 	 	<%#= I18nVariable.from_locale(locale) %>
-		<%= tag[locale] %>
+		<%= tag.name_translations[locale] %>
 	<% end %>
 	</div>
 	<div class="action">
-	<%= link_to t(:edit), edit_admin_tag_path(tag), :remote => true  %>
+	<%= link_to t(:edit), edit_admin_tag_path(tag, :module_app_id => @module_app_id), :remote => true  %>
 	<%= link_to t(:delete_), admin_tag_path(tag), :confirm => t('sure?'), :method => :delete, :remote => true  %>
 	</div>
 </div>

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-user')+ 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') if (is_admin? rescue nil) %>

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-users', :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/edit_passwd.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-users', :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-users', :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-users', :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-users', :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-users', :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-users', :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-users', :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-users', :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/devise/sessions/new.html.erb

@@ -11,8 +11,8 @@
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">
-					<%= f.label :user_id ,t(:user_id)%>
+					<%= f.label :user_id ,t("users.user_id")%>
-					<%= f.text_field :user_id, :placeholder => t(:email), :style => "width: 330px;" %>
+					<%= f.text_field :user_id, :placeholder => t("users.user_id"), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">

app/views/layouts/_drop_down_menu.html.erb

@@ -4,6 +4,6 @@
 	<li><%= link_to t(:template), admin_designs_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:purchase), admin_purchases_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:asset), admin_assets_path, :class => 'orblink' %></li>
-	<li><%= link_to t(:member), admin_users_path, :class => 'orblink' %></li>
+	<li><%= link_to t(:member_), admin_users_path, :class => 'orblink' %></li>
 	<li><%= link_to t(:site_), admin_sites_path, :class => 'orblink' %></li>
 </ul>

app/views/layouts/_guest_orbit_menu.erb

@@ -2,7 +2,7 @@
           <% if Me.backend_openness_on %>
             <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-users') + 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>    
           <% end %>  
           

app/views/layouts/_member_orbit_menu.erb

@@ -1,10 +1,10 @@
           <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-users') + 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>
+              <li><%#= link_to content_tag(:i, nil, :class => 'icons-member') + t(:member_), admin_users_path %></li>
               <li><%#= link_to content_tag(:i, nil, :class => 'icons-asset') + t(:asset), admin_assets_path %></li>
               <%if (is_admin? rescue false)%>
               <li class="divider"></li>

app/views/layouts/_orbit_bar.html.erb

@@ -74,7 +74,7 @@
               <li>
               <div class="input-prepend">
                 <span class="add-on"><i class="icon-user"></i></span>
-                <%= f.text_field :user_id, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+                <%= f.text_field :user_id, :class => 'span2', :placeholder => t("users.user_id"), :size => 16 %>
               </div>
               </li>
               <li>

config/locales/devise.en.yml

@@ -13,7 +13,7 @@ en:
       ldap_connection_failed: 'LDAP connection failed'
       ldap_pass_but_account_not_in_orbit: 'LDAP account is not supported to sign up this site.'
       locked: 'Your account is locked.'
-      invalid: 'Invalid email or password.'
+      invalid: 'Invalid user account or password.'
       invalid_token: 'Invalid authentication token.'
       timeout: 'Your session expired, please sign in again to continue.'
       inactive: 'Your account was not activated yet.'

config/locales/devise.zh_tw.yml

@@ -6,7 +6,7 @@ zh_tw:
     failure:
       already_authenticated: 你已經登入。
       inactive: 您的帳號尚未被啟用。
-      invalid: Email 或密碼是無效的。
+      invalid: 帳號或密碼是無效的。
       invalid_token: 無效的認證代碼。
       locked: 您的帳號已被鎖定。
       timeout: 您的登入時效過期，請重新登入，才能繼續。

config/locales/en.yml

@@ -277,7 +277,7 @@ en:
   markup_options: Markup options
   markup_value: Markup value
   me: Me
-  member: Member
+  member_: Member
   member_authorization: Authorizations
   member_info: Profile Form
   member_registration: Registration Approval
@@ -428,7 +428,7 @@ en:
     module_page_lang_not_support: "We are sorry, this page is not available for English"
     not_previewable: "Preview not support"
     preview_only_for_img: "Preview only supprt with file type: jpg, png, gif, bmp"
-  sys_basic_form: System Default Basic Field
+  sys_basic_form: System Required Info.
   sys_basic_id_form: System Account Info.
   system_info: System information
   tag_cloud: Tag cloud

config/locales/zh_tw.yml

@@ -277,7 +277,8 @@ zh_tw:
   markup_options: 標註選項
   markup_value: 標註值
   me: 我
-  member: 成員
+  # member: 成員
+  member_: 成員
   member_authorization: 成員權限
   member_info: 基本資料表
   member_registration: 註冊審核

lib/orbit_tag.rb

@@ -0,0 +1,3 @@
+# require "action_view"
+
+require "orbit_tag/taggable"

lib/orbit_tag/taggable.rb

@@ -0,0 +1,77 @@
+module OrbitTag
+  module Taggable
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def taggable
+        init_tag
+      end
+
+      private
+
+      def init_tag
+        class_eval do
+          field :tags_to_destroy, type: Array, default: []
+
+          has_many :taggings, as: :taggable, autosave: true, dependent: :destroy
+          accepts_nested_attributes_for :taggings, allow_destroy: true
+          after_save :remove_taggings, unless: Proc.new{self.tags_to_destroy.blank?}
+
+          def tags
+            self.taggings.blank? ? [] : self.taggings.map{|t| t.tag}
+          end
+
+          def tags=(tag_ids)
+            tag_ids = [tag_ids].flatten
+            tag_ids.delete('')
+            ids = self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
+            tag_ids.each do |tag_id|
+              unless ids.include? tag_id
+                self.taggings.build(tag_id: tag_id)
+              end
+            end
+            self.tags_to_destroy = self.taggings.where(:tag_id.in => (ids - tag_ids)).map{|t| t.id}
+          end
+
+          def tag_ids
+            self.taggings.blank? ? [] : self.taggings.map{|t| t.tag.id}
+          end
+
+          def tag_ids=(ids)
+            self.tags = ids
+          end
+
+          def sorted_tags
+            if tags.blank?
+              []
+            else
+              tag_array = tags.inject([]){ |result, value|
+                result << [value.name, value]
+              }
+              tag_array.sort.map{|x| x[1] }
+            end
+          end
+
+          private
+
+          def remove_taggings
+            self.taggings.where(:_id.in => self.tags_to_destroy).destroy
+            self.class.without_callback(:save, :after, :remove_taggings) do
+              self.update_attribute(:tags_to_destroy, [])
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+
+  module Tagging
+    extend OrbitCoreLib::AppBackendUtility
+    def get_tags
+      @module_app ? @module_app.tags : Tag.all
+    end
+  end
+end

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -25,7 +25,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     # @bulletins = Bulletin.all
     # @bulletins = Bulletin.desc("postdate desc")
     get_categorys('BulletinCategory',params[:bulletin_category_id])
-    get_tags
+    @tags = get_tags
 
     @filter = params[:filter]
     new_filter = params[:new_filter]
@@ -66,7 +66,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   # GET /bulletins/1.xml
   def show
     @bulletin = Bulletin.find(params[:id])
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # show.html.erb
@@ -85,7 +85,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     end
 
     @link_url = panel_announcement_back_end_bulletins_path
-    get_tags
+    @tags = get_tags
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @bulletin }
@@ -102,14 +102,14 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
 
       @link_url = panel_announcement_back_end_bulletin_path(@bulletin)
 
-      get_tags
+      @tags = get_tags
     end
   end
 
   # POST /bulletins
   # POST /bulletins.xml
   def create
-    get_tags
+    @tags = get_tags
     if params[:bulletin_link]
 
       @bulletin_link = BulletinLink.new(params[:bulletin_link])
@@ -240,7 +240,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
           format.js  { render 'toggle_enable' }
           format.xml  { head :ok }
         else
-          get_tags
+          @tags = get_tags
           format.html { render :action => "edit" }
           format.xml  { render :xml => @bulletin.errors, :status => :unprocessable_entity }
         end
@@ -280,7 +280,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
     @bulletin_categories = BulletinCategory.all
     #TODO 需要做 manager ,admin 才可以 all.  其他 available就好
 
-    get_tags
+    @tags = get_tags
   end
 
   def delete
@@ -327,11 +327,6 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   #   end
   # end
 
-  def get_tags
-    module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
-    @tags = Tag.all(:conditions => {:module_app_id => module_app.id}).order_by(I18n.locale, :asc) rescue []
-  end
-
   def clean_values
     if params[:bulletin]
       params[:bulletin][:bulletin_links_attributes].each_with_index do |link, index|

vendor/built_in_modules/announcement/app/models/bulletin.rb

@@ -11,13 +11,16 @@ class Bulletin
   include OrbitCoreLib::BelongsToCategoryMayDisable
   include OrbitCoreLib::Preview
 
+  include OrbitTag::Taggable
+  taggable
+
   is_impressionable :counter_cache => { :column_name => :view_count }
 
   field :title, localize: true
   field :subtitle, localize: true
   field :text, localize: true
 
-  has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
+  # has_and_belongs_to_many :tags, :class_name => "AnnouncementTag"
 
   field :postdate , :type => DateTime
   field :deadline , :type => DateTime
@@ -51,7 +54,7 @@ class Bulletin
   
   validates :title, :at_least_one => true
 
-  before_save :check_deadline, :update_avliable_language, :clean_values#, :save_bulletin_links, :save_bulletin_files
+  before_save :check_deadline, :update_avliable_language#, :clean_values#, :save_bulletin_links, :save_bulletin_files
 
   searchable do
     text :titles do
@@ -196,9 +199,10 @@ class Bulletin
     return nil
   end
 
-  def sorted_tags
+  # def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+  #   #tags.order_by(I18n.locale, :asc)
-  end
+	# tags
+  # end
   
 
   def to_preview
@@ -236,12 +240,12 @@ class Bulletin
     end
   end
 
-  def clean_values
+  # def clean_values
-    self.bulletin_links.each do |link|
+  #   self.bulletin_links.each do |link|
-      link.delete if link.url.blank? && link.title.blank?
+  #     link.delete if link.url.blank? && link.title.blank?
-    end
+  #   end
-    self.tag_ids.delete('')
+  #   self.tag_ids.delete('')
-  end
+  # end
 
 
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb

@@ -67,7 +67,7 @@
 		<div class="label-group">
 			<div class="label-td">
 				<% bulletin.sorted_tags.each do |tag| %>
-					<span class="label label-tags"><%= tag[I18n.locale] %></span>
+					<span class="label label-tags"><%= tag.name %></span>
 				<% end %>
 			</div>
 		</div>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter_tags.html.erb

@@ -1,6 +1,6 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<% @tags.each do |tag| -%>
-		<%= link_to tag[I18n.locale], panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+		<%= link_to tag.name, panel_announcement_back_end_bulletins_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
 	<% end -%> 
 </div>
 <%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb

@@ -99,7 +99,7 @@
 						<% @tags.each do |tag| %>
 							<%= content_tag :label,:class => "checkbox inline" do -%>
 								<%= check_box_tag 'bulletin[tag_ids][]', tag.id, @bulletin.tag_ids.include?(tag.id) %>
-								<%= tag[I18n.locale] %>
+								<%= tag.name %>
                 <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
 							<% end %>
 						<% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_quick_edit_tags.html.erb

@@ -5,7 +5,7 @@
     			<% @tags.each do |tag| %>
                 <label class="checkbox inline">
     			<%= check_box_tag 'bulletin[tag_ids][]', tag.id, bulletin.tag_ids.include?(tag.id) %>
-    			<%= tag[I18n.locale] %>
+    			<%= tag.name %>
                 </label>
                 <%= hidden_field_tag 'bulletin[tag_ids][]', '' %>
     			<% end %>

vendor/built_in_modules/announcement/app/views/panel/announcement/plugin/_profile.html.erb

@@ -40,7 +40,7 @@
         <td>
           <div class="label-group">
           <% bulletin.sorted_tags.each do |tag| %>
-            <span class="label label-tags"><%= tag[I18n.locale] %></span>
+            <span class="label label-tags"><%= tag.name %></span>
           <% end %>
           </div>
         </td>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_tag.html.erb

@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag[I18n.locale], panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_list.html.erb

@@ -5,7 +5,7 @@
 <div class="tag_block">
 	<ul class="tag_list">
 		<% @tags.each do |tag| %>
-		<li><%= tag[I18n.locale] %></li>
+		<li><%= tag.name %></li>
 		<% end %>
 	</ul>
 </div>

vendor/built_in_modules/announcement/init.rb

@@ -70,7 +70,7 @@ module Announcement
 
 
       context_link 'tags',
-                            :link_path=>"panel_announcement_back_end_tags_path" ,
+                            :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Announcement'}))" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:manager]

vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb

@@ -34,7 +34,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
 
   @archive_files = (params[:sort] || @filter) ? get_sorted_and_filtered("archive_file",:archive_file_category_id.in => @archive_file_category_ids) : get_viewable("archive_file",:archive_file_category_id.in => @archive_file_category_ids)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -59,7 +59,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
   def new
     @archive_file = ArchiveFile.new
 	
-	  get_tags
+	  @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -71,7 +71,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
   def edit
     @archive_file = ArchiveFile.find(params[:id])
 	
-	get_tags
+	@tags = get_tags
   end
 
   # POST /archive_files
@@ -86,7 +86,7 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
         format.html { redirect_to(panel_archive_back_end_archive_files_url) }
         format.xml  { render :xml => @archive_file, :status => :created, :location => @archive_file }
       else
-        get_tags
+        @tags = get_tags
         format.html { render :action => "new" }
         format.xml  { render :xml => @archive_file.errors, :status => :unprocessable_entity }
       end
@@ -139,9 +139,4 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
   #   @archive_file_categorys = (id ? ArchiveFileCategory.find(id).to_a : ArchiveFileCategory.excludes('disabled' => true))
   # end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'archive'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/archive/app/models/archive_file.rb

@@ -10,9 +10,12 @@ class ArchiveFile
 
   PAYMENT_TYPES = @site_valid_locales
 
+  include OrbitTag::Taggable
+  taggable
+
   field :title, localize: true
   
-  has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
+  # has_and_belongs_to_many :tags, :class_name => "ArchiveTag"
   
   field :create_user_id
   field :update_user_id
@@ -59,7 +62,8 @@ class ArchiveFile
   end
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
 
 

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_archive_file.html.erb

@@ -36,7 +36,7 @@
 		<div class="label-group">
 			<div class="label-td">
 				<% archive_file.sorted_tags.each do |tag| %>
-					<span class="label label-tags"><%= tag[I18n.locale] %></span>
+					<span class="label label-tags"><%= tag.name %></span>
 				<% end %>
 			</div>
 		</div>

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_filter_tags.html.erb

@@ -1,6 +1,6 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<% @tags.each do |tag| -%>
-		<%= link_to tag[I18n.locale], panel_archive_back_end_archive_files_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+		<%= link_to tag.name, panel_archive_back_end_archive_files_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
 	<% end -%> 
 </div>
 <%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>

vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb

@@ -28,7 +28,7 @@
 			<div class="widget-content clear form-horizontal">
 				<% @tags.each do |tag| %>
 				<%= check_box_tag 'archive_file[tag_ids][]', tag.id, @archive_file.tag_ids.include?(tag.id)%>
-				<%= tag[I18n.locale] %>
+				<%= tag.name %>
 				<% end %>
 			</div>
 		</div>  

vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/_tag.html.erb

@@ -1,3 +1,3 @@
 <li>
-	<%= link_to tag[I18n.locale], panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
+	<%= link_to tag.name, panel_announcement_widget_bulletins_and_web_links_path(:id => tag.id), :remote => true, :class => ('active' if tag.eql?(@selected_tag)) %>
 </li>

vendor/built_in_modules/archive/app/views/panel/archive/widget/archive_files/bulletins_list.html.erb

@@ -5,7 +5,7 @@
 <div class="tag_block">
 	<ul class="tag_list">
 		<% @tags.each do |tag| %>
-		<li><%= tag[I18n.locale] %></li>
+		<li><%= tag.name %></li>
 		<% end %>
 	</ul>
 </div>

vendor/built_in_modules/archive/init.rb

@@ -66,7 +66,7 @@ module Archive
                             :available_for => [:manager]
 
       context_link 'tags',
-                            :link_path=>"panel_archive_back_end_tags_path" ,
+                            :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Archive'}))" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:admin]

vendor/built_in_modules/calendar/app/models/cal.rb

@@ -2,6 +2,9 @@ class Cal
 	include Mongoid::Document
 	include Mongoid::Timestamps
 
+  include OrbitTag::Taggable
+  taggable
+
 	field :name, localize: true
 	field :color
 	has_many :events, :autosave => true, :dependent => :destroy

vendor/built_in_modules/calendar/init.rb

@@ -25,7 +25,7 @@ module Calendar
                             :available_for => [:manager]
 
       context_link 'tags',
-                            :link_path=>"panel_calendar_back_end_tags_path" ,
+                            :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Calendar'}))" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:manager]

vendor/built_in_modules/faq/app/controllers/panel/faq/back_end/qas_controller.rb

@@ -37,7 +37,7 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
 	#@qas = (params[:sort] || @filter) ? get_sorted_and_filtered_qas : Qa.all.page(params[:page]).per(10)
   @qas = (params[:sort] || @filter) ? get_sorted_and_filtered("qa",:qa_category_id.in => @qa_category_ids) : get_viewable("qa",:qa_category_id.in => @qa_category_ids)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -60,7 +60,7 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
   # GET /qas/new.xml
   def new
     @qa = Qa.new
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -71,14 +71,14 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
   # GET /qas/1/edit
   def edit
     @qa = Qa.find(params[:id])
-	get_tags
+	@tags = get_tags
   end
 
   # POST /qas
   # POST /qas.xml
   def create
     @qa = Qa.new(params[:qa])
-	get_tags
+	@tags = get_tags
     @qa.create_user_id = current_user.id
     @qa.update_user_id = current_user.id
 
@@ -134,11 +134,4 @@ class Panel::Faq::BackEnd::QasController < OrbitBackendController
     redirect_to panel_faq_back_end_qas_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options])
   end
   
-  protected
-  
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'faq'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id}) rescue []
-  end
-  
 end

vendor/built_in_modules/faq/app/models/qa.rb

@@ -4,13 +4,15 @@ class Qa
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::MultiParameterAttributes
-  
+  include OrbitTag::Taggable
+  taggable
+
   scope :available_for_lang, ->(locale){ where("available_for_#{locale}".to_sym => true) }
 
   field :title, localize: true
   field :answer, localize: true
   
-  has_and_belongs_to_many :tags, :class_name => "FaqTag"
+  #has_and_belongs_to_many :tags, :class_name => "FaqTag"
   
 
   field :create_user_id
@@ -61,7 +63,8 @@ class Qa
   end 
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
   
   def update_avliable_language

vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_filter_tags.html.erb

@@ -1,6 +1,6 @@
 <div class="accordion-inner" data-toggle="buttons-checkbox">
 	<% @tags.each do |tag| -%>
-		<%= link_to tag[I18n.locale], panel_faq_back_end_qas_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
+		<%= link_to tag.name, panel_faq_back_end_qas_path(:filter => @filter, :new_filter => {:type => 'tags', :id => tag.id}, :sort => params[:sort], :direction => params[:direction], :sort_options => params[:sort_options]), :class => "btn btn-small js_history#{is_filter_active?('tags', tag.id)}" %>
 	<% end -%> 
 </div>
 <%= render :partial => 'clear_filters', :locals => {:type => 'tags'} %>

vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb

@@ -39,7 +39,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'qa[tag_ids][]', tag.id, @qa.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'qa[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_qa.html.erb

@@ -35,7 +35,7 @@
 		<div class="label-group">
 			<div class="label-td">
 				<% qa.sorted_tags.each do |tag| %>
-					<span class="label label-tags"><%= tag[I18n.locale] %></span>
+					<span class="label label-tags"><%= tag.name %></span>
 				<% end %>
 			</div>
 		</div>

vendor/built_in_modules/faq/init.rb

@@ -64,7 +64,7 @@ module Faq
                             :available_for => [:manager]
 
       context_link 'tags',
-                            :link_path=>"panel_faq_back_end_tags_path" ,
+                            :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Faq'}))" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:manager]

vendor/built_in_modules/gallery/app/models/gallery_album.rb

@@ -2,6 +2,9 @@ class GalleryAlbum
 	include Mongoid::Document
   	include Mongoid::Timestamps
 
+  include OrbitTag::Taggable
+  taggable
+
   	field :name, localize: true
   	field :description, localize: true
   	field :cover, default: "default"
@@ -9,7 +12,7 @@ class GalleryAlbum
   	field :tag_names
 
   	belongs_to :gallery_category
-  	has_and_belongs_to_many :tags, :class_name => "GalleryTag"
+  	# has_and_belongs_to_many :tags, :class_name => "GalleryTag"
   	has_many :gallery_images, :autosave => true, :dependent => :destroy
     accepts_nested_attributes_for :gallery_images, :allow_destroy => true
 

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/album_images/show.html.erb

@@ -53,7 +53,7 @@
         <ul class="tag_list" id="gallery_tag_list">
           <%# if @authenticated %>
           <% @tags.each do |tag| %>
-             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
           <% end %>
           <%# end %>
         </ul>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/edit.html.erb

@@ -98,7 +98,7 @@
       <div class="overview">
         <ul class="tag_list" id="gallery_tag_list">
           <% @tags.each do |tag| %>
-             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
           <% end %>
         </ul>
       </div>

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/index.html.erb

@@ -27,7 +27,7 @@
     <div class="accordion-body collapse" id="collapse-tags">
       <div class="accordion-inner filter_btns tags" data-toggle="buttons-checkbox">
         <% @tags.each do |tag| %>
-        <a href="tag=<%= tag.id %>" class="btn" onclick="return false;"><%= tag[I18n.locale] %></a>
+        <a href="tag=<%= tag.id %>" class="btn" onclick="return false;"><%= tag.name %></a>
         <% end %>
       </div>
       <div class="filter-clear">

vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/albums/show.html.erb

@@ -29,7 +29,7 @@
       <div class="overview">
         <ul class="tag_list" id="gallery_tag_list">
           <% @tags.each do |tag| %>
-             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
           <% end %>
         </ul>
       </div>

vendor/built_in_modules/gallery/app/views/panel/gallery/front_end/orbit_galleries/index.html.erb

@@ -33,7 +33,7 @@
       <div class="overview">
         <ul class="tag_list" id="gallery_tag_list">
           <% @tags.each do |tag| %>
-             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag[I18n.locale] %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
+             <li data-content="<%= tag.id %>"><input id="tag_<%= tag.id %>" type="checkbox"><label for="tag_<%= tag.id %>"><%= tag.name %></label><span style="display:none;"><%= tag[@locales[1]] %> <%= tag[@locales[0]] %></span></li>
           <% end %>
         </ul>
       </div>

vendor/built_in_modules/gallery/init.rb

@@ -55,7 +55,7 @@ module Gallery
                             :available_for => [:manager]
 
       context_link 'tags',
-                            :link_path=>"panel_gallery_back_end_tags_path" ,
+                            :link_path=>"admin_tags_path(:module_app_id => ModuleApp.first(conditions: {title: 'Gallery'}))" ,
                             :priority=>4,
                             # :active_for_action=>{:bulletin_categorys=>:index},
                             :available_for => [:manager]

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb

@@ -41,7 +41,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
 
     @writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_book",:book_paper_type_id.in => @paper_type_ids) : get_viewable("writing_book",:book_paper_type_id.in => @paper_type_ids)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -57,7 +57,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
-    get_tags
+    @tags = get_tags
 	
     @set_author_type = BookAuthorType.new(:display => 'List')
 	@author_type_url = panel_personal_book_back_end_writing_books_path
@@ -132,7 +132,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -151,7 +151,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /writing_books
@@ -184,7 +184,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
     # @level_types = BookLevelType.all
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
-	get_tags
+	@tags = get_tags
   
     @writing_book = WritingBook.new(params[:writing_book])
 	
@@ -316,9 +316,4 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
     @plugins = OrbitApp::Plugin::Registration.all
   end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/front_end/writing_books_controller.rb

@@ -21,10 +21,4 @@ class Panel::PersonalBook::FrontEnd::WritingBooksController < OrbitWidgetControl
   
   end
   
-  
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/plugin/writing_books_controller.rb

@@ -37,7 +37,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
 	#@writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_books : WritingBook.all.page(params[:page]).per(10)
   @writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_book",:create_user_id => current_user.id) : get_viewable("writing_book", :create_user_id => current_user.id)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -66,7 +66,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -82,7 +82,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /writing_books
@@ -92,7 +92,7 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
     # @level_types = BookLevelType.all
     @author_types = BookAuthorType.all
     @paper_types = BookPaperType.all
-	get_tags
+	@tags = get_tags
   
     @writing_book = WritingBook.new(params[:writing_book])
 	
@@ -178,9 +178,4 @@ class Panel::PersonalBook::Plugin::WritingBooksController < OrbitBackendControll
   #   end
   # end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_book'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_book/app/models/writing_book.rb

@@ -79,7 +79,8 @@ class WritingBook
   end 
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
   
   def update_avliable_language

vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb

@@ -32,7 +32,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'writing_book[tag_ids][]', tag.id, @writing_book.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'writing_book[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/writing_books/_form.html.erb

@@ -32,7 +32,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'writing_book[tag_ids][]', tag.id, @writing_book.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'writing_book[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb

@@ -42,7 +42,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_conference",:conference_paper_type_id.in => @paper_type_ids) : get_viewable("writing_conference",:conference_paper_type_id.in => @paper_type_ids)
 
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -58,7 +58,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
 	
-    get_tags
+    @tags = get_tags
 	
     @set_author_type = ConferenceAuthorType.new(:display => 'List')
 	@author_type_url = panel_personal_conference_back_end_writing_conferences_path
@@ -132,7 +132,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     # @paper_types = ConferenceLevelType.all
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -151,7 +151,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /writing_conferences
@@ -183,7 +183,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     # @paper_types = ConferenceLevelType.all
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
-	get_tags
+	@tags = get_tags
   
     @writing_conference = WritingConference.new(params[:writing_conference])
 	
@@ -315,9 +315,4 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
     @plugins = OrbitApp::Plugin::Registration.all
   end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/front_end/writing_seminars_controller.rb

@@ -23,9 +23,4 @@ class Panel::PersonalConference::FrontEnd::WritingConferencesController < OrbitW
   end
   
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/plugin/writing_conferences_controller.rb

@@ -38,7 +38,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
 	#@writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_conferences : WritingConference.all.page(params[:page]).per(10)
   @writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_conference",:create_user_id => current_user.id) : get_viewable("writing_conference", :create_user_id => current_user.id)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -67,7 +67,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -83,7 +83,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /writing_conferences
@@ -93,7 +93,7 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
     # @level_types = ConferenceLevelType.all
     @author_types = ConferenceAuthorType.all
     @paper_types = ConferencePaperType.all
-	get_tags
+	@tags = get_tags
   
     @writing_conference = WritingConference.new(params[:writing_conference])
 	
@@ -179,9 +179,4 @@ class Panel::PersonalConference::Plugin::WritingConferencesController < OrbitBac
   #   end
   # end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_conference'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_conference/app/models/writing_conference.rb

@@ -80,7 +80,8 @@ class WritingConference
   end
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
 
   def update_avliable_language

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb

@@ -48,7 +48,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'writing_conference[tag_ids][]', tag.id, @writing_conference.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'writing_conference[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/writing_conferences/_form.html.erb

@@ -48,7 +48,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'writing_conference[tag_ids][]', tag.id, @writing_conference.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'writing_conference[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb

@@ -31,7 +31,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   
   @diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma") : get_viewable("diploma")
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -44,7 +44,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   
     get_plugins
   	
-    get_tags
+    @tags = get_tags
 	
   end
 
@@ -66,7 +66,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
   
     @diploma = Diploma.new 
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -81,14 +81,14 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
 	
     @diploma = Diploma.find(params[:id]) 
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /diplomas
   # POST /diplomas.xml
   def create
   
-	get_tags
+	@tags = get_tags
   
     @diploma = Diploma.new(params[:diploma])
 	
@@ -190,9 +190,4 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
     @plugins = OrbitApp::Plugin::Registration.all
   end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_diploma'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/plugin/diplomas_controller.rb

@@ -27,7 +27,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
   end
   
   @diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma",:create_user_id => current_user.id) : get_viewable("diploma", :create_user_id => current_user.id)
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -38,7 +38,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
 
   def diploma_setting
   	
-    get_tags
+    @tags = get_tags
 	
   end
 
@@ -58,7 +58,7 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
   
     @diploma = Diploma.new 
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -70,14 +70,14 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
   def edit
     @diploma = Diploma.find(params[:id]) 
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /diplomas
   # POST /diplomas.xml
   def create
   
-	get_tags
+	@tags = get_tags
   
     @diploma = Diploma.new(params[:diploma])
 	
@@ -164,9 +164,4 @@ class Panel::PersonalDiploma::Plugin::DiplomasController < OrbitBackendControlle
   #   end
   # end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_diploma'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_diploma/app/models/diploma.rb

@@ -52,7 +52,8 @@ class Diploma
   end 
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
   
   def update_avliable_language

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb

@@ -15,7 +15,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'diploma[tag_ids][]', tag.id, @diploma.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'diploma[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/diplomas/_form.html.erb

@@ -15,7 +15,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'diploma[tag_ids][]', tag.id, @diploma.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'diploma[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb

@@ -38,7 +38,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   
   @experiences = (params[:sort] || @filter) ? get_sorted_and_filtered("experience",:experience_category_id.in => @experience_category_ids) : get_viewable("experience",:experience_category_id.in => @experience_category_ids)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   
     @experience_types = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
 	
     @set_experience_type = ExperienceCategory.new(:display => 'List')
 	@experience_type_url = panel_personal_experience_back_end_experiences_path
@@ -101,7 +101,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
     @experience = Experience.new
     @experience_categorys = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
 	
     @experience_types = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /experiences
@@ -138,7 +138,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
   else
 	
     @experience_types = ExperienceCategory.all
-	get_tags
+	@tags = get_tags
   
     @experience = Experience.new(params[:experience])
 	
@@ -258,9 +258,4 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
     @plugins = OrbitApp::Plugin::Registration.all
   end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_experience'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/plugin/experiences_controller.rb

@@ -35,7 +35,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
 
   @experiences = (params[:sort] || @filter) ? get_sorted_and_filtered("experience",:create_user_id => current_user.id) : get_viewable("experience", :create_user_id => current_user.id)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -48,7 +48,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
   
     @experience_types = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
 	
     @set_experience_type = ExperienceCategory.new(:display => 'List')
 	@experience_type_url = panel_personal_experience_plugin_experiences_path
@@ -94,7 +94,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
     @experience = Experience.new
     @experience_categorys = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -108,7 +108,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
 	
     @experience_types = ExperienceCategory.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /experiences
@@ -128,7 +128,7 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
   else
 	
     @experience_types = ExperienceCategory.all
-	get_tags
+	@tags = get_tags
   
     @experience = Experience.new(params[:experience])
 	
@@ -233,9 +233,4 @@ class Panel::PersonalExperience::Plugin::ExperiencesController < OrbitBackendCon
   #   end
   # end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_experience'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end

vendor/built_in_modules/personal_experience/app/models/experience.rb

@@ -66,7 +66,8 @@ class Experience
   end 
 
   def sorted_tags
-    tags.order_by(I18n.locale, :asc)
+    #tags.order_by(I18n.locale, :asc)
+	tags
   end
   
   def update_avliable_language

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb

@@ -15,7 +15,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'experience[tag_ids][]', tag.id, @experience.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'experience[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/experiences/_form.html.erb

@@ -15,7 +15,7 @@
 				<% @tags.each do |tag| %>
 					<%= content_tag :label,:class => "checkbox inline" do -%>
 						<%= check_box_tag 'experience[tag_ids][]', tag.id, @experience.tag_ids.include?(tag.id)%>
-						<%= tag[I18n.locale] %>
+						<%= tag.name %>
             <%= hidden_field_tag 'experience[tag_ids][]', '' %>
 					<% end %>
 				<% end %>

vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb

@@ -38,7 +38,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   
   @honors = (params[:sort] || @filter) ? get_sorted_and_filtered("honor",:honor_category_id.in => @honor_category_ids) : get_viewable("honor",:honor_category_id.in => @honor_category_ids)
 
-  get_tags
+  @tags = get_tags
 
     respond_to do |format|
       format.html # index.html.erb
@@ -53,7 +53,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   
     @honor_types = HonorCategory.all
 	
-    get_tags
+    @tags = get_tags
 	
     @set_honor_type = HonorCategory.new(:display => 'List')
 	@honor_type_url = panel_personal_honor_back_end_honors_path
@@ -101,7 +101,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
     @honor = Honor.new
     @honor_categorys = HonorCategory.all
 	
-    get_tags
+    @tags = get_tags
 
     respond_to do |format|
       format.html # new.html.erb
@@ -118,7 +118,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
 	
     @honor_types = HonorCategory.all
 	
-    get_tags
+    @tags = get_tags
   end
 
   # POST /honors
@@ -138,7 +138,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
   else
 	
     @honor_types = HonorCategory.all
-	get_tags
+	@tags = get_tags
   
     @honor = Honor.new(params[:honor])
 	
@@ -261,9 +261,4 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
     @plugins = OrbitApp::Plugin::Registration.all
   end
   
-  def get_tags
-  	module_app = ModuleApp.first(:conditions => {:key => 'personal_honor'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-  end
-  
 end