lit 0.3.3 → 0.4.0.pre.alpha

data/app/views/kaminari/lit/_gap.html.erb

@@ -1,3 +1,3 @@
 <li class="page gap disabled">
-  <a href="#" onclick="return false;"><%= raw t('views.pagination.truncate') %></a>
+  <a href="#" onclick="return false;"><%= raw I18n.t('views.pagination.truncate') %></a>
 </li>

data/app/views/layouts/lit/_navigation.html.erb

@@ -9,7 +9,7 @@
 </div>
 <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
   <ul class="nav navbar-nav">
-    <li><%= link_to "Translate!", lit.localization_keys_path %></li>
+    <li><%= link_to "Translate!", lit.not_translated_localization_keys_path %></li>
     <li><%= link_to "Synchronize", lit.sources_path %></li>
     <li class="dropdown">
       <a href="#" class="dropdown-toggle" data-toggle="dropdown">

data/app/views/lit/dashboard/index.html.erb

@@ -1,5 +1,5 @@
-<strong>All localization keys</strong> <%= Lit::LocalizationKey.count(:id) %><br/>
+<strong>All localization keys</strong> <%= Lit::LocalizationKey.active.count(:id) %><br/>
 <% @locales.each do |l| %>
-  <strong><%= image_tag "lit/famfamfam_flags/#{l.locale[0,2]}.png" %> <%= t("lit.locale_to_languages.#{l.locale}", :default=>l.locale) %>:</strong> <span title="<%= "#{l.get_changed_localizations_count}/#{l.get_all_localizations_count}" %>"><%= l.get_translated_percentage %>%</span><br/>
+  <strong><%= image_tag "lit/famfamfam_flags/#{l.locale[0,2]}.png" %> <%= I18n.t("lit.locale_to_languages.#{l.locale}", :default=>l.locale) %>:</strong> <span title="<%= "#{l.changed_localizations_count}/#{l.all_localizations_count}" %>"><%= l.translated_percentage %>%</span><br/>
 <% end %>
 

data/app/views/lit/incomming_localizations/index.html.erb

@@ -5,10 +5,10 @@
     <h4 class="<%= source_loading_class(@source) %>">Synchronization in progress, please wait. The page will refresh automatically when done.</h2>
     <span class="pull-right">
       <%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success btn-sm", :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-        <%= t('lit.common.accept_all', :default=>"Accept all") %>
+        <%= I18n.t('lit.common.accept_all', :default=>"Accept all") %>
       <% end %>
       <%= link_to reject_all_source_incomming_localizations_path(@source), :class=>"btn btn-danger btn-sm", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-        <%= t('lit.common.reject_all', :default=>"Reject all") %>
+        <%= I18n.t('lit.common.reject_all', :default=>"Reject all") %>
       <% end %>
     </span>
   </div>
@@ -19,6 +19,7 @@
   <tr>
     <th>Current value</th>
     <th>Imported value</th>
+    <th>Is deleted</th>
     <th width="200px"></th>
   </tr>
   <% @incomming_localizations.each do |il| %>
@@ -31,16 +32,19 @@
     <tr data-id="<%= il.id %>">
       <td>
         <% if il.localization %>
-          <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.localization.get_value} %>
+          <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.localization.translation} %>
         <% end %>
       </td>
-      <Td>
-        <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.get_value} %>
+      <td>
+        <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.translation} %>
+      </td>
+      <td>
+        <%= il.localization_key_is_deleted %>
       </td>
       <td>
         <%= link_to accept_source_incomming_localization_path(@source, il, format: :js), class: 'btn btn-success btn-sm', remote: true do %>
           <%= draw_icon 'check', class: 'icon-white' %>
-          <%= t('lit.common.accept', default: 'Accept') %>
+          <%= I18n.t('lit.common.accept', default: 'Accept') %>
         <% end %>
         <%= link_to source_incomming_localization_path(@source, il, format: :js), class: 'btn btn-danger btn-sm', remote: true, method: :delete, data: {confirm: I18n.t('lit.common.you_sure', default: 'Are you sure?')} do %>
           <%= draw_icon 'times', class: "icon-white" %>

data/app/views/lit/localization_keys/_localization_row.html.erb

@@ -6,7 +6,7 @@
   </ul>
 <% else %>
   <% if localization.nil? %>
