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

Review branding #102

Merged
merged 22 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Apply the limited width layout on each page
  • Loading branch information
Xpirix committed Dec 24, 2024
commit 9b84cc9746a5f78b7d41505620cfba5a3fb78da4
160 changes: 79 additions & 81 deletions qgisfeedproject/templates/feeds/feed_home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,98 +27,96 @@
}
</style>
{% endblock stylesheets %}

{% block content %}
{% block pagetitle %}
{% include "layouts/page-title.html" with page_title='QGIS Feed' %}
<section class="section">
<div class="container content">
<div class="columns is-multiline is-centered">
<div class="column is-3">
<div class="box has-background-light box-container mt-5">
<h5 class="title is-5">Filter by</h5>
<form method="GET">
<div class="field">
<label class="label">Language filter:</label>
<div class="select is-fullwidth">
{{form.lang}}
</div>
</div>
{% endblock %}
{% block content %}

<div class="field">
<label class="label">Date published from:</label>
<div class="control has-icons-left">
{{form.publish_from}}
<span class="icon is-small is-left">
<i class="fas fa-calendar"></i>
</span>
</div>
</div>
<button class="button is-primary1 is-fullwidth" type="submit" value="filter"
id="submit-button">
Filter <i class="fa fa-filter" aria-hidden="true"></i>
</button>
<button type="button" class="button is-fullwidth mt-2" value="clear"
onclick="window.location.href='?';">
Clear filter <i class="fa fa-delete-left" aria-hidden="true"></i>
</button>
</form>
<div class="columns is-multiline is-centered">
<div class="column is-3">
<div class="box has-background-light box-container mt-5">
<h5 class="title is-5">Filter by</h5>
<form method="GET">
<div class="field">
<label class="label">Language filter:</label>
<div class="select is-fullwidth">
{{form.lang}}
</div>
</div>
</div>
<div class="column is-9">
<div class="tabs is-centered is-boxed" id="tabs">
<ul>
<li class="is-active" data-tab="1">
<a>
<span class="icon is-small"><i class="fa fa-image"></i></span>
<span>Preview</span>
</a>
</li>
<li data-tab="2">
<a>
<span class="icon is-small"><i class="fa fa-code"></i></span>
<span>Raw</span>
</a>
</li>
</ul>

<div class="field">
<label class="label">Date published from:</label>
<div class="control has-icons-left">
{{form.publish_from}}
<span class="icon is-small is-left">
<i class="fas fa-calendar"></i>
</span>
</div>
</div>
<div id="tab-content">
<div class="tab-content-element is-active" style="padding:0 10px;" data-content="1">
{% if data|length > 0 %}
{% for feed in data %}
<div class="box-container hoverable-preview form-preview columns has-background-light p-2 mt-5"
onclick="window.location.href='{% url 'feed_detail' feed.pk %}';" style="margin-left: auto;margin-right: auto;">
<div class="column is-4 is-flex is-flex-direction-column is-align-items-center"
name="imagePreview">
{% if feed.image %}
<img src="{{ feed.image }}" style="border-radius:20px;">
{% endif %}
</div>
<div class="column is-8">
<h5 name="titlePreview" class="title is-5">
{{feed.title | default:""}}
</h5>
<div name="contentPreview">
{{feed.content | default:"" | safe }}
</div>
</div>
</div>
{% endfor %}
{% else %}
<div style="width: 100%; text-align: center;" class="m-5">
No data found
</div>
<button class="button is-primary1 is-fullwidth" type="submit" value="filter"
id="submit-button">
Filter <i class="fa fa-filter" aria-hidden="true"></i>
</button>
<button type="button" class="button is-fullwidth mt-2" value="clear"
onclick="window.location.href='?';">
Clear filter <i class="fa fa-delete-left" aria-hidden="true"></i>
</button>
</form>
</div>
</div>
<div class="column is-9">
<div class="tabs is-centered is-boxed" id="tabs">
<ul>
<li class="is-active" data-tab="1">
<a>
<span class="icon is-small"><i class="fa fa-image"></i></span>
<span>Preview</span>
</a>
</li>
<li data-tab="2">
<a>
<span class="icon is-small"><i class="fa fa-code"></i></span>
<span>Raw</span>
</a>
</li>
</ul>
</div>
<div id="tab-content">
<div class="tab-content-element is-active" style="padding:0 10px;" data-content="1">
{% if data|length > 0 %}
{% for feed in data %}
<div class="box-container hoverable-preview form-preview columns has-background-light p-2 mt-5"
onclick="window.location.href='{% url 'feed_detail' feed.pk %}';" style="margin-left: auto;margin-right: auto;">
<div class="column is-4 is-flex is-flex-direction-column is-align-items-center"
name="imagePreview">
{% if feed.image %}
<img src="{{ feed.image }}" style="border-radius:20px;">
{% endif %}
</div>
<div class="tab-content-element is-inactive" data-content="2">
<pre style="background-color:unset; padding:0;">
<code class="language-json">{{data_json}}</code>
</pre>
<div class="column is-8">
<h5 name="titlePreview" class="title is-5">
{{feed.title | default:""}}
</h5>
<div name="contentPreview">
{{feed.content | default:"" | safe }}
</div>
</div>
</div>
{% endfor %}
{% else %}
<div style="width: 100%; text-align: center;" class="m-5">
No data found
</div>
{% endif %}
</div>
<div class="tab-content-element is-inactive" data-content="2">
<pre style="background-color:unset; padding:0;">
<code class="language-json">{{data_json}}</code>
</pre>
</div>
</div>
</div>
</section>
</div>
{% endblock content %}

