-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from adinhodovic/multiple-improvements
feat: Made icons for blocks not required
- Loading branch information
Showing
11 changed files
with
393 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
313 changes: 313 additions & 0 deletions
313
wagtail_resume/migrations/0011_baseresumepage_about_icon_and_more.py
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
wagtail_resume/templates/wagtail_resume/blocks/contributions_block.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 5 additions & 1 deletion
6
wagtail_resume/templates/wagtail_resume/blocks/education_block.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 17 additions & 9 deletions
26
wagtail_resume/templates/wagtail_resume/blocks/work_experience_block.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,25 @@ | ||
{% load i18n %} | ||
{% load wagtailmarkdown %} | ||
|
||
<h2 class="section-title"><i class="{{ value.fa_icon }} mr-3"></i><span>{{ value.heading }}</span></h2> | ||
<h2 class="section-title"> | ||
{% if value.fa_icon %}<i class="{{ value.fa_icon }}"></i>{% endif %} | ||
<span>{{ value.heading }}</span> | ||
</h2> | ||
<hr> | ||
{% for experience in value.experiences %} | ||
<span class="work-experience-heading"><b>{{ experience.role }}</b> - <a href="{{ experience.url }}">{{ experience.company }}</a></span> | ||
<a href="{{ experience.url }}">{{ role.experience }}</a> | ||
<p class="date"> | ||
{% if experience.location %} | ||
<b>{{ experience.location }}, </b> | ||
{% endif %} | ||
<p class="work-experience-heading mb-0"><b>{{ experience.role }} · <a href="{{ experience.url }}">{{ experience.company }}</a></b></p> | ||
{% if experience.location %} | ||
<p class="mt-0 mb-0"> | ||
{{ experience.location }} | ||
</p> | ||
{% endif %} | ||
<p class="date mt-0"> | ||
{{ experience.from_date }} - {% if experience.currently_working_here %}<b>{% trans "Present" %}</b>{% else %}{{ experience.to_date }}{% endif %} | ||
</p> | ||
<p> | ||
<div style="margin-top: 1.5rem;"> | ||
{{ experience.text | markdown }} | ||
</p> | ||
</div> | ||
{% if not forloop.last %} | ||
<hr> | ||
{% endif %} | ||
{% endfor %} |
6 changes: 5 additions & 1 deletion
6
wagtail_resume/templates/wagtail_resume/blocks/writings_block.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters