From a26e4f813bde13f75522b6e2deea6e3270e1ee1c Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 16 Oct 2015 22:50:11 +0200 Subject: [PATCH] r20151014.2 Signed-off-by: Flashwave --- _sakura/templates/misaki/main/profile.tpl | 298 ++++++++++---------- _sakura/templates/misaki/profile/hidden.tpl | 9 + public/content/data/misaki/css/misaki.css | 4 +- public/imageserve.php | 2 +- 4 files changed, 160 insertions(+), 153 deletions(-) create mode 100644 _sakura/templates/misaki/profile/hidden.tpl diff --git a/_sakura/templates/misaki/main/profile.tpl b/_sakura/templates/misaki/main/profile.tpl index 64aa1b9..e500e98 100755 --- a/_sakura/templates/misaki/main/profile.tpl +++ b/_sakura/templates/misaki/main/profile.tpl @@ -4,180 +4,178 @@ {% set noUserpage = profile.userPage|length < 1 %} -{% set profileView = noUserpage and profileView == 'index' ? 'comments' : profileView %} +{% set profileView = profileHidden ? 'hidden' : (noUserpage and profileView == 'index' ? 'comments' : profileView) %} {% block title %}{% if profileHidden %}User not found!{% else %}Profile of {{ profile.data.username }}{% endif %}{% endblock %} +{% block css %} + +{% endblock %} + {% block content %} - {% if profileHidden %} -
-

user not found!

- There are a few possible reasons for this: -
    -
  • They changed their username.
    • -
  • They may have been abyss'd.
    • -
  • You made a typo.
    • -
  • They never existed.
    • -
-
- {% else %} -
-
-
{{ profile.data.username }}'s Avatar
-
-
-
- {{ profile.data.username }} -
-
- {{ profile.userTitle }} -
+
+
+
{{ profile.data.username }}'s Avatar
+
+
+
+ {% if profileHidden %}Unknown user{% else %}{{ profile.data.username }}{% endif %}
-
-
Joined {{ profile.elapsed.joined }}
-
{% if profile.data.user_last_online < 1 %}User hasn't logged in yet.{% else %}Last Active {{ profile.elapsed.lastOnline }}{% endif %}
+
+ {% if profileHidden %}The requested user does not exist!{% else %}{{ profile.userTitle }}{% endif %}
+
+ {% if not profileHidden %} +
Joined {{ profile.elapsed.joined }}
+
{% if profile.data.user_last_online < 1 %}User hasn't logged in yet.{% else %}Last Active {{ profile.elapsed.lastOnline }}{% endif %}
+ {% endif %} +
-
-
- {% if not profile.checkPermission('SITE', 'DEACTIVATED') and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %} -
-
-
    - {% if profile.checkPremium[0] %} -
  • Tenshi
    • - {% endif %} - {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %} -
  • Staff
    • - {% endif %} - {% if false %} -
  • Developer
    • - {% endif %} - {% if false %} -
  • Alumnii
    • - {% endif %} -
-
+
+
+
+ {% if not profileHidden and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %} +
+
+
    + {% if profile.checkPremium[0] %} +
  • Tenshi
    • + {% endif %} + {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %} +
  • Staff
    • + {% endif %} + {% if false %} +
  • Developer
    • + {% endif %} + {% if false %} +
  • Alumnii
    • + {% endif %} +
-
-
- {% if session.checkLogin %} - {% if profile.profileFields %} - {% for name,field in profile.profileFields %} -
-
{{ field.name }}
- +
+
+ {% if session.checkLogin %} + {% if profile.profileFields %} + {% for name,field in profile.profileFields %} +
+
{{ field.name }}
+ -
+ {{ field.value }} + {% if field.islink %} + + {% endif %} + {% endif %}
- {% endfor %} - {% else %} -
-
-
This user has not set any links yet.
-
- {% endif %} +
+
+ {% endfor %} {% else %}
-
-
Log in to view the full profile.
+
+
This user has not set any links yet.
{% endif %} -
-
- {% endif %} -
-
-
Account Standing
- {% if profile.checkPermission('SITE', 'DEACTIVATED') %} -
Deactivated
- {% elseif profile.checkBan %} -

Banned

