flash/sakura
flash/sakura
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A few fixes to Misaki

Browse source
This commit is contained in:
flash 2015-11-07 14:24:02 +01:00
parent fb29f726c3
commit 2e6158d027
2 changed files with 117 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
_sakura/templates/misaki/main/profile.tpl
View file

@ -66,63 +66,80 @@
</div> </div>
<div class="profileContainer" id="profileContent"> <div class="profileContainer" id="profileContent">
<div class="userDataBar"> <div class="userDataBar">
{% if not profileHidden and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %} {% if not profileHidden %}
<div class="profilePlatform hierarchyContainer"> {% if (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
<div class="inner"> <div class="profilePlatform hierarchyContainer">
<ul class="hierarchies"> <div class="inner">
{% if profile.checkPremium[0] %} <ul class="hierarchies">
<li class="tenshi">Tenshi</li> {% if profile.checkPremium[0] %}
{% endif %} <li class="tenshi">Tenshi</li>
{% if profile.checkPermission('MANAGE', 'USE_MANAGE') %} {% endif %}
<li class="staff">Staff</li> {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %}
{% endif %} <li class="staff">Staff</li>
{% if false %} {% endif %}
<li class="developer">Developer</li> {% if false %}
{% endif %} <li class="developer">Developer</li>
{% if false %} {% endif %}
<li class="alumnii">Alumnii</li> {% if false %}
{% endif %} <li class="alumnii">Alumnii</li>
</ul> {% endif %}
</ul>
</div>
</div> </div>
</div> {% endif %}
<div class="profilePlatform userAccounts"> {% if session.checkLogin %}
<div class="inner"> <div class="profilePlatform userActions">
{% if session.checkLogin %} <div class="inner">
{% if profile.profileFields %} <ul class="actions">
{% for name,field in profile.profileFields %} {% if user.data.user_id == profile.data.user_id %}
<div class="field"> <li class="edit"><a title="Edit your profile" href="{{ urls.format('SETTING_MODE', ['general', 'profile']) }}">Edit</a></li>
<div>{{ field.name }}</div> <li class="settings"><a title="Change your settings" href="{{ urls.format('SETTINGS_INDEX') }}">Settings</a></li>
<div>
{% if name == 'youtube' %}
<a href="https://youtube.com/{% if field.youtubetype == 'true' %}channel{% else %}user{% endif %}/{{ field.value }}" class="default">{% if field.youtubetype == 'true' %}{{ profile.data.username }}'s Channel{% else %}{{ field.value }}{% endif %}</a>
{% else %} {% else %}
{% if field.islink %} <li class="{% if user.checkFriends(profile.data.user_id) == 2 %}mutualFriend{% elseif user.checkFriends(profile.data.user_id) == 1 %}pendingFriend{% else %}addFriend{% endif %}"><a href="{% if user.checkFriends(profile.data.user_id) == 0 %}{{ urls.format('FRIEND_ADD', [profile.data.user_id, php.sessionid, php.time, sakura.currentPage]) }}{% else %}{{ urls.format('FRIEND_REMOVE', [profile.data.user_id, php.sessionid, php.time, sakura.currentPage]) }}{% endif %}">{% if user.checkFriends(profile.data.user_id) == 0 %}Add friend{% else %}Friends{% endif %}</a></li>
<a href="{{ field.link }}"> <li class="report"><a href="{{ urls.format('USER_REPORT', [profile.data.user_id]) }}">Report</a></li>
{% endif %}
{{ field.value }}
{% if field.islink %}
</a>
{% endif %}
{% endif %} {% endif %}
</ul>
</div>
</div>
{% endif %}
<div class="profilePlatform userAccounts">
<div class="inner">
{% if session.checkLogin %}
{% if profile.profileFields %}
{% for name,field in profile.profileFields %}
<div class="field">
<div>{{ field.name }}</div>
<div>
{% if name == 'youtube' %}
<a href="https://youtube.com/{% if field.youtubetype == 'true' %}channel{% else %}user{% endif %}/{{ field.value }}" class="default">{% if field.youtubetype == 'true' %}{{ profile.data.username }}'s Channel{% else %}{{ field.value }}{% endif %}</a>
{% else %}
{% if field.islink %}
<a href="{{ field.link }}">
{% endif %}
{{ field.value }}
{% if field.islink %}
</a>
{% endif %}
{% endif %}
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div> {% endfor %}
</div> {% else %}
{% endfor %} <div class="noAccounts">
<div class="fa fa-question"></div>
<div class="notif">This user has not set any links yet.</div>
</div>
{% endif %}
{% else %} {% else %}
<div class="noAccounts"> <div class="noAccounts">
<div class="fa fa-question"></div> <div class="fa fa-exclamation-circle"></div>
<div class="notif">This user has not set any links yet.</div> <div class="notif">Log in to view the full profile.</div>
</div> </div>
{% endif %} {% endif %}
{% else %} </div>
<div class="noAccounts">
<div class="fa fa-exclamation-circle"></div>
<div class="notif">Log in to view the full profile.</div>
</div>
{% endif %}
</div> </div>
</div> {% endif %}
{% endif %}
<div class="profilePlatform accountStanding"> <div class="profilePlatform accountStanding">
<div class="inner"> <div class="inner">
<div class="title">Account Standing</div> <div class="title">Account Standing</div>

56
public/content/data/misaki/css/misaki.css
View file

@ -538,13 +538,15 @@ a:active {
flex-shrink: 0; flex-shrink: 0;
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies,
#profileContent > .userDataBar > .userActions > .inner > .actions {
list-style: none; list-style: none;
font-size: 2.5em; font-size: 2.5em;
line-height: 1.2em; line-height: 1.2em;
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > li:before { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > li:before,
#profileContent > .userDataBar > .userActions > .inner > .actions > li > a:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
width: 36px; width: 36px;
padding-right: 3px; padding-right: 3px;
@ -554,6 +556,19 @@ a:active {
text-shadow: 0 0 3px #fcfcfc; text-shadow: 0 0 3px #fcfcfc;
} }
#profileContent > .userDataBar > .userActions > .inner > .actions > li > a {
display: block;
color: inherit;
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .owner {
color: #824ca0;
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .owner:before {
content: "\f0ad";
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .tenshi { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .tenshi {
color: #ee9400; color: #ee9400;
} }
@ -563,7 +578,7 @@ a:active {
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff {
color: #09f; color: #fa3703;
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff:before { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff:before {
@ -571,7 +586,7 @@ a:active {
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer {
color: #824ca0; color: #6eac0a;
} }
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer:before { #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer:before {
@ -586,6 +601,39 @@ a:active {
content: "\f005"; content: "\f005";
} }
#profileContent > .userDataBar > .userActions > .inner > .actions > .edit > a:before {
content: "\f044";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .settings > a:before {
content: "\f013";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .addFriend > a:before {
content: "\f234";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .mutualFriend > a:before {
content: "\f004";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .pendingFriend > a:before {
content: "\f006";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .mutualFriend:hover > a:before,
#profileContent > .userDataBar > .userActions > .inner > .actions > .pendingFriend:hover > a:before {
content: "\f235";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .message > a:before {
content: "\f0e0";
}
#profileContent > .userDataBar > .userActions > .inner > .actions > .report > a:before {
content: "\f06a";
}
#profileContent > .userDataBar > .userAccounts a { #profileContent > .userDataBar > .userAccounts a {
color: inherit; color: inherit;
} }