From aeeb664bddfe18a5cddaf66346c1b53a708ff199 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Fri, 17 Aug 2018 14:07:36 +0200
Subject: [PATCH] Quit for now.
---
.../news/news_card_content_for_api.html | 4 +-
.../news/news_card_content_short.html | 4 +-
scipost/static/scipost/assets/css/_grid.scss | 3 +
.../static/scipost/assets/css/_navbar.scss | 2 +-
.../scipost/assets/css/_typography.scss | 2 +
scipost/templates/scipost/header.html | 56 ++++++++++++++-----
scipost/templates/scipost/index.html | 5 +-
scipost/templates/scipost/navbar.html | 10 ++--
8 files changed, 59 insertions(+), 27 deletions(-)
diff --git a/news/templates/news/news_card_content_for_api.html b/news/templates/news/news_card_content_for_api.html
index e97c86549..99e86c1da 100644
--- a/news/templates/news/news_card_content_for_api.html
+++ b/news/templates/news/news_card_content_for_api.html
@@ -1,8 +1,8 @@
-<div class="news-item">
+<div class="news-item-short">
<h3 class="title">{{headline}}</h3>
<h5 class="sub-title">{{date}}</h5>
<p>
{{blurb|truncatechars_html:180|safe}}
</p>
- <a href="{% url 'news:news' %}#news_{{id}}" class="my-1 d-inline-block">Read more</a>
+ <a href="{% url 'news:news' %}#news_{{id}}" class="my-1 d-inline-block">Read more →</a>
</div>
diff --git a/news/templates/news/news_card_content_short.html b/news/templates/news/news_card_content_short.html
index 3e4b9696b..3d08370c7 100644
--- a/news/templates/news/news_card_content_short.html
+++ b/news/templates/news/news_card_content_short.html
@@ -1,8 +1,8 @@
-<div class="news-item">
+<div class="news-item-short">
<h3 class="title">{{news.headline}}</h3>
<h5 class="sub-title">{{news.date|date:'j F Y'}}</h5>
<p>
{{news.blurb|truncatechars_html:180|safe}}
</p>
- <a href="{% url 'news:news' %}#news_{{news.id}}" class="my-1">Read more</a>
+ <a href="{% url 'news:news' %}#news_{{news.id}}" class="my-1">Read more →</a>
</div>
diff --git a/scipost/static/scipost/assets/css/_grid.scss b/scipost/static/scipost/assets/css/_grid.scss
index 0eeba0177..5d72092c7 100644
--- a/scipost/static/scipost/assets/css/_grid.scss
+++ b/scipost/static/scipost/assets/css/_grid.scss
@@ -13,6 +13,9 @@ main {
&.container {
padding-top: $grid-gutter-width;
padding-bottom: $grid-gutter-width;
+ border-left: 1px solid;
+ border-right: 1px solid;
+ border-color: #e0e0e0;
}
}
diff --git a/scipost/static/scipost/assets/css/_navbar.scss b/scipost/static/scipost/assets/css/_navbar.scss
index 96066078a..f559212b1 100644
--- a/scipost/static/scipost/assets/css/_navbar.scss
+++ b/scipost/static/scipost/assets/css/_navbar.scss
@@ -97,7 +97,7 @@
.sub-nav {
background-color: $breadcrumb-bg;
// box-shadow: 0 0.25rem 0.75rem rgba(0, 0, 0, .05);
- border-bottom: 1px solid #ccc;
+ border-bottom: 1px solid #e0e0e0;
}
.navbar-toggler {
diff --git a/scipost/static/scipost/assets/css/_typography.scss b/scipost/static/scipost/assets/css/_typography.scss
index 03607cde3..02705a3c1 100644
--- a/scipost/static/scipost/assets/css/_typography.scss
+++ b/scipost/static/scipost/assets/css/_typography.scss
@@ -99,6 +99,8 @@ h3.highlight-empty {
h5,
.h5 {
font-weight: 300;
+ // text-transform: uppercase;
+ letter-spacing: 0.5px;
}
hr,
diff --git a/scipost/templates/scipost/header.html b/scipost/templates/scipost/header.html
index be3219ff2..5ce0ad9a7 100644
--- a/scipost/templates/scipost/header.html
+++ b/scipost/templates/scipost/header.html
@@ -1,17 +1,45 @@
{% load staticfiles %}
- <header>
- <div class="container">
- <div class="content">
- <div class="logobox">
- <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="240" /></a>
- </div>
- <div class="blurbbox d-none d-md-block">
- <p>
- <i>The complete scientific publication portal</i><br />
- <i>Managed by professional scientists</i><br />
- <i>For open, global and perpetual access to science</i>
- </p>
- </div>
+{% load notifications_tags %}
+
+<header>
+ <div class="container">
+ <div class="content">
+ <div class="logobox">
+ <a href="{% url 'scipost:index' %}"><img src="{% static 'scipost/images/logo_scipost_RGB_HTML_groot.png' %}" alt="SciPost logo" width="160" /></a>
</div>
+
</div>
- </header>
+ <ul class="navbar-nav mr-auto">
+ {% if user.is_authenticated %}
+ <li class="nav-item">
+ <a href="{% if user.contributor %}{% url 'scipost:personal_page' %}{% elif user.partner_contact %}{% url 'partners:dashboard' %}{% else %}javascript:;{% endif %}">Welcome {% if user.last_name %}{% if user.contributor %}{{ user.contributor.get_title_display }} {% endif %}{{ user.first_name }} {{ user.last_name }}{% else %}{{ user.username }}{% endif %}</a>
+ </li>
+ <li class="nav-item navbar-counter">
+ ·
+ <div class="nav-link notifications_container">
+ <a href="javascript:;" class="d-inline-block ml-lg-1 badge_link" id="notifications_badge" data-toggle="modal" data-target="#notification_center">
+ <span class="user d-inline d-lg-none d-xl-inline">Notifications</span>
+ <i class="fa fa-inbox" aria-hidden="true" style="min-width: 16px;"></i>
+ {% live_notify_badge classes="badge badge-pill" %}
+ </a>
+ {% live_notify_list %}
+ </div>
+
+ </li>
+ {% else %}
+ <li class="nav-item">
+ ·
+ <a class="nav-link" href="{% url 'scipost:login' %}">Login/register</a>
+ </li>
+ {% endif %}
+
+ <li class="nav-item">
+ ·
+ <a class="nav-link" href="{% url 'scipost:about' %}">About</a>
+ </li>
+ <li class="nav-item">
+ ·
+ <a class="nav-link" href="javascript:;">Our journals <i class="fa fa-caret-down"></i></a>
+ </li>
+ </div>
+</header>
diff --git a/scipost/templates/scipost/index.html b/scipost/templates/scipost/index.html
index df75367cb..4e1f289fe 100644
--- a/scipost/templates/scipost/index.html
+++ b/scipost/templates/scipost/index.html
@@ -91,7 +91,7 @@
News
<small><a href="{% url 'scipost:feeds' %}"><i class="fa fa-rss"></i></a></small>
</h2>
- <h4 class="sub-title"><a href="{% url 'news:news' %}">Latest news and announcements.</a></h4>
+ <a href="{% url 'news:news' %}">View all news and announcements.</a>
<hr class="sm">
<ul class="list-unstyled">
{% if latest_newsitem %}
@@ -104,7 +104,6 @@
</li>
{% endif %}
</ul>
- <!-- <a href="{% url 'news:news' %}">More news</a> -->
</div><!-- End news -->
<!-- Partners -->
@@ -136,7 +135,7 @@
<!-- Summarized -->
<div class="p-3 my-3 bg-light" id="summarized">
<h2 class="title"><a href="{% url 'journals:journals' %}">Journals</a></h2>
- <h4 class="sub-title">SciPost publishes a portfolio of high-quality two-way open access scientific journals.</h4>
+ <h5 class="sub-title">SciPost publishes a portfolio of high-quality two-way open access scientific journals.</h5>
<p>
All SciPost Journals implement the stringent <a href="{% url 'scipost:FAQ' %}#pwr">peer-witnessed refereeing</a> principle.
<br>
diff --git a/scipost/templates/scipost/navbar.html b/scipost/templates/scipost/navbar.html
index 34e0f4453..a4990d334 100644
--- a/scipost/templates/scipost/navbar.html
+++ b/scipost/templates/scipost/navbar.html
@@ -54,11 +54,11 @@
</div>
</li>
- {% else %}
- <li class="nav-item highlighted">
- <span class="nav-link">Logged in as {{ user.username }}</span>
- </li>
- {% endif %}
+ {% else %}
+ <li class="nav-item highlighted">
+ <span class="nav-link">Logged in as {{ user.username }}</span>
+ </li>
+ {% endif %}
<li class="nav-item">
<a class="nav-link" href="{% url 'scipost:logout' %}">Logout</a>
</li>
--
GitLab