tolk 3.0.1 → 4.0.0

data/app/views/tolk/searches/_form.html.erb

@@ -6,5 +6,5 @@
   <%= text_field_tag :q, params[:q] %>
   within key:
   <%= text_field_tag :k, params[:k] %>
-  <%= submit_tag "Search", :name => nil %>
+  <%= submit_tag "Search", name: nil, class: 'btn' %>
 <% end %>

data/app/views/tolk/searches/show.html.erb

@@ -1,62 +1,68 @@
-<h3 class="search">
-  <%= render :partial => "form", :locals => { :locale => @locale } %>
-</h3>
+<%= render 'tolk/nav' %>
 
-<div class="search_exits">
-  <%= link_to "Phrases missing translation", @locale %>
-  &nbsp;
-  <%= link_to "Completed translations", tolk.all_locale_path(@locale) %>
+<div class="search">
+  <%= render partial: "form", locals: { locale: @locale } %>
 </div>
 
-<div class="translations">
-  <% if @phrases.any? %>
+<% if @phrases.any? %>
+  <div class="translations">
      <%= form_for @locale do |locale_form| %>
-      <table class="translations">
-        <tr>
-          <th class="translation"><%= @locale.language_name -%></th>
-          <th class="actions"></th>
-          <th class="key"><%= Tolk::Locale.primary_language_name -%></th>
-        </tr>
-        <% @phrases.each do |phrase| %>
+      <table>
+        <thead>
+          <tr>
+            <th><%= @locale.language_name -%></th>
+            <th class="actions"></th>
+            <th><%= Tolk::Locale.primary_language_name -%></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @phrases.each do |phrase| %>
+            <% if translation = phrase.translations.where(locale_id: @locale.id).first || Tolk::Translation.new(locale: @locale, phrase: phrase) %>
+              <tr>
+                <td class="translation">
+                  <%= hidden_field_tag :"translations[][id]", translation.id, id: "#{translation.object_id}_id" %>
+                  <%= hidden_field_tag :"translations[][phrase_id]", phrase.id, id: "#{translation.object_id}_phrase_id" %>
+                  <%= hidden_field_tag :"translations[][locale_id]", translation.locale_id, id: "#{translation.object_id}_locale_id" %>
+                  <%= text_area_tag :"translations[][text]", format_i18n_text_area_value(translation.text),
+                        class: "locale",
+                        id: "#{translation.object_id}_text",
+                        onfocus: "$(this).up('tr').addClassName('active');",
+                        onblur: "$(this).up('tr').removeClassName('active');" %>
+                </td>
+                <td class="actions">
+                  <a class="copy" href="#" tabindex="-1" title="Copy original translation">&larr;</a><br>
+                  <span class="warning" title="Interpolation keys don't match">⚠</span>
+                </td>
+                <td class="original">
+                  <%= text_area_tag :"translations[][original_text]", format_i18n_text_area_value(phrase.translations.primary.text), disabled: true %>
 
-          <% if translation = phrase.translations.where(locale_id: @locale.id).first || Tolk::Translation.new(:locale => @locale, :phrase => phrase) %>
-            <tr>
-              <td class="translation">
-                <%= hidden_field_tag :"translations[][id]", translation.id, :id => "#{translation.object_id}_id" %>
-                <%= hidden_field_tag :"translations[][phrase_id]", phrase.id, :id => "#{translation.object_id}_phrase_id" %>
-                <%= hidden_field_tag :"translations[][locale_id]", translation.locale_id, :id => "#{translation.object_id}_locale_id" %>
-                <%= text_area_tag :"translations[][text]", format_i18n_text_area_value(translation.text), :class => "locale", :id => "#{translation.object_id}_text", :onfocus => "$(this).up('tr').addClassName('active');", :onblur => "$(this).up('tr').removeClassName('active');" %>
-              </td>
-              <td class="actions">
-                <a class="copy" href="#" tabindex="-1" title="Copy original translation">&larr;</a><br>
-                <span class="warning" title="Interpolation keys don't match">⚠</span>
-              </td>
-              <td class="original">
-                <%= text_area_tag :"translations[][original_text]", format_i18n_text_area_value(phrase.translations.primary.text), :disabled => true %>
+                  <% if params[:q].present? -%>
+                    <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
+                  <% else -%>
+                    <%= format_i18n_value(phrase.translations.primary.text) -%>
+                  <% end -%>
+                  <%= boolean_warning if phrase.translations.primary.boolean? -%>
 
