publify_core 10.0.0 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315c96f6777f5d761c19b1b78a37aa38fdddb337522c56059813be2340f835cd
-  data.tar.gz: cd54077be1d63bfd63e385e2dd61e2f23e2928ba3e19ef9aa04f69ab94e00263
+  metadata.gz: a80ae8a43965fcfb378504dd7b9d0cf6f13d5bc87df95fd9fb937caca4eb401f
+  data.tar.gz: d18535211810991287441d7e851786062d1ae0dea3b7835f47a102d20c0c179f
 SHA512:
-  metadata.gz: af4a6c89bc46ba69993175cbc0245c8cda50e5818a0d809322c5ff9a3431848c8c3b1e5b38db15e8a1ec2e226f3127978b25d312c4e91039af436eba950d2889
-  data.tar.gz: 114fd493221442b2d93dd40cf8c2766cd7b18e1d07a843fe14b605a44e1745a38b4481ccf4f83bf24afd378bb7d525ebd812e4b2bb8dfef3bcff6b7b18db13ba
+  metadata.gz: 4154fcce63f81d06ea49c427307cebe10dec30c90dfeb16d4955fd9fca6e40be98a6d95a00b2582d0dd41d81ed82535a5f6b4ee3fc403ebfd04f924aa5e3bb59
+  data.tar.gz: 8dfb7191f158518c34cac975d53f89ed74539c14340db36f67fc6f5951e3f8a90004881d1a2a74c0740368040c19f424d29f0d830ddae9dcbe2b260b69c81846

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## 10.0.2 / 2024-06-28
+
+### Security updates
+
+* Safely link target URLs for Redirects in admin ([#148] by [mvz])
+* Upgrade jquery-ui-rails to version 7.0 ([#149] by [mvz])
+
+### Functional changes
+
+* Use native datetime inputs in the Admin ([#121] by [mvz])
+* Display Theme description nicely in the admin ([#151] by [mvz])
+
+### Internal changes
+
+* Stop using and depending on REXML ([#123] by [mvz])
+* Remove inline javascript ([#124] by [mvz])
+* Switch to no-trailing-comma style ([#127] by [mvz])
+* Remove inline styles assigned in ERB templates ([#128] by [mvz])
+* Make Content.searchstring scope code more transparent ([#150] by [mvz])
+* Add erb-lint and fix initial warnings ([#125] by [mvz])
+
+[#121]: https://github.com/publify/publify_core/pull/121
+[#123]: https://github.com/publify/publify_core/pull/123
+[#124]: https://github.com/publify/publify_core/pull/124
+[#125]: https://github.com/publify/publify_core/pull/125
+[#127]: https://github.com/publify/publify_core/pull/127
+[#128]: https://github.com/publify/publify_core/pull/128
+[#148]: https://github.com/publify/publify_core/pull/148
+[#149]: https://github.com/publify/publify_core/pull/149
+[#150]: https://github.com/publify/publify_core/pull/150
+[#151]: https://github.com/publify/publify_core/pull/151
+
+## 10.0.1 / 2023-10-28
+
+* Update CarrierWave dependency to version 3.0 ([#102] by [mvz])
+* Move String monkey-patches into a module under PublifyCore ([#115] by [mvz])
+* Remove text filter plugin naming requirements ([#109], [#110], [#117] by [mvz])
+* Fix name and description of Twitterfilter ([#118] by [mvz])
+* Fix link to pull request in CHANGELOG ([#116] by [mvz])
+* Provide proper validation feedback during setup ([#119] by [mvz])
+
+[#102]: https://github.com/publify/publify_core/pull/102
+[#109]: https://github.com/publify/publify_core/pull/109
+[#110]: https://github.com/publify/publify_core/pull/110
+[#115]: https://github.com/publify/publify_core/pull/115
+[#116]: https://github.com/publify/publify_core/pull/116
+[#117]: https://github.com/publify/publify_core/pull/117
+[#118]: https://github.com/publify/publify_core/pull/118
+[#119]: https://github.com/publify/publify_core/pull/119
+[mvz]: https://github.com/mvz
+
 ## 10.0.0 / 2023-06-25
 
 ### Updated dependencies
@@ -37,7 +88,7 @@
 * Remove `sitealizer` table [publify#1089](https://github.com/publify/publify/pull/1089) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
 * Remove itunes fields from resources [publify#1092](https://github.com/publify/publify/pull/1092) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
 * Remove `page_caches` table [publify#1090](https://github.com/publify/publify/pull/1090) by [SupriyaMedankar](https://github.com/SupriyaMedankar)
-* Remove obsolete Sidebar code [publify#58](https://github.com/publify/publify/pull/58)
+* Remove obsolete Sidebar code [publify_core#58](https://github.com/publify/publify_core/pull/58)
 
 ## 9.2.10 / 2023-01-08
 

data/app/assets/javascripts/markup_help_popup.js

@@ -0,0 +1,25 @@
+$(document).ready(function() {
+  $('.markup-help-popup-link').on("click", function(e){
+    var dialog = document.getElementById(e.target.dataset["target"]);
+    var url = e.target.dataset.url;
+
+    $.ajax({
+      url: url,
+      type: 'get',
+      dataType: 'html',
+      success: function(data) {
+        dialog.getElementsByClassName("content-target").item(0).innerHTML = data;
+        dialog.showModal();
+      }
+    });
+    e.preventDefault();
+  });
+  $('.markup-help-popup-close').on("click", function(e) {
+    e.target.closest('dialog').close();
+  });
+  $('.markup-help-popup').on("click", function(e) {
+    if (e.target == e.currentTarget) {
+      e.target.close();
+    }
+  });
+});

data/app/assets/javascripts/optional_field_toggle.js

@@ -0,0 +1,7 @@
+$(document).ready(function() {
+  $('.optional_field').hide();
+  $('.optional-field-toggle').on("click", function(e){
+    $('.optional_field').fadeToggle();
+    e.preventDefault();
+  });
+});

data/app/assets/javascripts/preview_comment.js

@@ -0,0 +1,10 @@
+$(document).ready(function() {
+  $('.preview-comment-link').on("click", function(e) {
+    var lnk = e.currentTarget;
+    var preview_url = lnk.dataset.previewUrl;
+    var comment_form_selector = lnk.dataset.targetForm;
+
+    $.post(preview_url, $(comment_form_selector).serialize());
+    e.preventDefault();
+  });
+});

data/app/assets/javascripts/publify.js

@@ -6,7 +6,10 @@
 //= require set-timeago-lang
 //= require jquery_ujs
 //= require lightbox
+//= require markup_help_popup
 //= require observe
+//= require optional_field_toggle
+//= require preview_comment
 //= require check_password
 //
 //= require_self

data/app/assets/javascripts/publify_admin.js

@@ -3,23 +3,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
-//= require jquery-ui/i18n/datepicker-da
-//= require jquery-ui/i18n/datepicker-de
-//= require jquery-ui/i18n/datepicker-es
-//= require jquery-ui/i18n/datepicker-fr
-//= require jquery-ui/i18n/datepicker-he
-//= require jquery-ui/i18n/datepicker-it
-//= require jquery-ui/i18n/datepicker-ja
-//= require jquery-ui/i18n/datepicker-lt
-//= require jquery-ui/i18n/datepicker-nb
-//= require jquery-ui/i18n/datepicker-nl
-//= require jquery-ui/i18n/datepicker-pl
-//= require jquery-ui/i18n/datepicker-pt-BR
-//= require jquery-ui/i18n/datepicker-ro
-//= require jquery-ui/i18n/datepicker-ru
-//= require jquery-ui/i18n/datepicker-zh-CN
-//= require jquery-ui/i18n/datepicker-zh-TW
-//= require datetimepicker
 //= require bootstrap-sprockets
 //= require quicktags
 //= require tagmanager
@@ -84,14 +67,7 @@ $(document).ready(function() {
   $('#article_form').each(function(e){autosave_request(e)});
   $('#article_form').submit(function(e){save_article_tags()});
   $('#article_form').each(function(e){tag_manager()});
-
-  // DatePickers
-  $('.datepicker').each(function() {
-    $(this).datepicker($.datepicker.regional[this.dataset.locale]);
-  });
-
-  // Date time picker (not related to date picker at all!)
-  $( "#article_published_at" ).datetimepicker();
+  $('#checkall').click(function(e){check_all(e.target)});
 
   // DropDown
   $(".dropdown-toggle").dropdown();

data/app/assets/javascripts/spinnable.js

@@ -1,5 +1,10 @@
 // Show and hide spinners on Ajax requests.
 $(document).ready(function(){
-  $('form.spinnable').on('ajax:before', function(evt, xhr, status){ $('#spinner').show();})
-  $('form.spinnable').on('ajax:complete', function(evt, xhr, status){ $('#spinner').hide();})
+  $('#spinner').hide().removeClass("hidden");
+  $('form.spinnable').on('ajax:before', function(evt, xhr, status){
+    $('#spinner').show();
+  });
+  $('form.spinnable').on('ajax:complete', function(evt, xhr, status){
+    $('#spinner').hide();
+  });
 });

data/app/assets/stylesheets/administration_structure.css.scss

@@ -1,7 +1,7 @@
 /* General */
 
 body {
-  padding-top: 40px;
+  padding-top: 60px;
 }
 
 footer {

data/app/assets/stylesheets/publify.css.scss

@@ -7,3 +7,46 @@
   border-bottom: #eee 1px solid;
   font-size: 0.9em;
 }
+
+.markup-help-popup {
+  padding: 0;
+}
+
+.markup-help-popup > div {
+  padding: 1em;
+}
+
+.markup-help-popup-close {
+  float: right;
+  cursor: pointer;
+}
+
+.admintools {
+  display: none;
+}
+
+.admin-tools-reveal:hover .admintools {
+  display: block;
+}
+
+.tag-sidebar-tag-cloud {
+  overflow: hidden;
+}
+
+.tag-sidebar-tag-67 { font-size: 0.67em; }
+.tag-sidebar-tag-75 { font-size: 0.75em; }
+.tag-sidebar-tag-83 { font-size: 0.83em; }
+.tag-sidebar-tag-91 { font-size: 0.91em; }
+.tag-sidebar-tag-100 { font-size: 1em; }
+.tag-sidebar-tag-112 { font-size: 1.12em; }
+.tag-sidebar-tag-125 { font-size: 1.25em; }
+.tag-sidebar-tag-137 { font-size: 1.37em; }
+.tag-sidebar-tag-150 { font-size: 1.50em; }
+.tag-sidebar-tag-162 { font-size: 1.62em; }
+.tag-sidebar-tag-175 { font-size: 1.75em; }
+.tag-sidebar-tag-187 { font-size: 1.87em; }
+.tag-sidebar-tag-200 { font-size: 2em; }
+
+.hidden {
+  display: none;
+}

data/app/assets/stylesheets/publify_admin.css.scss

@@ -3,7 +3,6 @@
  *= require jquery-ui
  *= require tagmanager
  *= require sidebar_admin
- *= require datetimepicker
  */
 // "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
 @import "bootstrap-sprockets";

data/app/controllers/admin/articles_controller.rb

@@ -93,7 +93,7 @@ class Admin::ArticlesController < Admin::BaseController
   end
 
   def auto_complete_for_article_keywords
-    @items = Tag.select(:display_name).order(:display_name).map(&:display_name)
+    @items = Tag.order(:display_name).pluck(:display_name)
     render json: @items
   end
 
@@ -123,9 +123,9 @@ class Admin::ArticlesController < Admin::BaseController
     if @article.save
       flash[:success] = I18n.t("admin.articles.autosave.success")
       @must_update_calendar =
-        (params[:article][:published_at] and
-         params[:article][:published_at].to_time.to_i < Time.zone.now.to_time.to_i and
-         @article.parent_id.nil?)
+        params[:article][:published_at] and
+        params[:article][:published_at].to_time.to_i < Time.zone.now.to_time.to_i and
+        @article.parent_id.nil?
       respond_to do |format|
         format.js
       end

data/app/controllers/admin/dashboard_controller.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 class Admin::DashboardController < Admin::BaseController
-  require "open-uri"
-  require "time"
-  require "rexml/document"
-
   def index
     today = Time.zone.now.strftime("%Y-%m-%d 00:00")
 

data/app/controllers/admin/post_types_controller.rb

@@ -38,7 +38,7 @@ class Admin::PostTypesController < Admin::BaseController
     # Reset all Articles from the PostType we're destroying to the default PostType
     # Wrap it in a transaction for safety
     @post_type.transaction do
-      Article.where(post_type: @post_type.permalink).each do |article|
+      Article.where(post_type: @post_type.permalink).find_each do |article|
         article.post_type = "read"
         article.save
       end

data/app/controllers/admin/themes_controller.rb

@@ -1,22 +1,14 @@
 # frozen_string_literal: true
 
-require "open-uri"
-require "time"
-require "rexml/document"
-
 class Admin::ThemesController < Admin::BaseController
   def index
     @themes = Theme.find_all
-    @themes.each do |theme|
-      # TODO: Move to Theme
-      theme.description_html = TextFilter.none.filter_text(theme.description)
-    end
     @active = this_blog.current_theme
   end
 
   def preview
     theme = Theme.find(params[:theme])
-    send_file File.join(theme.path, "preview.png"),
+    send_file theme.theme_file("preview.png"),
               type: "image/png", disposition: "inline", stream: false
   end
 

data/app/controllers/articles_controller.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 class ArticlesController < ContentController
+  include ActionView::Helpers::SanitizeHelper
+
   before_action :login_required, only: [:preview, :preview_page]
-  before_action :auto_discovery_feed, only: [:show, :index]
   before_action :verify_config
+  before_action :auto_discovery_feed, only: [:show, :index]
 
   layout :theme_layout, except: [:trackback]
 
@@ -127,7 +129,7 @@ class ArticlesController < ContentController
   def markup_help
     filter = TextFilter.make_filter(params[:id])
     if filter
-      render html: filter.commenthelp
+      render html: sanitize(filter.commenthelp)
     else
       render plain: "Unknown filter"
     end
@@ -201,7 +203,7 @@ class ArticlesController < ContentController
     case from
     when /^.*\.rss$/
       request.format = "rss"
-      from = from.gsub(/\.rss/, "")
+      from = from.gsub(/\.rss$/, "")
     when /^.*\.atom$/
       request.format = "atom"
       from = from.gsub(/\.atom$/, "")

data/app/controllers/comments_controller.rb

@@ -32,7 +32,7 @@ class CommentsController < BaseController
 
   def recaptcha_ok_for?(comment)
     use_recaptcha = comment.blog.use_recaptcha
-    ((use_recaptcha && verify_recaptcha(model: comment)) || !use_recaptcha)
+    (use_recaptcha && verify_recaptcha(model: comment)) || !use_recaptcha
   end
 
   def new_comment_defaults

data/app/controllers/setup_controller.rb

@@ -4,23 +4,24 @@ class SetupController < BaseController
   before_action :check_config
   layout "accounts"
 
-  def index; end
+  def index
+    this_blog.blog_name = ""
+    @user = User.new
+  end
 
   def create
-    this_blog.blog_name = params[:setting][:blog_name]
+    this_blog.blog_name = blog_params[:blog_name]
     this_blog.base_url = blog_base_url
 
-    @user = User.new(login: "admin",
-                     email: params[:setting][:email],
-                     password: params[:setting][:password],
-                     text_filter_name: this_blog.text_filter,
-                     nickname: "Publify Admin")
+    @user = User.new(user_params.merge(login: "admin",
+                                       text_filter_name: this_blog.text_filter,
+                                       nickname: "Publify Admin"))
     @user.name = @user.login
 
-    unless this_blog.save && @user.save
-      redirect_to setup_url
-      return
-    end
+    return render :index unless this_blog.valid? && @user.valid?
+
+    this_blog.save!
+    @user.save!
 
     sign_in @user
 
@@ -36,6 +37,14 @@ class SetupController < BaseController
 
   private
 
+  def blog_params
+    params.require(:blog).permit(:blog_name)
+  end
+
+  def user_params
+    params.require(:user).permit(:email, :password)
+  end
+
   def create_first_post(user)
     this_blog.articles.build(title: I18n.t("setup.article.title"),
                              author: user.login,

data/app/helpers/admin/feedback_helper.rb

@@ -16,7 +16,7 @@ module Admin::FeedbackHelper
       change_status(item, context),
       button_to_edit_comment(item),
       button_to_delete_comment(item),
-      button_to_conversation(item),
+      button_to_conversation(item)
     ], " "
   end
 

data/app/helpers/base_helper.rb

@@ -71,21 +71,29 @@ module BaseHelper
 
   def markup_help_popup(markup, text)
     if markup && markup.commenthelp.size > 1
-      link_to(text,
-              url_for(controller: "articles", action: "markup_help", id: markup.name),
-              onclick: "return popup(this, 'Publify Markup Help')")
+      modal = tag.dialog id: "this_markup_help_popup_dialog", class: "markup-help-popup" do
+        tag.div do
+          close_div = tag.div tag.span("\u2a09", class: "markup-help-popup-close")
+          content = tag.div class: "content-target"
+          safe_join [close_div, content]
+        end
+      end
+
+      url = url_for(controller: "articles", action: "markup_help", id: markup.name)
+
+      link = link_to(text, "#", class: "markup-help-popup-link",
+                                data: { target: "this_markup_help_popup_dialog",
+                                        url: url })
+
+      safe_join [modal, link]
     else
       ""
     end
   end
 
-  def onhover_show_admin_tools(type, id = nil)
-    admin_id = "#admin_#{[type, id].compact.join("_")}"
-    tag = []
-    tag << %{ onmouseover="if (getCookie('publify_user_profile') == 'admin')\
-             { $('#{admin_id}').show(); }" }
-    tag << %{ onmouseout="$('#{admin_id}').hide();" }
-    safe_join(tag, " ")
+  # This method's original implementation was broken. Now it does nothing.
+  def onhover_show_admin_tools(_type, _id = nil)
+    ""
   end
 
   def feed_title
@@ -138,7 +146,7 @@ module BaseHelper
         v = v.chomp
         # trim the same number of spaces from the beginning of each line
         # this way plugins can indent nicely without making ugly source output
-        spaces = /\A[ \t]*/.match(v)[0].gsub(/\t/, "  ")
+        spaces = /\A[ \t]*/.match(v)[0].gsub("\t", "  ")
         # add 2 spaces to line up with the assumed position of the surrounding tags
         v.gsub!(/^#{spaces}/, "  ")
       end
@@ -190,7 +198,7 @@ module BaseHelper
   end
 
   def stop_index_robots?(blog)
-    stop = (params[:year].present? || params[:page].present?)
+    stop = params[:year].present? || params[:page].present?
     stop = blog.unindex_tags if controller_name == "tags"
     stop = blog.unindex_categories if controller_name == "categories"
     stop
@@ -216,7 +224,7 @@ module BaseHelper
     elsif !@article.nil?
       @article.feed_url(type)
     elsif !@auto_discovery_url_atom.nil?
-      instance_variable_get("@auto_discovery_url_#{type}")
+      instance_variable_get(:"@auto_discovery_url_#{type}")
     end
   end
 

data/app/models/archives_sidebar.rb

@@ -36,7 +36,7 @@ class ArchivesSidebar < Sidebar
         name: I18n.l(Date.new(year, month), format: "%B %Y"),
         month: month,
         year: year,
-        article_count: entry.count,
+        article_count: entry.count
       }
     end
   end

data/app/models/article.rb

@@ -174,8 +174,7 @@ class Article < Content
 
     if params[:title]
       req_params[:permalink] = CGI.escape(params[:title])
-      article = published.find_by(req_params)
-      return article if article
+      published.find_by(req_params)
     end
   end
 

data/app/models/content.rb

@@ -25,10 +25,15 @@ class Content < ApplicationRecord
   scope :drafts, -> { where(state: "draft").order("created_at DESC") }
   scope :no_draft, -> { where.not(state: "draft").order("published_at DESC") }
   scope :searchstring, lambda { |search_string|
+    result = where(state: "published")
+
     tokens = search_string.split(" ").map { |c| "%#{c.downcase}%" }
-    matcher = "(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)"
-    template = "state = ? AND #{([matcher] * tokens.size).join(" AND ")}"
-    where(template, "published", *tokens.map { |token| [token] * 3 }.flatten)
+    tokens.each do |token|
+      result = result
+        .where("(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)",
+               token, token, token)
+    end
+    result
   }
 
   scope :published_at_like, lambda { |date_at|

data/app/models/note.rb

@@ -44,7 +44,7 @@ class Note < Content
   end
 
   def html_postprocess(field, html)
-    super(field, PublifyApp::Textfilter::Twitterfilter.filtertext(html))
+    super(field, PublifyCore::TextFilter::Twitterfilter.filtertext(html))
   end
 
   def truncate(message, length)

data/app/models/redirect.rb

@@ -17,8 +17,8 @@ class Redirect < ApplicationRecord
     return path if %r{^(https?)://([^/]*)(.*)}.match?(path)
 
     url_root = blog.root_path
-    unless url_root.nil? || path[0, url_root.length] == url_root
-      path = File.join(url_root, path)
+    if url_root.length == 0 || path[0, url_root.length] != url_root
+      path = blog.url_for(path, only_path: true)
     end
     path
   end

data/app/models/tag_sidebar.rb

@@ -18,12 +18,34 @@ class TagSidebar < Sidebar
     average = total.to_f / @tags.size
     @sizes = tags.reduce({}) do |h, tag|
       size = tag.content_counter.to_f / average
-      h.merge tag => size.clamp(2.0 / 3.0, 2) * 100
+      h.merge tag => bucket(size)
     end
   end
 
-  def font_multiplier
-    80
+  BUCKETS = [
+    67,
+    75,
+    83,
+    91,
+    100,
+    112,
+    125,
+    137,
+    150,
+    162,
+    175,
+    187,
+    200
+  ].freeze
+
+  private
+
+  def bucket(size)
+    base_size = size.clamp(2.0 / 3.0, 2) * 100
+    BUCKETS.each do |sz|
+      return sz if sz >= base_size
+    end
+    BUCKETS.last
   end
 end
 

data/app/models/text_filter.rb

@@ -65,7 +65,7 @@ class TextFilter
       markdown,
       smartypants,
       markdown_smartypants,
-      none,
+      none
     ]
   end
 

data/app/uploaders/resource_uploader.rb

@@ -30,7 +30,7 @@ class ResourceUploader < CarrierWave::Uploader::Base
   end
 
   def dynamic_resize_to_fit(size)
-    resize_setting = model.blog.send("image_#{size}_size").to_i
+    resize_setting = model.blog.send(:"image_#{size}_size").to_i
 
     resize_to_fit(resize_setting, resize_setting)
   end
@@ -57,11 +57,9 @@ class ResourceUploader < CarrierWave::Uploader::Base
   end
 
   def check_content_type!(new_file)
-    detected_type = if image? new_file
-                      file_content_content_type(new_file)
-                    else
-                      file_content_type(new_file)
-                    end
+    return unless image? new_file
+
+    detected_type = file_content_content_type(new_file)
     if detected_type != new_file.content_type
       raise CarrierWave::IntegrityError, "has MIME type mismatch"
     end
@@ -72,8 +70,4 @@ class ResourceUploader < CarrierWave::Uploader::Base
   def file_content_content_type(new_file)
     Marcel::MimeType.for Pathname.new(new_file.path)
   end
-
-  def file_content_type(new_file)
-    Marcel::MimeType.for Pathname.new(new_file.path), name: new_file.filename
-  end
 end

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

@@ -9,7 +9,7 @@
       <span id="preview_link">
         <%= link_to(t('.preview'), { controller: '/articles', action: 'preview', id: @article.id }, { target: 'new', class: 'btn btn-default' }) if @article.id %>
       </span>
-      <input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default" />
+      <input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default">
       <!-- Button trigger modal -->
       <button class="btn btn-success" data-toggle="modal" type="button" data-target="#publishOptions">
         <%= controller.action_name == 'new' ? t('.publish') : t('.save') %>
@@ -144,7 +144,7 @@
               <%= toggle_element('publish') %>
               </p>
               <div id="publish" class="collapse">
-                <%= text_field 'article', 'published_at' %>
+                <%= datetime_field 'article', 'published_at' %>
                 <p>
                 <span class="btn btn-mini btn-default">
                   <%= toggle_element('publish', t('.ok')) %>