From 528457130041e3bd70f3e595ae4a588f8315258a Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Mon, 22 Jul 2013 16:55:02 +0800
Subject: [PATCH] Add tooltip to bulletin form and remove file

---
 app/assets/stylesheets/lib/main-forms.css                 | 2 +-
 .../panel/announcement/back_end/bulletins/_form.html.erb  | 7 ++++++-
 .../announcement/back_end/bulletins/_form_file.html.erb   | 8 ++++----
 .../announcement/back_end/bulletins/_form_link.html.erb   | 6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/lib/main-forms.css b/app/assets/stylesheets/lib/main-forms.css
index f5dff7f60..ed3aea650 100644
--- a/app/assets/stylesheets/lib/main-forms.css
+++ b/app/assets/stylesheets/lib/main-forms.css
@@ -90,7 +90,7 @@
 .main-forms fieldset .input-area .controls .exist .input-prepend,
 .main-forms fieldset .input-area .controls .add-target .input-prepend {
 	margin-bottom: 10px;
-	display: inline-block;
+	display: block;
 }
 .main-forms fieldset .input-area .controls .exist .fileupload-new {
 	display: block;
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index 14bdb653f..c7e45b0e3 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -272,7 +272,7 @@
 
 <% content_for :page_specific_javascript do %>
   <script>
-    $(document).ready(function() {
+    $(function() {
       $(document).on('click', '#add_link', function(){
         var new_id = $(this).prev().attr('value');
         var old_id = new RegExp("new_bulletin_links", "g");
@@ -281,6 +281,7 @@
         $(this).prev().attr('value', parseInt(new_id) + 1);
         $(this).parent().siblings('.add-target').append(("<%= escape_javascript(add_attribute 'form_link', f, :bulletin_links) %>").replace(old_id, new_id));
         $(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.tab-content').children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
+        formTip();
       });
       $(document).on('click', '#add_file', function(){
         var new_id = $(this).prev().attr('value');
@@ -292,11 +293,15 @@
         $(this).parent('.add-btn').prev('.add-target').children('.start-line').eq(le).children('.input-append').find('.tab-content').each(function() {
           $(this).children('.tab-pane').eq(on).addClass('in active').siblings().removeClass('in active');
         });
+        formTip();
       });
       $('.for_preview').popover({ html : true });
       $(document).on('click', '.delete_link', function(){
         $(this).parents('.input-prepend').remove();
       });
+      $(document).on('click', '.delete_file', function(){
+        $(this).parents('.input-prepend').remove();
+      });
       $(document).on('click', '.remove_existing_record', function(){
         if(confirm("<%= I18n.t(:sure?)%>")){
           $(this).next('.should_destroy').attr('value', 1);
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
index e78a3a556..a3a77a11b 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_file.html.erb
@@ -7,7 +7,7 @@
   <div class="input-prepend input-append">
     <% if form_file.new_record? %>
       <label>
-        <span class="add-on btn btn-file">
+        <span class="add-on btn btn-file" title='<%= t(:file_) %>'>
           <i class="icons-paperclip"></i>
           <%= f.file_field :file %>
         </span>
@@ -17,7 +17,7 @@
         </div>
       </label>
     <% end %>
-    <span class="add-on icons-pencil"></span>
+    <span class="add-on icons-pencil" title='<%= t(:alternative) %>'></span>
     <span class="tab-content">
       <% @site_valid_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
@@ -27,7 +27,7 @@
         </span>
       <% end %>
     </span>
-    <span class="add-on icons-pencil"></span>
+    <span class="add-on icons-pencil" title='<%= t(:description) %>'></span>
     <span class="tab-content">
       <% @site_valid_locales.each_with_index do |locale, i| %>
         <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
@@ -38,7 +38,7 @@
       <% end %>
     </span>
     </span>
-    <span class="delete_file add-on btn">
+    <span class="delete_file add-on btn" title="<%= form_file.new_record? ? t(:remove) : t(:delete_) %>">
       <% if form_file.new_record? %>
         <a class="icon-trash"></a>
       <% else %> 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
index 079d27b53..842172284 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_link.html.erb
@@ -1,7 +1,7 @@
 <div class="input-prepend input-append start-line">
-  <span class="add-on icons-link"></span>
+  <span class="add-on icons-link" title="<%= t(:url) %>"></span>
   <%= f.text_field :url, class: "input-large", placeholder: t(:url) %>
-  <span class="add-on icons-pencil"></span>
+  <span class="add-on icons-pencil" title="<%= t(:url_alt) %>"></span>
   <span class="tab-content">
     <% @site_valid_locales.each_with_index do |locale, i| %>
       <span class="tab-pane fade <%= ( i == 0 ) ? "in active" : '' %> <%= locale %>">
@@ -11,7 +11,7 @@
       </span>
     <% end %>
   </span>
-  <span class="delete_link add-on btn">
+  <span class="delete_link add-on btn" title="<%= form_link.new_record? ? t(:remove) : t(:delete_) %>">
     <% if form_link.new_record? %>
       <a class="icon-trash"></a>
     <% else %>