Skip to content

GitLab

Commit 3daf5aa0 authored by felix.herrmann's avatar felix.herrmann
Browse files

Merge branch '419-2-neue-buttons-auf-landing-page' into 'master' 

Resolve "2 neue buttons auf landing page"

Closes #419

See merge request !398
parents 474f7b88 8aab003d
Hide whitespace changes
Inline Side-by-side
config/urls.py
View file @ 3daf5aa0
......@@ -13,6 +13,7 @@ from discuss_data.core.views import (
about_page,
contacts_page,
security_page,
login_page,
)
from discuss_data.ddusers.views import datasets_act_feed
......@@ -46,6 +47,7 @@ urlpatterns = [
path("about/", about_page, name="core.about_page"),
path("contacts/", contacts_page, name="core.contacts_page"),
path("security/", security_page, name="core.security_page"),
path("login/", login_page, name="core.login_page"),
path("dashboard/", datasets_act_feed, name="ddusers.dashboard_page"),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
......
discuss_data/core/views.py
View file @ 3daf5aa0
......@@ -277,6 +277,14 @@ def security_page(request):
return render(request, "pages/text_page.html", {"page": page},)
def login_page(request):
"""
Platform login page
"""
page = get_object_or_404(TextPage, slug="discuss-data-loginpage")
return render(request, "login.html", {"page": page},)
def handler404(request):
response = render(request, "404.html")
response.status_code = 404
......
discuss_data/static/images/dariah-de.svg 0 → 100644
View file @ 3daf5aa0
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="524px" height="163.121px" viewBox="0 0 524 163.121" enable-background="new 0 0 524 163.121" xml:space="preserve">
<g>
<path fill="#213365" d="M519.121,196.086c0,0.59-0.031,1.014-0.097,1.341 M517.711,202.114l0.529,2.066"/>
<path fill="#213365" d="M518.728,239.756 M518.143,228.977l-0.688,2.099"/>
</g>
<g>
<g>
<path fill="#213365" d="M107.317,148.216c11.829,0,19.386-6.98,19.386-20.125c0-12.979-7.721-19.963-19.386-19.963h-8.789v40.088
H107.317z M88.014,102.462c0-2.219,1.15-3.451,3.367-3.451h16.512c17.99,0,29.736,10.68,29.736,29.08
s-11.746,29.244-29.736,29.244H91.381c-2.217,0-3.367-1.15-3.367-3.451V102.462z"/>
<path fill="#213365" d="M174.098,133.759l-5.175-15.609c-0.985-3.285-2.3-9.035-2.3-9.035h-0.165c0,0-1.314,5.75-2.3,9.035
l-5.258,15.609H174.098z M160.051,101.804c0.657-1.889,1.891-2.793,3.861-2.793h5.257c1.972,0,3.286,0.904,3.86,2.793
l18.236,51.588c0.821,2.381-0.246,3.943-2.793,3.943h-3.777c-1.973,0-3.287-0.904-3.861-2.793l-4.107-12.158h-20.455
l-4.025,12.076c-0.574,1.971-1.889,2.875-3.86,2.875h-3.778c-2.547,0-3.615-1.563-2.793-3.943L160.051,101.804z"/>
<path fill="#213365" d="M219.354,126.366c5.668,0,9.201-3.533,9.201-9.283c0-3.697-1.396-6.654-4.6-7.967
c-1.396-0.66-3.204-0.988-6.326-0.988h-7.803v18.238H219.354z M199.311,102.462c0-2.219,1.15-3.451,3.369-3.451h15.771
c5.75,0,8.625,0.492,11.089,1.561c5.915,2.465,9.776,8.051,9.776,15.936c0,6.9-3.614,13.473-9.693,15.938v0.164
c0,0,0.74,0.904,1.889,3.039l9.612,17.58c1.396,2.381,0.326,4.107-2.383,4.107h-4.437c-1.889,0-3.119-0.74-4.025-2.383
l-10.268-19.385h-10.186v18.316c0,2.301-1.15,3.451-3.369,3.451h-3.777c-2.219,0-3.369-1.15-3.369-3.451V102.462z"/>
<path fill="#213365" d="M250.727,102.462c0-2.219,1.151-3.451,3.368-3.451h3.78c2.218,0,3.367,1.232,3.367,3.451v51.422
c0,2.301-1.149,3.451-3.367,3.451h-3.78c-2.217,0-3.368-1.15-3.368-3.451V102.462z"/>
<path fill="#213365" d="M301.572,133.759l-5.175-15.609c-0.985-3.285-2.3-9.035-2.3-9.035h-0.164c0,0-1.314,5.75-2.3,9.035
l-5.257,15.609H301.572z M287.526,101.804c0.656-1.889,1.89-2.793,3.861-2.793h5.256c1.974,0,3.288,0.904,3.86,2.793
l18.236,51.588c0.821,2.381-0.246,3.943-2.793,3.943h-3.777c-1.971,0-3.285-0.904-3.86-2.793l-4.106-12.158h-20.455l-4.026,12.076
c-0.573,1.971-1.888,2.875-3.858,2.875h-3.781c-2.545,0-3.613-1.563-2.791-3.943L287.526,101.804z"/>
<path fill="#213365" d="M326.785,102.462c0-2.219,1.15-3.451,3.367-3.451h3.78c2.218,0,3.367,1.232,3.367,3.451v21.275h26.696
v-21.275c0-2.219,1.151-3.451,3.451-3.451h3.697c2.219,0,3.367,1.232,3.367,3.451v51.422c0,2.301-1.148,3.451-3.367,3.451h-3.697
c-2.3,0-3.451-1.15-3.451-3.451v-21.029H337.3v21.029c0,2.301-1.149,3.451-3.367,3.451h-3.78c-2.217,0-3.367-1.15-3.367-3.451
V102.462z"/>
<path fill="#213365" d="M386.007,134.991v-2.301c0-2.217,1.231-3.367,3.451-3.367h17.823c2.221,0,3.453,1.15,3.453,3.367v2.301
c0,2.299-1.232,3.449-3.453,3.449h-17.823C387.238,138.44,386.007,137.29,386.007,134.991"/>
<path fill="#213365" d="M441.534,148.216c11.829,0,19.387-6.98,19.387-20.125c0-12.979-7.722-19.963-19.387-19.963h-8.79v40.088
H441.534z M422.229,102.462c0-2.219,1.151-3.451,3.368-3.451h16.513c17.989,0,29.736,10.68,29.736,29.08
s-11.747,29.244-29.736,29.244h-16.513c-2.217,0-3.368-1.15-3.368-3.451V102.462z"/>
<path fill="#213365" d="M482.026,102.462c0-2.219,1.151-3.451,3.368-3.451h28.093c2.22,0,3.451,1.232,3.451,3.451v2.299
c0,2.219-1.231,3.367-3.451,3.367h-20.945v15.279h16.265c2.217,0,3.449,1.15,3.449,3.369v2.301c0,2.299-1.232,3.447-3.449,3.447
h-16.265v15.691h22.26c2.22,0,3.452,1.15,3.452,3.367v2.301c0,2.301-1.232,3.451-3.452,3.451h-29.407
c-2.217,0-3.368-1.15-3.368-3.451V102.462z"/>
<path fill="#424569" d="M53.003,25.907c0-10.174,13.099-16.463,21.722-21.688C81.5,8.345,97.302,15.81,97.305,26.516
c0.004,11.884-4.943,31.255-8.877,31.339c-4.279,0.094-10.191-24.552-13.338-24.487c-3.145,0.066-9,24.587-12.947,24.581
C57.857,57.942,53.003,36.98,53.003,25.907"/>
<path fill="#727299" d="M17.913,83.302C8.237,80.155,6.305,65.755,4,55.94c6.018-5.17,18-17.892,28.184-14.587
c11.303,3.67,28.197,14.358,27.061,18.128c-1.23,4.098-26.499,2.105-27.408,5.117c-0.912,3.012,20.601,16.158,19.375,19.912
C49.881,88.581,28.445,86.722,17.913,83.302"/>
<path fill="#213365" d="M61.654,134.407c-5.982,8.229-20.272,5.617-30.32,4.779c-3.058-7.32-11.452-22.65-5.164-31.313
c6.984-9.615,22.371-22.377,25.603-20.135c3.517,2.436-6.187,25.852-3.601,27.648c2.582,1.799,21.734-14.6,24.924-12.273
C76.557,105.636,68.164,125.448,61.654,134.407"/>
<path fill="#494E7D" d="M118.427,41.539c9.679-3.144,19.706,7.37,27.341,13.958c-1.83,7.717-4.046,25.053-14.227,28.363
c-11.303,3.678-31.253,4.959-32.549,1.244c-1.413-4.041,20.199-17.283,19.166-20.254c-1.032-2.971-26.166-0.961-27.379-4.717
C89.461,56.054,107.898,44.962,118.427,41.539"/>
</g>
</g>
</svg>
discuss_data/static/images/twitter.svg 0 → 100644
View file @ 3daf5aa0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 310 310"
style="enable-background:new 0 0 310 310;"
xml:space="preserve"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs37" />
<g
id="XMLID_826_"
style="fill:#ffffff">
<path
id="XMLID_827_"
d="M302.973,57.388c-4.87,2.16-9.877,3.983-14.993,5.463c6.057-6.85,10.675-14.91,13.494-23.73 c0.632-1.977-0.023-4.141-1.648-5.434c-1.623-1.294-3.878-1.449-5.665-0.39c-10.865,6.444-22.587,11.075-34.878,13.783 c-12.381-12.098-29.197-18.983-46.581-18.983c-36.695,0-66.549,29.853-66.549,66.547c0,2.89,0.183,5.764,0.545,8.598 C101.163,99.244,58.83,76.863,29.76,41.204c-1.036-1.271-2.632-1.956-4.266-1.825c-1.635,0.128-3.104,1.05-3.93,2.467 c-5.896,10.117-9.013,21.688-9.013,33.461c0,16.035,5.725,31.249,15.838,43.137c-3.075-1.065-6.059-2.396-8.907-3.977 c-1.529-0.851-3.395-0.838-4.914,0.033c-1.52,0.871-2.473,2.473-2.513,4.224c-0.007,0.295-0.007,0.59-0.007,0.889 c0,23.935,12.882,45.484,32.577,57.229c-1.692-0.169-3.383-0.414-5.063-0.735c-1.732-0.331-3.513,0.276-4.681,1.597 c-1.17,1.32-1.557,3.16-1.018,4.84c7.29,22.76,26.059,39.501,48.749,44.605c-18.819,11.787-40.34,17.961-62.932,17.961 c-4.714,0-9.455-0.277-14.095-0.826c-2.305-0.274-4.509,1.087-5.294,3.279c-0.785,2.193,0.047,4.638,2.008,5.895 c29.023,18.609,62.582,28.445,97.047,28.445c67.754,0,110.139-31.95,133.764-58.753c29.46-33.421,46.356-77.658,46.356-121.367 c0-1.826-0.028-3.67-0.084-5.508c11.623-8.757,21.63-19.355,29.773-31.536c1.237-1.85,1.103-4.295-0.33-5.998 C307.394,57.037,305.009,56.486,302.973,57.388z"
style="fill:#ffffff" />
</g>
<g
id="g4">
</g>
<g
id="g6">
</g>
<g
id="g8">
</g>
<g
id="g10">
</g>
<g
id="g12">
</g>
<g
id="g14">
</g>
<g
id="g16">
</g>
<g
id="g18">
</g>
<g
id="g20">
</g>
<g
id="g22">
</g>
<g
id="g24">
</g>
<g
id="g26">
</g>
<g
id="g28">
</g>
<g
id="g30">
</g>
<g
id="g32">
</g>
</svg>
discuss_data/static/images/twitter_blue.svg 0 → 100644
View file @ 3daf5aa0
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 310 310"
style="enable-background:new 0 0 310 310;"
xml:space="preserve"
sodipodi:docname="twitter_blue.svg"
inkscape:version="1.0.2 (e86c870879, 2021-01-15)"><metadata
id="metadata39"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs37" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1379"
id="namedview35"
showgrid="false"
inkscape:zoom="3.2516129"
inkscape:cx="89.032738"
inkscape:cy="155"
inkscape:window-x="1920"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<g
id="XMLID_826_"
style="fill:#343b86;fill-opacity:1">
<path
id="XMLID_827_"
d="M302.973,57.388c-4.87,2.16-9.877,3.983-14.993,5.463c6.057-6.85,10.675-14.91,13.494-23.73 c0.632-1.977-0.023-4.141-1.648-5.434c-1.623-1.294-3.878-1.449-5.665-0.39c-10.865,6.444-22.587,11.075-34.878,13.783 c-12.381-12.098-29.197-18.983-46.581-18.983c-36.695,0-66.549,29.853-66.549,66.547c0,2.89,0.183,5.764,0.545,8.598 C101.163,99.244,58.83,76.863,29.76,41.204c-1.036-1.271-2.632-1.956-4.266-1.825c-1.635,0.128-3.104,1.05-3.93,2.467 c-5.896,10.117-9.013,21.688-9.013,33.461c0,16.035,5.725,31.249,15.838,43.137c-3.075-1.065-6.059-2.396-8.907-3.977 c-1.529-0.851-3.395-0.838-4.914,0.033c-1.52,0.871-2.473,2.473-2.513,4.224c-0.007,0.295-0.007,0.59-0.007,0.889 c0,23.935,12.882,45.484,32.577,57.229c-1.692-0.169-3.383-0.414-5.063-0.735c-1.732-0.331-3.513,0.276-4.681,1.597 c-1.17,1.32-1.557,3.16-1.018,4.84c7.29,22.76,26.059,39.501,48.749,44.605c-18.819,11.787-40.34,17.961-62.932,17.961 c-4.714,0-9.455-0.277-14.095-0.826c-2.305-0.274-4.509,1.087-5.294,3.279c-0.785,2.193,0.047,4.638,2.008,5.895 c29.023,18.609,62.582,28.445,97.047,28.445c67.754,0,110.139-31.95,133.764-58.753c29.46-33.421,46.356-77.658,46.356-121.367 c0-1.826-0.028-3.67-0.084-5.508c11.623-8.757,21.63-19.355,29.773-31.536c1.237-1.85,1.103-4.295-0.33-5.998 C307.394,57.037,305.009,56.486,302.973,57.388z"
style="fill:#343b86;fill-opacity:1" />
</g>
<g
id="g4">
</g>
<g
id="g6">
</g>
<g
id="g8">
</g>
<g
id="g10">
</g>
<g
id="g12">
</g>
<g
id="g14">
</g>
<g
id="g16">
</g>
<g
id="g18">
</g>
<g
id="g20">
</g>
<g
id="g22">
</g>
<g
id="g24">
</g>
<g
id="g26">
</g>
<g
id="g28">
</g>
<g
id="g30">
</g>
<g
id="g32">
</g>
</svg>
discuss_data/templates/footer.html
View file @ 3daf5aa0
......@@ -9,7 +9,12 @@
</div>
<div class="col-md-auto">
<a href="https://www.dfg.de" target="_blank" rel="noreferrer noopener">
<img class="footer-logo" src="{% static 'images/dfg-logo.svg' %}" />
<img class="footer-logo" src="{% static 'images/dfg_logo_en.png' %}" />
</a>
</div>
<div class="col-md-auto">
<a href="https://de.dariah.eu/en/home" target="_blank" rel="noreferrer noopener">
<img class="footer-logo" src="{% static 'images/dariah-de.svg' %}" />
</a>
</div>
<div class="col-md-auto">
......
discuss_data/templates/landingpage/nav_top_landing_page.html
View file @ 3daf5aa0
......@@ -52,9 +52,12 @@
</li>
{% else %}
<li class="nav-item">
<a id="log-in-link" class="nav-link" href="{% url 'shibboleth:login' %}">{% trans "Sign In" %}</a>
<a id="log-in-link" class="nav-link" href="{% url 'core.login_page' %}">{% trans "Sign In" %}</a>
</li>
{% endif %}
<li class="nav-item">
<a id="log-in-link" class="nav-link" href="https://twitter.com/discussd"><img height="20" src="{% static 'images/twitter.svg' %}" /></a>
</li>
</ul>
</div>
</nav>
discuss_data/templates/nav-top.html
View file @ 3daf5aa0
......@@ -16,6 +16,7 @@
</div>
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="{% slugurl 'discuss-data-help' %}">{% trans "Help" %}</a>
</li>
......@@ -32,9 +33,12 @@
</li>
{% else %}
<li class="nav-item">
<a id="log-in-link" class="nav-link" href="{% url 'shibboleth:login' %}">{% trans "Sign In" %}</a>
<a id="log-in-link" class="nav-link" href="{% url 'core.login_page' %}">{% trans "Sign In" %}</a>
</li>
{% endif %}
<li class="nav-item">
<a id="log-in-link" class="nav-link" href="{% url 'shibboleth:login' %}"><img height="20" src="{% static 'images/twitter_blue.svg' %}" /></a>
</li>
</ul>
</div>
</nav>
\ No newline at end of file
Markdown is supported
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