mrlan
/
LRR
3
0
Fork 2
Code Issues Pull Requests 7 Projects Releases Wiki Activity

Remove all *.rej files.

Bug37-Dmytro
Lan Hui 2021-11-22 10:46:49 +08:00
parent 207d12a4a3
commit 036489041f
5 changed files with 0 additions and 1712 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1209
Courses.php.rej
View File

File diff suppressed because it is too large Load Diff

16
Footer.php.rej
View File

@ -1,16 +0,0 @@
diff a/Footer.php b/Footer.php (rejected hunks)
@@ -1,4 +1,9 @@
-<br><br><br><br><br><br><br><br><br>
-<div style="background-color:white;width:100%di">
-
-</div>
\ No newline at end of file
+
+ <footer class="footer bg-primary">
+ <div class="container text-light">
+ <p >LRR was originally developed as a <a href="http://lanlab.org/course/2018f/se/homepage.html" style="color:white;">Software engineering course project</a> by Mohamed Nor and Elmahdi Houzi. Please submit your suggestions or bug reports to lanhui _at_ zjnu.edu.cn. Last updated on 18/04/2020 by Ashly. <a href="./homepage" style="color:white;">More information ...</a></p>
+ <small>© 2018 Copyright: <a href="http://lanlab.org/">lanlab.org</a></small>
+ </div>
+ </footer>
+
+

241
Header.php.rej
View File

