express_translate 1.0.5 → 1.0.6

data/app/assets/stylesheets/express_translate/express_translate.css.scss

@@ -98,7 +98,7 @@ body#express_translate {
         float: left;
         width: 130px;
         height: 130px;
-        background: #3e94d1;
+        background-color: #3e94d1;
         border-radius: 80px;
         border:3px solid #fff;
         box-shadow:0px 0px 2px #888;
@@ -108,10 +108,15 @@ body#express_translate {
         transition:all 0.5s;
         -webkit-transition:all 0.5s;
         -moz-transition:all 0.5s;
+        background-repeat:no-repeat;
+        background-position:center 13%;
+        background-size:25%;
         
         &:hover {
           box-shadow:0px 0px 3px #665;
-          background: #398ac4;
+          background-color: #398ac4;
+          background-position:center 8%;
+          background-size:35%;
           & > p {display:none;}
           h5 {display:block;}
           h4 {display:block;}          
@@ -310,7 +315,7 @@ body#express_translate {
         }
         
         &.origin_true {
-          background: #0B61A4;
+          background-color: #0B61A4;
         }
         
         &.add_files {

data/app/controllers/express_translate/account_controller.rb

@@ -31,6 +31,12 @@ class ExpressTranslate::AccountController < ExpressTranslate::BaseController
     string = (0...50).map { o[rand(o.length)] }.join
   end
   
+  # Reset account with url
+  def reset
+    Account.reset
+    redirect_to action: "login"
+  end
+  
   # Check login status function
   # If logined auto change location for Client
   def check_login

data/app/controllers/express_translate/ajax/codes_controller.rb

@@ -7,6 +7,11 @@ class ExpressTranslate::Ajax::CodesController < ActionController::Base
   require 'csv'
   include ExpressTranslate
   
+  # Load all codes
+  def code_load
+    load_content_code(params)
+  end
+  
   # Add code
   # The first: selector LanguageDetail want to add with Language ID and Package ID
   # After: add code for LanguageDetail selected
@@ -28,7 +33,6 @@ class ExpressTranslate::Ajax::CodesController < ActionController::Base
     load_content_code(params)
   end
   
-  
   # Delete code
   # The first: selector LanguageDetail want to add with Language ID and Package ID
   # Next step: find and remove code data
@@ -46,8 +50,20 @@ class ExpressTranslate::Ajax::CodesController < ActionController::Base
   # The second: selector Language want to show
   def load_content_code(params)
     @origin_lang = Language.get_origin(params[:pack])
-    @LanguageDetail = LanguageDetail
     @lang = {'id'=> params[:lang], 'packages'=> params[:pack]}
-    render :action => :code_update
+    data = []
+    LanguageDetail.info(@origin_lang).all.each_with_index do |item, index|
+      is_origin = @origin_lang["id"] == @lang["id"]
+      code = LanguageDetail.info(@lang).find(item['code']) if !is_origin
+      data.push({
+        index: index + 1,
+        item_code: item["code"],
+        item_text: item["text"],
+        code_text: is_origin ? item["text"] : (code.present? ? code["text"] : ""),
+        origin_lang: is_origin,
+        origin_list: is_origin ? "origin_list" : ""
+      })
+    end
+    render json: {success: true, data: data}
   end
 end

data/app/views/express_translate/ajax/languages/_content_language.html.erb

@@ -1,5 +1,5 @@
 <% @languages.each do |lang| %>
-  <a class="lang origin_<%= lang['is_origin'] %>" href="/express_translate/language/<%= params[:packages] %>/<%= lang['id'] %>">
+  <a class="lang origin_<%= lang['is_origin'] %>" href="/express_translate/language/<%= params[:packages] %>/<%= lang['id'] %>" style="background-image: url('/assets/express_translate/flags/<%= lang['id'] %>.png')">
     <span><%= lang['text'].slice(0,1).capitalize + lang['text'].slice(1..-1) %></span>
     <p><%= (@LanguageDetail.info(lang).all.count.to_f / (@max == 0 ? 1 : @max) * 100).to_i %>%</p>
     <h5><%= @LanguageDetail.info(lang).all.count %>/<%= @max %></h5>

data/app/views/express_translate/options/language_detail.html.erb

@@ -1,7 +1,6 @@
 <div class="content" id="content_code">
-  <%= render "/express_translate/ajax/codes/content_code" %>
+  
 </div>
-
 <div class="popup">
   <form id="add_code">
     <div class="title">Add Code</div>
@@ -18,6 +17,8 @@
   </form>
 </div>
 
+<%= render "/express_translate/templates/code_item" %>
+
 <script>
 
 <% if @origin_lang["id"] == params["id"] %>
@@ -48,14 +49,15 @@
           text: edit.find(".new_value").val()
         },
         success: function(data) {
-          setTimeout(function() {
+          if (data.success) {
+            var template = Handlebars.compile($("#code_item").html());
+            var html = template(data);
             item.removeClass("wait");
             item.removeClass("update");
             window.notification("Successful for update!", true);
-            contentCode.html(data);
+            contentCode.html(html);
             runJavascriptsCode();
-          }, 500);
-        
+          }
         }
       })
     }