-    <em title="<%= I18n.t('.value_not_yet_translated', default: 'Value not yet translated') %>">null</em>
+    <em title="<%= I18n.t('lit.value_not_yet_translated', default: 'Value not yet translated') %>">null</em>
   <% else %>
     <%= localization %>
   <% end %>

data/app/views/lit/localization_keys/_localizations_list.html.erb

@@ -0,0 +1,84 @@
+<table class="table">
+  <%- @localization_keys.each do |lk| %>
+    <tr class="localization_key_row" data-id="<%= lk.id %>">
+      <td>
+        <strong><%= lk.localization_key %></strong>
+        <span class="badge"><%= Lit.init.cache.get_global_hits_counter(lk.localization_key) %></span>
+        <div class="localization_keys_options">
+          <% if Lit.store_request_info %>
+            <%= link_to '#', class: 'request_info_link title',  title: 'Show / hide request' do %>
+              <%= draw_icon 'link' %>
+            <% end %>
+          <% end %>
+          <% if lk.is_deleted? %>
+            <%= link_to lit.restore_deleted_localization_key_path(lk), method: :put, remote: true, class: 'rotate_left_icon title', title: 'Restore translation key' do %>
+              <%= draw_icon 'rotate-left' %>
+            <% end %>
+          <% end %>
+          <% unless lk.is_deleted? %>
+            <%= link_to lit.change_completed_localization_key_path(lk), method: :put, remote: true, class: 'check_icon title', title: 'Complete / incomplete translation key' do %>
+              <%= draw_icon lk.is_starred? ? 'check-circle' : 'check-circle-o' %>
+            <% end %>
+            <%= link_to lit.star_localization_key_path(lk), remote: true, class: 'star_icon title', title: 'Star / unstar translation key' do %>
+              <%= draw_icon lk.is_starred? ? 'star' : 'star-o' %>
+            <% end %>
+            <%= link_to lit.localization_key_path(lk), method: :delete, data: {confirm: I18n.t('lit.common.you_sure', default: "Are you sure?")}, remote: true, title: 'Delete translation key', class: 'title' do %>
+              <%= draw_icon 'trash-o' %>
+            <% end %>
+          <% end %>
+        </div>
+        <div class="detail_wrapper">
+          <table class="table table-bordered table-striped">
+            <tr>
+              <th class="col-md-8">Translation</th>
+              <th class="col-md-2 text-center">Locale</th>
+              <% unless lk.is_deleted? %>
+                <th class="col-md-2 text-center">Completed</th>
+              <% end %>
+            </tr>
+            <%- available_locales.each do |locale| %>
+              <%- localization = localization_for(locale, lk) %>
+              <tr>
+                <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
+                  <%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
+                </td>
+                <td class="locale_row text-center">
+                  <%= image_tag "lit/famfamfam_flags/#{locale[0,2]}.png" %>
+                  <%= locale %>
+                  <% if localization %>
+                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization, format: :js), class: "show_prev_versions #{'hidden' unless versions?(localization)}", remote: true do %>
+                      <%= draw_icon 'random', title: I18n.t('lit.common.previous_versions', default: 'Previous versions') %>
+                    <% end %>
+                  <% end %>
+                </td>
+                <% unless lk.is_deleted? %>
+                  <td class="text-center">
+                    <%= link_to lit.change_completed_localization_key_localization_path(lk, localization), method: :put, remote: true, class: "change_completed_#{localization.id}" do |f| %>
+                      <%= check_box_tag :is_changed, localization.is_changed, localization.is_changed %>
+                    <% end %>
+                  </td>
+                <% end %>
+              </tr>
+              <tr class="hidden localization_versions_row" data-id="<%= localization.id %>">
+                <td colspan="2" class="localization_versions"></td>
+              </tr>
+            <% end %>
+            <% if Lit.store_request_info %>
+              <tr class="hidden request_info_row">
+                <td colspan="2">
+                  <strong>Translation key recently displayed on following pages:</strong>
+                  <ul>
+                    <% Lit.init.cache.get_request_info(lk.localization_key).split(' ').reverse.each do |l| %>
+                      <li><%= link_to l, l %></li>
+                   <% end %>
+                  </ul>
+                  <em>Note: you might not have access to those pages!</em>
+                </td>
+              </tr>
+            <% end %>
+          </table>
+        </div>
+      </td>
+    </tr>
+  <% end %>
+</table>

data/app/views/lit/localization_keys/_sidebar.html.erb

