typo 5.4.3 → 5.4.4

data/app/models/blog.rb

@@ -48,16 +48,6 @@ class Blog < ActiveRecord::Base
   setting :sp_url_limit,               :integer, 0
   setting :sp_akismet_key,             :string, ''
 
-  # Podcasting
-  setting :itunes_explicit,            :boolean, false
-  setting :itunes_author,              :string, ''
-  setting :itunes_subtitle,            :string, ''
-  setting :itunes_summary,             :string, ''
-  setting :itunes_owner,               :string, ''
-  setting :itunes_email,               :string, ''
-  setting :itunes_name,                :string, ''
-  setting :itunes_copyright,           :string, ''
-
   # Mostly Behaviour
   setting :text_filter,                :string, 'markdown smartypants'
   setting :comment_text_filter,        :string, 'markdown smartypants'

data/app/models/content.rb

@@ -168,8 +168,8 @@ class Content < ActiveRecord::Base
         search_hash = {}
       end
 
-      if search_hash[:searchstring]
-        list_function << 'searchstring(search_hash[:searchstring])'
+      if search_hash[:searchstring] 
+        list_function << 'searchstring(search_hash[:searchstring])' unless search_hash[:searchstring].to_s.empty?
       end
 
       if search_hash[:published_at] and %r{(\d\d\d\d)-(\d\d)} =~ search_hash[:published_at]
@@ -180,10 +180,11 @@ class Content < ActiveRecord::Base
         list_function << 'user_id(search_hash[:user_id])'
       end
 
-      if search_hash[:published]
+      if search_hash[:published]      
         list_function << 'published' if search_hash[:published].to_s == '1'
         list_function << 'not_published' if search_hash[:published].to_s == '0'
       end
+      
       list_function
     end
   end

data/app/models/feedback.rb

@@ -89,6 +89,7 @@ class Feedback < Content
 
   def classify
     begin
+      return :ham if self.user_id
       return :spam if blog.default_moderate_comments
       return :ham unless blog.sp_global
     rescue NoMethodError

data/app/models/feedback/states.rb

@@ -69,7 +69,8 @@ module Feedback::States
     def enter_hook
       super
       content.just_changed_published_status = true
-      content.state = :presumed_ham
+      content.state = :presumed_ham unless content.user_id
+      content.state = :just_marked_as_ham if content.user_id
     end
     def to_s
       _("Just Presumed Ham")

data/app/models/resource.rb

@@ -6,32 +6,6 @@ class Resource < ActiveRecord::Base
   after_destroy :delete_filename_on_disk
   before_validation_on_create :uniq_filename_on_disk
   belongs_to :article
-
-  #Reads YAML file from config dir (iTunes.yml) for easy updating
-  def get_itunes_categories
-      itunes_categories_raw = YAML::load( File.open( "#{RAILS_ROOT}/config/iTunes.yml" ) )
-      itunes_categories = []
-      itunes_categories_raw.keys.sort.each do |cat|
-        itunes_categories.push cat => itunes_categories_raw[cat]
-      end
-      return itunes_categories
-  end
-
-  def validate_on_update
-    if itunes_explicit?
-      errors.add_to_base("You must check the box to activate metadata.") unless itunes_metadata?
-      errors.add_to_base("You must specify an author.") if itunes_author.blank?
-      errors.add_to_base("You must specify an subtitle.") if itunes_subtitle.blank?
-      errors.add_to_base("You must specify a summary.") if itunes_summary.blank?
-      errors.add_to_base("You must specify keywords.") if itunes_keywords.blank?
-      if !itunes_duration.blank?
-        errors.add_to_base("You must specify duration in a HH:MM:SS format.") unless itunes_duration =~ /^(\d{0,2}:)?\d{1,2}:?\d{2}$/
-      end
-      if !itunes_category.nil?
-        errors.add_to_base("You can only specify one parent category, but you can choose multiple sub categories.") if itunes_category.length > 1
-      end
-    end
-  end
   
   def fullpath(file = nil)
     "#{RAILS_ROOT}/public/files/#{file.nil? ? filename : file}"

data/app/models/user.rb

@@ -27,7 +27,7 @@ class User < ActiveRecord::Base
     find(:first,
          :conditions => ["login = ? AND password = ? AND state = ?", login, sha1(pass), 'active'])
   end
