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

Style test #32

Merged
merged 20 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f3cf338
Footer and overall style improvements
ekoteva15 Feb 28, 2024
2850c4a
Get back the footer in 2 rows, small style improvements
ekoteva15 Feb 28, 2024
2134c2e
Initial commit for the header
ekoteva15 Feb 29, 2024
aea607f
Make the hader according to IAEA's style guide
ekoteva15 Feb 29, 2024
9614cb5
Put the nav links in the right order
ekoteva15 Feb 29, 2024
7efba90
Add header logo
ekoteva15 Feb 29, 2024
027e9fe
Add hero section
ekoteva15 Feb 29, 2024
8586f64
Remove Read more button and add smaller radius to the buttons in whol…
ekoteva15 Mar 1, 2024
ec719d5
Remove the sso in the header
ekoteva15 Mar 1, 2024
63b2ad3
Change dataserach url
blagojabozinovski Mar 1, 2024
0d4078f
Merge pull request #30 from keitaroinc/style-improvements
blagojabozinovski Mar 1, 2024
a0b834d
Improve the search field into the hero section
ekoteva15 Mar 1, 2024
298fd43
Add an initial version of the topics section on the home page
ekoteva15 Mar 1, 2024
31c469d
Change Groups to Topics in the navbar
ekoteva15 Mar 4, 2024
5d2b9a7
Add promoted and stats html templates
ekoteva15 Mar 4, 2024
79e60a8
Solve the header issue and add temporary style for the hero desgin im…
ekoteva15 Mar 4, 2024
101ea14
Add helper file for the custom IAEA Topics template
ekoteva15 Mar 5, 2024
b442d66
Improve the text visibility to the title and text in the hero section…
ekoteva15 Mar 5, 2024
d568687
Merge pull request #31 from keitaroinc/style-improvements
blagojabozinovski Mar 5, 2024
60bb477
Add Featured Group on homepage
blagojabozinovski Mar 5, 2024
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
11,551 changes: 11,551 additions & 0 deletions ckanext/iaea/assets/css/iaea.css

Large diffs are not rendered by default.

52 changes: 52 additions & 0 deletions ckanext/iaea/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
$primary-color: #3366cc;
$primary-light-color: #edf3f8;
$secondary-color: #fa991c;
$tertiary-color: #faf3f1;
$text-primary: #032539;
$neutral: #fbf3f2;
$white: white;

$bold: bolder;
$bold-size: larger;
$xxl-size: xx-large;
$xxxl-size: xxx-large;

$primary: $primary-color !default;
$primary-light: $primary-light-color !default;

$secondary: $secondary-color !default;

$theme-colors: () !default;
$theme-colors: map-merge(
(
"primary": $primary,
"primary-dark": $ibasis-primary-dark-1,
"primary-light": $ibasis-primary-light-3,
"primary-lighter": $ibasis-primary-light-4,
"secondary": $secondary,
"secondary-dark": $secondary-dark,
"secondary-light": $ibasis-secondary-light-3,
"secondary-lighter": $ibasis-secondary-light-4,
"tertiary": $purple,
"success": $success,
"success-light": $success-light,
"info": $info,
"warning": $warning,
"danger": $danger,
"danger-light": $danger-light,
"light": $light,
"dark": $dark,
"action": $ibasis-neutral-light-1,
"neutral": $neutral,
"neutral-light": $ibasis-neutral-light-3,
"neutral-muted": $neutral-muted,
"neutral-dark": $neutral-dark,
"success-pale": $success-pale,
"selected": $ibasis-neutral-light-2,
"flat": $ibasis-flat-rate,
"list-item": $list-item,
"list-item-pale": $list-item-pale,
"excel-heading": $ibasis-excel-header,
),
$theme-colors
);
1 change: 1 addition & 0 deletions ckanext/iaea/assets/scss/iaea.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "variables";
17 changes: 16 additions & 1 deletion ckanext/iaea/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
from ckan.lib.plugins import DefaultTranslation
from ckanext.iaea.helpers import get_helpers
from ckanext.iaea.logic import action, validators
import ckan.logic as logic
import ckan.model as model


def featured_group():
try:
group_list = logic.get_action('group_list')(
{}, {'sort': 'package_count', 'all_fields': True})
if group_list:
return group_list
else:
return logic.get_action('group_list')(
{}, {'all_fields': True})
except (logic.NotFound, logic.ValidationError, logic.NotAuthorized):
return {}


class IaeaPlugin(plugins.SingletonPlugin, DefaultTranslation):
Expand All @@ -22,7 +37,7 @@ def update_config(self, config_):