@@ -0,0 +1,66 @@
+<% content_for(:sidebar) do %>
+  <div class="well">
+    <%= form_tag '', :class=>"form-search", :method=>:get do |f| %>
+      <% if @search_options.has_key?(:key_prefix) %>
+        <%= hidden_field_tag :key_prefix, @search_options[:key_prefix] %>
+      <% end %>
+      <div class="input-group">
+        <%= text_field_tag :key, @search_options[:key], :class=>"form-control search-query" %>
+        <div class="input-group-btn">
+          <button type="submit" class="btn btn-default"><%= draw_icon 'search' %></button>
+        </div>
+      </div>
+    <% end %>
+    <ul class="nav nav-pills nav-stacked">
+      <li class="<%= "active" if params[:action]=='not_translated' %>">
+        <%= link_to lit.not_translated_localization_keys_path do -%>
+          <%= draw_icon 'pencil' %>
+          not translated
+        <% end %>
+      </li>
+      <li class="<%= "active" if params[:action]=='index' %>">
+        <%= link_to lit.localization_keys_path do -%>
+          <%= draw_icon 'list' %>
+          all
+        <% end %>
+      </li>
+      <li class="<%= "active" if params[:action]=='starred' %>">
+        <%= link_to lit.starred_localization_keys_path do -%>
+          <%= draw_icon 'star' %>
+          starred
+        <% end %>
+      </li>
+      <li class="<%= "active" if params[:action]=='visited_again' %>">
+        <%= link_to lit.visited_again_localization_keys_path do -%>
+          <%= draw_icon 'undo' %>
+          deleted and visited again
+        <% end %>
+      </li>
+      <li class="nav-header"><%= I18n.t(".order_by", :default => "Order by") %>:</li>
+      <% Lit::LocalizationKey.order_options.each do |order| %>
+        <li class="<%= "active" if order == @search_options[:order]  %>">
+          <%= link_to url_for(@search_options.merge(:order => order)) do %>
+            <%= I18n.t("lit.order_options.#{order.gsub(" ", "_")}", :default => order.humanize) %>
+          <% end %>
+        </li>
+      <% end %>
+      <li class="nav-header">Narrow with prefix</li>
+      <% if @search_options[:key_prefix].present? %>
+        <li>
+          <%= link_to url_for(@search_options.merge(:key_prefix=>@parent_prefix.present? ? @parent_prefix : nil)), :title=>(@parent_prefix.present? ? @parent_prefix : 'show all') do %>
+            <%= draw_icon('chevron-left') %>
+            <%= @parent_prefix.present? ? @parent_prefix.split('.').last : 'show all' %>
+          <% end %>
+        </li>
+      <% end %>
+      <% @prefixes.each do |p| %>
+        <li class="key_prefix">
+        <%= link_to url_for(@search_options.merge(:key_prefix=>p)) do %>
+          <%= draw_icon('chevron-right') %>
+          <%=  p.split('.').last %>
+        <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/lit/localization_keys/change_completed.js.erb

@@ -0,0 +1,2 @@
+$('tr.localization_key_row[data-id="<%= @localization_key.id %>"] a.check_icon').html("<%= ejs(draw_icon(@localization_key.is_completed? ? 'check-circle' : 'check-circle-o')) %>");
+$('tr.localization_key_row[data-id="<%= @localization_key.id %>"] input[type=checkbox]').prop("checked", <%= @localization_key.is_completed? %>);

data/app/views/lit/localization_keys/index.html.erb

@@ -1,127 +1,9 @@
-<h3><%= I18n.t('.header', default: 'Localization keys') %></h3>
-<% available_locales = I18n.backend.available_locales %>
+<h3><%= I18n.t('lit.header', default: 'Localization keys') %></h3>
 
