pageflow 14.0.0 → 14.1.0

data/app/assets/stylesheets/pageflow/themes/default/navigation/icons/sprite.scss

@@ -88,18 +88,6 @@
     @include pageflow-sprite-icon-credits;
   }
 
-  .share_google {
-    @include pageflow-sprite-icon-google($offset: -5px);
-  }
-
-  .share_twitter {
-    @include pageflow-sprite-icon-twitter($offset: -5px);
-  }
-
-  .share_facebook {
-    @include pageflow-sprite-icon-facebook($offset: -5px);
-  }
-
   .volume-control {
     &:before,
     &:after {

data/app/assets/stylesheets/pageflow/themes/default/navigation_share_box.scss

@@ -0,0 +1,40 @@
+.navigation_share_box {
+  @import "./navigation_share_box/icon_colors";
+
+  padding: 15px;
+  text-align: center;
+
+  .share_box_icons {
+    display: flex;
+    text-align: center;
+
+    .menu_item {
+      min-height: 50px;
+      margin: 0 auto;
+    }
+
+    a {
+      float: left;
+      position: relative;
+      width: 70px;
+      height: 45px;
+      text-align: center;
+      text-decoration: none;
+      margin: 0 auto;
+
+      svg {
+        width: 70px;
+        height: 25px;
+        margin-bottom: 7px;
+      }
+
+      p {
+        font-family: SourceSansPro;
+        font-size: 13px;
+        text-align: center;
+        line-height: 1;
+        margin: 0;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/navigation_share_box/icon_colors.scss

@@ -0,0 +1,46 @@
+$share-icon-color: #fff !default;
+$share-icon-hover-color: $main-color !default;
+$share-icon-active-color: $share-icon-hover-color !default;
+
+a {
+  color: $share-icon-color;
+
+  svg {
+    fill: $share-icon-color;
+  }
+
+  p {
+    color: $share-icon-color;
+  }
+}
+
+a:hover {
+  color: $share-icon-hover-color;
+
+  svg {
+    fill: $share-icon-hover-color;
+  }
+
+  p {
+    color: $share-icon-hover-color;
+  }
+}
+
+a.active,
+button.pressed {
+  color: $share-icon-active-color;
+
+  svg {
+    fill: $share-icon-active-color;
+  }
+
+  p {
+    color: $share-icon-active-color;
+  }
+}
+
+.sub_share {
+  a, a:hover {
+    color: #ffffff;
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/overview/icons/icon_font.scss

@@ -4,10 +4,7 @@
 
   $button-icon-color,
   $active-button-icon-color,
-  $deactivated-button-icon-color,
-
-  $share-icon-color: null,
-  $active-share-icon-color: null
+  $deactivated-button-icon-color
 ) {
 
   .button {

data/app/assets/stylesheets/pageflow/themes/default/page.scss

@@ -14,25 +14,6 @@ $page-content-font-size: 1em !default;
 /// Base font size for page content in phone layout
 $page-content-phone-font-size: 0.7em !default;
 
-/// Color of text
-/// @group page-colors
-$page-text-color: #fff !default;
-
-/// Color of text on inverted pages
-/// @group page-colors
-$page-inverted-text-color: #000 !default;
-
-/// Color of title on inverted pages
-/// @group page-colors
-$page-inverted-title-color: null !default;
-
-/// Background-color of pages
-/// @group page-colors
-$page-background-color: #000 !default;
-
-/// Background-color of inverted pages
-/// @group page-colors
-$page-inverted-background-color: #fff !default;
 
 // Deprecated. Use typography variables above.
 
@@ -41,8 +22,11 @@ $page-font-size: 16px !default;
 $page-content-text-font-family: $page-font-family !default;
 $page-content-text-font-size: 1.2em !default;
 $page-content-text-line-height: 1.5em !default;
+$page-content-list-margin: 1em !default;
+$page-content-list-indent: 40px !default;
 
 @import "./page/anchors";
+@import "./page/colors";
 @import "./page/header";
 @import "./page/hyphenate";
 @import "./page/paddings";
@@ -61,18 +45,6 @@ $page-content-text-line-height: 1.5em !default;
     )
   );
 
-  color: $page-text-color;
-  background-color: $page-background-color;
-
-  &.invert {
-    color: $page-inverted-text-color;
-    background-color: $page-inverted-background-color;
-
-    .page_header-title {
-      color: $page-inverted-title-color;
-    }
-  }
-
   .content {
     font-size: $page-content-font-size;
 
@@ -92,7 +64,9 @@ $page-content-text-line-height: 1.5em !default;
     );
   }
 
-  p {
-    margin-top: 0;
+  .page_text > .paragraph ul,
+  .page_text > .paragraph ol {
+    margin: $page-content-list-margin 0;
+    padding: 0 0 0 $page-content-list-indent;
   }
 }

data/app/assets/stylesheets/pageflow/themes/default/page/anchors.scss

@@ -11,13 +11,15 @@ $page-anchor-inverted-color: #000 !default;
 /// Typography settings of links in page content text
 $page-anchor-typography: () !default;
 
-.page_text a {
-  @extend %anchor;
-  color: $page-anchor-color;
-  pointer-events: all;
-  @include typography($page-anchor-typography)
-}
+.page {
+  .page_text a {
+    @extend %anchor;
+    color: $page-anchor-color;
+    pointer-events: all;
+    @include typography($page-anchor-typography)
+  }
 
-.invert .page_text a {
-  color: $page-anchor-inverted-color;
+  &.invert .page_text a {
+    color: $page-anchor-inverted-color;
+  }
 }

data/app/assets/stylesheets/pageflow/themes/default/page/colors.scss

@@ -0,0 +1,41 @@
+/// Color of text
+/// @group page-colors
+$page-text-color: #fff !default;
+
+/// Color of text on inverted pages
+/// @group page-colors
+$page-inverted-text-color: #000 !default;
+
+/// Background-color of pages
+/// @group page-colors
+$page-background-color: #000 !default;
+
+/// Background-color of inverted pages
+/// @group page-colors
+$page-inverted-background-color: #fff !default;
+
+/// Color of title
+/// @group page-colors
+$page-title-color: null !default;
+
+/// Color of title on inverted pages
+/// @group page-colors
+$page-inverted-title-color: null !default;
+
+.page {
+  color: $page-text-color;
+  background-color: $page-background-color;
+
+  .page_header-title {
+    color: $page-title-color;
+  }
+
+  &.invert {
+    color: $page-inverted-text-color;
+    background-color: $page-inverted-background-color;
+
+    .page_header-title {
+      color: $page-inverted-title-color;
+    }
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/page/content_text_margin.scss

@@ -1,4 +1,4 @@
-.page_text {
+.page .page_text {
   // This has to be the default behavior since all non-React pages
   // still do not apply additional modifier classes to the content
   // text

data/app/assets/stylesheets/pageflow/themes/default/page/line_lengths.scss

@@ -22,7 +22,7 @@ $page-content-width: 60% !default;
   &_header-subtitle,
   &_header-tagline,
   &_sub_header,
-  p {
+  .paragraph {
     max-width: $page-content-max-width;
     width: $page-content-width;
 
@@ -73,7 +73,7 @@ $page-content-width: 60% !default;
       .page_header-title,
       .page_header-tagline,
       .page_sub_header,
-      p {
+      .paragraph {
         width: $page-content-split-layout-width;
       }
     }
@@ -84,7 +84,7 @@ $page-content-width: 60% !default;
     .page_header-title,
     .page_header-tagline,
     .page_sub_header,
-    p {
+    .paragraph {
       @include margin-start(auto);
       max-width: $page-content-position-right-max-width;
       width: 60%;

data/app/assets/stylesheets/pageflow/ui.scss

@@ -14,3 +14,4 @@
 }
 
 @import "./ui/input/extended_select_input";
+@import "./ui/input/check_box_group_input";

data/app/assets/stylesheets/pageflow/ui/input/check_box_group_input.scss

@@ -0,0 +1,15 @@
+.check_box_group_input {
+  .check_box {
+    margin: 5px 0;
+
+    input {
+      display: inline;
+      width: auto;
+      margin: 0 5px 0 0;
+    }
+
+    label {
+      display: inline;
+    }
+  }
+}

data/app/controllers/pageflow/entries_controller.rb

@@ -92,7 +92,8 @@ module Pageflow
                                     :overview_button_enabled,
                                     :emphasize_chapter_beginning, :emphasize_new_pages,
                                     :share_url, :share_image_id, :share_image_x, :share_image_y,
-                                    :locale, :author, :publisher, :keywords, :theme_name)
+                                    :locale, :author, :publisher, :keywords, :theme_name,
+                                    share_providers: {})
     end
 
     def entry_request_scope

data/app/helpers/pageflow/navigation_bar_helper.rb

@@ -4,8 +4,14 @@ module Pageflow
       [
         options[:class],
         entry.home_button.enabled? ? 'with_home_button' : nil,
-        entry.overview_button.enabled? ? 'with_overview_button' : nil
+        entry.overview_button.enabled? ? 'with_overview_button' : nil,
+        entry.active_share_providers.empty? ? 'without_sharing_button' : nil,
+        mobile_share_providers_only?(entry) ? 'mobile_sharing_only' : nil
       ].compact.join(' ')
     end
+
+    def mobile_share_providers_only?(entry)
+      entry.active_share_providers.sort.eql?(%w[telegram whats_app].sort)
+    end
   end
 end

data/app/helpers/pageflow/pages_helper.rb

@@ -49,7 +49,7 @@ module Pageflow
 
     def page_text(page)
       content_tag(:div, class: 'page_text') do
-        content_tag(:p, raw(page.configuration['text']))
+        content_tag(:div, raw(page.configuration['text']), class: 'paragraph')
       end
     end
 

data/app/helpers/pageflow/social_share_links_helper.rb

@@ -3,9 +3,13 @@ module Pageflow
     include SocialShareHelper
 
     PROVIDER_URL_TEMPLATES = {
+      email: 'mailto:?body=%{url}',
       facebook: 'http://www.facebook.com/sharer/sharer.php?u=%{url}',
       google: 'https://plus.google.com/share?url=%{url}',
-      twitter: 'http://twitter.com/home?status=%{url}'
+      linked_in: 'https://www.linkedin.com/shareArticle?mini=true&url=%{url}',
+      telegram: 'tg://msg?text=%{url}',
+      twitter: 'http://twitter.com/home?status=%{url}',
+      whats_app: 'WhatsApp://send?text=%{url}'
     }.freeze
 
     def social_share_link(provider, entry, &block)

data/app/models/pageflow/draft_entry.rb

@@ -19,6 +19,7 @@ module Pageflow
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
              :share_url, :share_image_id, :share_image_x, :share_image_y,
+             :share_providers, :active_share_providers,
              :find_files, :find_file,
              :image_files, :video_files, :audio_files,
              :locale,

data/app/models/pageflow/published_entry.rb

@@ -22,6 +22,7 @@ module Pageflow
              :emphasize_chapter_beginning,
              :emphasize_new_pages,
              :share_url, :share_image_id, :share_image_x, :share_image_y,
+             :share_providers, :active_share_providers,
              :locale,
              :author, :publisher, :keywords,
              :theme,

data/app/models/pageflow/revision.rb

@@ -13,6 +13,8 @@ module Pageflow
 
     include ThemeReferencer
 
+    serialize :share_providers, JSON
+
     belongs_to :entry, touch: :edited_at
     belongs_to :creator, class_name: 'User', optional: true
     belongs_to :restored_from, class_name: 'Pageflow::Revision', optional: true
@@ -91,6 +93,14 @@ module Pageflow
       UsedFile.new(file)
     end
 
+    def share_providers
+      self[:share_providers] || entry.theming.default_share_providers
+    end
+
+    def active_share_providers
+      share_providers.select { |_k, v| v }.keys
+    end
+
     def creator
       super || NullUser.new
     end

data/app/models/pageflow/theming.rb

@@ -2,6 +2,8 @@ module Pageflow
   class Theming < ApplicationRecord
     include ThemeReferencer
 
+    serialize :default_share_providers, JSON
+
     belongs_to :account
     has_many :widgets, as: :subject, dependent: :destroy
 
@@ -29,6 +31,18 @@ module Pageflow
       copy_attributes_to(revision)
     end
 
+    def share_providers=(share_providers_array)
+      self.default_share_providers = hashify_provider_array(share_providers_array)
+    end
+
+    def share_providers
+      default_share_providers.to_a
+    end
+
+    def default_share_providers
+      self[:default_share_providers].presence || hashify_provider_array(Pageflow.config.default_share_providers)
+    end
+
     private
 
     def copy_attributes_to(revision)
@@ -36,6 +50,7 @@ module Pageflow
         author: default_author.presence || Pageflow.config.default_author_meta_tag,
         publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
         keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag,
+        share_providers: default_share_providers,
         theme_name: theme_name,
         home_button_enabled: home_button_enabled_by_default,
         locale: default_locale
@@ -45,5 +60,9 @@ module Pageflow
     def available_themes
       Pageflow.config_for(account).themes
     end
+
+    def hashify_provider_array(arr)
+      Hash[arr.reject(&:blank?).map { |v| [v.to_s, true] }]
+    end
   end
 end