HornsAndHooves-publify_core 10.0.3 → 10.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c608c462079f3d5fd64160d1506e7c90f4912c65120fdaf3e65e2d144420ed93
-  data.tar.gz: e9b8ccb059eb98cb23a310edd1d26acd41fbfa2a3a01ed68d10e4b6531cacf4d
+  metadata.gz: 4cd1439645737309c9615edba562cd7d51ede8f66a21fe888161ca91c0eacc83
+  data.tar.gz: 9a44b960e7718b3fb36aea0e6e24ef22efd98e21c9f6e8dc72d2fa96857a4a26
 SHA512:
-  metadata.gz: '064290a1fb5c58f8377b5b5f1def37eaeecfb3534fb619dbd9bbe58771c6f399ef38932304b3a4d3c8a8c04475ef262f544b267fff85a4c813e92db568475227'
-  data.tar.gz: 1e70d5f710253599e2059d3a9632c3509495cd6b54f9f6922e2e13416790fee8a5a70ef41eb0287c23c36b75eedceac6a8ad5caaac09b5ae9f8769c6771440e9
+  metadata.gz: a099c2cd4321e1f98da962ede37b2419e5c975af1f64ea3149be241ab714bcdf70aa104feae5fe3573321ed0fa3afb41aab40662173fc880647860444dcfd1e9
+  data.tar.gz: f88a34421a40fbec2ac11ef84a772369d68ef5b85e9f0d9e6e459dd13bd196f12a94f0e08a85d6a8968f48d93b139f3e610fa0ba4951479b67d6d6f30b375907

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

@@ -136,6 +136,15 @@ select#article_resource_id:invalid {
   color: gray;
 }
 
+#article_image_alt {
+  border: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  -webkit-transition: none;
+  transition: none;
+  padding-left: 4px;
+}
+
 #article_body_and_extended,
 #page_body {
   font-size: 1.3em;

data/app/controllers/admin/content_controller.rb

@@ -113,7 +113,7 @@ class Admin::ContentController < Admin::BaseController
     @article.author = current_user
     @article.save_attachments!(params[:attachments])
     @article.state = "draft" unless @article.withdrawn?
-    @article.text_filter_name ||= current_user.text_filter.name
+    @article.text_filter_name ||= current_user.text_filter&.name || this_blog.text_filter
 
     if @article.title.blank?
       lastid = Article.order("id desc").first.id
@@ -185,7 +185,8 @@ class Admin::ContentController < Admin::BaseController
              :permalink,
              :published_at,
              :title,
-             :keywords)
+             :keywords,
+             :excerpt)
   end
 
   def default_text_filter

data/app/controllers/articles_controller.rb

@@ -6,7 +6,6 @@ class ArticlesController < ContentController
   before_action :login_required, only: [:preview, :preview_page]
   before_action :auto_discovery_feed, only: [:show, :index]
   before_action :verify_config
-  before_action :populate_recent_articles, only: [:redirect, :preview]
 
   layout :theme_layout, except: [:trackback]
 
@@ -66,6 +65,8 @@ class ArticlesController < ContentController
     @article = Article.last_draft(params[:id])
     @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
 
+    populate_recent_articles
+
     render "read"
   end
 
@@ -85,6 +86,9 @@ class ArticlesController < ContentController
     factory = Article::Factory.new(this_blog, current_user)
 
     @article = factory.match_permalink_format(from, this_blog.permalink_format)
+
+    populate_recent_articles
+
     return show_article if @article
 
     # Redirect old version with /:year/:month/:day/:title to new format,
@@ -160,6 +164,8 @@ class ArticlesController < ContentController
 
   private def populate_recent_articles
     @recent_articles = this_blog.contents.published.limit(RECENT_ARTICLES_COUNT)
+
+    @recent_articles = @recent_articles.where.not(id: @article.id) if @article
   end
 
   # See an article We need define @article before

data/app/controllers/setup_controller.rb

@@ -31,7 +31,7 @@ class SetupController < BaseController
 
     # EmailNotify.send_user_create_notification(@user)
 