@ -1,241 +0,0 @@
diff a/Header.php b/Header.php (rejected hunks)
@@ -18,138 +18,36 @@ if (mysqli_connect_errno()) {
<html>
<head>
+
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+ <link href="./font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" /><!-- Font-awesome CSS -->
+ <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous"><!-- Bootstrap CSS -->
- <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" />
- <link href="./css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+ <link href="./css/styles.css" rel="stylesheet" type="text/css" />
<script src="./css/jquery.min.js" type="text/javascript"></script>
- <script src="./css/bootsrap.min.js" type="text/javascript"></script>
+ <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+ <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+
<script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script>
+ <script src="./js/CustomDropdown.js" type="text/javascript"></script>
+
+ <style>
+ .bd-placeholder-img {
+ font-size: 1.125rem;
+ text-anchor: middle;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ user-select: none;
+ }
-</head>
-
-<body>
-
- <nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="padding-left:150px;padding-right:150px;margin:auto;">
- <a class="navbar-brand" href="~\..\index.php"> <img src="logo.png" style="width:30px;height:30px;"> LRR </a>
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
-
- <div class="collapse navbar-collapse" id="navbarColor02">
- <ul class="navbar-nav mr-auto">
- <li class="nav-item active">
-
- <li class="nav-item active">
- <!-- <a class='nav-link' href='~\..\Visitors.php'> <i class='fa fa-globe'></i> Visitor Portal <span class='sr-only'>(current)</span></a> -->
- </li>
- <?php
- if (isset($_SESSION["user_fullname"])) {
-
- echo " <a class='nav-link' href='~\..\Courses.php'><i class='fa fa-book'></i> Courses <span class='sr-only'>(current)</span></a>";
- ?>
- </li>
- </ul>
- <form class="form-inline my-2 my-lg-0" style="color:#fff;">
- Welcome &nbsp; <b> <?php echo $_SESSION['user_fullname']; ?> </b> &nbsp;
-
- <?php
- $c_date = date("Y-m-d H:i");
- if (isset($_SESSION['user_student_id']))
- echo "(" . $_SESSION['user_type'] . " - " . $_SESSION['user_student_id'] . ") ";
- else
- echo "(" . $_SESSION['user_type'] . ") ";
- ?>
-
- <?php
- if ($_SESSION['user_type'] == "Lecturer") {
- echo "&nbsp;&nbsp;&nbsp; <i class=\"fa fa-cog\" style=\"color:#fff;\"> </i> &nbsp;<a style='color:#fff !important' href=\"~\..\Admin.php\">Admin </a>";
- }
- ?>
-
- &nbsp;&nbsp;&nbsp; <i class="fa fa-user" style="color:#fff;"> </i>
- &nbsp;<a href="#" style='color:#fff !important' onclick="updatePass(<?php echo $_SESSION['user_id']; ?>)">Update password</a>
- &nbsp;&nbsp;&nbsp; <i class="fa fa-lock" style="color:#fff;"> </i> &nbsp;<a style='color:#fff !important' href="~\..\logout.php">Logout </a>
-
- <?php
+ @media (min-width: 768px) {
+ .bd-placeholder-img-lg {
+ font-size: 3.5rem;
}
- ?>
- </form>
- </div>
- </nav>
-
- <style>
- .nav-item {
- border-color: #00ff66;
- }
-
- .nav-tabs {
- border-color: #00ff66;
- }
-
- .btn-default {
- border: 2px solid #00ff66;
- width: 100%;
- text-align: left;
- margin: 3px auto;
- font-weight: bold;
- font-size: 13pt;
- }
-
- .table-bordered {
- padding: 5px !important;
- }
-
- .alert {
- font-weight: bold;
- }
-
- h1,
- h2,
- h3,
- h4 {
- color: #03407B;
- }
-
- a {
- color: #03407B;
- }
-
- .break-word {
- word-wrap: break-word;
- white-space: -moz-pre-wrap !important;
- /* Mozilla, since 1999 */
- white-space: -pre-wrap;
- /* Opera 4-6 */
- white-space: -o-pre-wrap;
- /* Opera 7 */
- white-space: pre-wrap;
- /* css-3 */
- word-wrap: break-word;
- /* Internet Explorer 5.5+ */
- white-space: -webkit-pre-wrap;
- /* Newer versions of Chrome/Safari*/
- word-break: break-all;
- white-space: normal;
- }
-
- .ui-widget-content.ui-dialog {
- border: 2px solid #03488B;
-
- }
-
- .ui-dialog>.ui-widget-header {
- background: #03488B;
- color: white
- }
-
- .ui-button {
- background: #03488B;
- color: white
- }
- </style>
-
+ }
+ </style>
<script>
function updatePass(id) {
@@ -168,4 +66,73 @@ if (mysqli_connect_errno()) {
}
window.location.href = "\Script.php\?action=statuschange&uid=" + id + "&status=" + status;
}
- </script>
\ No newline at end of file
+ </script>
+</head>
+
+<body>
+
+
+<nav class="navbar navbar-expand-md navbar-dark bg-primary sticky-top">
+ <div class="container-fluid">
+ <a class="navbar-brand" href="~\..\index.php"> <img src="logo.png" width="30" height="30"> LRR </a>
+
+ <?php
+ if (isset($_SESSION["user_fullname"]))
+ {
+ ?>
+ <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+
+ <?php
+ }
+ ?>
+
+ <div class="collapse navbar-collapse" id="navbarResponsive">
+
+ <?php
+ if (isset($_SESSION["user_fullname"])) {
+ echo "<ul class=\"navbar-nav mr-auto\">";
+ echo "<li class=\"nav-item active\">";
+ echo "<a class='nav-link' href='~\..\Courses.php'><i class='fa fa-book'></i> Courses</a>";
+ echo "</li></ul>";
+ ?>
+
+ <ul class="nav navbar-nav navbar-right">
+ <li class="nav-item">
+ <a class="nav-link text-light" href="#">Welcome <b> <?php echo $_SESSION['user_fullname']; ?> </b>
+
+ <?php
+ $c_date = date("Y-m-d H:i");
+ if (isset($_SESSION['user_student_id']))
+ echo "(" . $_SESSION['user_type'] . " - " . $_SESSION['user_student_id'] . ") ";
+ else
+ echo "(" . $_SESSION['user_type'] . ") ";
+ ?>
+ </a>
+ </li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle text-light" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Menu </a>
+ <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+ <a href="#" class="dropdown-item" onclick="updatePass(<?php echo $_SESSION['user_id']; ?>)"><i class="fa fa-user ">Update passwor</i></a>
+
+ <?php
+ if ($_SESSION['user_type'] == "Lecturer") {
+ echo "<a class=\"dropdown-item\" href=\"~\..\Admin.php\"><i class=\"fa fa-cog\" >Admin</i> </a>";
+ }
+ ?>
+ </div>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link text-light" href="~\..\logout.php"><i class="fa fa-lock" > Logout</i> </a>
+ </li>
+ </ul>
+
+ <?php
+ }
+ ?>
+
+ </div>
+
+ </div>
+</nav>
\ No newline at end of file

193
index.php.rej
View File

@ -1,193 +0,0 @@
diff a/index.php b/index.php (rejected hunks)
@@ -1,7 +1,7 @@
<?php
- $page='Home';
- require 'Header.php';
- session_start();
+$page='Home';
+require 'Header.php';
+session_start();
?>
<?php
@@ -10,119 +10,78 @@ if (isset($_SESSION["user_fullname"])) {
header("Location: Courses.php");
}
?>
+<div class="album py-5 bg-white">
+ <div class="container bg-white">
-<br><br><br>
+ <div class="row align-items-center">
-<div class="row" style="width:85%;margin:auto;">
- <div class="col-md-4">
- <br><br>
- <img src="logo.png" style="width:40%; position:relative; right:-95px; top:1px;">
- <br><br>
- <div style="width:20%; position:relative; right:-90px; font-family: Poppins-Regular;">
- <h1>Lab Report Repository</h1>
- <br><br>
- </div>
- </div>
- <br>
- <div style = "position:relative; left:240px; top:-2px;">
- <h4 class="list-group-item active" style="font-weight:normal;font-family: Poppins-Regular;"> Sign in </h4>
- <div class="list-group-item">
+ <div class="col-md-6">
+ <div class="mb-6 box-shadow">
+ <img class="mx-auto d-block" src="logo.png" />
+ <div class="card-body">
+ <h1 style="font-family: Poppins-Regular;">Lab Report Repository</h1>
+ </div>
+ </div>
+ </div>
- <div class="panel-body">
+ <div class="col-md-6">
+ <div class="card mb-6 box-shadow">
+ <div class="card-header bg-primary" >
+ <h4 class="list-group-item active" style="font-weight:normal;font-family: Poppins-Regular;"> Sign in </h4>
+ </div>
+ <div class="card-body">
+ <form method="post" action="Script.php" name="frm_login">
+ <input type="hidden" name="frm_login" value="true"/>
+ Student ID / Instructor Email
+ <input type="text" name="user" placeholder="Email / Student Number" class="form-control" required="required" />
+ <br>
+ Password
+ <input type="password" class="form-control" name="password" placeholder="password" required="required" />
+ <div class="text-center">
+ <br><input type="submit" class="btn btn-primary my-2" value="Login">
+ </div>
+ <br> <a href="recover_password.php">Reset my password</a>
+ <div class="text-center">
+ <br><span class="txt1">Don't have an account?</span>
+ <a class="txt2" href="signup.php" >Sign Up</a>
+ </div>
- <form method="post" action="Script.php" name="frm_login">
- <input type="hidden" name="frm_login" value="true"/>
- Student ID / Instructor Email
- <input type="text" name="user" placeholder="Email / Student Number" class="form-control" required="required" />
- <br>
- Password
- <input type="password" class="form-control" name="password" placeholder="password" required="required" />
- <div class="text-center">
- <br><input type="submit" class="btn-primary" value="Login">
- </div>
- <br> <a href="recover_password.php" style="font-weight:normal;color:#2471A3; font-family: Poppins-Regular;
- font-size: 17px;">Reset my password</a>
- <div class="text-center">
- <br><span class="txt1">Don't have an account?</span>
- <a class="txt2" href="signup.php" style="font-weight:normal">Sign Up</a>
- </a>
- </div>
+ <?php
- <?php
-
- error_reporting(E_ALL);
-
- if(isset($_SESSION['info_login'])) {
- echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_login'].'</div>';
- $_SESSION['info_login']=null;
- }
-
-
- // wrong pass
- if(isset($_SESSION['wrong_pass'])) {
- echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['wrong_pass'].'</div>';
- $_SESSION['wrong_pass']=null;
- }
-
-
- if(isset($_SESSION['infoChangePassword'])) {
- echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['infoChangePassword'].'</div>';
- $_SESSION['infoChangePassword']=null;
- }
- ?>
-
- </div>
- </form>
- </div>
-</div>
-</div>
-</div>
+ error_reporting(E_ALL);
-</div>
+ if(isset($_SESSION['info_login'])) {
+ echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_login'].'</div>';
+ $_SESSION['info_login']=null;
+ }
-<div id="footer">
- LRR was originally developed as a <a href="http://lanlab.org/course/2018f/se/homepage.html" style="color:white;">software engineering course project</a> by Mohamed Nor and Elmahdi Houzi. Please submit your suggestions or bug reports to lanhui _at_ zjnu.edu.cn. Last updated on 18/04/2020 by Ashly. <a href="./homepage" style="color:white;">More information ...</a>
- </div>
+ // wrong pass
+ if(isset($_SESSION['wrong_pass'])) {
+ echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['wrong_pass'].'</div>';
+ $_SESSION['wrong_pass']=null;
+ }
-</body>
-<style>
- /*------------------------------------------------------------------
-[ Login Button ]*/
-.btn-primary {
- color: white;
- border-radius: 5px;
- text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
- background: rgb(75, 184, 240);
- padding:5px 100px;
- font-family: Poppins-Regular;
- font-size: 23px;
- line-height: 1.5;
- }
+ if(isset($_SESSION['infoChangePassword'])) {
+ echo '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['infoChangePassword'].'</div>';
+ $_SESSION['infoChangePassword']=null;
+ }
+ ?>
+
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
-#footer{
-position:fixed;
-bottom:0;
-left:0;
-background-color:#03417C;
-color:#FFF;
-text-align:center;
-width:100%;
-}
-.txt1 {
- font-family: Poppins-Regular;
- font-size: 18px;
- line-height: 1.5;
- color: #666666;
-}
-.txt2 {
- font-family: Poppins-Regular;
- font-size: 19px;
- line-height: 1.5;
- color: #2471A3;
-}
+<?php
+require 'Footer.php';
+?>
+
+</body>
-</style>
</html>

53
signup.php.rej
View File

@ -1,53 +0,0 @@
diff a/signup.php b/signup.php (rejected hunks)
@@ -6,16 +6,17 @@ include 'NoDirectPhpAcess.php';
include 'Header.php';
?>
-<div class="row">
-
- <div class="col-md-4 list-group" style="margin:auto;">
+<div class="album py-5 bg-white">
+ <div class="container bg-white">
+
+ <div class="col-md-6 panel panel-primary" >
<br>
<h4 class="list-group-item active"> Please fill in each field below </h4>
<div class="list-group-item">
- <div class="panel-body">
+ <div class="panel panel-primary">
<form method="post" action="Script.php">
<input type="hidden" name="frm_signup_2" value="true" />
@@ -34,7 +35,7 @@ include 'Header.php';
Confirm Password
<input type="password" class="form-control" name="confirmpassword" placeholder="Confirm password" required="required" />
<br>
- <input type="submit" class="btn-primary" value="Sign up">
+ <input type="submit" class="btn btn-primary" value="Sign up">
<?php
error_reporting(E_ALL);
if (isset($_SESSION['info_signup2'])) {
@@ -48,17 +49,5 @@ include 'Header.php';
</div>
</div>
</div>
-<style>
- /*------------------------------------------------------------------
-[ Login Button ]*/
- .btn-primary {
- color: white;
- border-radius: 5px;
- text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
- background: rgb(75, 184, 240);
- padding: 5px 105px;
- font-family: Poppins-Regular;
- font-size: 23px;
- line-height: 1.5;
- }
-</style>
\ No newline at end of file
+</div>
+