From bc38e24259937575199b9bf3361b0e0ef5e5031b Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Mon, 26 Aug 2013 14:30:45 +0800
Subject: [PATCH] company review

---
 .../back_end/dictionary_vocabs/_form.html.erb       | 10 +++++-----
 .../back_end/dictionary_vocabs/index.html.erb       |  4 ----
 .../back_end/dictionary_vocabs/show.html.erb        |  4 ----
 .../front_end/dictionary_vocabs/index.html.erb      | 13 +++----------
 .../front_end/dictionary_vocabs/show.html.erb       |  2 +-
 .../dictionary/config/locales/zh_tw.yml             |  4 ++--
 6 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/_form.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/_form.html.erb
index 2e18960e9..56d97944c 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/_form.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/_form.html.erb
@@ -1,17 +1,17 @@
 <br />
-<div class="offset1"> 
+<div class="site-map"> 
    <h4><%= t :category, :scope => :dictionary %></h4>
   <%= f.collection_select :dictionary_vocab_category_id, @categories, :id, :title %>
 </div>	
-<div class="offset1"> 
+<div class="site-map"> 
    <h4><%= t :word, :scope => :dictionary %></h4>
    <%= f.text_field :word %>    
 </div>	
-<div class="offset1">
+<div class="site-map">
    <h4><%= t :definition, :scope => :dictionary %></h4> 
-   <%= f.text_area :definition %>  
+   <%= f.text_field :definition %>  
 </div> 
 <br />
-<div class="offset1">
+<div class="site-map">
    <%= f.submit t('submit'), class: 'btn btn-primary'%>
 </div>
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/index.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/index.html.erb
index 055f20eb3..5c7a88835 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/index.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/index.html.erb
@@ -1,5 +1,3 @@
-<div class="row">
-  <div class="span8 offset1">
     <% flash.each do |key, value| %>
        <div class="alert alert-<%= key %>"><%= value %></div>
     <% end %>
@@ -32,5 +30,3 @@
       </tbody>
 
     </table>
-  </div>
-</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/show.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/show.html.erb
index 0988d1386..87ab0436c 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/show.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/back_end/dictionary_vocabs/show.html.erb
@@ -1,5 +1,3 @@
-<div class="row">
-  <div class="span8 offset1">
     <table class="table"  align ="center">
         <tr>
           <td ><%= t :category, :scope => :dictionary %></td>
@@ -29,5 +27,3 @@
 			<%= link_to t(:back), panel_dictionary_back_end_dictionary_vocabs_path%></td>
         </tr>
     </table>
-  </div>
-</div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
index 0331dc01c..c672aed6a 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/index.html.erb
@@ -6,7 +6,7 @@
         <tr>
           <th class="span2"><%= t :category, :scope => :dictionary %></th>
           <th class="span2"><%= t :word, :scope => :dictionary %></th>
-          <th class="span2"><%= t :time, :scope => :dictionary %></th>
+          <th class="span2"><%= t :definition, :scope => :dictionary %></th>
         </tr>
       </thead>
 
@@ -15,14 +15,7 @@
             <tr>
               <td><%= vocab.dictionary_vocab_category.title %></td>
               <td><%= link_to truncate(vocab.word,length: 25), panel_dictionary_front_end_dictionary_vocab_path(vocab) %></td>
-              <td>
-                <% if vocab.created_at > Time.now.beginning_of_day %>
-                  <%="#{time_ago_in_words(vocab.created_at)}"%>
-                  <%=t :ago,:scope => :dictionary%>
-                <% else %>
-                  <%= vocab.created_at.strftime("%Y/%m/%d") %>
-                <% end %>
-              </td>        
+              <td><%= link_to truncate(vocab.definition,length: 25), panel_dictionary_front_end_dictionary_vocab_path(vocab) %></td>
             </tr>
         <% end %>
       </tbody>
@@ -30,4 +23,4 @@
   </div>
 </div>
 
-<%= paginate(@vocabs, :param_name => :page_main, :params => {:inner => 'false'} ) rescue nil %>
\ No newline at end of file
+<%= paginate(@vocabs, :param_name => :page_main, :params => {:inner => 'false'} ) rescue nil %>
diff --git a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb
index 5ab42030f..534206b47 100644
--- a/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb
+++ b/vendor/built_in_modules/dictionary/app/views/panel/dictionary/front_end/dictionary_vocabs/show.html.erb
@@ -3,7 +3,7 @@
     <table class="table"  align ="center">
         <tr>
           <td ><%= t :category, :scope => :dictionary %></td>
-          <td><%= @vocab.dictionary_vocab_category.key %></td>
+          <td><%= @vocab.dictionary_vocab_category.title %></td>
         </tr>
         <tr>
           <td ><%= t :word, :scope => :dictionary %></td>
diff --git a/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml b/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml
index b2eec8a6e..1a676a24a 100644
--- a/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/dictionary/config/locales/zh_tw.yml
@@ -21,8 +21,8 @@ zh_tw:
       dictionary: 字典前台
     dictionary: 字彙辭典
     category: 類別
-    word: 字彙
-    definition: 定義
+    word: 字彙中文
+    definition: 英文定義
     time: 建立時間
     ago: 前
     new: 新增