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

WIP:LAMASHEVSKYI DMYTRO's work on mobile phone UI adaption. Need more detail? Check the Kanban card at http://118.25.96.118/kanboard/?controller=TaskViewController&action=show&task_id=1483&project_id=170 #28

Draft
mrlan wants to merge 6 commits from Bug37-Dmytro into master
pull from: Bug37-Dmytro
merge into: mrlan:master
Conversation 1 Commits 6 Files Changed 9
mrlan commented 2021-11-16 22:23:06 +08:00
Owner

This pull request fixex the following bug:

  • Bug 37 The Website is not mobile-friendly

Hui

This pull request fixex the following bug: - [Bug 37](http://118.25.96.118/bugzilla/show_bug.cgi?id=37) The Website is not mobile-friendly Hui
mrlan added 1 commit 2021-11-16 22:23:06 +08:00
mrlan changed title from LAMASHEVSKYI DMYTRO's work on mobile phone UI adaption. Need more detail? Check the Kanban card at http://118.25.96.118/kanboard/?controller=TaskViewController&action=show&task_id=1483&project_id=170 to WIP:LAMASHEVSKYI DMYTRO's work on mobile phone UI adaption. Need more detail? Check the Kanban card at http://118.25.96.118/kanboard/?controller=TaskViewController&action=show&task_id=1483&project_id=170 2021-11-18 08:39:20 +08:00
mrlan added 1 commit 2021-11-22 10:47:00 +08:00
mrlan reviewed 2021-11-22 11:05:47 +08:00
Header.php Outdated
@ -22,3 +26,1 @@
<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" />
mrlan commented 2021-11-22 11:05:47 +08:00
Poster
Owner

@lamashevskyi

Thanks.

I think it should be Styles.css, not styles.css. The first letter should be capitalized.

See http://121.4.94.30:3000/mrlan/LRR/src/branch/Bug37-Dmytro/css/Styles.css

Hui

@lamashevskyi Thanks. I think it should be `Styles.css`, not `styles.css`. The first letter should be capitalized. See http://121.4.94.30:3000/mrlan/LRR/src/branch/Bug37-Dmytro/css/Styles.css Hui
mrlan reviewed 2021-11-22 11:08:36 +08:00
Header.php Outdated
@ -73,3 +45,1 @@
&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) {
mrlan commented 2021-11-22 11:08:36 +08:00
Poster
Owner

@lamashevskyi

Could you make a comment explaining what this thing (@media) is for?

Hui

@lamashevskyi Could you make a comment explaining what this thing (`@media`) is for? Hui
mrlan reviewed 2021-11-22 11:11:01 +08:00
index.php Outdated
@ -32,0 +42,4 @@
</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>
mrlan commented 2021-11-22 11:11:01 +08:00
Poster
Owner

@lamashevskyi

Thanks.

What is txt1? A style definition? Where is it defined? Likewise for txt2 in the next line.

Hui

@lamashevskyi Thanks. What is `txt1`? A style definition? Where is it defined? Likewise for `txt2` in the next line. Hui
mrlan reviewed 2021-11-22 11:11:54 +08:00
signup.php Outdated
@ -35,3 +36,3 @@
<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">
mrlan commented 2021-11-22 11:11:54 +08:00
Poster
Owner

@lamashevskyi

Thanks. Good correction.

Hui

@lamashevskyi Thanks. Good correction. Hui
lamashevskyi added 1 commit 2021-12-01 07:04:28 +08:00
18a41dd1bb Fixed merge commits 
Fixed merge commits
Added password pattern: https://www.w3schools.com/howto/howto_js_password_validation.asp
Validating to make password  one and two similar:
https://stackoverflow.com/questions/9142527/can-you-require-two-form-fields-to-match-with-html5
Fixed Button and HTML Tags for text in login and registration form
lamashevskyi added 1 commit 2021-12-01 09:22:56 +08:00
mrlan commented 2021-12-01 10:19:25 +08:00
Poster
Owner

Thanks for your work, Dmytro. I will double check your branch on the testing server and tell your the result in your Kanboard card.

Hui

Thanks for your work, Dmytro. I will double check your branch on the testing server and tell your the result in your Kanboard card. Hui
lamashevskyi added 2 commits 2022-06-16 18:28:33 +08:00
24120f1bc4 Fixed 418 
Update SQL and change UI
This pull request has changes conflicting with the target branch.
  • index.php
  • signup.php
  • Admin.php
  • Course.php
  • Courses.php
  • Header.php
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b Bug37-Dmytro master
git pull origin Bug37-Dmytro

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff Bug37-Dmytro
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mrlan/LRR#28
There is no content yet.
Delete Branch "Bug37-Dmytro"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?