def get_helpers(self):
iaea_helpers = {
# 'featured_group': featured_group,
'featured_group': featured_group,
# 'package_activity_html': package_activity_html,
# 'suggested_filter_fields_serializer': suggested_filter_fields_serializer,
# 'featured_view_url': featured_view_url,
Expand Down
Binary file added ckanext/iaea/public/images/hero.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions ckanext/iaea/public/images/iaea-logo-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ckanext/iaea/public/images/iaea-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
137 changes: 137 additions & 0 deletions ckanext/iaea/templates/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
{% ckan_extends %} {% block footer_content %}
<div class="row">
<div class="col-md-8 footer-links">
{% block footer_nav %}
<div class="row">
<div class="col-sm-6 address">
<p>
<a href="/pages/about">
<img
class="footer-logo"
src="/images/iaea-logo-blue.svg"
alt="International Atomic Energy Agency (IAEA)"
/></a>
</p>
<h4>International Atomic Energy Agency</h4>
<p>
Vienna International Centre, PO Box 100, A-1400 Vienna,
<br />Austria <br />Telephone: <a href="">+43 (1) 26000-0</a>
<br />Facsimile: <a href="">+43 (1) 26000-7</a> <br />Email:
<a href="https://www.iaea.org/contact/official-mail">Official Mail</a>
</p>
</div>
</div>
{% endblock %}
</div>
<div class="col-sm-6 col-md-2 col-lg-2">
<h5 class="h4">Shortcuts</h5>
<ul class="nav flex-column social-links">
<li class="nav-item">
<a
class="nav-link"
title="Facebook"
href="https://www.iaea.org/about/privacy-policy"
>Privacy Policy</a
>
</li>
<li class="nav-item">
<a
class="nav-link"
title="Facebook"
href="https://nucleus.iaea.org/Pages/Others/Disclaimer.aspx"
>Terms of Use</a
>
</li>
</ul>
</div>
<div class="col-sm-6 col-md-2 col-lg-2">
<h5 class="h4">Stay connected</h5>
<ul class="nav flex-column social-links">
<li class="nav-item">
<a
itemprop="sameAs"
class="nav-link"
title="Facebook"
href="https://twitter.com/iaeaorg"
target="_blank"
rel="noopener noreferrer"
><svg
class="me-1"
xmlns="http://www.w3.org/2000/svg"
width="18"
height="18"
viewBox="0 0 32 32"
>
<title>logo-twitter</title>
<g fill="currentColor">
<path
fill="currentColor"
d="M32,6.1c-1.2,0.5-2.4,0.9-3.8,1c1.4-0.8,2.4-2.1,2.9-3.6c-1.3,0.8-2.7,1.3-4.2,1.6C25.7,3.8,24,3,22.2,3 c-3.6,0-6.6,2.9-6.6,6.6c0,0.5,0.1,1,0.2,1.5C10.3,10.8,5.5,8.2,2.2,4.2c-0.6,1-0.9,2.1-0.9,3.3c0,2.3,1.2,4.3,2.9,5.5 c-1.1,0-2.1-0.3-3-0.8c0,0,0,0.1,0,0.1c0,3.2,2.3,5.8,5.3,6.4c-0.6,0.1-1.1,0.2-1.7,0.2c-0.4,0-0.8,0-1.2-0.1 c0.8,2.6,3.3,4.5,6.1,4.6c-2.2,1.8-5.1,2.8-8.2,2.8c-0.5,0-1.1,0-1.6-0.1C2.9,27.9,6.4,29,10.1,29c12.1,0,18.7-10,18.7-18.7 c0-0.3,0-0.6,0-0.8C30,8.5,31.1,7.4,32,6.1z"
></path>
</g></svg
>/ iaeaorg</a
>
</li>
<li class="nav-item">
<a
itemprop="sameAs"
class="nav-link"
title="LinkedIn"
href="https://www.linkedin.com/company/iaea"
target="_blank"
rel="noopener noreferrer"
><svg
class="me-1"
xmlns="http://www.w3.org/2000/svg"
width="18"
height="18"
viewBox="0 0 32 32"
>
<title>logo-linkedin</title>
<g fill="currentColor">
<path
d="M29,1H3A2,2,0,0,0,1,3V29a2,2,0,0,0,2,2H29a2,2,0,0,0,2-2V3A2,2,0,0,0,29,1ZM9.887,26.594H5.374V12.25H9.887ZM7.63,10.281a2.625,2.625,0,1,1,2.633-2.625A2.624,2.624,0,0,1,7.63,10.281ZM26.621,26.594H22.2V19.656c0-1.687,0-3.75-2.35-3.75s-2.633,1.782-2.633,3.656v7.126H12.8V12.25h4.136v1.969h.094a4.7,4.7,0,0,1,4.231-2.344c4.513,0,5.359,3,5.359,6.844Z"
fill="currentColor"
></path>
</g></svg
>/ iaea</a
>
</li>
<li class="nav-item">
<a
itemprop="sameAs"
class="nav-link"
title="Twitter"
href="https://www.facebook.com/iaeaorg"
target="_blank"
rel="noopener noreferrer"
><svg
class="me-1"
xmlns="http://www.w3.org/2000/svg"
width="18"
height="18"
viewBox="0 0 32 32"
>
<title>logo-fb-simple</title>
<g fill="currentColor">
<path
fill="currentColor"
d="M12.46218,31V18H8v-6h4.46218V7.80998C12.46218,3.24577,15.35166,1,19.42325,1 c1.95033,0,3.62655,0.1452,4.11504,0.21011v4.76987l-2.82387,0.00128C18.50007,5.98127,18,7.0335,18,8.57757V12h6l-2,6h-4v13 H12.46218z"
></path>
</g></svg
>/ iaeaorg</a
>
</li>
</ul>
</div>
<div class="col-md-4 attribution">
{% block footer_attribution %}
<p>
{% trans %}<strong>Powered by</strong>
<a href="http://ckan.org">CKAN</a>{% endtrans %}
</p>
{% endblock %} {% block footer_lang %} {% snippet
"snippets/language_selector.html" %} {% endblock %}
</div>
</div>
{% endblock %}
14 changes: 14 additions & 0 deletions ckanext/iaea/templates/group/snippets/helper.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="module module-narrow module-shallow">
<h2 class="module-heading">
<i class="fa fa-info-circle"></i>
{{ _('What are Topics?') }}
</h2>
<div class="module-content">
<p>
{% trans %} You can use CKAN Topics to create and manage collections of
datasets. This could be to catalogue datasets for a particular project or
team, or on a particular theme, or as a very simple way to help people
find and search your own published datasets. {% endtrans %}
</p>
</div>
</div>
Loading
Loading