-
+  
   def update_connection_time
     self.last_venue = last_connection
     self.last_connection = Time.now
@@ -163,7 +163,7 @@ class User < ActiveRecord::Base
   def crypt_unless_empty
     if password(true).empty?
       user = self.class.find(self.id)
-      self.password = user.password
+      write_attribute "password", user.password
     else
       send_create_notification
       write_attribute "password", self.class.sha1(password(true))

data/app/views/accounts/confirm.html.erb

@@ -1,16 +1 @@
-<%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
-
-<h3 class='mt20'><%= _("Congratulation!") %></h3>
-<p class='input_text_title'><%= _("You have successfully signed up") %></p>  
-<p class='input_text_title'>
-  <%= _("<strong>Login:</strong> %s", current_user.login)%>
-</p>
-<p class='input_text_title'>
-  <%= _("<strong>Password:</strong> %s", session[:tmppass]) %>
-</p>
-<p class='input_text_title'>
-  <%= _("Don't lose the mail sent at %s or you won't be able to login anymore", current_user.email)%>
-</p>
-<p class='input_text_title right'>
-  <%= _("Proceed to %s",  link_to(_("admin"), :controller => 'admin/settings')) %>
-</p>
+<%= render :partial => 'shared/confirm'%>

data/app/views/accounts/login.html.erb

@@ -1,33 +1,25 @@
 <%= content_tag :h3, link_to(image_tag("/images/admin/typologo.gif", :alt=>"Typo website"), "http://typosphere.org") %>
 
-<div id="flash"><%= render_flash rescue nil %></div>
+<div id="flash"><%= render_the_flash %></div>
     
 <% form_tag :action=> "login" do %>
-<div>
-  <h2><label for="user_login"><%= _('Login')%></label></h2>
+  <h3><label for="user_login"><%= _('Login')%></label></h3>
   <p class='input_text_title'>
     <%= text_field(:user, :login, {:class => 'title large'})%>
   </p>
-</div>
-<div>
-  <h2><label for="user_password"><%= _('Password')%></label></h2>
+  <h3><label for="user_password"><%= _('Password')%></label></h3>
   <p class='input_text_title'>
     <%= password_field(:user, :password, {:class => 'title large'})%>
   </p>
-</div>
-<div>
   <label for="remember_me"><%= _('Remember me')%>
     <%= check_box_tag 'remember_me' %>  
   </label>
-</div>
-<p>
-  <input type="submit" name="login" value= "<%= _('Submit') %>" class="save large" id="submit" />
-</p>
+  <p>
+    <input type="submit" name="login" value= "<%= _('Submit') %>" class="save large" id="submit" />
+  </p>
 
-    <p>
+  <p>
     <small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small><br />
     <small><%= link_to "#{_("I've lost my password")} &raquo;", :action => 'recover_password' %></small>
-    </p>
-    <% end %>
-  </div>
-</div>
+  </p>
+<% end %>

data/app/views/accounts/recover_password.html.erb

@@ -3,16 +3,13 @@
 <p id="flash"><%= render_flash rescue nil %></p>
 
 <% form_tag :action=> "recover_password" do %>
-<div>
-  <h2><label for="user_login"><%= _("Username or email") %>:</label></h2>
+  <h3><label for="user_login"><%= _("Username or email") %>:</label></h3>
   <p class='input_text_title'>
     <%= text_field(:user, :login, {:class => 'title large'})%>
   </p>
-</div>
-<p><input type="submit" id="submit" class='save large' value="<%= _('Submit')%>" /></p>
-<p>
-<small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small>
-</p>
-
+  <p><input type="submit" id="submit" class='save large' value="<%= _('Submit')%>" /></p>
+  <p>
+    <small><%= link_to "&laquo; #{_('Back to ')} #{this_blog.blog_name}", this_blog.base_url %></small>
+  </p>
 <% end %>
 

data/app/views/accounts/signup.html.erb

@@ -4,6 +4,7 @@
 
 <% form_tag :action=> "signup" do %>
 <div>
+  <h1><%= _("Create an account")%></h1>
   <h2><label for="user_login"><%= _("Username") %>:</label></h2>
   <p class='input_text_title'>
     <%= text_field(:user, :login, {:class => 'title large'})%>

data/app/views/admin/categories/_categories.html.erb

@@ -1,14 +1,22 @@
 <table>
   <tr>
     <th><%= _("Title") %></th>
-    <th><%= _("Posts") %></th>
   </tr>
   <%= render_void_table(@categories.size, 2)  %>
   
   <% for category in @categories -%>
   <tr <%= alternate_class -%> id="category_<%= category.id -%>">
-    <td><%= link_to_edit category.name, category %></td>
-    <td><%= link_to_permalink category, pluralize(category.articles.size, _('no articles') , _('1 article'), __('%d articles')) %></td>
+    <td>
+      <%= link_to_edit category.name, category %><br />
+      <%= show_actions category %>
+      </td>
   </tr>  
   <% end -%>
+  <tr>
+    <td class='paginate'>
+      <%= link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %> |
+      <%= link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) %>
+      
+    </td>
+  </tr>
 </table>

data/app/views/admin/categories/index.html.erb

@@ -1,11 +1,8 @@
-  <% @page_heading = _('Categories') +  "<span>&raquo; #{link_to(_('add new'), :controller => 'categories', :action => 'new')}</span>" %>
-  <% subtabs_for(:content) %>
+<% @page_heading = _('Categories') %>
+<% @link_to_new = link_to(_("New Category"), {:controller => 'categories', :action => 'new'}, :id => 'dialog-link', :class => 'ui-state-default ui-corner-all') %>
+<% subtabs_for(:content) %>
 
-  <div id="category_container" class="list">	
-    <%= render :partial => 'categories' %>  
-  </div>                      
+<div id="category_container" class="list">
+  <%= render :partial => 'categories' %>  
+</div>                      
 
-  <div class="paginate">
-    <%= link_to_remote(_('Reorder'), :update => 'category_container', :url => { :action => 'reorder' }) %> |
-  	<%= link_to_remote(_('Sort alphabetically'), :update => 'category_container', :url => { :action => 'asort' }) %>
-  </div>

data/app/views/admin/categories/reorder.html.erb

@@ -1,9 +1,11 @@
-<ul id="category_list">
+<ul class='ui-sortable' id="category_list">
   <% for category in @categories -%>
-  <li id="category_<%= category.id -%>"><%= category.name -%></li>
+  <li class='ui-state-default' id="category_<%= category.id -%>">
+    <span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
+    <%= category.name -%>
+  </li>
   <% end -%>
 </ul>
 
 <%= link_to_remote _("(Done)"), :update => "category_container", :url => { :action => "category_container" } %>
-
 <%= sortable_element "category_list", :url => { :action => "order" }, :complete => visual_effect(:highlight, "category_list") %>

data/app/views/admin/content/_article_list.html.erb

@@ -1,12 +1,17 @@
 <%= render_void_table(@articles.size, 7)  %>
 <% for article in @articles %>
 <tr <%= alternate_class %>>
-  <td> <%= link_to h(article.title), :action => 'edit', :id => article.id %></td>
+  <td>
+    <%= link_to h(article.title), :action => 'edit', :id => article.id %>
+    <%= show_actions article %>
+  </td>
   <td><%= article.categories.map { |c| link_to h(c.name), {:controller => 'content', :action => 'index', "search[category]" => c.id}}.join(", ") %></td>
-  <td><%= article.published_at.strftime("%m/%d/%Y") %></td>
   <td><%= author_link(article)%></td>
-  <td><%= link_to_published article %></td>
-  <td class="operation"><%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %></td>
+  <td>
+    <%= format_date article.published_at %><br />
+    <%= published_or_not article %>
+  </td>
+  <td><%= (article.allow_comments?) ? link_to(article.comments.ham.size.to_s, :controller => '/admin/feedback', :id => article.id, :action => 'article') : '-' %></td>
 </tr>
 <% end %>
 <%= display_pagination(@articles, 7)%>

data/app/views/admin/content/_drafts.html.erb

@@ -1,6 +1,8 @@
-<div class='bordered'>
-  <h3><label class="block content"><%= _("Drafts:") %></label></h3>
-  <% Article.drafts.all.each do |draft| %>
-    <%= link_to("#{draft.title}<br />", :action => 'edit', :id => draft.id) %>
-  <% end %>
+<div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+  <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><%= _("Drafts")%></h3>
+  <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+    <% Article.drafts.all.each do |draft| %>
+      <%= link_to("#{draft.title},", :action => 'edit', :id => draft.id) %>
+    <% end %>
+  </div>
 </div>