<!-- Specific JS goes HERE -->
Expand Down
108 changes: 54 additions & 54 deletions qgisfeedproject/templates/feeds/feed_item_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,65 +41,65 @@
{{ form.media }}
</head>

<section class="section">
<h1 class="title is-3 has-text-centered">
{% if form.title.value %}
Edit feed item
{% else %}
New feed item
{% endif %}
</h1>
<div class="columns">
<div class="column is-6">
{% include 'feeds/feed_item_form_widgets.html' %}
</div>
<div class="column is-6">
<div style="border: solid #e5e5e5 1px; border-radius: 10px;">
<h5 class="title is-5 has-text-centered mt-3">Preview</h5>
{% include 'feeds/feed_item_preview.html' %}
</div>
<h1 class="title is-3 has-text-centered">
{% if form.title.value %}
Edit feed item
{% else %}
New feed item
{% endif %}
</h1>

<div class="columns is-multiline is-centered">
<div class="column is-6">
{% include 'feeds/feed_item_form_widgets.html' %}
</div>
<div class="column is-6">
<div style="border: solid #e5e5e5 1px; border-radius: 10px;">
<h5 class="title is-5 has-text-centered mt-3">Preview</h5>
{% include 'feeds/feed_item_preview.html' %}
</div>
</div>
<div class="columns">
<div class="column is-6 is-flex is-justify-content-end">
<div class="columns">
{% if not published and user_is_approver and form.instance.pk %}
<div class="column is-5">
<button name="formConfirmationBtn" class="button is-outlined is-primary1" type="submit"
form="feedItemForm">
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Save changes</span>
</button>
</div>
{% endif %}

<div class="column is-7">
<button name="formConfirmationBtn" class="button is-primary1 js-modal-trigger"
data-target="form-review-modal">
{% if published %}
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Save changes</span>
{% elif not published and user_is_approver and form.instance.pk %}
<span class="icon">
<i class="fa fa-check" aria-hidden="true"></i>
</span>
<span>Approve and publish</span>
{% else %}
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Submit for review</span>
{% endif %}
</button>
</div>
</div>

<div class="columns">
<div class="column is-6 is-flex is-justify-content-end">
<div class="columns">
{% if not published and user_is_approver and form.instance.pk %}
<div class="column is-5">
<button name="formConfirmationBtn" class="button is-outlined is-primary1" type="submit"
form="feedItemForm">
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Save changes</span>
</button>
</div>
{% endif %}

<div class="column is-7">
<button name="formConfirmationBtn" class="button is-primary1 js-modal-trigger"
data-target="form-review-modal">
{% if published %}
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Save changes</span>
{% elif not published and user_is_approver and form.instance.pk %}
<span class="icon">
<i class="fa fa-check" aria-hidden="true"></i>
</span>
<span>Approve and publish</span>
{% else %}
<span class="icon">
<i class="fa fa-floppy-disk" aria-hidden="true"></i>
</span>
<span>Submit for review</span>
{% endif %}
</button>
</div>
</div>
</div>
</section>
</div>

{% include 'feeds/feed_item_confirmation.html' %}

Expand Down
Loading
Loading