Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NGO registration above Useful Instruments #360

Merged
merged 11 commits into from
Apr 27, 2020
Merged

NGO registration above Useful Instruments #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e15149
move deployment files for web service in the docker folder
Mar 28, 2020
047da08
Document solution for launching project on wsl with docker desktop
Mar 28, 2020
796e808
Update buildspec.yml
lcapatina Mar 28, 2020
546374d
Update Dockerfile
lcapatina Mar 28, 2020
b4741e5
sync with upstream
Apr 25, 2020
eebeedc
Merge branch 'code4romania-develop' into develop
Apr 25, 2020
8dedf2e
bring register-ngo in right sidebar
Apr 25, 2020
3d0a4f5
merge
Apr 25, 2020
315a789
Merge branch 'code4romania-develop' into develop
Apr 25, 2020
01e9515
update docker-entrypoint due to a merge issue
Apr 25, 2020
4232704
forgot newline at end of docker-entrypoint file
Apr 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ro_help/hub/templates/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<div class="container">
<div class="columns">
<div class="column is-two-thirds">

{% block left-side-view %}
<div id="donate_safely" class="container content">
<h1>
Expand Down Expand Up @@ -87,6 +88,9 @@ <h2>{% trans "How RoHelp got started" %}</h2>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down
3 changes: 3 additions & 0 deletions ro_help/hub/templates/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ <h1>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down
3 changes: 3 additions & 0 deletions ro_help/hub/templates/cookies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ <h2>{% trans 'How can I turn cookies off?' %}</h2>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down
1 change: 1 addition & 0 deletions ro_help/hub/templates/ngo/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ <h1 class="donate-title">

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}
{% include "register-ngo.html" %}
<div class="container">
{% if red_cross_need %}
<div id="redcross-banner" class="container is-hidden-mobile">
Expand Down
1 change: 0 additions & 1 deletion ro_help/hub/templates/ngo/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ <h2 class="ngo-list-title">
<p style="text-align: center;">{% trans "No results matching query" %}</p>
</div>
{% endif %}
{% include "register-ngo.html" %}
</div>
{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion ro_help/hub/templates/register-ngo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load static %}
{% load i18n %}

<div class="is-flex" style="background-color: #ffd738; padding: 2em; justify-content: center;">
<div class="is-flex" style="background-color: #ffd738; padding: 2em; justify-content: center; margin-bottom: 1em;">
<div class="is-flex" style="flex-direction:column">
<div class="title" style="font-size:30px; margin-bottom:1.25em;" >
{% trans "Do you represent a NGO or a Fund and could help?" %}
Expand Down
3 changes: 3 additions & 0 deletions ro_help/hub/templates/rules.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ <h1>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down
3 changes: 3 additions & 0 deletions ro_help/hub/templates/terms_and_conditions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ <h2>{% trans "11. Contact Code for Romania" %}</h2>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down
3 changes: 3 additions & 0 deletions ro_help/hub/templates/updates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ <h1>

<div id="right_sidebar" class="column is-one-third">
{% block right-side-view %}

{% include "register-ngo.html" %}

<div class="container">

<h1 class="donate-title">
Expand Down