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

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

@ -66,7 +66,8 @@
</div>
<div class="profileContainer" id="profileContent">
<div class="userDataBar">
{% if not profileHidden and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
{% if not profileHidden %}
{% if (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
<div class="profilePlatform hierarchyContainer">
<div class="inner">
<ul class="hierarchies">
@ -85,6 +86,22 @@
</ul>
</div>
</div>
{% endif %}
{% if session.checkLogin %}
<div class="profilePlatform userActions">
<div class="inner">
<ul class="actions">
{% if user.data.user_id == profile.data.user_id %}
<li class="edit"><a title="Edit your profile" href="{{ urls.format('SETTING_MODE', ['general', 'profile']) }}">Edit</a></li>
<li class="settings"><a title="Change your settings" href="{{ urls.format('SETTINGS_INDEX') }}">Settings</a></li>
{% else %}
<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>
<li class="report"><a href="{{ urls.format('USER_REPORT', [profile.data.user_id]) }}">Report</a></li>
{% endif %}
</ul>
</div>
</div>
{% endif %}
<div class="profilePlatform userAccounts">
<div class="inner">
{% if session.checkLogin %}

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

@ -538,13 +538,15 @@ a:active {
flex-shrink: 0;
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies {
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies,
#profileContent > .userDataBar > .userActions > .inner > .actions {
list-style: none;
font-size: 2.5em;
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";
width: 36px;
padding-right: 3px;
@ -554,6 +556,19 @@ a:active {
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 {
color: #ee9400;
}
@ -563,7 +578,7 @@ a:active {
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff {
color: #09f;
color: #fa3703;
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff:before {
@ -571,7 +586,7 @@ a:active {
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer {
color: #824ca0;
color: #6eac0a;
}
#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer:before {
@ -586,6 +601,39 @@ a:active {
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 {
color: inherit;
}