merrycms 0.1.0 → 0.1.1

data/app/controllers/admin/translations_controller.rb

@@ -14,12 +14,14 @@ module Admin
       @all_translations = Translation.not_pending.group_by{|t| t.locale }
     end
   
-    def new
-      if params[:type] && params[:type] == "pending"
-        @translations = Translation.search_query(params[:query]).pending.where(:locale => params[:language]).page(params[:page]).per(10)
-      else
-        @translations = Translation.search_query(params[:query]).not_pending.where(:locale => params[:language]).page(params[:page]).per(10)
-      end
+    def all
+      @search = Translation.not_pending.search(params[:search])
+      @translations = @search.where(:locale => params[:language]).page(params[:page]).per(10)
+    end
+    
+    def pending
+      @search = Translation.pending.search(params[:search])
+      @translations = @search.where(:locale => params[:language]).page(params[:page]).per(10)
     end
   
     def create

data/app/views/admin/translations/_edit_javascript.erb

@@ -0,0 +1,7 @@
+<% content_for (:head) do %>
+<script type="text/javascript">
+  $(function() {
+    $('table textarea').autoResize().trigger('change');
+  });
+</script>
+<% end %>

data/app/views/admin/translations/_filter.html.erb

@@ -1,8 +1,15 @@
-<%= form_tag new_admin_translation_path, :method => :get do %>
+<%= form_for @search, :url => new_admin_translation_path, :html => {:method => :get, :class => 'search'} do |f| %>
 <div>
-  <%= hidden_field_tag "language", params[:language] %>
-  <%= hidden_field_tag "type", params[:type] %>
-  <%= text_field_tag "query", params[:query] %>
-  <%= submit_tag t('translations.filter') %>
+  <h3><%= t('translations.search.title') %></h3>
+  <div class='top'>
+    <%= f.label :key_or_value_contains, t('translations.search.key_or_value'), :class => 'desc' %>
+    <%= f.text_field :key_or_value_contains, :size => "20" %>
+  </div>
+  <div class='top'>
+    <label>&nbsp;</label>
+    <p>
+      <%= f.submit t('translations.search.submit') %>
+    </p>
+  </div>
 </div>
 <% end %>

data/app/views/admin/translations/_form.erb

@@ -0,0 +1,31 @@
+<%= form_tag admin_translations_path do %>
+<table>
+  <tr>
+    <th><%= t('translations.key') %></th>
+    <th><%= t("translations.locales.#{params[:language]}")%></th>
+    <th></th>
+  </tr>
+  <% @translations.each_with_index do |translation, index| %>
+  <tr id="translation-<%= translation[:id] %>">
+    <td>
+      <%= display_translation_if_exist(translation) %>
+      <span class='key'><%= translation.key %></span></td>
+    <td>
+      <%= hidden_field_tag "translations[#{index}][id]", translation[:id] %>
+      <%= hidden_field_tag "translations[#{index}][locale]", translation[:locale] %>
+      <%= hidden_field_tag "translations[#{index}][key]", translation[:key] %>
+      <%= hidden_field_tag "translations[#{index}][destroy]", false, :class => 'translation-destroy' %>
+      <%= text_area_tag "translations[#{index}][value]", translation[:value] %>
+    </td>
+    <td class="actions"><%= link_to t('translations.delete'), admin_translation_path(translation[:id], :type => params[:type], :language => params[:language]), :method => :delete, :class => :delete, :remote => true %></td>
+  </tr>
+  <% end %>
+  <tr>
+    <td colspan="3">
+      <%= submit_tag t('translations.submit') %>
+      <%= link_to t("cancel"), admin_translations_path %>
+    </td>
+  </tr>
+</table>
+<% end %>
+</div>

data/app/views/admin/translations/all.html.erb

@@ -0,0 +1,12 @@
+<div id="translations">
+  <h1><%= t('translations.new.title') %></h1>
+  <p><%= t('translations.you_are_editing') %> : <%= t("translations.version.#{params[:language]}") %></p>
+  
+  <%= render "filter" %>
+  
+  <%= paginate @translations %>
+  
+  <%= render :partial => 'form', :locals => { :translations => @translations } %>
+</div>
+
+<%= render 'edit_javascript' %>

data/app/views/admin/translations/index.html.erb

@@ -10,7 +10,7 @@
   <ul class='pending'>
   <% @pending_translations.each do |translation| %>
     <li>
-    <%= link_to t("translations.locales.#{translation[0]}"), new_admin_translation_path(:language => translation[0], :type => 'pending') %>
+    <%= link_to t("translations.locales.#{translation[0]}"), admin_pending_translations_path(:language => translation[0], :type => 'pending') %>
     <span class="count"><%= translation[1].size %></span>
     </li>
   <% end %>
@@ -24,7 +24,7 @@
   <ul class='all'>
   <% @all_translations.each do |translation| %>
     <li>
-      <%= link_to t("translations.locales.#{translation[0]}"), new_admin_translation_path(:language => translation[0]) %>
+      <%= link_to t("translations.locales.#{translation[0]}"), admin_all_translations_path(:language => translation[0]) %>
       <span class="count"><%= translation[1].size %></span>
       </li>
   <% end %>

