summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshen2018-03-07 12:46:51 +0530
committerGitHub2018-03-07 12:46:51 +0530
commit0fb805a83a7dd6b691fc7a683cc63a6b25f73779 (patch)
tree5a032cbb2fd72931e40e815dc43094156344e84d
parentcad6f5281768bd34a476fbf08e32255b9057e7bc (diff)
parentfe854319dfb89d17107a13c48f044353d4247fad (diff)
downloadworkshop_booking-0fb805a83a7dd6b691fc7a683cc63a6b25f73779.tar.gz
workshop_booking-0fb805a83a7dd6b691fc7a683cc63a6b25f73779.tar.bz2
workshop_booking-0fb805a83a7dd6b691fc7a683cc63a6b25f73779.zip
Merge pull request #45 from Akshen/develop
Update Self Workshop Banner
-rw-r--r--docs/ModelsTable_Diagram.jpg (renamed from static/workshop_app/img/ModelsTable_Diagram.jpg)bin61668 -> 61668 bytes
-rw-r--r--workshop_app/static/workshop_app/img/Web_banner.gifbin0 -> 427635 bytes
-rw-r--r--workshop_app/templates/workshop_app/index.html18
-rw-r--r--workshop_app/templates/workshop_app/self_workshop.html32
4 files changed, 42 insertions, 8 deletions
diff --git a/static/workshop_app/img/ModelsTable_Diagram.jpg b/docs/ModelsTable_Diagram.jpg
index de7bc0c..de7bc0c 100644
--- a/static/workshop_app/img/ModelsTable_Diagram.jpg
+++ b/docs/ModelsTable_Diagram.jpg
Binary files differ
diff --git a/workshop_app/static/workshop_app/img/Web_banner.gif b/workshop_app/static/workshop_app/img/Web_banner.gif
new file mode 100644
index 0000000..a8df977
--- /dev/null
+++ b/workshop_app/static/workshop_app/img/Web_banner.gif
Binary files differ
diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html
index 2bcc71b..bd00bad 100644
--- a/workshop_app/templates/workshop_app/index.html
+++ b/workshop_app/templates/workshop_app/index.html
@@ -35,17 +35,19 @@
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
</head>
+
<body>
<!-- Navigation -->
-
+ <div class="row">
+ <div class="col-12">
+ <center>
+ <a href="{{URL_ROOT}}/self_workshop" ><img style="width:100%;max-width:900px;max-height:150px" src="{{URL_ROOT}}/static/workshop_app/img/Web_banner.gif" /></a>
+ </center>
+ </div>
+ </div>
+ <br>
<div class="container">
- <div class="row">
- <div class="col-12">
- <center>
- <a href="{{URL_ROOT}}/self_workshop" ><img style="width:100%;max-width:900px;max-height:150px" src="{{URL_ROOT}}/static/workshop_app/img/PWB_3.png" /></a>
- </center>
- </div>
- </div>
+
<!-- Heading Row -->
<div class="row">
diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html
index 373b799..deb2667 100644
--- a/workshop_app/templates/workshop_app/self_workshop.html
+++ b/workshop_app/templates/workshop_app/self_workshop.html
@@ -13,6 +13,21 @@
{% endblock %}
+{% block header %}
+ <nav class="navbar navbar-default navbar-custom">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <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>
+ </ul>
+ </div>
+ </nav>
+ {% endblock %}
+
{% block content %}
<div class="container">
@@ -72,6 +87,23 @@
</ul>
</ul>
+
+ <ul class='num'>
+ <h2>Duration:</h2>
+ <ul>
+ <li class='ans'>
+ The course will be open for one month (Approximately the participant can devote an hour each day or 4 hours per day on weekends to complete the course)
+ </li>
+
+ <li class='ans'>
+ The course will start on the 1st day of every month and closes on the last day of the month.
+ </li>
+
+
+
+ </ul>
+ </ul>
+
</div>
<br>
<br>