@@ -71,10 +73,12 @@
           text: form.find("#text").val()
         },
         success: function(data) {
-          if (typeof(data.success) == "undefined"){
+          if (data.success) {
+            var template = Handlebars.compile($("#code_item").html());
+            var html = template(data);
             popup.bPopup().close();
             window.notification("Successful for save!", true);
-            contentCode.html(data);
+            contentCode.html(html);
             runJavascriptsCode();
           } else {
             window.notification(data.error, false);
@@ -142,12 +146,17 @@
                 pack: "<%= params[:package] %>"
               },
               success: function(data) {
-                setTimeout(function() {
-                  item.removeClass("wait");
+                item.removeClass("wait");
+                if (data.success) {
+                  var template = Handlebars.compile($("#code_item").html());
+                  var html = template(data);
+                  popup.bPopup().close();
                   window.notification("Successful for delete!", true);
-                  $("#"+$(event.target).attr("data_show")).html(data);
+                  contentCode.html(html);
                   runJavascriptsCode();
-                }, 500); 
+                } else {
+                  window.notification(data.error, false);
+                }
               }
             })
           },
@@ -174,6 +183,24 @@
     })
   }
   
-  runJavascriptsCode();
+  var load_index = function(args) {
+    $.ajax({
+      type: "POST",
+      url: "/express_translate/ajax/code/load",
+      data: {
+        lang: "<%= params[:id] %>",
+        pack: "<%= params[:package] %>",
+      },
+      success: function(data) {
+        if (data.success) {
+          var template = Handlebars.compile($("#code_item").html());
+          contentCode.html(template(data));
+          runJavascriptsCode();
+        }
+      }
+    })
+  }
+  
+  load_index();
 
 </script>

data/app/views/express_translate/templates/_code_item.html.erb

@@ -0,0 +1,49 @@
+<script id="code_item" type="text/x-handlebars-template">
+  {{#each data}}
+    <div class="item_box" data="{{item_code}}">
+      <h6 class="index">{{index}}</h6>
+      <h6 class="code">{{item_code}}</h6>
+  
+      <div class='edit'>
+        <a class='btn' href="/express_translate/ajax/code/update" data="{{item_code}}" type="update_code" data_show="content_code">Save</a>
+        <a class='btn btn_cancel' href="#">Cancel</a>
+        <div class="col1 btn_cancel">
+          <h2><b>Origin:</b></h2>
+          <span>{{item_text}}</span>
+        </div>
+        <div class="col1">
+          <h2><b>Translate:</b></h2>
+          <textarea class="new_value" href="/express_translate/ajax/code/update" data="{{item_code}}">{{code_text}}</textarea>
+        </div>
+      </div>
+
+      <div class="show {{origin_list}}">
+        <a class='btn btn_edit' href="#">Edit</a>
+        {{#unless origin_lang}}
+          <a class='btn btn_delete' href="/express_translate/ajax/code/delete" data="{{item_code}}" type="delete_code" data_show="content_code">Delete</a>
+          <div class="col1">
+            <h2><b>Origin:</b></h2>
+            <span class="origin_span">{{item_text}}</span>
+            <hr>
+          </div>
+        {{/unless}}
+        <div class="col1 btn_edit">
+          <h2><b>Translate:</b></h2>
+          <span class="trans_span">{{code_text}}</span>
+        </div>
+      </div>
+  
+      <div class="waiting">
+        <div class="bubblingG">
+          <p id="bubblingG_1"></p>
+          <p id="bubblingG_2"></p>
+          <p id="bubblingG_3"></p>
+        </div>
+      </div>
+  
+      <div class="delete_dialog_{{item_code}}" style="display: none">
+        <h4>Are you sure you want to delete?</br>{{item_text}}</h4>
+      </div>
+    </div>
+  {{/each}}
+</script>

data/config/routes.rb

@@ -11,7 +11,11 @@ Rails.application.routes.draw do
     get "/login" => "express_translate/account#login"
     post "/login" => "express_translate/account#login_check"
     
+    # TOOLS
+    get "/reset/account" => "express_translate/account#reset"
+    
     # CODE
+    post "/ajax/code/load" => 'express_translate/ajax/codes#code_load'
     post "/ajax/code/add" => 'express_translate/ajax/codes#code_add'
     post "/ajax/code/update" => 'express_translate/ajax/codes#code_update'
     post "/ajax/code/delete" => 'express_translate/ajax/codes#code_delete'

data/express_translate.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "express_translate"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl"]
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
     "app/assets/javascript/express_translate/application.js",
     "app/assets/javascript/express_translate/base.js",
     "app/assets/javascript/express_translate/bpopup.js",
+    "app/assets/javascript/express_translate/handlebars-v1.3.0.js",
     "app/assets/javascript/express_translate/jquery-ui-1.10.4.js",
     "app/assets/javascript/express_translate/translate.layout.js",
     "app/assets/javascript/express_translate/wSelect.js",
@@ -138,8 +139,6 @@ Gem::Specification.new do |s|
     "app/views/.DS_Store",
     "app/views/express_translate/.DS_Store",
     "app/views/express_translate/account/login.html.erb",
-    "app/views/express_translate/ajax/codes/_content_code.html.erb",
-    "app/views/express_translate/ajax/codes/code_update.html.erb",
     "app/views/express_translate/ajax/languages/_content_language.html.erb",
     "app/views/express_translate/ajax/languages/language_update.html.erb",
     "app/views/express_translate/ajax/packages/_content_index.html.erb",
@@ -148,6 +147,7 @@ Gem::Specification.new do |s|
     "app/views/express_translate/options/index.html.erb",
     "app/views/express_translate/options/language_detail.html.erb",
     "app/views/express_translate/options/languages.html.erb",
+    "app/views/express_translate/templates/_code_item.html.erb",
     "app/views/layouts/express_translate/login.html.erb",
     "app/views/layouts/express_translate/translate.html.erb",
     "config/languages.yml",

data/lib/express_translate/account_management.rb

@@ -27,5 +27,10 @@ module ExpressTranslate
       encode = encode.split("=").join()
       encode = encode.split("\n").join()
     end
+    
+    def self.reset
+      Database.redis.del("account")
+      self.seed
+    end
   end
 end

data/lib/generators/express_translate/reset_account_generator.rb

@@ -5,8 +5,7 @@ module ExpressTranslate
     # Reset all account
     # Synchronize account with config file 
     def reset_data
-      Database.redis.del("account")
-      Account.seed
+      Account.reset
       puts "Reset account is successful!"
     end
   end

data/lib/generators/express_translate/templates/config/express_translate.yml

@@ -13,9 +13,9 @@ package:
   
 account: 
   - 
-    username: "karl_nguyen"
+    username: "username"
     password: "password"
   - 
-    username: "karl_nguyen_1"
+    username: "express_translate"
     password: "password"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_translate
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -273,6 +273,7 @@ files:
 - app/assets/javascript/express_translate/application.js
 - app/assets/javascript/express_translate/base.js
 - app/assets/javascript/express_translate/bpopup.js
+- app/assets/javascript/express_translate/handlebars-v1.3.0.js
 - app/assets/javascript/express_translate/jquery-ui-1.10.4.js
 - app/assets/javascript/express_translate/translate.layout.js
 - app/assets/javascript/express_translate/wSelect.js
@@ -300,8 +301,6 @@ files:
 - app/views/.DS_Store
 - app/views/express_translate/.DS_Store
 - app/views/express_translate/account/login.html.erb
-- app/views/express_translate/ajax/codes/_content_code.html.erb
-- app/views/express_translate/ajax/codes/code_update.html.erb
 - app/views/express_translate/ajax/languages/_content_language.html.erb
 - app/views/express_translate/ajax/languages/language_update.html.erb
 - app/views/express_translate/ajax/packages/_content_index.html.erb
@@ -310,6 +309,7 @@ files:
 - app/views/express_translate/options/index.html.erb
 - app/views/express_translate/options/language_detail.html.erb
 - app/views/express_translate/options/languages.html.erb
+- app/views/express_translate/templates/_code_item.html.erb
 - app/views/layouts/express_translate/login.html.erb
 - app/views/layouts/express_translate/translate.html.erb
 - config/languages.yml
@@ -406,7 +406,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3987829692264650777
+      hash: 2008451929382581134
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/express_translate/ajax/codes/_content_code.html.erb

@@ -1,48 +0,0 @@
-<% @LanguageDetail.info(@origin_lang).all.each_with_index do |item, index| %>
-  <div class="item_box" data="<%= item['code'] %>">
-    <h6 class="index"><%= index + 1 %></h6>
-    <h6 class="code"><%= item['code'] %></h6>
-    
-    <div class='edit'>
-      <a class='btn' href="/express_translate/ajax/code/update" data="<%= item['code'] %>" type="update_code" data_show="content_code">Save</a>
-      <a class='btn btn_cancel' href="#">Cancel</a>
-      <div class="col1 btn_cancel">
-        <h2><b>Origin:</b></h2>
-        <span><%= item['text'] %></span>
-      </div>
-      <div class="col1">
-        <h2><b>Translate:</b></h2>
-        <% code = @LanguageDetail.info(@lang).find(item['code']) %>
-        <textarea class="new_value" href="/express_translate/ajax/code/update" data="<%= item['code'] %>"><%= code.nil? ? "" : code['text'] %></textarea>
-      </div>
-    </div>
-  
-    <div class="show <%= @origin_lang["id"] == params["id"] ? "origin_list" : "" %>">
-      <a class='btn btn_edit' href="#">Edit</a>
-      <% if @origin_lang["id"] != @lang["id"] %>
-        <a class='btn btn_delete' href="/express_translate/ajax/code/delete" data="<%= item['code'] %>" type="delete_code" data_show="content_code">Delete</a>
-        <div class="col1">
-          <h2><b>Origin:</b></h2>
-          <span class="origin_span"><%= item['text'] %></span>
-          <hr>
-        </div>
-      <% end %>
-      <div class="col1 btn_edit">
-        <h2><b>Translate:</b></h2>
-        <span class="trans_span"><%= code.nil? ? "" : code['text'] %></span>
-      </div>
-    </div>
-    
-    <div class="waiting">
-      <div class="bubblingG">
-        <p id="bubblingG_1"></p>
-        <p id="bubblingG_2"></p>
-        <p id="bubblingG_3"></p>
-      </div>
-    </div>
-    
-    <div class="delete_dialog_<%= item['code'] %>" style="display: none">
-      <h4>Are you sure you want to delete?</br><%= item['text'] %></h4>
-    </div>
-  </div>
-<% end %>

data/app/views/express_translate/ajax/codes/code_update.html.erb

@@ -1 +0,0 @@
-<%= render 'content_code' %>