-<table class="table">
-  <%- @localization_keys.each do |lk| %>
-    <tr class="localization_key_row" data-id="<%= lk.id %>">
-      <td>
-        <strong><%= lk.localization_key %></strong>
-        <span class="badge"><%= Lit.init.cache.get_global_hits_counter(lk.localization_key) %></span>
-        <div class="localization_keys_options">
-          <% if Lit.store_request_info %>
-            <%= link_to '#', class: 'request_info_link title',  title: 'Show / hide request' do %>
-              <%= draw_icon 'link' %>
-            <% end %>
-          <% end %>
-          <%= link_to lit.star_localization_key_path(lk), remote: true, class: 'star_icon title', title: 'Star / unstar translation key' do %>
-            <%= draw_icon lk.is_starred? ? 'star' : 'star-o' %>
-          <% end %>
-          <%= link_to lit.localization_key_path(lk), method: :delete, data: {confirm: t('lit.common.you_sure', default: "Are you sure?")}, remote: true, title: 'Delete translation key', class: 'title' do %>
-            <%= draw_icon 'trash-o' %>
-          <% end %>
-        </div>
-        <div class="detail_wrapper">
-          <table class="table table-bordered table-striped">
-            <%- available_locales.each do |locale| %>
-              <%- localization = localization_for(locale, lk) %>
-              <tr>
-                <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
-                  <%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
-                </td>
-                <td class="locale_row">
-                  <%= image_tag "lit/famfamfam_flags/#{locale[0,2]}.png" %>
-                  <%= locale %>
-                  <% if localization %>
-                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization, format: :js), class: "show_prev_versions #{'hidden' unless has_versions?(localization)}", remote: true do %>
-                      <%= draw_icon 'random', title: I18n.t('lit.common.previous_versions', default: 'Previous versions') %>
-                    <% end %>
-                  <% end %>
-                </td>
-              </tr>
-              <tr class="hidden localization_versions_row" data-id="<%= localization.id %>">
-                <td colspan="2" class="localization_versions"></td>
-              </tr>
-            <% end %>
-            <% if Lit.store_request_info %>
-              <tr class="hidden request_info_row">
-                <td colspan="2">
-                  <strong>Translation key recently displayed on following pages:</strong>
-                  <ul>
-                    <% Lit.init.cache.get_request_info(lk.localization_key).split(' ').reverse.each do |l| %>
-                      <li><%= link_to l, l %></li>
-                   <% end %>
-                  </ul>
-                  <em>Note: you might not have access to those pages!</em>
-                </td>
-              </tr>
-            <% end %>
-          </table>
-        </div>
-      </td>
-    </tr>
-  <% end %>
+<%= render 'localizations_list', available_locales: I18n.backend.available_locales %>
 
-</table>
 <% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
 <% end %>
 
-
-<% content_for(:sidebar) do %>
-  <div class="well">
-    <%= form_tag '', :class=>"form-search", :method=>:get do |f| %>
-      <% if @search_options.has_key?(:key_prefix) %>
-        <%= hidden_field_tag :key_prefix, @search_options[:key_prefix] %>
-      <% end %>
-      <div class="input-group">
-        <%= text_field_tag :key, @search_options[:key], :class=>"form-control search-query" %>
-        <div class="input-group-btn">
-          <button type="submit" class="btn btn-default"><%= draw_icon 'search' %></button>
-        </div>
-      </div>
-      <label class="checkbox">
-        <%= check_box_tag :include_completed, '1', @search_options[:include_completed].to_i==1 %>
-        <%= t('.is_completed', :default=>"Include completed") %>
-      </label>
-    <% end %>
-    <ul class="nav nav-pills nav-stacked">
-      <li class="<%= "active" if params[:action]=='index' %>">
-        <%= link_to lit.localization_keys_path do -%>
-          <%= draw_icon 'list' %>
-          all
-        <% end %>
-      </li>
-      <li class="<%= "active" if params[:action]=='starred' %>">
-        <%= link_to lit.starred_localization_keys_path do -%>
-          <%= draw_icon 'star' %>
-          starred
-        <% end %>
-      </li>
-      <li class="nav-header"><%= t(".order_by", :default => "Order by") %>:</li>
-      <% Lit::LocalizationKey.order_options.each do |order| %>
-        <li class="<%= "active" if order == @search_options[:order]  %>">
-          <%= link_to url_for(@search_options.merge(:order => order)) do %>
-            <%= t("lit.order_options.#{order.gsub(" ", "_")}", :default => order.humanize) %>
-          <% end %>
-        </li>
-      <% end %>
-      <li class="nav-header">Narrow with prefix</li>
-      <% if @search_options[:key_prefix].present? %>
-        <li>
-          <%= link_to url_for(@search_options.merge(:key_prefix=>@parent_prefix.present? ? @parent_prefix : nil)), :title=>(@parent_prefix.present? ? @parent_prefix : 'show all') do %>
-            <%= draw_icon('chevron-left') %>
-            <%= @parent_prefix.present? ? @parent_prefix.split('.').last : 'show all' %>
-          <% end %>
-        </li>
-      <% end %>
-      <% @prefixes.each do |p| %>
-        <li class="key_prefix">
-        <%= link_to url_for(@search_options.merge(:key_prefix=>p)) do %>
-          <%= draw_icon('chevron-right') %>
-          <%=  p.split('.').last %>
-        <% end %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
+<%= render 'sidebar' %>