- {% else %} - {% if profile.getWarnings %} -
Bad
- {% else %} -
Good
- {% endif %} - {% endif %} - {% if profile.getWarnings %} -
This user has {{ profile.getWarnings|length }} warning{% if profile.getWarnings|length != 1 %}s{% endif %}!
-
After 10 warnings a user may be permanently banned.
- {% endif %} -
-
-
-
- {% if not profile.checkPermission('SITE', 'DEACTIVATED') %} -
- {% if profileView != (noUserpage ? 'comments' : 'index') %} -
- -
- + {% else %} +
+
+
Log in to view the full profile.
{% endif %} - {% if profileView != 'friends' %} -
- -
-
{{ profile.getFriends|length }}
- -
+
+
+ {% endif %} +
+
+
Account Standing
+ {% if profileHidden %} +
Unknown
+ {% elseif profile.checkBan %} +

Banned

+ {% else %} + {% if profile.getWarnings %} +
Bad
+ {% else %} +
Good
+ {% endif %} {% endif %} - {% if profileView != 'groups' %} -
- -
-
0
- -
- {% endif %} - {% if profileView != 'comments' %} -
- -
-
{{ profile.profileComments.count }}
- -
- {% endif %} - {% if profileView != 'threads' %} -
- -
-
{{ profile.forumStats.topics }}
- -
- {% endif %} - {% if profileView != 'posts' %} -
- -
-
{{ profile.forumStats.posts }}
- -
+ {% if profile.getWarnings %} +
This user has {{ profile.getWarnings|length }} warning{% if profile.getWarnings|length != 1 %}s{% endif %}!
+
After 10 warnings a user may be permanently banned.
{% endif %}
-
-
- {% include 'profile/' ~ profileView ~ '.tpl' %} +
+
+
+ {% if not profileHidden %} +
+ {% if profileView != (noUserpage ? 'comments' : 'index') %} +
+ +
+
+ {% endif %} + {% if profileView != 'friends' %} +
+ +
+
{{ profile.getFriends|length }}
+
+ {% endif %} + {% if profileView != 'groups' %} +
+ +
+
0
+ +
+ {% endif %} + {% if profileView != 'comments' %} +
+ +
+
{{ profile.profileComments.count }}
+ +
+ {% endif %} + {% if profileView != 'threads' %} +
+ +
+
{{ profile.forumStats.topics }}
+ +
+ {% endif %} + {% if profileView != 'posts' %} +
+ +
+
{{ profile.forumStats.posts }}
+ +
+ {% endif %} +
{% endif %} +
+
+ {% include 'profile/' ~ profileView ~ '.tpl' %} +
- {% endif %} +
{% endblock %} diff --git a/_sakura/templates/misaki/profile/hidden.tpl b/_sakura/templates/misaki/profile/hidden.tpl new file mode 100644 index 0000000..efd101c --- /dev/null +++ b/_sakura/templates/misaki/profile/hidden.tpl @@ -0,0 +1,9 @@ +
+ There are a few possible reasons for this: +
    +
  • They changed their username.
    • +
  • They may have been abyss'd.
    • +
  • You made a typo.
    • +
  • They never existed.
    • +
+
diff --git a/public/content/data/misaki/css/misaki.css b/public/content/data/misaki/css/misaki.css index 3a8393a..407d4bb 100755 --- a/public/content/data/misaki/css/misaki.css +++ b/public/content/data/misaki/css/misaki.css @@ -321,7 +321,7 @@ a:active { #content > #navigation .nav-avatar { height: 30px; width: 30px; - background: url('/pixel.png') no-repeat scroll left center / contain transparent; + background: url('/pixel.png') no-repeat scroll left center / cover transparent; } #content > #navigation > ul > li > ul { @@ -418,7 +418,7 @@ a:active { .profile > .profileHeader > .userAvatar { font-size: 0; - background: transparent no-repeat scroll left center / contain; + background: transparent no-repeat scroll left center / cover; height: 200px; width: 200px; border-radius: 2px; diff --git a/public/imageserve.php b/public/imageserve.php index 793ca7b..afd276c 100755 --- a/public/imageserve.php +++ b/public/imageserve.php @@ -40,7 +40,7 @@ if (isset($_GET['m'])) { ); // If ?u= isn't set or if it isn't numeric - if (!isset($_GET['u']) || !is_numeric($_GET['u']) || $_GET['u'] == 0) { + if (!isset($_GET['u']) || !is_numeric($_GET['u'])) { $serveImage = $noAvatar; break; }