Skip to content

201732120134 tanaka michelle sandati fixing spelling errors and grammatical errors #42

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

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

201732120134 tanaka michelle sandati fixing spelling errors and grammatical errors #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfb6b15
Adding web page icon and web page title to LRR
TanakaMichelle May 31, 2020
767ca7e
Fixing spelling mistakes and grammatical errors.
TanakaMichelle May 31, 2020
4832314
201732120134- correcting a spelling mistake
TanakaMichelle May 31, 2020
8b554cf
Fixing Bugzilla- bug 18
TanakaMichelle May 31, 2020
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
4 changes: 2 additions & 2 deletions Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<script>
function updatePass(id,pass)
{
if(!confirm('Are you to Reset User Password'))
if(!confirm('Do you want to reset user password?'))
{
return;
}
Expand All @@ -326,7 +326,7 @@ function updatePass(id,pass)

function blockUser(id,status)
{
if(!confirm('Are you to change User Status'))
if(!confirm('Do you want to change user status?'))
{
return;
}
Expand Down
3 changes: 2 additions & 1 deletion Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@

<html>
<header>
<title>Lab Report Repository System</title>

<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<link href="font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
<script src="http://118.25.96.118/nor/css/jquery.min.js" type="text/javascript"></script>
<script src="http://118.25.96.118/nor/css/bootsrap.min.js" type="text/javascript"></script>
<link href="http://118.25.96.118/nor/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
<script src="http://118.25.96.118/nor/css/jquery.datetimepicker.min.js" type="text/javascript"></script>
<link rel = "shortcut icon" href = "logo_text.png">
Copy link
Copy Markdown
Member

@spm2020spring spm2020spring Jun 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

@TanakaMichelle

Why line 36?

Do you expect the image logo_text.png also exists on the server?

Hui




Expand Down
12 changes: 6 additions & 6 deletions Script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
header("Location: signup.php");
return;
}
// check if email is taked
// check if email exists in the database
$result = mysqli_query($con,
"SELECT * FROM Users_Table WHERE email='$email'");
if(mysqli_num_rows($result)!=0)
Expand Down Expand Up @@ -272,7 +272,7 @@



$_SESSION["info_login"]="<br> Please check your Inbox & Junk folders for the recovery email , a reset link was sent to your email <b> $pure_email </b>";
$_SESSION["info_login"]="<br> Please check your Inbox & Junk folders for the recovery email. A reset link was sent to your email: <b> $pure_email </b>";

header("Location: index.php");

Expand Down Expand Up @@ -392,7 +392,7 @@
. "('$email','$password','$fullname','$type','$passport')";

if ($con->query($sql) === TRUE) {
$_SESSION["info_Admin_Users"]=$type." user Created successfully : email ".$email." and $password as Password.";
$_SESSION["info_Admin_Users"]=$type." user created successfully : email ".$email." and $password as Password.";
header("Location: Admin.php");

} else {
Expand Down Expand Up @@ -910,7 +910,7 @@ function checksize($file)

if($joining==0)
{
$_SESSION["info_Courses_student"]="You enroll in this Course successfully.";
$_SESSION["info_Courses_student"]="You have successfully enrolled in this course.";
}
else {
$_SESSION["info_Courses_student"]="Course enrollment request was sent to the lecturer.";
Expand Down Expand Up @@ -951,7 +951,7 @@ function checksize($file)

if($marks>$total)
{
echo " Marks could not be greater than total";
echo " Marks cannot be greater than total";
return;
}
$date= date("Y-m-d H:i");
Expand Down Expand Up @@ -1512,7 +1512,7 @@ function checksize($file)


if ($con->query($sql) === TRUE) {
$_SESSION["info_Admin_Courses"]="Course portal was Created successfully.";
$_SESSION["info_Admin_Courses"]="Course portal was created successfully.";
if($who=="l")
{
header("Location: Courses.php");
Expand Down
2 changes: 1 addition & 1 deletion Student.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="row" style="width:80%;margin:auto;">

<div class="col-md-6">
<h1> STUEDNT Account Created , Now you can Browse Course Portals </h1>
<h1> STUDENT account created, now you can browse Course Portals. </h1>
</div>


Expand Down
4 changes: 2 additions & 2 deletions SubmitLab.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@


echo " <div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='~\..\Courses.php?course=$url'>
Courses > $url > Submlit Lab Report > $title
Courses > $url > Submit Lab Report > $title
<br>
</a></div>
";
Expand Down Expand Up @@ -127,7 +127,7 @@


Title
<input type='text' name='title' placeholder='Ttle' class='form-control' required=''>
<input type='text' name='title' placeholder='Title' class='form-control' required=''>
Attachment 1
<input type='file' name='attachment1' placeholder='Attachment 1' class='form-control' required=''>

Expand Down
2 changes: 1 addition & 1 deletion recover_password.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<br>
<input type="submit" class="btn btn-primary" value="Recover">
<br> * You will recieve email with recovery information
<br> * You will receive an email with password recovery information.
<?php


Expand Down