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

Upgrade to Bootstrap 5.1 #135

Open
wants to merge 1 commit into
base: stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ local_settings.py
/media/
*.mo
venv
bin
lib
lib64
.idea
share
pyvenv.cfg
73 changes: 39 additions & 34 deletions dolweb/blog/templates/blog_sidebar.html
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
{% load i18n zinnia blog_tags %}

<div style="margin-bottom: 1em">
<form method="get" action="{% url 'zinnia:entry_search' %}" role="search">
<div class="input-group">
<input type="text" placeholder="{% trans "Search articles" %}" name="pattern" class="form-control" />
<span class="input-group-btn">
<button type="submit" class="btn">
<i class="icon-search"></i>
<div class="row row-cols-1">
<div class="col">
<form method="get" action="{% url 'zinnia:entry_search' %}" role="search">
<div class="input-group mb-3">
<input type="text" placeholder="{% trans "Search articles" %}" name="pattern" class="form-control" />
<button type="submit" class="btn btn-outline-secondary">
<i class="bi bi-search"></i>
</button>
</span>
</div>
</form>
</div>

<div class="well text-center">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-8646203626363069";
/* Dolphin Blog Sidebar Ad */
google_ad_slot = "9795528512";
google_ad_width = 200;
google_ad_height = 200;
//-->
</script>
<script type="text/javascript"
src="//pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</div>
</form>
</div>

<div class="well">
<h4>{% trans "Blog tags" %}</h4>
{% get_tag_cloud %}
</div>
<div class="col">
<div class="text-center">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-8646203626363069";
/* Dolphin Blog Sidebar Ad */
google_ad_slot = "9795528512";
google_ad_width = 200;
google_ad_height = 200;
//-->
</script>
<script type="text/javascript"
src="//pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</div>

<div class="well">
<h4>{% trans "Blog series" %}</h4>
{% get_recent_blog_series 3 %}
<p class="seemore"><a href="{% url 'dolweb_blog_series_index' %}">{% trans "See all" %} »</a></p>
</div>
<div class="col">
<div class="card">
<div class="card-body">
<h5 class="card-title">{% trans "Blog tags" %}</h5>
{% get_tag_cloud %}
</div>
<div class="card-body">
<h5 class="card-title">{% trans "Blog series" %}</h5>
{% get_recent_blog_series 3 %}
<div class="float-end"><a href="{% url 'dolweb_blog_series_index' %}">{% trans "See all" %} »</a></div>
</div>
</div>
</div>
</div>
55 changes: 29 additions & 26 deletions dolweb/blog/templates/series-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,36 @@

{% block content %}

{% for series in all_series %}
{% for series in all_series %}

<div class="well clearfix series">
{% if series.image %}
{% thumbnail series.image "120x120" crop="center" format="PNG" as im %}
<img src="{{ im.url }}" alt="Series illustration" class="pull-left thumbnail" width="{{ im.width }}" height="{{ im.height }}" />
{% endthumbnail %}
{% endif %}
<div class="innerdiv">
{# <h2 id="serie-{{ serie.pk }}"><a href="{% url 'dolweb.blog.views.serie_view' uid=serie.pk %}">{{ serie.name }}</a> #}
<h2 id="series-{{ series.pk }}">{{ series.name }}
<small>{% blocktrans count count=series.entries.count %}
{{ count }} entry
{% plural %}
{{ count }} entries
{% endblocktrans %}</small></h2>
<p>{% trans "RSS feed:" %} <a href="{% url 'dolweb_blog_series_feed' pk=series.pk %}" class="rss-tag"><i class="icon-rss"></i></a></p>
<ol>
{% for entry in series.entries_reversed %}
<li><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a></li>
{% endfor %}
</ol>
</div>
</div>
<div class="mb-5 series">
{% if series.image %}
{% thumbnail series.image "120x120" crop="center" format="PNG" as im %}
<img src="{{ im.url }}" alt="Series illustration" class="pull-left thumbnail" width="{{ im.width }}" height="{{ im.height }}" />
{% endthumbnail %}
{% endif %}
<div class="innerdiv">
{# <h2 id="serie-{{ serie.pk }}"><a href="{% url 'dolweb.blog.views.serie_view' uid=serie.pk %}">{{ serie.name }}</a> #}
<h2 id="series-{{ series.pk }}">{{ series.name }}
<small class="text-muted">{% blocktrans count count=series.entries.count %}
{{ count }} entry
{% plural %}
{{ count }} entries
{% endblocktrans %}</small>
</h2>
<p>
{% trans "RSS feed:" %} <a href="{% url 'dolweb_blog_series_feed' pk=series.pk %}" class="rss-tag"><i class="bi bi-rss" role="button" aria-label="RSS"></i></a>
</p>
<ol>
{% for entry in series.entries_reversed %}
<li><a href="{{ entry.get_absolute_url }}">{{ entry.title }}</a></li>
{% endfor %}
</ol>
</div>
</div>

{% empty %}
<p>{% trans "No blog series yet." %}</p>
{% endfor %}
{% empty %}
<p>{% trans "No blog series yet." %}</p>
{% endfor %}

{% endblock %}
Loading