-    redirect_to confirm_accounts_url
+    redirect_to admin_dashboard_url
   end
 
   private

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

@@ -31,6 +31,7 @@
   <div class="col-md-8">
     <%= text_field 'article', 'title', class: 'form-control', placeholder: t('.title') %>
     <%= select 'article', 'resource_id', resource_options, { prompt: 'Select Image' }, { class: 'form-control', required: "required" } %>
+    <%= text_field 'article', 'image_alt', class: 'form-control', placeholder: t('.image_alt') %>
     <div id="editor">
       <%= text_area('article', 'body_and_extended', class: 'form-control ', style: 'height: 360px', placeholder: t('.type_your_post')) %>
     </div>
@@ -133,6 +134,22 @@
                 </p>
               </div>
             </div>
+            <div class='control-group'>
+              <p>
+                <%= t('.excerpt') %>:
+                <%= toggle_element('excerpt') %>
+              </p>
+              <div id="excerpt" class="collapse">
+                <div class="form-group">
+                  <%= text_field 'article', 'excerpt', autocomplete: 'off', class: 'form-control' %>
+                </div>
+                <p>
+                  <span class="btn btn-mini btn-default">
+                    <%= toggle_element('excerpt', t('.ok')) %>
+                  </span>
+                </p>
+              </div>
+            </div>
           </fieldset>
         </div>
       </div>

data/config/locales/en.yml

@@ -43,6 +43,7 @@ en:
         article_type: Article type
         cancel: Cancel
         default: Default
+        excerpt: Excerpt(Meta description)
         now: now
         ok: OK
         password: Password
@@ -59,6 +60,7 @@ en:
         tags: Tags
         tags_explanation_html: Separate tags with commas. Use double quotes (") around multi-word tags, e.g. "opera house".
         title: Title
+        image_alt: Image Alt Text
         type_your_post: Type your post
         visibility: Visibility
       index:

data/db/migrate/20150207131657_add_missing_indexes.rb

@@ -4,18 +4,18 @@ class AddMissingIndexes < ActiveRecord::Migration[4.2]
   set_role "blog_content"
 
   def change
-    add_index :feedback, [:id, :type]
+    add_index :feedback, %i[id type]
     add_index :feedback, :user_id
-    add_index :sidebars, [:id, :type]
+    add_index :sidebars, %i[id type]
     add_index :contents, :user_id
-    add_index :contents, [:id, :type]
+    add_index :contents, %i[id type]
     add_index :articles_tags, :tag_id
     add_index :articles_tags, :article_id
     add_index :profiles_rights, :profile_id
     add_index :users, :profile_id
     add_index :users, :text_filter_id
     add_index :users, :resource_id
-    add_index :triggers, [:pending_item_id, :pending_item_type]
+    add_index :triggers, %i[pending_item_id pending_item_type]
     add_index :redirections, :content_id
     add_index :redirections, :redirect_id
     add_index :resources, :article_id

data/db/migrate/20160605154632_remove_profiles.rb

@@ -19,13 +19,13 @@ class RemoveProfiles < ActiveRecord::Migration[4.2]
     end
 
     Profile.create!(label: "admin", nicename: "Publify administrator",
-                    modules: [:dashboard, :articles, :notes, :pages, :feedback,
-                              :media, :themes, :sidebar, :profile, :users,
-                              :settings, :seo])
+                    modules: %i[dashboard articles notes pages feedback
+                                media themes sidebar profile users
+                                settings seo])
     Profile.create!(label: "publisher", nicename: "Blog publisher",
-                    modules: [:dashboard, :articles, :notes, :pages, :feedback,
-                              :media, :profile])
+                    modules: %i[dashboard articles notes pages feedback
+                                media profile])
     Profile.create!(label: "contributor", nicename: "Contributor",
-                    modules: [:dashboard, :profile])
+                    modules: %i[dashboard profile])
   end
 end

data/lib/publify_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PublifyCore
-  VERSION = "10.0.3"
+  VERSION = "10.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-publify_core
 version: !ruby/object:Gem::Version
-  version: 10.0.3
+  version: 10.1.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm