Merge branch 'master' into niweicong-bug-458&459
commit
4624186f50
|
@ -631,7 +631,7 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl
|
||||||
|
|
||||||
if($Status=="Joined")
|
if($Status=="Joined")
|
||||||
{
|
{
|
||||||
echo "<a href='~\..\Course.php?url=$url'> <div class='btn btn-default' style='word-wrap:break-word' onclick="document.location='Course.php?url=$url'">
|
echo "<a href='~\..\Course.php?url=$url'> <div class='btn btn-default' style='word-wrap:break-word'>
|
||||||
($code) - $name <br>($url) <i class='fa fa-check-circle'></i> $Status <a href='~\..\Course.php?url=$url' class='btn-sm btn-primary'> Open</a>
|
($code) - $name <br>($url) <i class='fa fa-check-circle'></i> $Status <a href='~\..\Course.php?url=$url' class='btn-sm btn-primary'> Open</a>
|
||||||
<br> <span style='font-size:8pt'>Faculty : $faculty Year : $academic Lecturer :$lecturer </span></div></a>
|
<br> <span style='font-size:8pt'>Faculty : $faculty Year : $academic Lecturer :$lecturer </span></div></a>
|
||||||
";
|
";
|
||||||
|
@ -678,7 +678,7 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl
|
||||||
<div class='row'>
|
<div class='row'>
|
||||||
<div class='col-md-10'>
|
<div class='col-md-10'>
|
||||||
<div class='row'><div class='col-md-6'> Find course by Code
|
<div class='row'><div class='col-md-6'> Find course by Code
|
||||||
<input type='text' class='form-control' name='search' maxlength='11' placeholder='Enter Course Code'>
|
<input type='text' class='form-control' name='search' placeholder='Enter Course Code'>
|
||||||
</div><div class='col-md-6'>
|
</div><div class='col-md-6'>
|
||||||
List courses by faculty
|
List courses by faculty
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue