tolk 3.0.2 → 3.1.0

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

@@ -26,6 +26,10 @@ module Tolk
       # 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
+
       def reset
         @exclude_gems_token = false
 
@@ -83,6 +87,8 @@ module Tolk
         }
 
         @yaml_line_width = Psych::Handler::OPTIONS.line_width # Psych::Handler::DumperOptions uses 0 as "default" for unset
+
+        @base_controller =  'ActionController::Base'
       end
     end
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "3.0.2"
+  VERSION = "3.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-09-12 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: sass
+  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
@@ -128,7 +142,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 +151,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
@@ -179,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails engine providing web interface for managing i18n yaml 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;
-}