chris tags update

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]