MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

BUG FIX: name size

Browse Source
This commit is contained in:
Lars van Hijfte
2017-02-01 14:51:27 +01:00
parent 89cff4da8c
commit 0546b8689d
7 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/public/styles/main.css
View File

@@ -102,7 +102,6 @@ p {
.group-picture { .group-picture {
border-radius: 5px; border-radius: 5px;
border: none;
} }
.item-box, .item-box-full-width { .item-box, .item-box-full-width {
@@ -291,19 +290,6 @@ div[data-title]:hover:after {
vertical-align: middle; vertical-align: middle;
} }
::-webkit-scrollbar {
width: 5px;
height: 5px;
}
::-webkit-scrollbar-track {
background: none;
}
::-webkit-scrollbar-thumb {
-webkit-border-radius: 20px;
border-radius: 20px;
background: #4CAF50;
}
@media only screen and (max-width: 1080px) { @media only screen and (max-width: 1080px) {
body { body {
font-size: 28px!important; font-size: 28px!important;

3
website/public/styles/profile.css
View File

@@ -11,7 +11,7 @@
display: inline-block; display: inline-block;
} }
.friend-button-container { .friend-button-container, .group-button-container {
position: relative; position: relative;
float: right; float: right;
width: 200px; width: 200px;
@@ -62,7 +62,6 @@
.group-picture { .group-picture {
border: none; border: none;
margin-bottom: 0;
margin-right: 15px; margin-right: 15px;
} }

17
website/queries/friendship.php
View File

@@ -10,8 +10,8 @@ function selectLimitedFriends($userID, $limit) {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`username`, LEFT(`username`, 17) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/avatar-standard.png' '../img/avatar-standard.png'
@@ -50,8 +50,8 @@ function selectAllFriends($userID) {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`username`, LEFT(`username`, 17) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/avatar-standard.png' '../img/avatar-standard.png'
@@ -85,8 +85,8 @@ function selectAllFriendRequests() {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`username`, LEFT(`username`, 17) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/avatar-standard.png' '../img/avatar-standard.png'
@@ -235,8 +235,9 @@ function searchSomeFriends($n, $m, $search) {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, LEFT(`username`, 17) as `username`,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/avatar-standard.png' '../img/avatar-standard.png'

2
website/queries/private_message.php
View File

@@ -95,7 +95,7 @@ function getNewChatMessages($lastID, $destination) {
function selectAllUnreadChat() { function selectAllUnreadChat() {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
`user`.`userID`, `user`.`userID`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,

4
website/queries/user.php
View File

@@ -345,12 +345,12 @@ function searchSomeUsers($n, $m, $search) {
$stmt = prepareQuery(" $stmt = prepareQuery("
SELECT SELECT
`userID`, `userID`,
`username`, LEFT(`username`, 17) as `username`,
IFNULL( IFNULL(
`profilepicture`, `profilepicture`,
'../img/avatar-standard.png' '../img/avatar-standard.png'
) AS profilepicture, ) AS profilepicture,
LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`, LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE) CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
WHEN TRUE THEN 'online' WHEN TRUE THEN 'online'
WHEN FALSE THEN 'offline' WHEN FALSE THEN 'offline'

19
website/views/group.php
View File

@@ -1,12 +1,17 @@
<div class="content"> <div class="content">
<div class="profile-box platform"> <div class="user-box">
<img class="left main-picture group-picture" src="<?= $group['picture'] ?>"> <img class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
<div class="group-button-container"></div> <div class="platform">
<h1 class="profile-username"><?= $group['name'] ?></h1> <div class="status-buttons-container">
<p><?= $group['description'] ?></p> <button disabled class="gray"><?= $group["status"] ?></button>
</div>
<div class="group-button-container"></div>
<div class="profile-info">
<h2><?= $group["name"]?></h2>
<?= $group["description"] ?>
</div>
</div>
</div> </div>
<div class="item-box-full-width platform"> <div class="item-box-full-width platform">
<h2>Leden (<?= $group['members'] ?>)</h2> <h2>Leden (<?= $group['members'] ?>)</h2>
<p> <p>

11
website/views/settings-view.php
View File

@@ -17,6 +17,7 @@ $settings = getSettings();
<input type="text" <input type="text"
name="fname" name="fname"
id="fname" id="fname"
maxlength="63"
placeholder="Voornaam" placeholder="Voornaam"
title="Voornaam" title="Voornaam"
value="<?=$settings["fname"]?>" value="<?=$settings["fname"]?>"
@@ -27,6 +28,7 @@ $settings = getSettings();
<input type="text" <input type="text"
name="lname" name="lname"
id="lname" id="lname"
maxlength="63"
placeholder="Achternaam" placeholder="Achternaam"
value="<?=$settings["lname"]?>" value="<?=$settings["lname"]?>"
> >
@@ -36,6 +38,7 @@ $settings = getSettings();
<input type="text" <input type="text"
name="location" name="location"
id="location" id="location"
maxlength="50"
placeholder="Locatie" placeholder="Locatie"
value="<?=$settings["location"]?>" value="<?=$settings["location"]?>"
> >
@@ -186,6 +189,7 @@ $settings = getSettings();
<label for="email-old">Huidig Email </label> <label for="email-old">Huidig Email </label>
<input type="email" <input type="email"
id="email-old" id="email-old"
maxlength="255"
value="<?=$settings["email"]?>" value="<?=$settings["email"]?>"
disabled disabled
> >
@@ -194,6 +198,7 @@ $settings = getSettings();
<label for="email">Nieuw Email</label> <label for="email">Nieuw Email</label>
<input type="email" <input type="email"
name="email" name="email"
maxlength="255"
id="email" id="email"
placeholder="Nieuw Email" placeholder="Nieuw Email"
> >
@@ -203,14 +208,16 @@ $settings = getSettings();
<input type="email" <input type="email"
name="email-confirm" name="email-confirm"
id="email-confirm" id="email-confirm"
maxlength="255"
placeholder="Bevestig Email" placeholder="Bevestig Email"
> >
</li> </li>
<li> <li>
<button type="submit" <button type="submit"
name="form" name="form"
value="email" value="email">
>Verander Email</button> Verander Email
</button>
</li> </li>
</ul> </ul>
</form> </form>