Commit 45272e4c authored by sachith.fernando's avatar sachith.fernando

Merge remote-tracking branch 'origin/master'

parents 134cf831 a13d0949
...@@ -736,9 +736,9 @@ ...@@ -736,9 +736,9 @@
<div class="card bg-white shadow-lg"> <div class="card bg-white shadow-lg">
<div class="card-header"> <!-- <div class="card-header">-->
<h1 class="card-title">Proposal</h1> <!-- <h1 class="card-title">Proposal</h1>-->
</div> <!-- </div>-->
<div class="card-body"> <div class="card-body">
<h3 class="font-weight-bold">Description</h3> <h3 class="font-weight-bold">Description</h3>
...@@ -780,9 +780,9 @@ ...@@ -780,9 +780,9 @@
<div class="card bg-white shadow-lg"> <div class="card bg-white shadow-lg">
<div class="card-header"> <!-- <div class="card-header">-->
<h1 class="card-title">Progress Presentation - 1</h1> <!-- <h1 class="card-title">Progress Presentation - 1</h1>-->
</div> <!-- </div>-->
<div class="card-body"> <div class="card-body">
...@@ -814,6 +814,129 @@ ...@@ -814,6 +814,129 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col">
<div class="card text-center">
<a href="#pp2" class="card-header bg-info" style="padding: 7px; font-size: 25px; color: white; text-decoration: none" data-toggle="collapse">Progress presentation 2</a>
<div id="pp2" class="collapse mt-4">
<div class="card bg-white shadow-lg">
<!-- <div class="card-header">-->
<!-- <h1 class="card-title">Progress Presentation - 2</h1>-->
<!-- </div>-->
<div class="card-body">
<h3 class="font-weight-bold">Description</h3>
<div class="justify-content-center">
<p class="card-text">The main purpose of this presentation was to show the progress of the
project. It was expected that 90% of the project to be completed.</p>
</div>
<h3 class="font-weight-bold">Date</h3>
<div class="justify-content-center">
<i class="glyphicon glyphicon-time"></i>
September 24, 2020
</div>
<h3 class="font-weight-bold">Marks</h3>
<div class="justify-content-center">
18%
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="card text-center">
<a href="#demo" class="card-header bg-info" style="padding: 7px; font-size: 25px; color: white; text-decoration: none" data-toggle="collapse">Demo</a>
<div id="demo" class="collapse mt-4">
<div class="card bg-white shadow-lg">
<!-- <div class="card-header">-->
<!-- <h1 class="card-title">Demo</h1>-->
<!-- </div>-->
<div class="card-body">
<h3 class="font-weight-bold">Description</h3>
<div class="justify-content-center">
<p class="card-text">The research project group had to design a Research Poster to provide a
basic understand about the Research. The content included were Introduction, Literature Survey,
Research Problem, Research Objectives, Methodology, Results and Discussion and Conclusion</p>
</div>
<h3 class="font-weight-bold">Date</h3>
<div class="justify-content-center">
<i class="glyphicon glyphicon-time"></i>
September 24, 2020
</div>
<h3 class="font-weight-bold">Marks</h3>
<div class="justify-content-center">
12%
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="card text-center">
<a href="#viva" class="card-header bg-info" style="padding: 7px; font-size: 25px; color: white; text-decoration: none" data-toggle="collapse">Final Assessment</a>
<div id="viva" class="collapse mt-4">
<div class="card bg-white shadow-lg">
<!-- <div class="card-header">-->
<!-- <h1 class="card-title">Final Assessment</h1>-->
<!-- </div>-->
<div class="card-body">
<h3 class="font-weight-bold">Description</h3>
<div class="justify-content-center">
<p class="card-text">A completed product demonstration was expected</p>
</div>
<h3 class="font-weight-bold">Date</h3>
<div class="justify-content-center">
<i class="glyphicon glyphicon-time"></i>
To be Informed
</div>
<h3 class="font-weight-bold">Marks</h3>
<div class="justify-content-center">
?%
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
...@@ -1263,7 +1386,6 @@ ...@@ -1263,7 +1386,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
......
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