New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Entry theme selection #764

Closed

aviav wants to merge 38 commits into codevise:master from aviav:entry-theme-selection

Contributor

aviav commented May 19, 2017

No description provided.

houndci-bot reviewed

View reviewed changes

spec/models/pageflow/theming_spec.rb Outdated

+                        config.themes.register(:named_theme)
+                      end
+                      theming = build(:theming, :theme_name => 'named_theme')

houndci-bot May 19, 2017

Use the new Ruby 1.9 hash syntax.

app/models/pageflow/revision.rb Outdated

@@ @@ -44,6 +44,10 @@ class Revision < ActiveRecord::Base @@
                   validate :published_until_unchanged, :if => :published_until_was_in_past?
                   validate :published_until_blank, :if => :published_at_blank?
+                  validates_inclusion_of(:theme_name, in: lambda do |revision|
+                                           Pageflow.config_for(revision.entry.account).themes.names
+                                         end)

houndci-bot May 19, 2017

end at 49, 27 is not aligned with lambda do |revision| at 47, 44 or validates_inclusion_of(:theme_name, in: lambda do |revision| at 47, 4.

app/helpers/pageflow/themes_helper.rb Outdated

+                  include RenderJsonHelper
+                  def themes_options_json_seed(config = Pageflow.config)
+                    config.themes.each_with_object({}) do |theme, options|

houndci-bot May 19, 2017

Prefer {...} over do...end for multi-line chained blocks.

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                }
+                li.active {
+                  background-color: #d2e5fa;

houndci-bot May 19, 2017

Color literals like #d2e5fa should only be used in variable declarations; they should be referred to via variable everywhere else.

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                  margin: 10px;
+                }
+                li.active {

houndci-bot May 19, 2017

Merge rule li.active with rule on line 77

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                }
+                .use_theme {
+                  @include button(#590);

houndci-bot May 19, 2017

Color literals like #590 should only be used in variable declarations; they should be referred to via variable everywhere else.

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                  overflow: auto;
+                  background-color: #fff;
+                  &>div {

houndci-bot May 19, 2017

Unnecessary parent selector (&)

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                  bottom: 50px;
+                  left: 20px;
+                  overflow: auto;
+                  background-color: #fff;

houndci-bot May 19, 2017

Color literals like #fff should only be used in variable declarations; they should be referred to via variable everywhere else.

app/assets/stylesheets/pageflow/editor/change_theme.scss

+                  right: 20px;
+                  max-width: 1100px;
+                  max-height: 650px;
+                  background-color: #eee;

houndci-bot May 19, 2017

Color literals like #eee should only be used in variable declarations; they should be referred to via variable everywhere else.

app/assets/stylesheets/pageflow/editor/change_theme.scss

		@@ -0,0 +1,106 @@
		button.change_theme {
		@include button(#559ff2);

houndci-bot May 19, 2017

Color literals like #559ff2 should only be used in variable declarations; they should be referred to via variable everywhere else.

coveralls commented May 19, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.055% when pulling 4c23293 on aviav:entry-theme-selection into 81a3276 on codevise:master.

aviav force-pushed the entry-theme-selection branch from 4c23293 to 6217402 Compare

May 19, 2017 15:30

aviav added 4 commits

May 19, 2017 17:32


          Integrate themes with features

1610f04


          Use more specific config where needed

c750128


          Adjust specs to themes as features

3ff4194


          Test that themes registered in disabled features cannot be used

490d835

coveralls commented May 19, 2017

Coverage increased (+0.03%) to 99.055% when pulling 6217402 on aviav:entry-theme-selection into 81a3276 on codevise:master.

1 similar comment

coveralls commented May 19, 2017

Coverage increased (+0.03%) to 99.055% when pulling 6217402 on aviav:entry-theme-selection into 81a3276 on codevise:master.

aviav force-pushed the entry-theme-selection branch from 6217402 to 190f533 Compare

May 22, 2017 07:10


          Placate Hound

805bdeb

aviav force-pushed the entry-theme-selection branch from 190f533 to c8e3a80 Compare

May 22, 2017 07:22

coveralls commented May 22, 2017

Coverage increased (+0.03%) to 99.055% when pulling c8e3a80 on aviav:entry-theme-selection into 81a3276 on codevise:master.

1 similar comment

coveralls commented May 22, 2017

Coverage increased (+0.03%) to 99.055% when pulling c8e3a80 on aviav:entry-theme-selection into 81a3276 on codevise:master.

coveralls commented May 22, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.055% when pulling c8e3a80 on aviav:entry-theme-selection into 81a3276 on codevise:master.

aviav added 2 commits

May 22, 2017 15:28


          Add theme name to revisions on database

6b317c6


          On creating an entry, set theme_name on its revision

0191ddb

- also move setting home_button_enabled to theming
- rename copy_default_meta_tags to reflect this change and make it
  private
- test the public API method instead of the now private helper

coveralls commented May 28, 2017

Coverage increased (+0.03%) to 99.058% when pulling e0b275a on aviav:entry-theme-selection into 81a3276 on codevise:master.

1 similar comment

coveralls commented May 28, 2017

Coverage increased (+0.03%) to 99.058% when pulling e0b275a on aviav:entry-theme-selection into 81a3276 on codevise:master.

aviav force-pushed the entry-theme-selection branch from e0b275a to 0b8ee69 Compare

May 28, 2017 15:18

coveralls commented May 28, 2017

Coverage increased (+0.03%) to 99.058% when pulling 0b8ee69 on aviav:entry-theme-selection into b452c34 on codevise:master.

1 similar comment

coveralls commented May 28, 2017

Coverage increased (+0.03%) to 99.058% when pulling 0b8ee69 on aviav:entry-theme-selection into b452c34 on codevise:master.

aviav force-pushed the entry-theme-selection branch from d850dc8 to 9aa1c3e Compare

May 29, 2017 13:29

coveralls commented May 29, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.058% when pulling 9aa1c3e on aviav:entry-theme-selection into b452c34 on codevise:master.

coveralls commented May 29, 2017

Coverage increased (+0.03%) to 99.058% when pulling 9aa1c3e on aviav:entry-theme-selection into b452c34 on codevise:master.

1 similar comment

coveralls commented May 29, 2017

Coverage increased (+0.03%) to 99.058% when pulling 9aa1c3e on aviav:entry-theme-selection into b452c34 on codevise:master.

aviav force-pushed the entry-theme-selection branch from 9aa1c3e to 456ba9c Compare

May 29, 2017 14:05

aviav added 2 commits

May 29, 2017 16:07


          Add preview_image_path theme attribute

20e061e


          Add themes to editor seeds

f6b0c4e

coveralls commented May 29, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.058% when pulling 456ba9c on aviav:entry-theme-selection into b452c34 on codevise:master.

aviav added 10 commits

May 30, 2017 10:32


          Use Backbone get instead of reaching into attributes

f43c7ba


          Refactor stylesheet utils

559e197


          Display labelText current value in separate element

ad29bd3


          Reuse ReferenceInputView and ModelThumbnailView

03d7478


          Fix page title hysteresis

On choosing a page link, properly update title when it should be an
empty string. Without this, e.g. in ReferenceInputView, `title` will
not update in certain situations, because page#title() returns
`'undefined'` due to `''` falsiness in Javascript.

To reproduce:
```
this.configuration.get('title') === ''
this.configuration.get('additional_title') === undefined
```


          Introduce dedicated preview thumbnails for themes

98fb650

To be stored at
`app/assets/images/pageflow/themes/$THEME_NAME/preview_thumbnail.png`.


          Add editor specs

36ad364


          Add inline documentation to ReferenceInputView#chooseValue

8684d9e


          Allow changing themes if selectable themes are enabled

9c87845


          Add some inline documentation to ReferenceInputView

efb03b7

Just from the code we cannot tell that there is a recommended way to
deal with different attribute names.

aviav force-pushed the entry-theme-selection branch from 509d196 to efb03b7 Compare

May 30, 2017 08:33

coveralls commented May 30, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.058% when pulling efb03b7 on aviav:entry-theme-selection into b452c34 on codevise:master.

tf modified the milestone: v12.1


          Use theming factory in updated specs

936ea61

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.059% when pulling 936ea61 on aviav:entry-theme-selection into b452c34 on codevise:master.

1 similar comment

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.059% when pulling 936ea61 on aviav:entry-theme-selection into b452c34 on codevise:master.

aviav added 2 commits

May 30, 2017 14:17


          Introduce dedicated preview thumbnails for themes

d83ec1a

To be stored at
`app/assets/images/pageflow/themes/$THEME_NAME/preview_thumbnail.png`.


          Add default image assets to default theme

7e45b84

coveralls commented May 30, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.059% when pulling d83ec1a on aviav:entry-theme-selection into b452c34 on codevise:master.

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.059% when pulling 7e45b84 on aviav:entry-theme-selection into b452c34 on codevise:master.

1 similar comment

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.059% when pulling 7e45b84 on aviav:entry-theme-selection into b452c34 on codevise:master.

coveralls commented May 30, 2017 •

edited

Loading

Coverage increased (+0.03%) to 99.058% when pulling 5f64e02 on aviav:entry-theme-selection into b452c34 on codevise:master.

houndci-bot reviewed

View reviewed changes

lib/generators/pageflow/theme/theme_generator.rb Outdated

@@ @@ -15,6 +15,8 @@ class ThemeGenerator < Rails::Generators::Base @@
                     def copy_template
                       directory('themes', File.join('app', 'assets', 'stylesheets', 'pageflow', 'themes'))
                       empty_directory(File.join('app', 'assets', 'images', 'pageflow', 'themes', name))
+                      copy_file('preview.png', "app/assets/images/pageflow/themes/#{name}/preview.png")
+                      copy_file('preview_thumbnail.png', "app/assets/images/pageflow/themes/#{name}/preview_thumbnail.png")

houndci-bot May 30, 2017

Line is too long. [109/100]

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.058% when pulling 62c2cc6 on aviav:entry-theme-selection into b452c34 on codevise:master.

aviav force-pushed the entry-theme-selection branch from 62c2cc6 to bdbf888 Compare

May 30, 2017 14:24

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.058% when pulling bdbf888 on aviav:entry-theme-selection into a1cba5a on codevise:master.

1 similar comment

coveralls commented May 30, 2017

Coverage increased (+0.03%) to 99.058% when pulling bdbf888 on aviav:entry-theme-selection into a1cba5a on codevise:master.

aviav force-pushed the entry-theme-selection branch from bdbf888 to 7e45b84 Compare

May 31, 2017 08:48

aviav closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment