publify_core 9.0.0.pre6 → 9.0.0

data/app/models/tag_sidebar.rb

@@ -5,16 +5,16 @@ class TagSidebar < Sidebar
   setting :maximum_tags, 20
 
   def tags
-    @tags ||= Tag.find_all_with_article_counters.
+    @tags ||= Tag.find_all_with_content_counters.
       take(maximum_tags.to_i).sort_by(&:name)
   end
 
   def sizes
     return @sizes if @sizes
-    total = @tags.reduce(0) { |sum, tag| sum + tag.article_counter }
+    total = tags.reduce(0) { |sum, tag| sum + tag.content_counter }
     average = total.to_f / @tags.size.to_f
-    @sizes = @tags.reduce({}) do |h, tag|
-      size = tag.article_counter.to_f / average
+    @sizes = tags.reduce({}) do |h, tag|
+      size = tag.content_counter.to_f / average
       h.merge tag => [[2.0 / 3.0, size].max, 2].min * 100
     end
   end

data/app/models/trackback.rb

@@ -1,5 +1,4 @@
-require_dependency 'spam_protection'
-
+# Legacy class to support old feedback sent as trackbacks.
 class Trackback < Feedback
   content_fields :excerpt
   validates :title, :excerpt, :url, presence: true
@@ -45,12 +44,6 @@ class Trackback < Feedback
     self.excerpt = newval
   end
 
-  def rss_author(_xml); end
-
-  def rss_title(xml)
-    xml.title feed_title
-  end
-
   def feed_title
     "Trackback from #{blog_name}: #{title} on #{article.title}"
   end

data/app/models/trigger.rb

@@ -11,21 +11,6 @@ class Trigger < ActiveRecord::Base
     def fire
       where('due_at <= ?', Time.now).destroy_all
       true
-    rescue
-      migrator = Migrator.new
-
-      unless migrator.pending_migrations.empty?
-        starting_version = migrator.current_schema_version
-        migrator.migrate
-
-        if starting_version == 0
-          load "#{Rails.root}/Rakefile"
-          Rake::Task['db:seed'].invoke
-          User.reset_column_information
-          Article.reset_column_information
-          Page.reset_column_information
-        end
-      end
     end
 
     def remove(pending_item, conditions = {})
@@ -36,6 +21,7 @@ class Trigger < ActiveRecord::Base
     end
   end
 
+  # TODO: Ensure errors bubble up to where they are visible
   before_destroy :trigger_pending_item
 
   def trigger_pending_item

data/app/models/user.rb

@@ -99,9 +99,9 @@ class User < ActiveRecord::Base
   end
 
   def display_name
-    if !nickname.blank?
+    if nickname.present?
       nickname
-    elsif !name.blank?
+    elsif name.present?
       name
     else
       login
@@ -122,13 +122,6 @@ class User < ActiveRecord::Base
     save
   end
 
-  def generate_password!
-    chars = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a
-    newpass = ''
-    8.times { newpass << chars[rand(chars.size - 1)] }
-    self.password = newpass
-  end
-
   def has_twitter_configured?
     twitter_oauth_token.present? && twitter_oauth_token_secret.present?
   end

data/app/uploaders/resource_uploader.rb

@@ -1,5 +1,8 @@
+require 'mimemagic'
+
 class ResourceUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
+  before :cache, :check_image_content_type!
 
   def store_dir
     "files/#{model.class.to_s.underscore}/#{model.id}"
@@ -24,7 +27,35 @@ class ResourceUploader < CarrierWave::Uploader::Base
   end
 
   def image?(new_file)
-    mime_magic_content_type = new_file.send :mime_magic_content_type
-    mime_magic_content_type && mime_magic_content_type.include?('image')
+    content_type = new_file.content_type
+    content_type && content_type.include?('image')
+  end
+
+  def check_image_content_type!(new_file)
+    if image?(new_file)
+      magic_type = mime_magic_content_type(new_file)
+      if magic_type != new_file.content_type
+        raise CarrierWave::IntegrityError, 'has MIME type mismatch'
+      end
+    end
+  end
+
+  private
+
+  # NOTE: This method was adapted from MagicMimeBlacklist#extract_content_type
+  # from CarrierWave 1.0.0 and SanitizedFile#mime_magic_content_type from CarrierWave 0.11.2
+  def mime_magic_content_type(new_file)
+    content_type = nil
+
+    File.open(new_file.path) do |fd|
+      content_type = MimeMagic.by_magic(fd).try(:type)
+    end
+
+    content_type
+  end
+
+  # NOTE: This method was copied from MagicMimeBlacklist from CarrierWave 1.0.0.
+  def filemagic
+    @filemagic ||= FileMagic.new(FileMagic::MAGIC_MIME_TYPE)
   end
 end

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

@@ -1,6 +1,5 @@
 <p><%= t('.success') %></p>
 <p><%= t(".login", login: current_user.login) %></p>
-<p><%= t(".password", password: session[:tmppass]) %></p>
 <div class='alert alert-warning'><%= t(".dont_lose_the_mail_sent", email: current_user.email) %></div>
 
 <% content_for :account_links do %>

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

@@ -8,7 +8,7 @@
 <% for article in @articles %>
   <tr>
     <td>
-      <% if article.published %>
+      <% if article.published? %>
         <%= link_to_permalink(article, article.title, nil, 'published')%>
       <% else %>
         <%= link_to(article.title, {controller: '/articles', action: "preview", id: article.id}, {class: 'unpublished', target: '_new'}) %>

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

@@ -86,7 +86,7 @@
               </p>
               <div id="status" class="collapse">
                 <label for="article_published" class="checkbox">
-                  <%= check_box 'article', 'published'  %>
+                  <%= check_box 'article', 'published?'  %>
                   <%= t('.published') %>
                 </label>
                 <p>
@@ -98,14 +98,10 @@
             </div>
             <div class="control-group">
               <p>
-                <%= t('.allowed_comments_and_trackbacks_html', allow_comment: content_tag(:strong, t('.allow_comments_status', count: @article.allow_comments ? 1 : 0)), allow_trackback: content_tag(:strong, t('.allow_pings_status', count: @article.allow_pings ? 1 : 0))) %>
+                <%= t('.allowed_comments_html', allow_comment: content_tag(:strong, t('.allow_comments_status', count: @article.allow_comments ? 1 : 0))) %>
                 <%= toggle_element('conversation') %>
               </p>
               <div id="conversation" class="collapse">
-                <label for="article_allow_pings" class='checkbox'>
-                  <%= check_box 'article', 'allow_pings' %>
-                  <%= t('.allow_trackbacks') %>
-                </label>
                 <label for="article_allow_comments" class="checkbox">
                   <%= check_box 'article', 'allow_comments' %>
                   <%= t('.allow_comments') %>
@@ -121,7 +117,7 @@
               <p>
                 <%= t('.published') %>
                 <strong>
-                  <% if @article.published %>
+                  <% if @article.published_at.present? %>
                     <%= display_date_and_time(@article.published_at) %>
                   <% else %>
                     <%= t('.now') %>

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

@@ -69,11 +69,11 @@
             <fieldset>
               <legend><%= t(".publish_settings") %></legend>
               <div class='control-group'>
-                <%= t(".status") %>: <strong><%= (@page.published) ? t(".published") : t(".offline") %></strong>
+                <%= t(".status") %>: <strong><%= (@page.published?) ? t(".published") : t(".offline") %></strong>
                 <%= toggle_element('status') %>
                 <div id='status' class='collapse'>
                   <label for="page_published" class='checkbox'>
-                    <%= check_box 'page', 'published'  %>
+                    <%= check_box 'page', 'published?'  %>
                     <%= t(".online")%>
                   </label>
                   <p><span class='btn btn-default btn-mini'><%= toggle_element 'status', "OK" %></span></p>

data/app/views/admin/seo/_general.html.erb

@@ -1,26 +1,31 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".general_settings") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".meta_keywords")%></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_meta_description"><%= t(".meta_description")%></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
+      <%= text_area(:setting, :meta_description, rows: 3, class: 'form-control') %>
+    </div>
+  </div>
+  <div class='form-group'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".use_meta_keywords")%></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_use_meta_keyword">
           <%= check_box(:setting, :use_meta_keyword)%>
           <%= t(".use_meta_keywords")%>
         </label>
       </div>
-      <%= text_area(:setting, :meta_keywords, rows: 3, class: 'form-control') %>
     </div>
   </div>
