chris tags update

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/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/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| %>
-	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
-	<% end %>
-	<%= f.hidden_field :module_app_id, :value => @module_app_id %>
+  <%= f.fields_for :name_translations do |f| %>
+  	<% @site_valid_locales.each do |locale| %>
+  	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
+  	<% 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| %>
-	  <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale %>
-	<% end %>
-	<%= f.hidden_field :module_app_id, :value => tag.module_app_id %>
+  <%= f.fields_for :name_translations do |f| %>
+    <% @site_valid_locales.each do |locale| %>
+      <%= I18nVariable.from_locale(locale) %>:<%= f.text_field locale, value: @tag.name_translations[locale] %>
+    <% 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/_filter.html.erb

@@ -48,7 +48,7 @@
                 <div class="accordion-body collapse" id="collapse-tags">
                     <div class="accordion-inner" data-toggle="buttons-checkbox">
                         <% @sub_role_tags.each do |sr_tag|%>
-                            <a href="#" class="btn"><%= sr_tag[I18n.locale] %></a>
+                            <a href="#" class="btn"><%= sr_tag.name %></a>
                         <% end -%>
                     </div>
                     <div class="filter-clear">