flashii/misuzu
flashii/misuzu
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed static.flash.moe references (topic left overs are up for redesign).

Browse source
This commit is contained in:
flash 2018-10-02 19:31:33 +02:00
parent fd1a2fd76e
commit 5097cb812a
15 changed files with 44 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets/less/classes/flag.less
View file

@ -9,7 +9,7 @@
display: inline-block;
width: @flag-width;
height: @flag-height;
background-image: url('https://static.flash.moe/images/flag-sprite.png');
background-image: url('/images/flag-sprite.png');
background-repeat: no-repeat;
font-size: 0;
.flag-position(23, 23); // xx

13
assets/less/classes/header.less
View file

@ -29,12 +29,13 @@
height: 40px;
&--menu {
background-image: url('https://static.flash.moe/images/mobile-menu.png');
background-size: 40px;
font-size: 3em;
justify-content: center;
align-items: center;
}
@media (max-width: @site-mobile-width) {
display: block;
display: inline-flex;
}
}
@ -44,14 +45,14 @@
text-decoration: none;
cursor: pointer;
display: block;
background: url('https://static.flash.moe/images/imouto-transparent.png') no-repeat center / cover;
background-image: url('https://static.flash.moe/images/imouto-halloween.png');
background: url('/images/logos/imouto-default.png') no-repeat center / cover;
background-image: url('/images/logos/imouto-halloween.png');
width: 60px;
height: 60px;
font-size: 0;
&--manage {
background-image: url('https://static.flash.moe/images/imouto-broom.png');
background-image: url('/images/logos/imouto-broom.png');
}
@media (max-width: @site-mobile-width) {

2
assets/less/classes/usercard.less
View file

@ -129,7 +129,7 @@
}
&--donator {
background-image: url('https://static.flash.moe/images/tenshi.png');
//background-image: url('/images/tenshi.png');
width: 37px;
height: 11px;
font-size: 0;

20
assets/less/main.less
View file

@ -67,26 +67,6 @@ body {
&--legacy {
--background-color: #fbeeff;
}
&--bg-blend {
background-blend-mode: multiply;
}
/*&--bg-slide {
}*/
&--bg-cover {
background-repeat: no-repeat;
}
&--bg-stretch {
background-size: 100% 100%;
background-repeat: no-repeat;
}
&--bg-tile {
background-repeat: repeat;
}
}
// Input elements

BIN
public/images/flag-sprite.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 81 KiB

BIN
public/images/logos/imouto-broom.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 51 KiB

BIN
public/images/logos/imouto-default.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
public/images/logos/imouto-halloween.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 48 KiB

79
public/settings.php
View file

@ -156,7 +156,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
switch ($_POST['background']['mode'] ?? '') {
case 'delete':
user_background_delete($settingsUserId);
user_background_set_settings($settingsUserId, MSZ_USER_BACKGROUND_ATTACHMENT_NONE);
break;
case 'upload':
@ -165,55 +164,40 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
break;
}
if (empty($_POST['background'])
|| !is_array($_POST['background'])) {
if (empty($_FILES['background'])
|| !is_array($_FILES['background'])
|| empty($_FILES['background']['name']['file'])) {
break;
}
if (!empty($_FILES['background']['name']['file'])) {
if ($_FILES['background']['error']['file'] !== UPLOAD_ERR_OK) {
$settingsErrors[] = sprintf(
MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload'][$_FILES['background']['error']['file']]
?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload']['_'],
$_FILES['background']['error']['file'],
byte_symbol($backgroundProps['max_size'], true),
$backgroundProps['max_width'],
$backgroundProps['max_height']
);
break;
}
$setBackground = user_background_set_from_path(
$settingsUserId,
$_FILES['background']['tmp_name']['file'],
$backgroundProps
if ($_FILES['background']['error']['file'] !== UPLOAD_ERR_OK) {
$settingsErrors[] = sprintf(
MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload'][$_FILES['background']['error']['file']]
?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['upload']['_'],
$_FILES['background']['error']['file'],
byte_symbol($backgroundProps['max_size'], true),
$backgroundProps['max_width'],
$backgroundProps['max_height']
);
if ($setBackground !== MSZ_USER_BACKGROUND_NO_ERRORS) {
$settingsErrors[] = sprintf(
MSZ_TMP_USER_ERROR_STRINGS['avatar']['set'][$setBackground]
?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['set']['_'],
$setBackground,
byte_symbol($backgroundProps['max_size'], true),
$backgroundProps['max_width'],
$backgroundProps['max_height']
);
}
break;
}
$backgroundSettings = in_array($_POST['background']['attach'] ?? '', MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES)
? array_flip(MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES)[$_POST['background']['attach']]
: MSZ_USER_BACKGROUND_ATTACHMENTS[0];
$setBackground = user_background_set_from_path(
$settingsUserId,
$_FILES['background']['tmp_name']['file'],
$backgroundProps
);
if (!empty($_POST['background']['attr']['blend'])) {
$backgroundSettings |= MSZ_USER_BACKGROUND_ATTRIBUTE_BLEND;
if ($setBackground !== MSZ_USER_BACKGROUND_NO_ERRORS) {
$settingsErrors[] = sprintf(
MSZ_TMP_USER_ERROR_STRINGS['avatar']['set'][$setBackground]
?? MSZ_TMP_USER_ERROR_STRINGS['avatar']['set']['_'],
$setBackground,
byte_symbol($backgroundProps['max_size'], true),
$backgroundProps['max_width'],
$backgroundProps['max_height']
);
}
if (!empty($_POST['background']['attr']['slide'])) {
$backgroundSettings |= MSZ_USER_BACKGROUND_ATTRIBUTE_SLIDE;
}
user_background_set_settings($settingsUserId, $backgroundSettings);
break;
}
}
@ -350,17 +334,11 @@ switch ($settingsMode) {
$getAccountInfo = Database::prepare(sprintf(
'
SELECT
%1$s, `email`, `user_about_content`, `user_about_parser`,
`user_background_settings` & 0x0F as `user_background_attachment`,
(`user_background_settings` & %2$d) > 0 as `user_background_attr_blend`,
(`user_background_settings` & %3$d) > 0 as `user_background_attr_slide`
SELECT %s, `email`, `user_about_content`, `user_about_parser`
FROM `msz_users`
WHERE `user_id` = :user_id
',
pdo_prepare_array($profileFields, true, '`user_%s`'),
MSZ_USER_BACKGROUND_ATTRIBUTE_BLEND,
MSZ_USER_BACKGROUND_ATTRIBUTE_SLIDE
pdo_prepare_array($profileFields, true, '`user_%s`')
));
$getAccountInfo->bindValue('user_id', $settingsUserId);
$accountInfo = $getAccountInfo->execute() ? $getAccountInfo->fetch(PDO::FETCH_ASSOC) : [];
@ -376,7 +354,6 @@ switch ($settingsMode) {
'settings_profile_fields' => $profileFields,
'settings_disable_account_options' => $disableAccountOptions,
'account_info' => $accountInfo,
'background_attachments' => MSZ_USER_BACKGROUND_ATTACHMENTS_NAMES,
]);
break;

4
templates/_layout/header.twig
View file

@ -3,7 +3,9 @@
<nav class="header">
<div class="header__wrapper">
<div class="header__icons">
<label class="header__icon header__icon--menu" for="toggle-mobile-header-menu"></label>
<label class="header__icon header__icon--menu" for="toggle-mobile-header-menu">
<i class="fas fa-bars"></i>
</label>
<a class="header__logo{% if in_manage %} header__logo--manage{% endif %}" href="/">
{{ globals.site_name }}

7
templates/errors/master.twig
View file

@ -16,12 +16,5 @@
{% endif %}
</div>
</div>
{% if error_code|default(0) >= 500 %}
<audio autoplay>
<source src="https://static.flash.moe/sounds/wbrb.ogg" type="audio/ogg">
<source src="https://static.flash.moe/sounds/wbrb.mp3" type="audio/mp3">
</audio>
{% endif %}
{% endblock %}

2
templates/master.twig
View file

@ -14,7 +14,7 @@
</style>
{% endif %}
</head>
<body class="main{% if current_user.user_background_settings is defined %} {{ current_user.user_background_settings|bg_settings('main--bg-%s')|join(' ') }}{% endif %}">
<body class="main">
{% include '_layout/header.twig' %}
<div class="main__wrapper">

18
templates/settings/account.twig
View file

@ -218,24 +218,6 @@
<li class="settings__images__requirement">May not be larger than <strong>{{ background.max_width }}x{{ background.max_height }}</strong>.</li>
<li class="settings__images__requirement">Animated gif images are <strong>not</strong> allowed.</li>
</ul>
<select name="background[attach]" class="input__select">
{% for key, value in background_attachments %}
<option value="{{ value }}"{% if account_info.user_background_attachment == key %} selected{% endif %}>
{{ value|capitalize }}
</option>
{% endfor %}
</select>
<label>
<input type="checkbox" name="background[attr][blend]"{% if account_info.user_background_attr_blend %} checked{% endif %}>
Blend
</label>
<label>
<input type="checkbox" name="background[attr][slide]"{% if account_info.user_background_attr_slide %} checked{% endif %}>
Slide
</label>
</div>
</div>

4
templates/settings/logs.twig
View file

@ -40,7 +40,7 @@
<div class="settings__login-history__column__value">
{{ attempt.attempt_ip_decoded }}
{% if attempt.attempt_country != 'XX' %}
<img class="settings__login-history__country" src="https://static.flash.moe/flags/fff/{{ attempt.attempt_country|lower }}.png" alt="{{ attempt.attempt_country }}" title="{{ attempt.attempt_country|country_name }}">
<div class="flag flag--{{ attempt.attempt_country|lower }} settings__login-history__country" title="{{ attempt.attempt_country|country_name }}"></div>
{% endif %}
</div>
</div>
@ -99,7 +99,7 @@
<div class="settings__log__column__value">
{{ log.log_ip }}
{% if log.log_country|default('XX') != 'XX' %}
<img class="settings__log__country" src="https://static.flash.moe/flags/fff/{{ log.log_country|lower }}.png" alt="{{ log.log_country }}" title="{{ log.log_country|country_name }}">
<div class="flag flag--{{ log.log_country|lower }} settings__log__country" title="{{ log.log_country|country_name }}"></div>
{% endif %}
</div>
</div>

2
templates/settings/sessions.twig
View file

@ -30,7 +30,7 @@
<div class="settings__sessions__column__value">
{{ session.session_ip_decoded }}
{% if session.session_country != 'XX' %}
<img class="settings__sessions__country" src="https://static.flash.moe/flags/fff/{{ session.session_country|lower }}.png" alt="{{ session.session_country }}" title="{{ session.session_country|country_name }}">
<div class="flag flag--{{ session.session_country|lower }} settings__sessions__country" title="{{ session.session_country|country_name }}"></div>
{% endif %}
</div>
</div>