-    <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_meta_description"><%= t(".meta_description")%></label>
-    <div class='col-sm-5'>
-      <%= text_area(:setting, :meta_description, rows: 3, class: 'form-control') %>
+  <div class='form-group'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".meta_keywords")%></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
+      <%= text_area(:setting, :meta_keywords, rows: 3, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".use_rss_description") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".use_rss_description") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_rss_description">
           <%= check_box(:setting, :rss_description) %>
@@ -32,8 +37,8 @@
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_rss_description_text"><%= t(".rss_description_message") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_rss_description_text"><%= t(".rss_description_message") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :rss_description_text, rows: 10, class: 'form-control') %>
       <small class='help-block'><%= t('.explain_rss_description') %></small>
     </div>
@@ -43,8 +48,8 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".indexing") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".indexing") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".indexing") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_unindex_tags">
           <%= check_box(:setting, :unindex_tags) %>
@@ -55,27 +60,27 @@
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_robots"><%= t(".robots_txt") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_robots"><%= t(".robots_txt") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :robots, rows: 10, class: 'form-control') %>
     </div>
   </div>
 
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".dofollow") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".dofollow") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_dofollowify">
-          <%= t(".use_dofollow_in_comments") %>
           <%= check_box(:setting, :dofollowify) %>
+          <%= t(".use_dofollow_in_comments") %>
         </label>
         <small class='help-block'><%= t(".explain_moderate_feedback") %></small>
       </div>
   </div>
 </div>
 <div class='form-group'>
-  <label class='control-label col-sm-2'><%= t(".canonical_url") %></label>
-  <div class='col-sm-5'>
+  <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".canonical_url") %></label>
+  <div class='col-sm-8 col-md-6 col-lg-4'>
     <div class='checkbox'>
       <label for="setting_use_canonical_url">
         <%= check_box(:setting, :use_canonical_url) %>
@@ -90,8 +95,8 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".human") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_humans"><%= t(".humans_txt") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_humans"><%= t(".humans_txt") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :humans, rows: 10, class: 'form-control') %>
       <small class='help-block'><%= t(".explain_humans_txt") %></small>
     </div>
@@ -101,20 +106,20 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".google") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_google_analytics"><%= t(".google_analytics") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_google_analytics"><%= t(".google_analytics") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :google_analytics, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_google_verification"><%= t(".google_webmaster_tools_validation_link") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_google_verification"><%= t(".google_webmaster_tools_validation_link") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :google_verification, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_custom_tracking_field"><%= t(".custom_tracking_code") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_custom_tracking_field"><%= t(".custom_tracking_code") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :custom_tracking_field, rows: 3, class: 'form-control') %>
       <small class='help-block'><%= t(".explain") %></small>
     </div>

data/app/views/admin/seo/_permalinks.html.erb

@@ -5,8 +5,8 @@
 
 <div class='form-horizontal'>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".permalink_format") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t(".permalink_format") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='radio'>
         <label for="setting_permalink_format_yearmonthdaytitle">
           <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%day%/%title%') %>

data/app/views/admin/seo/_titles.html.erb

@@ -1,14 +1,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".home") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_home_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :home_title_template, { :class => 'form-control'})%>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_home_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_home_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :home_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -16,14 +16,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".articles") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_article_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :article_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_article_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_article_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :article_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -31,14 +31,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".pages") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_page_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :page_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_page_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_page_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :page_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -47,14 +47,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".paginated_archives") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_paginated_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :paginated_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_paginated_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_paginated_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :paginated_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -62,14 +62,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".dated_archives") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_archives_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :archives_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_archives_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_archives_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :archives_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -78,14 +78,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".author_page") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_author_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :author_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_author_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_author_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :author_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -94,14 +94,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".search_results") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_search_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :search_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_search_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_search_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :search_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -110,14 +110,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".short_statuses_lists") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_statuses_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :statuses_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_statuses_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_statuses_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :statuses_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>
@@ -126,14 +126,14 @@
 <fieldset class='form-horizontal'>
   <legend><%= t(".short_statuses") %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_status_title_template"><%= t(".title_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_title_template"><%= t(".title_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :status_title_template, { :class => 'form-control'}) %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_status_desc_template"><%= t(".description_template") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_status_desc_template"><%= t(".description_template") %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :status_desc_template, :rows => 3, :class => 'form-control') %>
     </div>
   </div>