-                <% if params[:q].present? -%>
-                  <%= highlight(format_i18n_value(phrase.translations.primary.text), params[:q]) -%>
-                <% else -%>
-                  <%= format_i18n_value(phrase.translations.primary.text) -%>
-                <% end -%>
-                <%= boolean_warning if phrase.translations.primary.boolean? -%>
-
-                <span class="key" title="<%= phrase.key %>"><%= params[:k].present? ?
-                highlight(h(truncate(phrase.key, :length => 100)), params[:k]) :
-                h(truncate(phrase.key, :length => 100)) %></span>
-              </td>
-            </tr>
+                  <span class="translation-key" title="<%= phrase.key %>"><%= params[:k].present? ?
+                  highlight(h(truncate(phrase.key, length: 100)), params[:k]) :
+                  h(truncate(phrase.key, length: 100)) %></span>
+                </td>
+              </tr>
+            <% end %>
           <% end %>
-        <% end %>
+        </tbody>
       </table>
       <div class="table_submit">
-        <p><%= locale_form.submit "Save changes", :class => 'save' %></p>
+        <p><%= locale_form.submit "Save changes", class: 'save-translations btn btn--large' %></p>
       </div>
     <% end %>
-    <div class="paginate">
-      <%= tolk_paginate @phrases %>
-    </div>
-  <% else %>
-    <p style="text-align: left">No search results.</p>
-  <% end %>
-</div>
+    <%= tolk_paginate @phrases %>
+  </div>
+<% else %>
+  <div class="empty-state">
+    <%= render 'tolk/no_data.svg' %>
+    <p class="empty-state__msg">
+      No search results.
+    </p>
+  </div>
+<% end %>

data/lib/generators/tolk/templates/initializer.erb

@@ -409,4 +409,5 @@ Tolk.config do |config|
   # config.mapping['zu']      = 'Zulu'
   # config.mapping['zu-ZA']   = 'Zulu (South Africa)
 
+  # config.base_controller = 'ApplicationController'
 end

data/lib/tolk/config.rb

@@ -23,6 +23,16 @@ module Tolk
       # strip translation texts automatically
       attr_accessor :strip_texts
 
+      # specify line width which Yaml.dump will use to break lines. -1 for not breaking
+      attr_accessor :yaml_line_width
+
+      # specify controller to inherit from to keep Tolk controllers
+      # in the same context than the rest of your app
+      attr_accessor :base_controller
+
+      # Ignore specific keys
+      attr_accessor :ignore_keys
+
       def reset
         @exclude_gems_token = false
 
@@ -78,6 +88,12 @@ module Tolk
           'zh-CN' => 'Chinese (Simplified)',
           'zh-TW' => 'Chinese (Traditional)'
         }
+
+        @yaml_line_width = Psych::Handler::OPTIONS.line_width # Psych::Handler::DumperOptions uses 0 as "default" for unset
+
+        @base_controller =  'ActionController::Base'
+
+        @ignore_keys = []
       end
     end
 

data/lib/tolk/import.rb

@@ -24,27 +24,27 @@ module Tolk
         data = locale.read_locale_file
         return unless data
 
-        phrases = Tolk::Phrase.all
+        phrases_by_key = Tolk::Phrase.all.index_by(&:key)
+        translated_phrase_ids = Set.new(locale.translations.pluck(:phrase_id))
         count = 0
 
         data.each do |key, value|
-          phrase = phrases.detect {|p| p.key == key}
-
-          if phrase
-            translation = locale.translations.new(:text => value, :phrase => phrase)
-            if translation.save
-              count = count + 1
-            elsif translation.errors[:variables].present?
-              puts "[WARN] Key '#{key}' from '#{locale_name}.yml' could not be saved: #{translation.errors[:variables].first}"
-            end
-          else
+          phrase = phrases_by_key[key]
+          unless phrase
             puts "[ERROR] Key '#{key}' was found in '#{locale_name}.yml' but #{Tolk::Locale.primary_language_name} translation is missing"
+            next
+          end
+          next if translated_phrase_ids.include?(phrase.id)
+          translation = locale.translations.new(:text => value, :phrase => phrase)
+          if translation.save
+            count = count + 1
+          elsif translation.errors[:variables].present?
+            puts "[WARN] Key '#{key}' from '#{locale_name}.yml' could not be saved: #{translation.errors[:variables].first}"
           end
         end
 
         puts "[INFO] Imported #{count} keys from #{locale_name}.yml"
       end
-
     end
 
     def read_locale_file

data/lib/tolk/sync.rb

