summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--static/workshop_app/img/Scipy17top_bnr.pngbin0 -> 55282 bytes
-rw-r--r--statistics_app/templates/statistics_app/workshop_public_stats.html9
-rw-r--r--statistics_app/templates/statistics_app/workshop_stats.html4
-rw-r--r--workshop_app/static/workshop_app/img/Scipy17top_bnr.pngbin0 -> 55282 bytes
-rw-r--r--workshop_app/templates/workshop_app/index.html6
-rw-r--r--workshop_app/templates/workshop_app/login.html2
-rw-r--r--workshop_app/templates/workshop_app/logout.html4
-rw-r--r--workshop_app/templates/workshop_app/registration/register.html2
-rw-r--r--workshop_app/templates/workshop_app/testimonals.html2
-rw-r--r--workshop_app/templates/workshop_app/view_benefits.html4
-rw-r--r--workshop_app/templates/workshop_app/view_faq.html2
-rw-r--r--workshop_app/templates/workshop_app/view_workshoptype_details.html2
-rw-r--r--workshop_app/templates/workshop_app/workshop_stats.html2
13 files changed, 21 insertions, 18 deletions
diff --git a/static/workshop_app/img/Scipy17top_bnr.png b/static/workshop_app/img/Scipy17top_bnr.png
new file mode 100644
index 0000000..d4b03f1
--- /dev/null
+++ b/static/workshop_app/img/Scipy17top_bnr.png
Binary files differ
diff --git a/statistics_app/templates/statistics_app/workshop_public_stats.html b/statistics_app/templates/statistics_app/workshop_public_stats.html
index 8894037..b569d1f 100644
--- a/statistics_app/templates/statistics_app/workshop_public_stats.html
+++ b/statistics_app/templates/statistics_app/workshop_public_stats.html
@@ -4,8 +4,9 @@
<nav class="navbar navbar-default navbar-custom">
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+ <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
</div>
+
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span>Register</a></li>
<li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span>Login</a></li>
@@ -243,7 +244,7 @@
var ctx1 = document.getElementById("myChartPie").getContext('2d');
var myChart;
-
+
$('input[type=radio]').change(function() {
if (this.value == 'OWC') { //Overall Workshop Count
if(myChart){
@@ -277,7 +278,7 @@
'rgba(153, 102, 255, 1)',
'rgba(191, 191, 1, 1)',
'rgba(75, 192, 192, 1)',
- 'rgba(153, 102, 255, 1)'
+ 'rgba(153, 102, 255, 1)'
]
}]
},
@@ -298,7 +299,7 @@
$( "#visualization" ).dialog({
resizable: false,
draggable: true,
- title: 'Map of India',
+ title: 'State wise Completed Workshops(Map of India)',
closeOnEscape: true,
stack: true,
zIndex: 10000,
diff --git a/statistics_app/templates/statistics_app/workshop_stats.html b/statistics_app/templates/statistics_app/workshop_stats.html
index ba597dc..5b1e96a 100644
--- a/statistics_app/templates/statistics_app/workshop_stats.html
+++ b/statistics_app/templates/statistics_app/workshop_stats.html
@@ -258,7 +258,7 @@
'rgba(191, 191, 191, 0.2)'
],
borderColor: [
- 'rgba(255, 99, 132, 1)',
+ 'rgba(255, 99, 132, 1)',
'rgba(54, 162, 235, 1)',
'rgba(255, 206, 86, 1)',
'rgba(75, 192, 192, 1)',
@@ -339,7 +339,7 @@
$( "#visualization" ).dialog({
resizable: false,
draggable: true,
- title: 'Map of India',
+ title: 'State wise Completed Workshops(Map of India)',
closeOnEscape: true,
stack: true,
zIndex: 10000,
diff --git a/workshop_app/static/workshop_app/img/Scipy17top_bnr.png b/workshop_app/static/workshop_app/img/Scipy17top_bnr.png
new file mode 100644
index 0000000..d4b03f1
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/Scipy17top_bnr.png
Binary files differ
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index 5d9f872..0241b9e 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -36,7 +36,9 @@
<!-- Navigation -->
<div class="container">
-
+ <div class="row" style="align-items: center;">
+ <img class="img-responsive center-block" src=" {{ URL_ROOT }}/static/workshop_app/img/Scipy17top_bnr.png"> <br>
+ </div>
<!-- Heading Row -->
<div class="row">
<div class="col-md-5 fossee-label">
@@ -47,7 +49,7 @@
<div id="first-right">
<div class="label-bar">
<a href="http://python.fossee.in/about/"
- target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a onclick="window.open('http://fossee.in/fossee-stats'); window.open('/statistics/public_stats/')" target="_blank" > Past Workshops</a>
+ target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a onclick="window.open('/statistics/public_stats/'); window.open('http://fossee.in/fossee-stats') " target="_blank" > Past Workshops</a>
</div>
<br> <br>
<img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" ><br>
diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html
index a659643..ddf4655 100644
--- a/workshop_app/templates/workshop_app/login.html
+++ b/workshop_app/templates/workshop_app/login.html
@@ -8,7 +8,7 @@
<nav class="navbar navbar-default navbar-custom">
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+ <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html
index 796bb14..f136296 100644
--- a/workshop_app/templates/workshop_app/logout.html
+++ b/workshop_app/templates/workshop_app/logout.html
@@ -8,7 +8,7 @@
<nav class="navbar navbar-default navbar-custom">
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+ <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
@@ -28,4 +28,4 @@
<br>
</div>
- {% endblock %} \ No newline at end of file
+ {% endblock %}
diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html
index abca610..c5ce9c6 100644
--- a/workshop_app/templates/workshop_app/registration/register.html
+++ b/workshop_app/templates/workshop_app/registration/register.html
@@ -8,7 +8,7 @@
<nav class="navbar navbar-default navbar-custom">
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+ <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/testimonals.html b/workshop_app/templates/workshop_app/testimonals.html
index 1086775..fafd197 100644
--- a/workshop_app/templates/workshop_app/testimonals.html
+++ b/workshop_app/templates/workshop_app/testimonals.html
@@ -8,7 +8,7 @@
<nav class="navbar navbar-default navbar-custom">
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a>
+ <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
diff --git a/workshop_app/templates/workshop_app/view_benefits.html b/workshop_app/templates/workshop_app/view_benefits.html
index 76c9a85..cc46e6d 100644
--- a/workshop_app/templates/workshop_app/view_benefits.html
+++ b/workshop_app/templates/workshop_app/view_benefits.html
@@ -35,7 +35,7 @@
</ul>
{% else %}
<div class="navbar-header">
- <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a>
+ <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
@@ -65,4 +65,4 @@
<br><br>
</div>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html
index 9298254..49eaf3b 100644
--- a/workshop_app/templates/workshop_app/view_faq.html
+++ b/workshop_app/templates/workshop_app/view_faq.html
@@ -35,7 +35,7 @@
</ul>
{% else %}
<div class="navbar-header">
- <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a>
+ <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html
index 625434a..618f86d 100644
--- a/workshop_app/templates/workshop_app/view_workshoptype_details.html
+++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html
@@ -76,7 +76,7 @@
{% else %}
<div class="container-fluid">
<div class="navbar-header">
- <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a>
+ <a class="navbar-brand" href="{{URL_ROOT}}/">FOSSEE Workshops</a>
</div>
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li>
diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html
index 4f6533d..b5473e3 100644
--- a/workshop_app/templates/workshop_app/workshop_stats.html
+++ b/workshop_app/templates/workshop_app/workshop_stats.html
@@ -309,7 +309,7 @@
$( "#visualization" ).dialog({
resizable: false,
draggable: true,
- title: 'Map of India',
+ title: 'State wise Completed Workshops(Map of India)',
closeOnEscape: true,
stack: true,
zIndex: 10000,