Merge branch 'master' into 'master'

add ckeditor to title and add title to a tag



See merge request !11

app/controllers/admin/announcements_controller.rb

@@ -332,6 +332,8 @@ class Admin::AnnouncementsController < OrbitAdminController
 
       is_sent = bulletin.email.is_sent
       is_sent = !params[:resend_mail].eql?("true") if !params[:resend_mail].blank?
+      doc = Nokogiri::HTML(bulletin.title)
+      title = doc.text.empty? ? 'no content' : doc.text
         
       bulletin.email.update_attributes(
         :create_user=>current_user,
@@ -339,11 +341,11 @@ class Admin::AnnouncementsController < OrbitAdminController
         :module_app=>@module_app,
         :mail_lang => I18n.locale,
         :mail_to=>bulletin.email_addresses,
-        :mail_subject=>bulletin.title,
+        :mail_subject=>title,
         :template=>'announcements/email',
         :template_data=>{
           "host" => request.host_with_port,
-          "title" => bulletin.title,
+          "title" => title,
           "url" => page_for_bulletin(bulletin)
         },
         :is_sent=>is_sent

app/controllers/announcements_controller.rb

@@ -22,6 +22,8 @@ class AnnouncementsController < ApplicationController
         desc = (desc.nil? || desc == "" ? "announcement image" : desc)
         link_to_show = a.is_external_link ? a.external_link :  OrbitHelper.url_to_show(a.to_param)
         target = a.is_external_link ? "_blank" : "_self"
+        doc = Nokogiri::HTML(a.title)
+        title = doc.text.empty? ? 'no content' : doc.text
         anns << {
           "bulletin_links" => links,
           "bulletin_files" => files,
@@ -35,7 +37,7 @@ class AnnouncementsController < ApplicationController
           "postdate" => a.postdate,
           "author" => author,
           "is_top" => (a.is_top? ? 1 : 0),
-          "link_to_show" => link_to_show,
+          "link_to_show" => link_to_show+"\" title=\"#{title}\"",
           "target" => target,
           "img_src" => a.image.thumb.url || "/assets/announcement-default.jpg",
           "img_description" => desc,

app/models/bulletin.rb

@@ -9,7 +9,7 @@ class Bulletin
   include OrbitCategory::Categorizable
   include Slug
   
-  field :title, as: :slug_title, type: String, localize: true
+  field :title, type: String, localize: true
   field :subtitle, localize: true
   field :text, localize: true
   field :create_user_id
@@ -51,7 +51,10 @@ class Bulletin
   scope :is_approved, ->{where(:approved => true)}
 
   before_create :set_expire
-
+  def slug_title
+    doc = Nokogiri::HTML(self.title)
+    title = doc.text.gsub('/','-')
+  end
   def set_expire
     self.expirable_created_at = Time.now if self.is_preview
     return true

app/views/admin/announcements/_form.html.erb

@@ -242,7 +242,7 @@
           <label class="control-label muted"><%= t(:title) %></label>
           <div class="controls">
             <%= f.fields_for :title_translations do |f| %>
-              <%= f.text_field locale, class: "input-block-level", placeholder: t(:title), value: (@bulletin.title_translations[locale] rescue nil) %>
+              <%= f.text_area locale, class: "ckeditor input-block-level", placeholder: t(:title), value: (@bulletin.title_translations[locale] rescue nil) %>
             <% end %>
           </div>
         </div>
@@ -253,7 +253,7 @@
           <div class="controls">
             <div class="textarea">
               <%= f.fields_for :subtitle_translations do |f| %>
-                <%= f.text_area locale, rows: 2, class: "input-block-level", value: (@bulletin.subtitle_translations[locale] rescue nil) %>
+                <%= f.text_area locale, rows: 2, class: "ckeditor input-block-level", value: (@bulletin.subtitle_translations[locale] rescue nil) %>
               <% end %>
             </div>
           </div>

app/views/admin/announcements/_index.html.erb

@@ -26,7 +26,7 @@
           <% if b.expired? || (b.category.disable rescue false)%>
             <%= b.title %> 
           <% else %>
-            <a href="<%= page_for_bulletin(b) %>" target="_blank"><%= b.title %></a> 
+            <a href="<%= page_for_bulletin(b) %>" target="_blank"><%= b.title.html_safe %></a> 
           <% end %>
 
           <% if b.expired? %>

app/views/announcements/show.html.erb

@@ -27,12 +27,12 @@
       if now_index != 0
         prev_result = sorted[now_index-1]
         prev_url = params['url'] + '/' + prev_result.to_param
-        prev_content = "<a href='#{prev_url}' class='prev'><b>#{t('announcement.prev')}</b><p>#{prev_result['title'][I18n.locale]}</p></a>"
+        prev_content = "<a href='#{prev_url}' title='#{t('announcement.prev')}' class='prev'><b>#{t('announcement.prev')}</b><p>#{prev_result['title'][I18n.locale]}</p></a>"
       end
       if now_index != sorted.length-1
         next_result = sorted[now_index+1]
         next_url = params['url'] + '/' + next_result.to_param
-        next_content = "<a href='#{next_url}' class='next'><b>#{t('announcement.next')}</b><p>#{next_result['title'][I18n.locale]}</p></a>"
+        next_content = "<a href='#{next_url}' title='#{t('announcement.next')}' class='next'><b>#{t('announcement.next')}</b><p>#{next_result['title'][I18n.locale]}</p></a>"
       end
       content = "<div class='see_more_boxTitle'>#{prev_content}#{next_content}</div>".html_safe
     end