HornsAndHooves-publify_core 10.0.1 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21242c2ff99798629553c23ce6326ba52e5549248b712f61d39618f93e1536eb
-  data.tar.gz: 9d9d216308389597f2f14168026420a3ab5687fffec2f9bb1c72832aba9f2807
+  metadata.gz: 109eaa0d80e831ff83cd6067dfa3920895e59ef465533d2e6ee2346275a1191d
+  data.tar.gz: 2e2319019464945e2c6abe8d9434dc8505900fc13d163b3f58fed20e0063ddf2
 SHA512:
-  metadata.gz: e829cf9c5cbd0e33448c5b18129937646f81cd0fe4dbf26de20992ccbbdf3f38a904b7a197f0a5d81d41f1d6eba9be72775da4af92ab412fc4c13b8cb9212ccb
-  data.tar.gz: 5cf8270277ae368b80ac260540444a7692ab9bbf1ed16c3e35e6bf584609476b316d93b7a6205c591db0b1fda8254a05d3e1e3df492af8b67327d0c9e2f07611
+  metadata.gz: 8ba568f08175773bc85e078b69e099afd3286a4ca1a8ac29fde85e68b81f0529ebc1bdfb58cc8fe726c28e2cbbb10c276502145e7b5283095c6d46be7830e14d
+  data.tar.gz: 7eeed9172a3c7e4c0ef49668068f7587d16e2131ecd97d0214fc1e78fcc9372e17ede1d10931540ff919b8c5550a9bc775b02c251c14d4913f4f94e5adcd9048

data/HornsAndHooves-publify_core.gemspec

@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_dependency "RedCloth", "~> 4.3.2"
   s.add_dependency "rubypants", "~> 0.7.0"
   s.add_dependency "sassc-rails", "~> 2.0"
-  s.add_dependency "sprockets", "~> 3.0"
+  s.add_dependency "sprockets", "~> 4.0"
   s.add_dependency "twitter", "~> 7.0.0"
   s.add_dependency "uuidtools", "~> 2.1.1"
 

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/lib/publify_core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-publify_core
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.1.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-24 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -375,14 +375,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -1057,7 +1057,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Core engine for the Publify blogging system.