Skip to content

Commit

Permalink
login page update
Browse files Browse the repository at this point in the history
  • Loading branch information
seblecocq-dd committed Aug 6, 2024
1 parent 9685aa9 commit b4a83aa
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 22 deletions.
20 changes: 17 additions & 3 deletions ProjectApplication/project_core/static/css/css.css
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,12 @@ div.selector-filter {
/* font-weight: 500;*/
/* color: #007bff;*/
/*}*/

.newnavbar {
background-color: #FFFFFF !important;
}
.newnavbar .nav-link, .newnavbar .navbar-text {
color: #000000 !important;
}
.sidebar {
padding: 0;
height: 100vh;
Expand Down Expand Up @@ -628,12 +633,21 @@ is from: https://github.com/yourlabs/django-autocomplete-light/issues/1149
line-height: 1.2;
margin: 0;
}

.hero .legendimg {
position: absolute;
bottom: 10px;
right: 15px;
color: #FFF;
font-size: 12px;
}
.choose-option {
padding: 50px 0 100px;
background-color: #f6f6f6;
}

.choose-option.extend {
padding: 50px 0 100vh;
background-color: #f6f6f6;
}
.choose-option .choose-options--wrapper {
display: grid;
gap: 20px;
Expand Down
41 changes: 29 additions & 12 deletions ProjectApplication/project_core/templates/external/call-list.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,35 @@
{% block body_contents %}
<div class="container" role="main">
{% include 'logged/_navbar.tmpl' %}
<h1>Open calls</h1>
</div>
<section class="choose-option extend">
<div class="container">
<h1>Open calls</h1>


{% if calls %}
Click on a call to create a proposal.
<ul>
{% for call in calls %}
<li><a href="{% url 'proposal-add' %}?call={{ call.pk }}">{{ call.long_name }}</a></li>
{% endfor %}
</ul>
{% else %}
No calls at the moment.
{% endif %}
</div>
{% if calls %}
Click on a call to create a proposal.
<br/><br/>
<div class="choose-options--wrapper">
{% for call in calls %}
<a href="{% url 'proposal-add' %}?call={{ call.pk }}" class="card--options">
<div class="card--options--left">
<h3>{{ call.long_name }}</h3>
</div>
<div class="card--options--right">
<div class="btn-icon">
<span class="icon">
<img src="/static/images/angle-right.svg" alt="Right Arrow">
</span>
</div>
</div>
</a>
{% endfor %}
</div>
{% else %}
No calls at the moment.
{% endif %}
</div>
</section>

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<section class="hero">
<div class="hero--img">
<img src="{% static 'images/hero.png' %}" alt="Hero Image">
<div class="legendimg">@Giovanna Ceppi, all rights reserved</div>
</div>
<div class="container">
<div class="hero--content">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load request_is_reviewer %}
{% load static %}

<nav class="navbar navbar-expand-lg navbar-dark {{ navbarcolor|default_if_none:"bg-primary" }}">
<nav class="navbar navbar-expand-lg navbar-dark {{ navbarcolor|default_if_none:"bg-primary" }} newnavbar">
<div class="collapse navbar-collapse" id="navbarSupportedContent">

{% include 'common/_logo.tmpl' %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<section class="authentication">
<div class="container">
<div class="card-authentication">
<h1>Login to continue</h1>
<p>Please login to access the page you require.</p>
<h1>Log in to continue</h1>

{% if form.errors %}
<div class="alert alert-danger">Your username and password didn't match. Please try again.</div>
{% endif %}
Expand All @@ -27,7 +27,7 @@
</div>
{% else %}
<div class="authentication_error">
Please login to access the page you require.
Please log in to access the requested page.
</div>
{% endif %}
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<section class="authentication">
<div class="container">
<div class="card-authentication">
<h1>Login to continue</h1>
<p>Please login to access the page you require.</p>
<h1>Log in to continue</h1>


{% if form.errors %}
<div class="authentication_error">
Expand All @@ -30,7 +30,7 @@
</div>
{% else %}
<div class="authentication_error">
Please login to access the page you require.
Please log in to access the requested page.
</div>
{% endif %}
{% endif %}
Expand Down

0 comments on commit b4a83aa

Please sign in to comment.