data/app/views/admin/translations/pending.html.erb

@@ -0,0 +1,12 @@
+<div id="translations">
+  <h1><%= t('translations.new.title') %></h1>
+  <p><%= t('translations.you_are_editing') %> : <%= t("translations.version.#{params[:language]}") %></p>
+  
+  <%= render "filter" %>
+  
+  <%= paginate @translations %>
+  
+  <%= render :partial => 'form', :locals => { :translations => @translations } %>
+</div>
+
+<%= render 'edit_javascript' %>

data/config/locales/fr/admin/translations.fr.yml

@@ -19,7 +19,10 @@ fr:
     submit: Envoyer
     delete: supprimer
     
-    filter: Filtrer
+    search:
+      title: Filtrer les traductions
+      key_or_value: Par clé ou valeur
+      submit: Filtrer
     
     available_locales: Languages disponibles
       

data/lib/generators/merrycms/install_generator.rb

@@ -56,6 +56,7 @@ module Merrycms
     end
 
     def copy_javascripts
+      copy_file '../../../../public/javascripts/admin.js', 'public/javascripts/jquery-ui.js'
       copy_file '../../../../public/javascripts/form.js', 'public/javascripts/form.js'
       copy_file '../../../../public/javascripts/admin.js', 'public/javascripts/admin.js'
       copy_file '../../../../public/javascripts/autoresize.jquery.min.js', 'public/javascripts/autoresize.jquery.min.js'

data/lib/merrycms/rails/routes.rb

@@ -5,6 +5,7 @@ module ActionDispatch::Routing
     def merrycms_routes
       namespace :admin do
         resources :users
+        
         resources :pages do
           member do
             get 'publish'
@@ -13,6 +14,7 @@ module ActionDispatch::Routing
             get 'unarchive'
           end
         end
+        
         resources :categories do
           member do
             get 'sort'
@@ -21,11 +23,15 @@ module ActionDispatch::Routing
             get 'sorting'
           end
         end
+        
         resources :translations do
           collection do
             get 'dump'
           end
         end
+        match 'translations/pending/:language' => 'translations#pending', :as => 'pending_translations'
+        match 'translations/all/:language' => 'translations#all', :as => 'all_translations'
+        
         root :to => 'pages#index'
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Franck D'agostini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,10 +185,13 @@ files:
 - app/views/admin/pages/edit.html.erb
 - app/views/admin/pages/index.html.erb
 - app/views/admin/pages/new.html.erb
+- app/views/admin/translations/_edit_javascript.erb
 - app/views/admin/translations/_filter.html.erb
+- app/views/admin/translations/_form.erb
+- app/views/admin/translations/all.html.erb
 - app/views/admin/translations/destroy.js
 - app/views/admin/translations/index.html.erb
-- app/views/admin/translations/new.html.erb
+- app/views/admin/translations/pending.html.erb
 - app/views/admin/users/_form.html.erb
 - app/views/admin/users/edit.html.erb
 - app/views/admin/users/index.html.erb

data/app/views/admin/translations/new.html.erb

@@ -1,49 +0,0 @@
-<div id="translations">
-  <h1><%= t('translations.new.title') %></h1>
-
-  <p><%= t('translations.you_are_editing') %> : <%= t("translations.version.#{params[:language]}") %></p>
-  
-  <%= render "filter" %>
-  
-  <%= paginate @translations %>
-  
-  <%= form_tag admin_translations_path do %>
-  <table>
-    <tr>
-      <th><%= t('translations.key') %></th>
-      <th><%= t("translations.locales.#{params[:language]}")%></th>
-      <th></th>
-    </tr>
-    <% @translations.each_with_index do |translation, index| %>
-    <tr id="translation-<%= translation[:id] %>">
-      <td>
-        <%= display_translation_if_exist(translation) %>
-        <span class='key'><%= translation.key %></span></td>
-      <td>
-        <%= hidden_field_tag "translations[#{index}][id]", translation[:id] %>
-        <%= hidden_field_tag "translations[#{index}][locale]", translation[:locale] %>
-        <%= hidden_field_tag "translations[#{index}][key]", translation[:key] %>
-        <%= hidden_field_tag "translations[#{index}][destroy]", false, :class => 'translation-destroy' %>
-        <%= text_area_tag "translations[#{index}][value]", translation[:value] %>
-      </td>
-      <td class="actions"><%= link_to t('translations.delete'), admin_translation_path(translation[:id], :type => params[:type], :language => params[:language]), :method => :delete, :class => :delete, :remote => true %></td>
-    </tr>
-    <% end %>
-    <tr>
-      <td colspan="3">
-        <%= submit_tag t('translations.submit') %>
-        <%= link_to t("cancel"), admin_translations_path %>
-      </td>
-    </tr>
-  </table>
-  <% end %>
-</div>
-
-<% content_for (:head) do %>
-<script type="text/javascript">
-  $(function() {        
-      
-    $('table textarea').autoResize().trigger('change');
-  });
-</script>  
-<% end %>