data/app/views/lit/localization_keys/not_translated.html.erb

@@ -0,0 +1,9 @@
+<h3><%= I18n.t('lit.not_translated_header', default: 'Not translated localization keys') %></h3>
+
+<%= render 'localizations_list', available_locales: I18n.backend.available_locales %>
+
+<% if defined?(Kaminari)  %>
+  <%= paginate @localization_keys, :theme=>"lit" %>
+<% end %>
+
+<%= render 'sidebar' %>

data/app/views/lit/localization_keys/restore_deleted.js.erb

@@ -0,0 +1 @@
+$('tr.localization_key_row[data-id="<%= @localization_key.id %>"]').fadeOut();

data/app/views/lit/localization_keys/visited_again.html.erb

@@ -0,0 +1,9 @@
+<h3><%= I18n.t('lit.visited_again_header', default: 'Deleted and visited again localization keys') %></h3>
+
+<%= render 'localizations_list', available_locales: I18n.backend.available_locales %>
+
+<% if defined?(Kaminari)  %>
+  <%= paginate @localization_keys, :theme=>"lit" %>
+<% end %>
+
+<%= render 'sidebar' %>

data/app/views/lit/localizations/_previous_versions_rows.html.erb

@@ -1,8 +1,8 @@
 <span class="pull-right"><%= draw_icon 'times', :class=>"close_versions" %></span>
 <table class="table table-condensed">
   <tr>
-    <th><%= t('lit.common.previous_versions') %></th>
-    <th width="25%"><%= t('lit.common.changed_at') %></th>
+    <th><%= I18n.t('lit.common.previous_versions') %></th>
+    <th width="25%"><%= I18n.t('lit.common.changed_at') %></th>
   </tr>
   <% @versions.each do |v| %>
     <tr>

data/app/views/lit/localizations/change_completed.js.erb

@@ -0,0 +1,2 @@
+var input = $('a.change_completed_<%= @localization.id %> input[type=checkbox]');
+input.prop("checked", !input.prop("checked"));

data/app/views/lit/localizations/update.js.erb

@@ -2,3 +2,5 @@ var $row = $('td.localization_row[data-id="<%= @localization.id %>"]');
 $row.data('editing', 0);
 $row.html("<%= ejs render(:partial=>"/lit/localization_keys/localization_row", formats: ['html'], :locals=>{:localization=>@localization.translated_value }) %>");
 $row.siblings().find('.show_prev_versions').removeClass('hidden');
+$('a.change_completed_<%= @localization.id %> input[type=checkbox]').prop("checked", true);
+

data/app/views/lit/sources/_form.html.erb

@@ -30,6 +30,6 @@
   </div>
 
   <div class="actions">
-    <%= f.submit t('lit.common.save', :default => "Save"), :class=>"btn btn-primary btn-sm" %>
+    <%= f.submit I18n.t('lit.common.save', :default => "Save"), :class=>"btn btn-primary btn-sm" %>
   </div>
 <% end %>

data/app/views/lit/sources/index.html.erb

@@ -12,7 +12,7 @@
   <tr>
     <td><%= link_to source.identifier, lit.source_path(source) %></td>
     <td><%= source.last_updated_at.to_s(:db) unless source.last_updated_at.nil? %></td>
-    <td><%= source.get_last_change %></td>
+    <td><%= source.last_change %></td>
     <td>
       <%= link_to lit.source_incomming_localizations_path(source), :title=>t('lit.common.browse_incomming', :default=>"Browse incomming localizations") do %>
         <%= draw_icon 'search' %>

data/config/routes.rb

@@ -17,13 +17,18 @@ Lit::Engine.routes.draw do
   resources :localization_keys, only: [:index, :destroy] do
     member do
       get :star
+      put :change_completed
+      put :restore_deleted
     end
     collection do
       get :starred
       get :find_localization
+      get :not_translated
+      get :visited_again
     end
     resources :localizations, only: [:edit, :update, :show] do
       member do
+        put :change_completed
         get :previous_versions
       end
     end