data/app/views/admin/content/_form.html.erb

@@ -4,111 +4,119 @@
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
 
 <%= error_messages_for 'article' %>
+
 <div id='editor-right'>
-  <h3>Publish settings</h3>
-  <div id='publishing'>
-    <%= check_box 'article', 'allow_comments' %>
-    <label for="article_allow_comments"><%= _("Allow comments") %></label><br />
-    <%= check_box 'article', 'allow_pings' %>
-    <label for="article_allow_pings"><%= _("Allow trackbacks")%></label><br />
-    <%= check_box 'article', 'published'  %>
-    <label for="article_published"><%= _("Published")%></label><br />
-    <p class='right'>
-      <input id='save_draft' type="submit" value="<%= _('Save as draft') %> &raquo;" name="article[draft]"/>&nbsp;
-      <%= save( _("Publish") + " &raquo;") %><br />
-      <%= link_to_destroy_with_profiles(@article) unless @article.id.nil? %>
-      <%= link_to_destroy_draft @article %>
-    </p>
-    <span id='preview_link'><%= link_to(_("Preview"), {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new'}) if @article.id %></span>
-  </div>
-  <div class='editor_bottom'>
-    <div class='editor_bottom_right'></div>
+  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Publish settings")%></h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <%= check_box 'article', 'allow_comments' %>
+      <label for="article_allow_comments"><%= _("Allow comments") %></label><br />
+      <%= check_box 'article', 'allow_pings' %>
+      <label for="article_allow_pings"><%= _("Allow trackbacks")%></label><br />
+      <%= check_box 'article', 'published'  %>
+      <label for="article_published"><%= _("Published")%></label><br />
+      <p class='right'>
+        <input id='save_draft' type="submit" value="<%= _('Save as draft') %>" name="article[draft]" class='ui-state-default ui-corner-all' />
+        <%= save( _("Publish") + " &raquo;") %><br />
+        <%= link_to_destroy_with_profiles(@article) unless @article.id.nil? %>
+        <%= link_to_destroy_draft @article %>
+      </p>
+      <span id='preview_link'><%= link_to(_("Preview"), {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new'}) if @article.id %></span>
+    </div>
   </div>
-  <div id="categories">
-    <h3><%= _("Categories") %></h3>
-    <%- Category.all.each do |cat| %>
-      <%= check_box_tag('categories[]', cat.id, (@article.categories.map(&:id).include? cat.id), :id => "category_#{h(cat.id)}") %>
-      <%= label_tag "category_#{h(cat.id)}", h(cat.name) %><br />
-    <% end -%>
+  
+  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Categories")%></h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <%- Category.all.each do |cat| %>
+        <%= check_box_tag('categories[]', cat.id, (@article.categories.map(&:id).include? cat.id), :id => "category_#{h(cat.id)}") %>
+        <%= label_tag "category_#{h(cat.id)}", h(cat.name) %><br />
+      <% end -%>
+    </div>
   </div>
-  <%= render :partial => 'drafts'%>
 </div>
 
 <div id='editor-left'>
-  <div>
+  <div class='settings'>
     <h2><label for="article_title"><%= _("Title")%></label></h2>
-    <p class='input_text_title'>
-      <%= text_field 'article', 'title', :class => 'large title' %>
+    <p class='input_text'>
+      <%= text_field 'article', 'title', :class => 'large' %>
     </p>
-  </div>
-  <div id='editor-menu'>
-    <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
-      <%= build_editor_link("Visual", 'insert_editor', 'fck', 'visual_editor', 'visual') %>
-    </span>
-    <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
-      <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
-    </span>
-  </div>
-  <div id="editor">
+  
     <%= render(:partial => 'images', :object => @images) unless @images.empty? %>
-    <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
-      <script type="text/javascript">edToolbar('article_body_and_extended');</script>
-    </div>
-    <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
-      <%= ckeditor_textarea('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
-    </div>
-    <div id='simple_editor' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
-      <%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) %>
-      <%= render_macros(@macros) if current_user.editor == 'simple' %>  
+
+    <ul id='editor-menu'>
+      <li id="f" class=" <%= 'active' if current_user.editor == 'visual' %>">
+        <%= build_editor_link("Visual", 'insert_editor', 'fck', 'visual_editor', 'visual') %>
+      </li>
+      <li id="s" class=" <%= 'active' if current_user.editor == 'simple' %>">
+        <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
+      </li>
+    </ul>
+
+    <div id="editor" class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
+        <script type="text/javascript">edToolbar('article_body_and_extended');</script>
+      </div>
+    
+      <div id ='visual_editor' <%= "style='display: none;'" if current_user.editor == 'simple'%> >
+        <%= ckeditor_textarea('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'visual' %>
+      </div>
+      
+      <div id='simple_editor' class='input_text' <%= "style='display: none;'" if current_user.editor == 'visual'%> >
+        <%= text_area('article', 'body_and_extended', {:class => 'large', :height => '300px', :rows => '20'}) if current_user.editor == 'simple' %>
+        <%= render_macros(@macros) if current_user.editor == 'simple' %>  
+      </div>
     </div>
-  </div>
-  <div class='editor_bottom'>
-    <div class='editor_bottom_right'></div>
-  </div>
-  <div>
+
     <h3><label for="article_keywords"><%= _("Tags") %></label></h3>
-    <p class='input_text_title'>
+    <p class='input_text'>
       <%= text_field 'article', 'keywords', {:autocomplete => 'off', :class => 'large small'} %>
     </p>
     <%= auto_complete_field 'article_keywords', { :url => { :action => "auto_complete_for_article_keywords"}, :tokens => ','}%>
   </div>
 
-  <h3><label for='article_excerpt'><%= _("Excerpt") %></label></h3>
-  <div class='blue_block'>
-    <%= text_area 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '5'} %>
-    <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself")%></p>
+  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Excerpt")%></h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <p><%=_("Excerpts are posts summaries that are shown on your blog homepage only but won’t appear on the post itself")%></p>
+      <%= text_area 'article', 'excerpt', {:height => '150', :class => 'large', :rows => '5'} %>
+    </div>  
   </div>
-
-  <h3><label class="block"><%= _("Uploads") %></label></h3>
-  <div class='blue_block'>
-    Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.
-    <ul id='attachments'>
-      <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
-    </ul>
-  </div>
-
-  <h3><label class="block"><%= _("Post settings") %></label></h3>
-  <div class='blue_block'>
-    <div>
-      <label class='float'><%= _("Publish at")%></label>
-      <p class='input_text_title'>
-        <%= calendar_date_select 'article', 'published_at' %>
-      </p>
-    </div>
-    <div>
-      <label class='float' for="article_permalink"><%= _("Permalink") %></label>
-      <p class='input_text_title' id='permalink'>
-        <%= text_field 'article', 'permalink', {:class => 'small medium'} %>
-      </p>
+  
+  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Uploads")%></h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <p>Uploads will be displayed as attachments in your RSS feed, but won't appear in your articles.</p>
+    
+      <ul id='attachments'>
+        <%= render :partial => 'admin/content/attachment', :locals => { :attachment_num => 1, :hidden => false } -%>
+      </ul>
     </div>
-    <div>
+  </div>
+  
+  <div class='ui-accordion ui-widget ui-helper-reset ui-accordion-icons settings'>
+    <h3 class='ui-accordion-header ui-helper-reset ui-state-active ui-corner-top'><span class='ui-icon ui-icon-pencil'> </span><%= _("Post settings")%></h3>
+    <div class='ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active'>
+      <div class='setting'>
+        <label class='float'><%= _("Publish at")%></label>
+        <div class='input_text'>
+          <%= calendar_date_select 'article', 'published_at' %>
+        </div>
+      </div>
+      <div class='setting clear'>
+        <label class='float' for="article_permalink"><%= _("Permalink") %></label>
+        <div class='input_text' id='permalink'>
+          <%= text_field 'article', 'permalink', {:class => 'medium'} %>
+        </div>        
+      </div>
+    <div class='setting clear'>
       <label class='float' for="text_filter"><%= _("Article filter")%></label>
-      <p class='input_text_title'>
+      <div class='input_text'>
         <select name="article[text_filter]" id="text_filter">
           <%= options_for_select text_filter_options, @article.text_filter %>
         </select>
-      </p>
+      </div>
     </div>
   </div>
-
 </div>