SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 0a570f87 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

This is it.

parent 45f602ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scipost/static/scipost/assets/css/_general.scss
+ 24
− 1
View file @ 0a570f87
......@@ -13,7 +13,7 @@ body #MathJax_Message {
background-color: #f9f9f9;
border: 1px solid #f4f4f4;
border-radius: $card-border-radius;
color: #002b49;
color: $scipost-darkblue;
opacity: 0.9;
}
......@@ -23,9 +23,32 @@ body #MathJax_Message {
}
footer {
.row,
ul {
margin-bottom: 0;
}
//
// &.sub {
// background-color: $scipost-light;
// color: $body-color;
//
// a,
// a:hover {
// color: $body-color;
// }
//
// li {
// padding: .1rem;
// }
// }
background-color: $scipost-darkblue;
color: $white;
li {
padding: .1rem;
}
a,
a:hover {
color: $white;
......
scipost/static/scipost/assets/css/_navbar.scss
+ 41
− 25
View file @ 0a570f87
......@@ -31,31 +31,47 @@
}
.dropdown-menu {
background-color: $scipost-lightblue;
font-size: 100%;
a {
&:hover {
color: $scipost-lightblue;
}
}
h2, h3 {
color: $scipost-orange;
margin: 0.8rem 0rem 0.3rem 0.8rem;
}
}
.nav-item.active a {
font-weight: 700;
text-decoration: underline;
}
padding: 0;
background: $white;
color: $scipost-darkblue;
border-color: #e0e0e0;
top: 36px;
.dropdown-item {
padding: 0.5rem 0.625rem;
line-height: 1.5;
color: $scipost-darkblue;
}
.navbar-nav {
z-index: 99;
background-color: $scipost-lightblue;
white-space: nowrap;
.dropdown-divider {
margin: 0;
}
}
// background-color: $scipost-lightblue;
// font-size: 100%;
//
// a {
// &:hover {
// color: $scipost-lightblue;
// }
// }
//
// h2, h3 {
// color: $scipost-orange;
// margin: 0.8rem 0rem 0.3rem 0.8rem;
// }
// }
//
// .nav-item.active a {
// font-weight: 700;
// text-decoration: underline;
// }
//
// .navbar-nav {
// z-index: 99;
// background-color: $scipost-lightblue;
// white-space: nowrap;
// }
@media (min-width: 992px) {
.full-height-bar {
......@@ -204,8 +220,8 @@ header .nav-item {
right: 0;
top: 0;
height: 100%;
padding: 0.25rem 1.0rem 0.25rem 1.25rem;
width: 140px;
padding: 0.25rem 0.25rem 0.25rem 1.25rem;
width: 90px;
}
.btn {
......
scipost/templates/scipost/footer.html
+ 57
− 13
View file @ 0a570f87
{% load staticfiles %}
<footer class="footer">
<div class="container py-4">
<div class="row mb-0">
<div class="col-md-4 mb-3 mb-md-0">
Copyright &copy; <a href="{% url 'scipost:foundation' %}" target="_">SciPost Foundation</a>
<br/>
<a href="{% url 'scipost:terms_and_conditions' %}">Terms and conditions</a>
<div class="container py-4">
<div class="row">
<div class="col-md-3 mb-3 mb-md-0">
<ul class="list-unstyled">
<li>Copyright &copy; <a href="{% url 'scipost:foundation' %}" target="_">SciPost Foundation</a></li>
<li><a href="{% url 'scipost:terms_and_conditions' %}">Terms and conditions</a></li>
<li>
<table class="mt-2 social-media">
<tr>
<td>
......@@ -22,17 +23,60 @@
</td>
</tr>
</table>
</li>
</ul>
</div>
<div class="col-md-3 mb-3 mb-md-0">
<ul class="list-unstyled">
<li><a href="mailto:admin@scipost.org">Contact the administrators</a></li>
<li><a href="mailto:techsupport@scipost.org">Write to tech support</a></li>
<li><a href="https://code.scipost.org" target="_blank">code.scipost.org</a></li>
<ul>
</div>
<div class="col-md-5 mb-3 mb-md-0">
<a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank"><img alt="Creative Commons License" style="border-width:0" src="//licensebuttons.net/l/by/4.0/80x15.png" /></a><br />Except where otherwise noted, all content on SciPost is licensed under a <a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>.
<div class="col-md-3 mb-3 mb-md-0">
<ul class="list-unstyled">
<li><a href="{% url 'organizations:organizations' %}">Organizations benefiting from our activities</a></li>
<li><a href="{% url 'sponsors:sponsors' %}">Sponsors</a></li>
<li><a href="{% url 'finances:finances' %}" target="_blank">Finances</a></li>
<ul>
</div>
<div class="col-md-3 mb-3 mb-md-0 text-md-right">
<ul class="list-unstyled">
<li>Contact the <a href="mailto:admin@scipost.org">administrators</a></li>
<li>Write to <a href="mailto:techsupport@scipost.org">tech support</a></li>
<li><a href="https://code.scipost.org" target="_blank">code.scipost.org</a></li>
</ul>
<ul class="list-unstyled">
<li><a href="{% url 'scipost:about' %}">About SciPost</a></li>
<li><a href="{% url 'scipost:foundation' %}">The Foundation</a></li>
<li><a href="{% url 'scipost:FAQ' %}">FAQ</a></li>
<li><a href="{% url 'news:news' %}">News</a></li>
<li><a href="{% url 'scipost:feeds' %}">Feeds</a></li>
</ul>
</div>
</div>
<div class="row">
<div class="col-12">
<br>
<a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank" class="m-2">
<img alt="Creative Commons License" style="border-width:0" src="//licensebuttons.net/l/by/4.0/80x15.png" />
</a>
Except where otherwise noted, all content on SciPost is licensed under a <a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>.
</div>
</div>
</div>
</footer>
<!--<footer class="footer">
<div class="container">
<div class="row">
<div class="col-12 pb-3">
<img src="{% static 'scipost/images/logo_scipost_with_bgd_small.png' %}" class="mb-2">
<br>
<a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank" class="m-2">
<img alt="Creative Commons License" style="border-width:0" src="//licensebuttons.net/l/by/4.0/80x15.png" />
</a>
Except where otherwise noted, all content on SciPost is licensed under a <a rel="license" href="//creativecommons.org/licenses/by/4.0/" target="_blank">Creative Commons Attribution 4.0 International License</a>.
</div>
</div>
</div>
</footer>
-->
scipost/templates/scipost/header.html
+ 30
− 0
View file @ 0a570f87
......@@ -28,6 +28,36 @@
</form>
</div>
</li>
{% if user.is_authenticated %}
{% if user.contributor %}
<li class="nav-item">
<span class="separator">&middot;</span>
<a class="nav-link"href="{% url 'scipost:personal_page' %}">Personal Page</a>
</li>
{% if is_editorial_college %}
<li class="nav-item">
<span class="separator">&middot;</span>
<a class="nav-link" href="{% url 'submissions:pool' %}">Submissions Pool</a>
</li>
{% endif %}
{% endif %}
{% if perms.scipost.can_view_production %}
<li class="nav-item">
<span class="separator">&middot;</span>
<a class="nav-link" href="{% url 'production:production' %}">Production</a>
</li>
{% endif %}
{% if perms.scipost.can_manage_organizations or user.org_contact %}
<li class="nav-item">
<span class="separator">&middot;</span>
<a class="nav-link" href="{% url 'organizations:dashboard' %}">Orgs dashboard</a>
</li>
{% endif %}
<li class="nav-item">
<span class="separator">&middot;</span>
<a class="nav-link" href="{% url 'scipost:logout' %}?next={{ request.path }}">Logout</a>
</li>
{% endif %}
</ul>
</div>
......
scipost/templates/scipost/navbar.html
+ 10
− 38
View file @ 0a570f87
......@@ -29,18 +29,16 @@
<a href="{% url 'journals:journals' %}" class="dropdown-item">Journals homepage</a>
<a href="{% url 'journals:publications' %}" class="dropdown-item">View all publications</a>
<div class="dropdown-divider"></div>
<h3 class="dropdown-headline"><strong>Physics</strong></h3>
{% for journal in journals %}
<span class="dropdown-item dropdown-headline"><strong>Physics</strong></span>
{% for journal in journals %}
{% if journal.active %}
<a href="{{ journal.get_absolute_url }}" class="dropdown-item">{{ journal }}</a>
<a href="{{ journal.get_absolute_url }}" class="dropdown-item">{{ journal.get_name_display }}</a>
{% elif perms.scipost.can_view_pool %}
<a href="{% url 'journal:about' journal.name %}" class="dropdown-item">{{ journal }}</a>
<a href="{% url 'journal:about' journal.name %}" class="dropdown-item">{{ journal.get_name_display }}</a>
{% endif %}
{% endfor %}
{% endfor %}
</div>
</li>
<li class="nav-item{% if '/journals/publications' in request.path %} active{% endif %}">
</li>
<li class="nav-item{% if '/submissions/' in request.path %} active{% endif %}">
<a class="nav-link" href="{% url 'submissions:submissions' %}">Submissions</a>
</li>
......@@ -50,19 +48,8 @@
<li class="nav-item{% if '/theses/' in request.path %} active{% endif %}">
<a class="nav-link" href="{% url 'theses:theses' %}">Theses</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="MoreDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">More</a>
<div class="dropdown-menu" aria-labelledby="MoreDropdown">
<a class="dropdown-item" href="{% url 'scipost:about' %}">About SciPost</a>
<a class="dropdown-item" href="{% url 'scipost:foundation' %}">The Foundation</a>
<a class="dropdown-item" href="{% url 'scipost:FAQ' %}">FAQ</a>
<a class="dropdown-item" href="{% url 'news:news' %}">News</a>
<a class="dropdown-item" href="{% url 'scipost:feeds' %}">Feeds</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{% url 'organizations:organizations' %}">Organizations<br/><span class="small">benefitting from our activities</span></a>
<a class="dropdown-item" href="{% url 'sponsors:sponsors' %}">Sponsors</a>
<a class="dropdown-item" href="{% url 'finances:finances' %}">Finances</a>
</div>
<li class="nav-item{% if '/about' in request.path %} active{% endif %}">
<a class="nav-link" href="{% url 'scipost:about' %}">About SciPost</a>
</li>
</ul>
......@@ -70,28 +57,13 @@
<ul class="navbar-nav mr-0">
{% if user.is_authenticated %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="PersonalDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<li class="nav-item">
<div class="p-2 text-white">
Logged in as {% if user.last_name %}{% if user.contributor %}{{ user.contributor.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}
{% if request.user.contributor and not request.user.contributor.is_currently_available %}
<a href="javascript:;" class="text-warning" data-toggle="tooltip" data-title="You are currently unavailable.<br>Check your availability on your Personal Page if this should not be the case." data-html="true"><i class="fa fa-warning"></i></a>
{% endif %}
</a>
<div class="dropdown-menu" aria-labelledby="PersonalDropdown">
{% if user.contributor %}
<a class="dropdown-item" href="{% url 'scipost:personal_page' %}">Personal Page</a>
{% if is_editorial_college %}
<a class="dropdown-item" href="{% url 'submissions:pool' %}">Submissions Pool</a>
{% endif %}
{% if perms.scipost.can_view_production %}
<a class="dropdown-item" href="{% url 'production:production' %}">Production</a>
{% endif %}
{% if perms.scipost.can_manage_organizations or user.org_contact %}
<a class="dropdown-item" href="{% url 'organizations:dashboard' %}">Orgs dashboard</a>
{% endif %}
{% endif %}
<a class="dropdown-item" href="{% url 'scipost:logout' %}?next={{ request.path }}">Logout</a>
</div>
</li>
<li class="nav-item navbar-counter">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

SciPost Code Repository