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

Some corrections in templates #876

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Some corrections in templates #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5587e59
Update settings.py
Amalkarunakaran Aug 22, 2018
22868bc
Update 404.html
Amalkarunakaran Aug 22, 2018
c4997f3
Update home.html
Amalkarunakaran Aug 22, 2018
c8253fa
Update home.html
Amalkarunakaran Aug 22, 2018
74b419a
Update map.html
Amalkarunakaran Aug 22, 2018
4c053d7
Update 404.html
Amalkarunakaran Aug 22, 2018
ef35171
Update home.html
Amalkarunakaran Aug 22, 2018
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
5 changes: 3 additions & 2 deletions floodrelief/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ def get_list(text):
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient"
},

"KEY_PREFIX": "keralarescue"
}
}
Expand Down Expand Up @@ -214,7 +215,7 @@ def get_list(text):
DEFAULT_FILE_STORAGE="storages.backends.s3boto3.S3Boto3Storage"
else:
MEDIA_URL = '/media/'
ADMIN_SITE_HEADER = "Keralarescue Dashboard"
ADMIN_SITE_HEADER = "Kerala Rescue Dashboard"
MEDIA_ROOT = 'media'

#JWT REST Auth for API
Expand All @@ -234,4 +235,4 @@ def get_list(text):
'rest_framework.authentication.BasicAuthentication',
'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
),
}
}
7 changes: 4 additions & 3 deletions templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html>
<head>
<meta charset="utf-8">
<title>(404) The page you were looking for doesn't exist.</title>
<title>(404) The page you were looking for doesn't exist.Try again</title>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please add the phrase as "Please Try Again" ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.Also added malayalam version for the error message..

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the PR

<style type="text/css">
html,
body {
Expand Down Expand Up @@ -101,9 +101,10 @@

<div class="error-container">
<h1>404</h1>
<h4>ഈ പേജ് ലഭ്യമല്ല</h4>
<h4>The page you were looking for doesn't exist.</h4>
<p class="return">Take me back to <a href="/">keralarescue</a></p>
<p class="return">Take me back to <a href="/">keralarescue.in</a></p>
</div>

</body>
</html>
</html>
16 changes: 8 additions & 8 deletions templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
{% load bootstrap3 %}

<div class="container text-center">
<h1 class="main-logo">kerala<span style="font-weight: normal;">rescue</span></h1>
<h1 class="main-logo">Kerala<span style="font-weight: normal;">rescue</span></h1>
<p style="margin-bottom:20px;">
<i>An initiative by Govt. of Kerala, Kerala State IT Mission and IEEE Kerala Section<br>
For effective collaboration and communications between authorities, volunteers and public </i><br/>
<strong><span class="notranslate">ദുരിതാശ്വാസ പ്രവര്‍ത്തനങ്ങളും രക്ഷാ ദൗത്യങ്ങളും ഏകോപിപ്പിക്കാന്‍</span></strong><br/>
<strong><span class="notranslate">ദുരിതാശ്വാസ പ്രവർത്തനങ്ങളും രക്ഷാ ദൗത്യങ്ങളും ഏകോപിപ്പിക്കാൻ</span></strong><br/>
<a class="btn btn-info btn-msg" href="{% static 'images/msg_cm.jpg' %}">Message from Hon. Chief Minister of Kerala</a>
<a class="btn btn-info btn-msg" href="https://donation.cmdrf.kerala.gov.in/">Donate to Chief Minister's Fund Online</a>
</p>
<a href="/request/" class="home-button card" role="button">
{% bootstrap_icon "grain" %}
<span class="text">
Request<br/>for help<br/>
<span class="ml small notranslate">സഹായം അഭ്യര്‍ഥിക്കാന്‍</span>
<span class="ml small notranslate">സഹായം അഭ്യർത്ഥിക്കാൻ</span>
</span>
</a>
<a href="/relief_camps/" class="home-button card" role="button">
Expand All @@ -31,14 +31,14 @@ <h1 class="main-logo">kerala<span style="font-weight: normal;">rescue</span></h1
{% bootstrap_icon "apple" %}
<span class="text">
To Contribute<br/>
<span class="ml small notranslate">സംഭാവന നല്‍കാന്‍</span>
<span class="ml small notranslate">സംഭാവന നൽകാൻ </span>
</span>
</a>
<a href="/district_needs/" class="home-button card" role="button">
{% bootstrap_icon "map-marker" %}
<span class="text">
DISTRICT NEEDS &amp; COLLECTION CENTERS<br/>
<span class="ml small notranslate">ജില്ലകളിലെ ആവശ്യങ്ങള്‍</span>
<span class="ml small notranslate">ജില്ലകളിലെ ആവശ്യങ്ങൾ </span>
</span>
</a>
<a href="/ngo-volunteer/" class="home-button card" role="button">
Expand All @@ -52,14 +52,14 @@ <h1 class="main-logo">kerala<span style="font-weight: normal;">rescue</span></h1
{% bootstrap_icon "globe" %}
<span class="text">
Maps<br/>
<span class="ml small notranslate">സഹായം ആവശ്യമായ സ്ഥലങ്ങൾ &amp;<br/>ദുരിതാശ്വാസ ക്യാമ്പുകൾ</span>
<span class="ml small notranslate">സഹായം ആവശ്യമായ സ്ഥലങ്ങളും<br/>ദുരിതാശ്വാസ ക്യാമ്പുകളും</span>
</span>
</a>
<a href="{% url 'contactus' %}" class="home-button card" role="button">
{% bootstrap_icon "phone" %}
<span class="text">
Contact <br>INFO<br/>
<span class="ml small notranslate">ഞങ്ങളുമായി ബന്ധപ്പെടാന്‍</span>
<span class="ml small notranslate">ഞങ്ങളുമായി ബന്ധപ്പെടാൻ </span>
</span>
</a>
<a href="/requests/?district=" class="home-button card" role="button">
Expand Down Expand Up @@ -87,7 +87,7 @@ <h1 class="main-logo">kerala<span style="font-weight: normal;">rescue</span></h1
Contact Control Room or Disaster Management Cell or District Administration for any support.<br>
Volunteers may contact District Project Managers for support related to volunteering and contributions<br>
<br/>
<span class="notranslate">സഹായത്തിനായി വൊളന്‍റീയര്‍മാര്‍ തയ്യാറാണ്. സഹായം ആവശ്യമെങ്കില്‍ ഒരോ ജില്ലയിലെയും നിയോഗിക്കപെട്ട ഉദ്യോഗസ്ഥരുമായി ബന്ധപ്പെടാം</span>
<span class="notranslate">സഹായത്തിനായി സന്നദ്ധ സേവകർ തയ്യാറാണ്. സഹായം ആവശ്യമെങ്കിൽ ഒരോ ജില്ലയിലെയും നിയോഗിക്കപെട്ട ഉദ്യോഗസ്ഥരുമായി ബന്ധപ്പെടാം</span>
</p>
<p class="slack">
Our Collaboration Platform (Slack) <a href="https://bit.ly/keralarescueslack">Join</a>
Expand Down
7 changes: 4 additions & 3 deletions templates/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<title>Kerala Flood Map</title>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
<link href="{% static 'css/map.css'%}" rel="stylesheet"></head>
<body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/css/tachyons.min.css"/>
<script type="text/javascript" src="{% static 'js/map.js'%}"></script></body></html>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/css/tachyons.min.css"/>
<script type="text/javascript" src="{% static 'js/map.js'%}"></script></body></html>