Skip to content
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.

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

modify puput layout, configurable default template color and social link sharing #154

Merged
merged 1 commit into from Apr 10, 2018

Conversation

csalom
Copy link
Member

@csalom csalom commented Mar 30, 2018

As it was talk with @marctc this PR proposes a modification of puput layout.
In addition, a main color selector has been added in the blog model.
Moreover, social sharing links has been included in blog entries.

There are some work to do before the acceptance of this PR:

  1. Modify the documentation
  2. Check the compability with Django 2.0 and Wagtail 2.0

@csalom
Copy link
Member Author

csalom commented Apr 2, 2018

@marctc, I've update the documentation. Can you take a look?

README.rst Outdated
@@ -35,8 +35,11 @@ Features
* RSS feeds
* Related entries
* Extensible entry model
* Configurable main color
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configurable default template color

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@csalom csalom force-pushed the _plantilla branch 3 times, most recently from e2c96d8 to 4cf36e3 Compare April 9, 2018 20:34
@csalom
Copy link
Member Author

csalom commented Apr 9, 2018

I've check the compability with Django 2.0 and Wagtail 2.0.
I think that it's all right and that it can be merged when checks finish.

@csalom csalom changed the title [WIP] - modify puput layout and add a main color selector and social l… modify puput layout, configurable default template color and social link sharing Apr 9, 2018
</section>
</article>
{% empty %}
<span>{% trans 'No results found.' %}</span>
<span>{% trans 'No results founds.' %}</span>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

founds - found

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

<h3>
<a href="{% entry_url related_entry blog_page %}">{{ related_entry.title }}</a>
</h3>
<p>
{{ related_entry.body|richtext|truncatewords:20 }}
{{ related_entry.body|richtext|truncatewords:20 }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

extra white space

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Corrected

<link rel="stylesheet" href="{% static 'wagtailadmin/css/layouts/page-editor.css' %}" type="text/css" />
<link rel="stylesheet" href="{% static 'wagtailadmin/css/panels/rich-text.css' %}" type="text/css" />

<!--TODO: style color selector !!!!-->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has to be removed 🙄

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@csalom
Copy link
Member Author

csalom commented Apr 10, 2018

@marctc I've corrected the issues that you've pointed.

@marctc marctc merged commit f7904f2 into APSL:master Apr 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants