Compare commits

...
This repository has been archived on 2023-02-21. You can view files and clone it, but cannot push or open issues or pull requests.

6 Commits

Author SHA1 Message Date
Guillaume Denis 38c9db2ee8 footer i18n 2015-03-11 13:46:10 +01:00
Guillaume Denis b6c75a0b7c footer CSS 2015-03-11 11:06:50 +01:00
Guillaume Denis 6e06638d1f navbar CSS adujstments to fit with wwW.ozwillo.com navbar 2015-03-11 10:36:12 +01:00
Guillaume Denis 6a08cbcdb5 resolve css conflict from merge 2015-03-11 10:28:59 +01:00
Guillaume Denis 7eb16aeccf merge from master + CSS for navbar 2015-03-10 17:21:39 +01:00
Guillaume Denis a96eafc368 Ozwillo logo replaces Oasis 2015-03-04 14:55:57 +01:00
15 changed files with 135 additions and 95 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.pyc
ckanext_ozwillo_theme.egg-info
*.pot
.DS_Store

View File

@ -57,10 +57,10 @@ padding-top: 80px;
display: block;
content: "";
margin-top: -3px;
width: 40px;
height: 30px;
width: 38px;
height: 29px;
float: left;
background: url(/img/data-icon.png) no-repeat top left;
background: url('/images/ui/data-on.png') no-repeat top left;
}
.hero {
@ -94,7 +94,18 @@ padding-top: 80px;
.navbar-lang li a {
text-transform: capitalize;
text-transform: capitalize;
}
.navbar .nav .dropdown-toggle .caret {
margin-top: 0;
}
.navbar .btn, .navbar .btn-group {
margin-top: 7px;
}
.navbar .navbar-lang {
margin-right: 0;
}
.navbar li.item-112:hover .dropdown-menu,
@ -103,3 +114,40 @@ padding-top: 80px;
display: block;
}
/* footer */
footer .t3-footnav {
padding: 16px 0 0;
}
footer #oz-footer-well {
text-align: center;
color: #6f438e;
}
footer p {
margin: 16px 0;
}
footer .navbar-nav.navbar-footer > li > a {
color: #555555;
display: block;
box-sizing: border-box;
border-radius: 3px;
line-height: 22px;
padding: 0.25em 0.4em;
text-decoration: none;
}
footer .navbar-nav.navbar-footer > li > a:hover {
background: #efe4f0;
}
footer a.ext-twitter:after {
content: "";
display: inline-block;
margin-left: 4px;
width: 22px;
height: 18px;
background: url('/img/twitter.png') no-repeat top 3px left 0;
}

View File

@ -100,15 +100,15 @@ p.large {
background: #636884;
color: #fff;
}
.navbar-lang {
.navbar .navbar-lang {
margin-left: 20px;
}
.nav a.nav-apps:before {
display: block;
content: "";
margin-top: -3px;
width: 40px;
height: 30px;
width: 38px;
height: 29px;
float: left;
background: url('/images/ui/apps-on.png') no-repeat top left;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

View File

@ -1,54 +1,44 @@
{% set current_lang = request.environ.CKAN_LANG %}
<footer id="t3-footer" class="wrap t3-footer">
<section class="t3-sitemap">
<!-- FOOT NAVIGATION -->
<div class="container">
<!-- SPOTLIGHT -->
<div class="t3-spotlight t3-footnav row">
<div class=" col-lg-6 col-md-6 col-sm-3 col-xs-12">
<div class="t3-module module " id="Mod92"><div class="module-inner"><div class="module-ct">
<div class="custom">
<div class="text-center">
<img src="/img/logo.png">
<p>{% trans %}A platform of interactive services{% endtrans %}<br>
{% trans %}for a common good of data{% endtrans %}
</p>
<p>
<img src="/img/CIP.png" alt="CIP"/>
<img src="/img/EU.png" alt="EU"/>
<img src="/img/PIA.png" alt="PIA"/>
</div></div>
</div></div></div>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<div class="t3-module module " id="Mod141"><div class="module-inner"><div class="module-ct"><ul class="nav navbar-nav navbar-right navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/discover">{% trans %}Discovering{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/news">{% trans %}News{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/co-construct">{% trans %}Co-construct{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/let-s-go">{% trans %}Let's go{% endtrans %}</a></li></ul>
</div></div></div>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<div class="t3-module module " id="Mod142"><div class="module-inner"><div class="module-ct"><ul class="nav navbar-nav navbar-right navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/contact">{% trans %}Contact{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/l-equipe-projet-oasis">{% trans %}Project team{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects">{% trans %}Projects{% endtrans %}</a></li></ul>
</div></div></div>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<div class="t3-module module " id="Mod143"><div class="module-inner"><div class="module-ct"><ul class="nav navbar-nav navbar-right navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/guide-utilisateur">{% trans %}User guide{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/terms">{% trans %}General terms of use{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/legal-notices">{% trans %}Legal Notices{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/co-construct">{% trans %}Governance{% endtrans %}</a></li></ul>
</div></div></div>
</div>
<div class="container">
<div class="t3-spotlight t3-footnav row">
<div class=" col-lg-6 col-md-6 col-sm-3 col-xs-12">
<div id="oz-footer-well">
<img src="/img/logo.png">
<p>{% trans %}Common goods factory{% endtrans %}</p>
<p>
<a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects"><img src="/img/CIP.png" alt="CIP"/></a>
<a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects"><img src="/img/EU.png" alt="EU"/></a>
<a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects"><img src="/img/PIA.png" alt="PIA"/></a>
<a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects"><img src="/img/FR.png" alt="FR"/></a>
</p>
</div>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<ul class="nav navbar-nav navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/news">{% trans %}News{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/discover">{% trans %}Discovering{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/co-construct">{% trans %}Co-construct{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/let-s-go">{% trans %}Let's go{% endtrans %}</a></li></ul>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<ul class="nav navbar-nav navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/contact">{% trans %}Contact{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/l-equipe-projet-oasis">{% trans %}Project team{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/projects">{% trans %}Projects{% endtrans %}</a></li>
<li><a class="ext-twitter" href="https://twitter.com/ozwillo">@Ozwillo</a></li>
</ul>
</div>
<div class=" col-lg-2 col-md-2 col-sm-3 col-xs-4">
<ul class="nav navbar-nav navbar-footer">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/guide-utilisateur">{% trans %}User guide{% endtrans %}</a></li>
<li><a href="http://doc.ozwillo.com/">{% trans %}Developers{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/legal-notices">{% trans %}Legal Notices{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/terms">{% trans %}General terms of use{% endtrans %}</a></li>
</ul>
</div>
</div>
<!-- SPOTLIGHT --> </div>
<!-- //FOOT NAVIGATION -->
</section>
</div>
</section>
</footer>

View File

@ -22,8 +22,9 @@
<div class="t3-navbar navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="item-107 current"> <a class="logo" href="{{ g.ozwillo_url }}/{{current_lang}}"><img src="/img/logo-h43.png" alt="{% trans %}Home{% endtrans %}"></a>
</li><li class="item-108"> <a class="nav-apps" href="{{ g.ozwillo_portal_url }}/{{current_lang}}/store?ui_locales={{current_lang}}">{% trans %}Catalog{% endtrans %}</a>
</li>
</li>
<li class="item-108"> <a class="nav-apps" href="{{ g.ozwillo_portal_url }}/{{current_lang}}/store?ui_locales={{current_lang}}">{% trans %}Catalog{% endtrans %}</a>
</li>
<li class="item-119 deeper dropdown parent">
{% if c.userobj %}
<a class="dropdown-toggle nav-data" href="#" data-toggle="dropdown">{% trans %}Data{% endtrans %}<b class="caret"></b></a>
@ -56,7 +57,7 @@
<a class="btn navbar-btn" href="{{ g.ozwillo_portal_url }}/my?ui_locales={{current_lang}}">{% trans %}Log in{% endtrans %}</a>
{% endif %}
</li>
<li class="item-112 deeper dropdown parent"><a class="dropdown-toggle" href="/en/oz/discover" data-toggle="dropdown">{% trans %}Discover{% endtrans %}<b class="caret"></b></a>
<li class="item-112 deeper dropdown parent"><a class="dropdown-toggle" href="/en/oz/discover" data-toggle="dropdown">{% trans %}Discover{% endtrans %} <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/discover">{% trans %}Discovering the Platform{% endtrans %}</a></li>
<li><a href="{{ g.ozwillo_url }}/{{current_lang}}/oz/news">{% trans %}News{% endtrans %}</a></li>

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr ""
msgid "Common goods factory"
msgstr "Създател на общи ползи"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Правни бележки"
msgid "Governance"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Pазработчиците"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr ""
msgid "Common goods factory"
msgstr "La fàbrica del bé comú digital"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Notes Legals"
msgid "Governance"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Desenvolupadors"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr ""
msgid "Common goods factory"
msgstr "La fábrica del bien común digital"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Notas legales"
msgid "Governance"
msgstr "Gobernanza"
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Desarrolladores"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr "Une plateforme d'applications"
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr "pour la création d'un bien commune de données"
msgid "Common goods factory"
msgstr "Fabrique de biens communs"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Mentions légales"
msgid "Governance"
msgstr "Gouvernance"
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Développeurs"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr ""
msgid "Common goods factory"
msgstr "Una fucina di beni comuni"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Avvisi legali"
msgid "Governance"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Sviluppatori"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "

View File

@ -19,12 +19,8 @@ msgstr ""
"Generated-By: Babel 0.9.6\n"
#: ckanext/ozwillo_theme/templates/footer.html:14
msgid "A platform of interactive services"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html:15
msgid "for a common good of data"
msgstr ""
msgid "Common goods factory"
msgstr "Ortak fayda üretim merkezi"
#: ckanext/ozwillo_theme/templates/footer.html:22
msgid "/en/oz/discover"
@ -115,6 +111,10 @@ msgstr "Yasal Uyarılar"
msgid "Governance"
msgstr ""
#: ckanext/ozwillo_theme/templates/footer.html
msgid "Developers"
msgstr "Geliştiriciler"
#: ckanext/ozwillo_theme/templates/footer.html:58
msgid ""
"OASIS is a project cofunded by the EU under the Program for Competitiveness "