From f9a148c901457f3a4240e51739404e2b506792c4 Mon Sep 17 00:00:00 2001
From: iCross <rja@icross.cc>
Date: Wed, 5 Jun 2013 18:22:23 +0800
Subject: [PATCH] survey module: move down/up i18n

Conflicts:

	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
---
 .../back_end/surveys/_form_survey_question.html.erb      | 9 ++++++++-
 vendor/built_in_modules/survey/config/locales/en.yml     | 5 ++++-
 vendor/built_in_modules/survey/config/locales/zh_tw.yml  | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
index 9cfb1b67..2f265ce1 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb
@@ -32,6 +32,13 @@
 
         <% end %>
 
+        <div class="sequence">
+          <%= f.label :sequence , t('survey_question.sequence') %>
+          <%= f.text_field :sequence %>
+          <a href="#" class="btn btn-mini move-up"><%= t('survey_question.move_up') %></a>
+          <a href="#" class="btn btn-mini move-down"><%= t('survey_question.move_down') %></a>
+        </div>
+
         <div class="type">
           <%= f.label :type, t('survey_question.type')%> 
           <%= f.select :type, {
@@ -127,4 +134,4 @@
       <% end %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/vendor/built_in_modules/survey/config/locales/en.yml b/vendor/built_in_modules/survey/config/locales/en.yml
index d21ef914..20437e41 100644
--- a/vendor/built_in_modules/survey/config/locales/en.yml
+++ b/vendor/built_in_modules/survey/config/locales/en.yml
@@ -70,4 +70,7 @@ en:
     custom_option: Allow Custom Option
     use_custom_option: Other
 
-    have_not_chart: This type of question havn't chart
\ No newline at end of file
+    have_not_chart: This type of question havn't chart
+
+    move_up: Move up
+    move_down: Move down
diff --git a/vendor/built_in_modules/survey/config/locales/zh_tw.yml b/vendor/built_in_modules/survey/config/locales/zh_tw.yml
index 60548081..c8419628 100644
--- a/vendor/built_in_modules/survey/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/survey/config/locales/zh_tw.yml
@@ -73,3 +73,6 @@ zh_tw:
     use_custom_option: 其他
 
     have_not_chart: 此種類型問題不含結果圖表
+
+    move_up: 上移
+    move_down: 下移