@@ -30,7 +30,8 @@ module Tolk
           I18n.backend.send :init_translations unless I18n.backend.initialized? # force load
         end
         translations = flat_hash(I18n.backend.send(:translations)[primary_locale.name.to_sym])
-        filter_out_i18n_keys(translations.merge(read_primary_locale_file))
+        filtered = filter_out_i18n_keys(translations.merge(read_primary_locale_file))
+        filter_out_ignored_keys(filtered)
       end
 
       def read_primary_locale_file
@@ -62,30 +63,44 @@ module Tolk
         primary_locale = self.primary_locale
 
         # Handle deleted phrases
-        translations.present? ? Tolk::Phrase.where(["tolk_phrases.key NOT IN (?)", translations.keys]).destroy_all : Tolk::Phrase.destroy_all
+        Tolk::Phrase.where.not(:key => translations.keys).destroy_all
 
-        phrases = Tolk::Phrase.all
+        phrases_by_key = Tolk::Phrase.all.index_by(&:key)
+        primary_translation_by_phrase_id = primary_locale.translations.index_by(&:phrase_id)
 
         translations.each do |key, value|
           next if value.is_a?(Proc)
           # Create phrase and primary translation if missing
-          existing_phrase = phrases.detect {|p| p.key == key} || Tolk::Phrase.create!(:key => key)
-          translation = existing_phrase.translations.primary || primary_locale.translations.build(:phrase_id => existing_phrase.id)
+          phrase = phrases_by_key[key] || Tolk::Phrase.create!(:key => key)
+          translation = primary_translation_by_phrase_id[phrase.id]
+          translation ||= primary_locale.translations.build(:phrase => phrase)
           translation.text = value
 
           if translation.changed? && !translation.new_record?
             # Set the primary updated flag if the primary translation has changed and it is not a new record.
-            existing_phrase.translations.where(Tolk::Translation.arel_table[:locale_id].not_eq(primary_locale.id)).update_all({ :primary_updated => true })
+            phrase.translations.where.not(:locale_id => primary_locale.id).update_all({ :primary_updated => true })
           end
 
           translation.primary = true
-          translation.save!
+          translation.save! if translation.changed?
         end
       end
 
       def filter_out_i18n_keys(flat_hash)
         flat_hash.reject { |key, value| key.starts_with? "i18n" }
       end
