And another test commit, this time from the Git Gui on my local machine.

This commit is contained in:
flash 2015-06-21 15:16:31 +02:00
parent a47a43fca2
commit 59661114ee
5 changed files with 33 additions and 9 deletions

View file

@ -1,8 +1,8 @@
{% if user.checklogin %}
<div class="head">Hi, {{ user.data.username }}!</div>
<a href="//{{ sakura.urls.main }}/settings/avatar"><img src="//{{ sakura.urls.main }}/a/{{ user.data.id }}" class="default-avatar-setting homepage-menu-avatar" /></a>
<ul class="panel-quick-links">
<li><a href="//{{ sakura.urls.main }}/friends" title="View friends list"><span class="fa fa-users"></span><span class="count">0</span></a></li>
<ul class="panelQuickLinks">
<li><a href="//{{ sakura.urls.main }}/friends" title="Pending friend requests"><span class="fa fa-user-plus"></span><span class="count">0</span></a></li>
<li><a href="//{{ sakura.urls.main }}/messages" title="View private messages"><span class="fa fa-envelope"></span><span class="count">0</span></a></li>
</ul>
<div class="clear"></div>

View file

@ -27,7 +27,7 @@
{% else %}
{% if profile.friend != 0 %}<a class="fa fa-{% if profile.friend == 2 %}heart{% else %}star{% endif %}" title="You are friends"></a>{% endif %}
<a class="fa fa-user-{% if profile.friend == 0 %}plus{% else %}times{% endif %}" title="{% if profile.friend == 0 %}Add {{ profile.user.username }} as a friend{% else %}Remove friend{% endif %}" href="//{{ sakura.urls.main }}/friends?{% if profile.friend == 0 %}add{% else %}remove{% endif %}={{ profile.user.id }}&amp;session={{ php.sessionid }}&amp;time={{ php.time }}&amp;redirect={{ sakura.currentpage }}" id="profileFriendToggle"></a>
<a class="fa fa-flag" title="Report {{ profile.user.username }}" href="//{{ sakura.urls.main }}/report/{{ profile.user.id }}"></a>
<a class="fa fa-flag" title="Report {{ profile.user.username }}" href="//{{ sakura.urls.main }}/u/{{ profile.user.id }}/report"></a>
{% endif %}
</div>
{% endif %}

View file

@ -499,18 +499,39 @@ a.gotop.exit {
line-height: 1.3em;
}
.indexSidePanelLinks > a {
.panelQuickLinks {
font-size: 2.5em;
list-style: none;
line-height: 2.2em;
margin: 0 !important;
padding: 6px 0 0 8px
}
.panelQuickLinks > li {
float: left;
margin: 0 10px;
}
.panelQuickLinks > li > a > .count {
font: 100 1em "SegoeUI", "Segoe UI", sans-serif;
margin-left: 6px;
}
.indexSidePanelLinks > a,
.panelQuickLinks a {
color: #8364A1;
text-decoration: none;
text-shadow: 0 0 2px #9475B2;
transition: all .2s;
}
.indexSidePanelLinks > a:hover {
.indexSidePanelLinks > a:hover,
.panelQuickLinks a:hover {
text-shadow: 0 0 6px #9475B2;
}
.indexSidePanelLinks > a:active {
.indexSidePanelLinks > a:active,
.panelQuickLinks a:active {
color: #725390;
text-shadow: 0 0 8px #8364A1;
}

View file

@ -59,6 +59,7 @@ RewriteRule ^u/([A-Za-z0-9_-\s\.]+)/groups/?$ profile.php?u=$1&view=groups [L,QS
RewriteRule ^u/([A-Za-z0-9_-\s\.]+)/friends/?$ profile.php?u=$1$view=friends [L,QSA]
RewriteRule ^u/([A-Za-z0-9_-\s\.]+)/threads/?$ profile.php?u=$1$view=threads [L,QSA]
RewriteRule ^u/([A-Za-z0-9_-\s\.]+)/posts/?$ profile.php?u=$1$view=posts [L,QSA]
RewriteRule ^u/([A-Za-z0-9_-\s\.]+)/report/?$ report.php?mode=user&id=$1 [L,QSA]
## Groups
RewriteRule ^g/?$ group.php [L,QSA]

View file

@ -16,15 +16,17 @@ $renderData['page'] = [
$renderData['contributors'] = [
'Flashwave' => ['Main developer.', 'http://flash.moe'],
'Kurasha244' => ['Writing the base for the old backend.', 'http://saibateku.net'],
'nookls' => ['Code guidance and debug help.', 'http://nookls.org'],
'MallocNull' => ['Sock Chat and debug help.', 'http://aroltd.com']
'nookls' => ['Being nookls.', 'http://nookls.org'],
'MallocNull' => ['Sock Chat and debug help.', 'http://aroltd.com'],
'kamil' => ['Pointing out mistakes and fixing them.', 'http://krakow.pw']
];
$renderData['thirdParty'] = [
'ReCAPTCHA' => ['Providing the Captcha system we use.', 'http://recaptcha.net'],
'Twig' => ['The templating engine used by Sakura.', 'http://twig.sensiolabs.org/'],
'Parsedown' => ['A PHP markdown parser.', 'http://parsedown.org/'],
'Defuse' => ['Making the PBKDF2 implementation for PHP', 'http://defuse.ca/'],
'PHPMailer' => ['Writing PHPMailer and making e-mail sending a not pain in the ass', 'https://github.com/PHPMailer/PHPMailer']
'PHPMailer' => ['Writing PHPMailer and making e-mail sending a not pain in the ass', 'https://github.com/PHPMailer/PHPMailer'],
'PayPal' => ['Making a PayPal API', 'https://paypal.com']
];
// Print page contents