+
+      def filter_out_ignored_keys(flat_hash)
+        ignored = Tolk.config.ignore_keys
+
+        return flat_hash unless ignored.any?
+
+        ignored_escaped = ignored.map { |key| Regexp.escape(key) }
+
+        regexp = Regexp.new(/\A(#{ignored_escaped.join('|')})(:?\.|\Z)/)
+
+        flat_hash.reject { |key, _| regexp === key }
+      end
     end
   end
 end

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "3.0.1"
+  VERSION = "4.0.0"
 end

data/lib/tolk/yaml.rb

@@ -22,7 +22,7 @@ module Tolk
       if payload.respond_to?(:ya2yaml)
         payload.ya2yaml(:syck_compatible => true)
       else
-        ::YAML.dump(payload)
+        ::YAML.dump(payload, line_width: Tolk::Config.yaml_line_width)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -9,10 +9,10 @@ authors:
 - Emilio Tagua
 - Thomas Darde
 - Ferran Basora
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -42,6 +42,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.6
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -60,16 +74,22 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +148,7 @@ files:
 - app/assets/javascripts/tolk/libraries.js
 - app/assets/stylesheets/tolk/application.css
 - app/assets/stylesheets/tolk/reset.css
-- app/assets/stylesheets/tolk/screen.css
+- app/assets/stylesheets/tolk/screen.scss
 - app/controllers/tolk/application_controller.rb
 - app/controllers/tolk/locales_controller.rb
 - app/controllers/tolk/searches_controller.rb
@@ -137,6 +157,11 @@ files:
 - app/models/tolk/phrase.rb
 - app/models/tolk/translation.rb
 - app/views/layouts/tolk/application.html.erb
+- app/views/tolk/_blank_canva.svg
+- app/views/tolk/_empty.svg
+- app/views/tolk/_houra.svg
+- app/views/tolk/_nav.html.erb
+- app/views/tolk/_no_data.svg
 - app/views/tolk/locales/all.html.erb
 - app/views/tolk/locales/index.html.erb
 - app/views/tolk/locales/show.atom.builder
@@ -163,7 +188,7 @@ homepage: https://github.com/tolk/tolk
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,16 +196,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml files
 test_files: []

data/app/assets/stylesheets/tolk/screen.css

@@ -1,401 +0,0 @@
-/*-------------------------------------------------
-Defaults
--------------------------------------------------*/
-
-acronym, abbr {
-  font-variant: small-caps;
-  text-transform: lowercase;
-  font-weight: bold;
-}
-
-.center {text-align: center;}
-.large {font-size: larger;}
-.small {font-size: smaller;}
-strong {font-weight: bold;}
-em {font-style: italic;}
-
-.clear {clear: both;}
-.clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.clearfix { display: inline-block; }
-.clearfix{ display: block; }
-
-a {color: #888;}
-a:hover {color: #000;}
-
-/*-------------------------------------------------
-Layout
--------------------------------------------------*/
-
-body {
-  font-family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", sans-serif;
-  background: #e5e5e5;
-  color: #333;
-  margin: 0;
-  padding: 0;
-  font-size: 14px;
-  line-height: 21px;
-  text-align: left;
-}
-
-div#container {
-  margin: 2% 4%;
-  padding: 25px;
-  background: #fff;
-  -webkit-border-radius: 20px;
-  -moz-border-radius: 20px;
-  border-radius: 20px;
-  box-shadow: 0px 0px 15px rgba(00,00,00,0.5);
-  -moz-box-shadow: 0px 0px 15px rgba(00,00,00,0.5);
-  -webkit-box-shadow: 0px 0px 15px rgba(00,00,00,0.5);
-}
-
-div#head {
-  margin: -25px -25px 0;
-  background: #111;
-  color: #999;
-  padding: 25px 25px 20px 15px;
-  -webkit-border-top-left-radius: 20px;
-  -webkit-border-top-right-radius: 20px;
-  -moz-border-radius-topleft: 20px;
-  -moz-border-radius-topright: 20px;
-  border-top-left-radius: 20px;
-  border-top-right-radius: 20px;
-  font-size: 18px;
-}
-
-div#head a {
-  color: #2fadcf;
-  font-weight: bold;
-  text-decoration: none;
-}
-
-div#head span {
-  padding: 8px 6px;
-  margin-right: 1px;
-}
-
-div#head span.home {
-  background: #333;
-}
-
-div#head span.locale {
-  background: #444;
-}
-
-div#head span.locale a {
-  color: #fff;
-}
-
-div#head span.locale form.button_to {
-  display: inline;
-}
-
-div#head span.locale form.button_to div {
-  display: inline;
-}
-
-div#head span.locale form.button_to div input {
-  color: #fff;
-  background: none;
-  border: 0;
-  font-weight: bold;
-  text-decoration: none;
-  font-size: 18px;
-  color: #2fadcf;
-  cursor: pointer;
-}
-
-div#head span:first-child {
-  padding-left: 12px;
-  -webkit-border-top-left-radius: 10px;
-  -webkit-border-bottom-left-radius: 10px;
-  -moz-border-radius-topleft: 10px;
-  -moz-border-radius-bottomleft: 10px;
-  border-top-left-radius: 10px;
-  border-bottom-left-radius: 10px;
-}
-
-div#head span:last-child {
-  padding-right: 12px;
-  -webkit-border-top-right-radius: 10px;
-  -webkit-border-bottom-right-radius: 10px;
-  -moz-border-radius-topright: 10px;
-  -moz-border-radius-bottomright: 10px;
-  border-top-right-radius: 10px;
-  border-bottom-right-radius: 10px;
-}
-
-h2,
-h3 {
-  font-size: 18px;
-  color: #2fadcf;
-  margin: 25px 0 10px;
-}
-
-h2 span,
-h3 span {
-  font-size: 13px;
-  color: #888;
-}
-
-ul.locales {
-  margin: 25px 0;
-}
-
-ul.locales li {
-  width: 300px;
-  display: block;
-  float: left;
-  margin: 0 10px 10px 0;
- /* background: #fff;
-   -webkit-border-radius: 5px;
-   -moz-border-radius: 5px;
-   border-radius: 5px;
-   border: 1px solid #e5e5e5;
-   padding: 5px 10px;*/
-}
-
-ul.locales a {
-  font-weight: bold;
-  text-decoration: underline;
-  color: #2fadcf;
-}
-
-/*ul.locales li:hover {
-  background: #f5f5f5;
-  border-color: #ccc;
-}*/
-
-ul.locales span.missing_translations {
-  color: #fff;
-  font-weight: bold;
-  background: #c00;
-  font-size: 9px;
-  padding: 3px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  line-height: 9px;
-  vertical-align: top;
-  display: inline-block;
-}
-
-ul.locales span {
-  font-size: 13px;
-  color: #666;
-}
-
-div.submit {
-  background: #f5f5f5;
-  margin: 25px -25px -25px;
-  padding: 15px 25px;
-  border-top: 1px dashed #ccc;
-  -webkit-border-bottom-right-radius: 20px;
-  -webkit-border-bottom-left-radius: 20px;
-  -moz-border-radius-bottomright: 20px;
-  -moz-border-radius-bottomleft: 20px;
-  border-bottom-right-radius: 20px;
-  border-bottom-left-radius: 20px;
-}
-
-span.updated {
-  font-size: 11px;
-  padding: 1px;
-  background: #ffc;
-  color: #777;
-  margin-bottom: 10px;
-  float: right;
-}
-
-div.table_submit {
-  background: #f5f5f5;
-  margin: -25px 0 0;
-  padding: 12px 15px 15px;
-  text-align: left;
-}
-
-div.table_submit input.save {
-  border: 0;
-  font-weight: bold;
-  text-decoration: none;
-  font-size: 18px;
-  color: #fff;
-  cursor: pointer;
-  border-radius: 10px;
-  padding: 8px 10px;
-  background: #444;
-}
-
-
-div.translations {
-  width: 96%;
-  text-align: center;
-}
-
-span.notice {
-  background: #ffc;
-  color: #666;
-  font-size: 12px;
-  padding: 2px 5px;
-  margin: -5px 0 15px;
-  display: inline-block;
-}
-
-div.previous {
-  color: #999;
-  margin: 5px 0;
-  padding: 1px 8px 4px;
-}
-
-div.updated {
-  background: #ffc;
-  padding: 1px 8px 4px;
-}
-
-table.translations div.previous span.key {
-  margin: 0 0 -2px;
-  padding: 0;
-}
-
-table.translations div.updated span.key {
-  margin: 0 0 -2px;
-  color: orange !important;
-  padding: 0;
-}
-
-/*-------------------------------------------------
-Translation tables
--------------------------------------------------*/
-
-table.translations {
-  margin: 0 0 25px;
-  width: 100%;
-  text-align: left;
-}
-
-table.translations td,
-table.translations th {
-  font-size: 14px;
-  color: #222;
-  padding: 12px 8px;
-  border-bottom: 1px solid #e5e5e5;
-  vertical-align: top;
-  width: 48%;
-}
-
-table.translations th {
-  border-bottom-color: #bbb;
-  font-size: 11px;
-  font-weight: bold;
-  text-transform: uppercase;
-  color: #999;
-  padding-bottom: 2px;
-}
-
-table.translations th.actions {
-  width: 50px;
-}
-
-table.translations textarea.locale {
-  font-family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", sans-serif;
-  font-size: 14px;
-  line-height: 21px;
-  color: #222;
-  padding: 1px;
-  width: 100%;
-  height: 42px;
-}
-
-table.translations span.key {
-  color: #aaa;
-  font-size: 9px;
-  display: block;
-}
-
-table.translations td.translation {
-  padding: 10px 8px;
-}
-
-table.translations td.actions {
-  width: 50px;
-  text-align: center;
-}
-
-table.translations td.actions a {
-  font-weight: bold;
-  text-decoration: none;
-}
-
-table.translations td.actions .warning {
-  font-weight: bold;
-  font-size: 25px;
-  color: orange;
-  padding: 2px 4px;
-  display: none;
-  cursor: help;
-}
-
-table.translations tr.active td {
-  background: #edf9fe;
-}
-
-table.translations .highlight {
-  background-color: yellow;
-}
-
-table.translations .original textarea {
-  display: none;
-}
-
-table.translations .original .interpolation, 
-table.translations .original .carriage_return,
-table.translations .original .boolean  {
-  color: #2fadcf;
-  font-family: Courier, monospace;
-  font-weight: bold;
-  cursor: help;
-}
-
-table.translations .original .carriage_return:before {
-  content: "¶";
-}
-
-/*-------------------------------------------------
-Pagination
--------------------------------------------------*/
-
-div.paginate {
-  margin: 15px auto 20px;
-  font-size: 12px;
-  color: #777;
-}
-
-div.paginate a,
-div.paginate span {
-  padding: 2px 6px;
-  text-decoration: none;
-}
-
-div.paginate a:hover,
-div.paginate span.current {
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  background: #eee;
-  color: #333;
-}
-
-div.paginate .next_page,
-div.paginate .prev_page {
- margin: 0 15px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- border: 1px solid #bbb;
- padding: 4px 8px;
-}
-
-div.paginate .disabled {
-  color: #ccc;
-  border-color: #eee;
-}