Compare commits

...

8 commits

Author SHA1 Message Date
Artemka
10646905d0
Merge f575b71bb0 into 9b220a88db 2024-11-01 14:45:35 +03:00
ayato
9b220a88db
locales/en.strings: Rephrasing some strings and grammar check (#1098)
* locales: English: fix grammar

* locales: English: fix confusing labels in the repost modal

Clarified modal phrasing when reposting a user's post. The previous wording, 'Share to user's wall,' was ambiguous and could be interpreted as either sharing to your own wall or the original user's wall. Updated the language to make it clear that the post will be shared to your wall.

---------

Co-authored-by: Vladimir Barinov <veselcraft@icloud.com>
2024-11-01 14:00:09 +03:00
ayato
d1bcdaf7d7
Link directly to interests section of the edit page in completeness gauge (#1113) 2024-11-01 13:58:14 +03:00
f83c45ead9
build(docker): remove version from compose file and add name 2024-10-31 12:58:10 +03:00
Jillian Österreich
96dad033ba
fix(theme-midnight): bump version to 0.0.3.0 2024-10-30 18:59:03 +07:00
b557f42daa
build: add additional compose file for devs 2024-10-29 22:11:06 +03:00
Jillian Österreich
250c022bde
docs(docker): improve instructions 2024-10-30 00:16:06 +07:00
Artemka
f575b71bb0 Некоторые измения в шаблонах писем (Не тестировал) 2024-07-23 19:12:46 +00:00
13 changed files with 247 additions and 207 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

View file

@ -46,17 +46,14 @@
</th>
</tr>
</table>
<table class="row">
<tr>
<th class="small-12 large-12 columns first last">
<table class="row">
<tr>
<td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer">
<tr>
<td>
@ -64,9 +61,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -74,11 +71,11 @@
</td>
</tr>
</table>
<p class="text-left">
Здравствуйте, {$name}! Вы вероятно изменили свой адрес электронной почты в OpenVK. Чтобы изменение вступило в силу, необходимо подтвердить ваш новый Email.
</p>
<table class="spacer">
<tr>
<td>
@ -86,7 +83,7 @@
</td>
</tr>
</table>
<table class="button large expand success">
<tr>
<td>
@ -94,7 +91,7 @@
<tr>
<td>
<center>
<a href="http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
<a href="https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
</center>
</td>
</tr>
@ -102,7 +99,7 @@
</td>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -110,30 +107,30 @@
</td>
</tr>
</table>
<p class="text-left">
Если кнопка не работает, вы можете попробовать скопировать и вставить эту ссылку в адресную строку вашего веб-обозревателя:
</p>
<table class="callout">
<tr>
<th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}
<a href="https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}" style="color: #000; text-decoration: none;">
https://{$_SERVER['HTTP_HOST']}/settings/change_email?key={$key}
</a>
</th>
</tr>
</table>
<p class="text-left">
Обратите внимание на то, что эту ссылку нельзя:
</p>
<ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li>
<li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li>
</ul>
<table class="callout">
<tr>
<th class="callout-inner alert">
@ -144,7 +141,7 @@
</th>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -152,11 +149,11 @@
</td>
</tr>
</table>
<p class="text-right">
С уважением, овк-тян.
</p>
<table class="spacer">
<tr>
<td>
@ -164,9 +161,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -174,7 +171,7 @@
</td>
</tr>
</table>
<p class="text-left">
<small>
Вы получили это письмо так как кто-то или вы изменили адрес электронной почты. Это не рассылка и от неё нельзя отписаться. Если вы всё равно хотите перестать получать подобные письма, деактивируйте ваш аккаунт.
@ -201,4 +198,4 @@
</tr>
</table>
</body>
</html>
</html>

View file

@ -12,7 +12,7 @@
<tr>
<td class="float-center" align="center" valign="top">
<center>
Добро пожаловать в OpenVK! Приятного времяприпровождения, надеюсь вам понравится.<br><br>Если появились вопросы, касаемые нашего сайта, пишите <a href="https://ovk.to/support?act=new">сюда</a>
Добро пожаловать в OpenVK! Приятного времяприпровождения, надеюсь вам понравится.<br><br>Если появились вопросы, касаемые нашего сайта, пишите <a href="https://{$_SERVER['HTTP_HOST']}/support?act=new">сюда</a>
</center>
</td>
</tr>

View file

@ -46,17 +46,14 @@
</th>
</tr>
</table>
<table class="row">
<tr>
<th class="small-12 large-12 columns first last">
<table class="row">
<tr>
<td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer">
<tr>
<td>
@ -64,9 +61,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -74,11 +71,11 @@
</td>
</tr>
</table>
<p class="text-left">
Здравствуйте, {$name}! Вы вероятно забыли пароль от аккаунта OpenVK? Мы идём к Вам на помощь!
</p>
<table class="spacer">
<tr>
<td>
@ -86,7 +83,7 @@
</td>
</tr>
</table>
<table class="button large expand success">
<tr>
<td>
@ -94,7 +91,7 @@
<tr>
<td>
<center>
<a href="http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={rawurlencode($key)}" align="center" class="float-center">Сбросить пароль!</a>
<a href="https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={rawurlencode($key)}" align="center" class="float-center">Сбросить пароль!</a>
</center>
</td>
</tr>
@ -102,7 +99,7 @@
</td>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -110,30 +107,30 @@
</td>
</tr>
</table>
<p class="text-left">
Если кнопка не работает, вы можете попробовать скопировать и вставить эту ссылку в адресную строку вашего веб-обозревателя:
</p>
<table class="callout">
<tr>
<th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}
<a href="https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}" style="color: #000; text-decoration: none;">
https://{$_SERVER['HTTP_HOST']}/restore?act=finish&key={$key}
</a>
</th>
</tr>
</table>
<p class="text-left">
Обратите внимание на то, что эту ссылку нельзя:
</p>
<ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li>
<li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li>
</ul>
<table class="callout">
<tr>
<th class="callout-inner alert">
@ -144,7 +141,7 @@
</th>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -152,11 +149,11 @@
</td>
</tr>
</table>
<p class="text-right">
С уважением, овк-тян.
</p>
<table class="spacer">
<tr>
<td>
@ -164,9 +161,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -174,7 +171,7 @@
</td>
</tr>
</table>
<p class="text-left">
<small>
Вы получили это письмо так как кто-то или вы отправили запрос на восстановлние пароля. Это не рассылка и от неё нельзя отписаться. Если вы всё равно хотите перестать получать подобные письма, деактивируйте ваш аккаунт.
@ -201,4 +198,4 @@
</tr>
</table>
</body>
</html>
</html>

View file

@ -46,17 +46,14 @@
</th>
</tr>
</table>
<table class="row">
<tr>
<th class="small-12 large-12 columns first last">
<table class="row">
<tr>
<td>
<center>
<img src="pictures/lock.jpeg" align="center" class="float-center" width=128 height=128 />
</center>
<table class="spacer">
<tr>
<td>
@ -64,9 +61,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -74,11 +71,11 @@
</td>
</tr>
</table>
<p class="text-left">
Здравствуйте, {$name}! Вы вероятно зарегистрировались на одном из инстансов OpenVK. Чтобы ваш аккаунт активировался, необходимо подтвердить Email.
</p>
<table class="spacer">
<tr>
<td>
@ -86,7 +83,7 @@
</td>
</tr>
</table>
<table class="button large expand success">
<tr>
<td>
@ -94,7 +91,7 @@
<tr>
<td>
<center>
<a href="http://{$_SERVER['HTTP_HOST']}/regFinish?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
<a href="https://{$_SERVER['HTTP_HOST']}/regFinish?key={rawurlencode($key)}" align="center" class="float-center">Подтвердить Email!</a>
</center>
</td>
</tr>
@ -102,7 +99,7 @@
</td>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -110,30 +107,30 @@
</td>
</tr>
</table>
<p class="text-left">
Если кнопка не работает, вы можете попробовать скопировать и вставить эту ссылку в адресную строку вашего веб-обозревателя:
</p>
<table class="callout">
<tr>
<th class="callout-inner primary">
<a href="http://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}" style="color: #000; text-decoration: none;">
http://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}
<a href="https://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}" style="color: #000; text-decoration: none;">
https://{$_SERVER['HTTP_HOST']}/regFinish?key={$key}
</a>
</th>
</tr>
</table>
<p class="text-left">
Обратите внимание на то, что эту ссылку нельзя:
</p>
<ul>
<li>Передавать другим людям (даже друзьям, питомцам, соседам, любимым девушкам)</li>
<li>Передавать другим людям (даже друзьям, питомцам, соседям, любимым девушкам)</li>
<li>Использовать, если прошло более двух дней с её генерации</li>
</ul>
<table class="callout">
<tr>
<th class="callout-inner alert">
@ -144,7 +141,7 @@
</th>
</tr>
</table>
<table class="spacer">
<tr>
<td>
@ -152,11 +149,11 @@
</td>
</tr>
</table>
<p class="text-right">
С уважением, овк-тян.
</p>
<table class="spacer">
<tr>
<td>
@ -164,9 +161,9 @@
</td>
</tr>
</table>
<hr/>
<table class="spacer">
<tr>
<td>
@ -174,7 +171,7 @@
</td>
</tr>
</table>
<p class="text-left">
<small>
Вы получили это письмо так как кто-то или вы зарегистрировались на инстансе OpenVK. Это не рассылка и от неё нельзя отписаться. Если вы всё равно хотите перестать получать подобные письма, деактивируйте ваш аккаунт.
@ -201,4 +198,4 @@
</tr>
</table>
</body>
</html>
</html>

View file

@ -202,7 +202,7 @@
{if isset($thisUser) && $user->getId() === $thisUser->getId() && sizeof($completeness->unfilled) > 0}
<br/>
<a n:if="in_array('interests', $completeness->unfilled)" href="/edit">
<a n:if="in_array('interests', $completeness->unfilled)" href="/edit?act=interests">
<img src="/assets/packages/static/openvk/img/icon1.gif" />
{_interests} (+20%)
</a>

View file

@ -1,51 +1,55 @@
# Docker
Note: `buildx` is required for building multi-arch images. See [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) for more information.
Note: If you want to build images for multiple architectures, you must use `buildx`. See [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) for more information.
If unsure, skip to single-arch image build instructions.
## Build
Note: commands below should be run from the root of the repository.
Note: **commands below must be run from the this directory** (`/install/automated/docker/`).
### Multi-arch (arm64, amd64)
Base images:
```
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/php:8.2-cli . --load -f install/automated/docker/base-php-cli.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/php:8.2-apache . --load -f install/automated/docker/base-php-apache.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/php:8.2-cli ../../.. --load -f base-php-cli.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/php:8.2-apache ../../.. --load -f base-php-apache.Dockerfile
```
DB images:
```
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/mariadb:10.9-primary . --load -f install/automated/docker/mariadb-primary.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb . --load -f install/automated/docker/mariadb-eventdb.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/mariadb:10.9-primary ../../.. --load -f mariadb-primary.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb ../../.. --load -f mariadb-eventdb.Dockerfile
```
OpenVK main image:
```
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/openvk:latest . --load -f install/automated/docker/openvk.Dockerfile
docker buildx build --platform linux/amd64,linux/arm64 -t ghcr.io/openvk/openvk/openvk:latest ../../.. --load -f openvk.Dockerfile
```
### Single-arch
Base images:
```
docker build -t ghcr.io/openvk/openvk/php:8.2-cli . -f install/automated/docker/base-php-cli.Dockerfile
docker build -t ghcr.io/openvk/openvk/php:8.2-apache . -f install/automated/docker/base-php-apache.Dockerfile
docker build -t ghcr.io/openvk/openvk/php:8.2-cli ../../.. -f base-php-cli.Dockerfile
docker build -t ghcr.io/openvk/openvk/php:8.2-apache ../../.. -f base-php-apache.Dockerfile
```
DB images:
```
docker build -t ghcr.io/openvk/openvk/mariadb:10.9-primary . -f install/automated/docker/mariadb-primary.Dockerfile
docker build -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb . -f install/automated/docker/mariadb-eventdb.Dockerfile
docker build -t ghcr.io/openvk/openvk/mariadb:10.9-primary ../../.. -f mariadb-primary.Dockerfile
docker build -t ghcr.io/openvk/openvk/mariadb:10.9-eventdb ../../.. --f mariadb-eventdb.Dockerfile
```
OpenVK main image:
```
docker build -t ghcr.io/openvk/openvk/openvk:latest . -f install/automated/docker/openvk.Dockerfile
docker build -t ghcr.io/openvk/openvk/openvk:latest ../../.. -f openvk.Dockerfile
```
## Run
If you have Docker Desktop installed, then you probably have `docker-compose` installed as well. If not, refer to [Docker Compose](https://docs.docker.com/compose/install/) for installation instructions.
If you have Docker Desktop installed, then you should have `docker compose` installed automatically. If not, refer to [Docker Compose](https://docs.docker.com/compose/install/) for installation instructions.
Before start, copy `openvk-example.yml` from the root of the repository to `openvk.yml` in this directory and edit it to your liking.
Example configurations are located in this directory for convenience. Before start, copy `openvk.example.yml` to `openvk.yml`, then `chandler.example.yml` to `chandler.yml` and edit them to your liking.
Then, obtain `chandler-example.yml` from [chandler repository](https://github.com/openvk/chandler/blob/master/chandler-example.yml) and place it in this directory as well.
Start is simple as `docker-compose up -d`. You can also use `docker-compose up` to see logs.
Start is simple as `docker compose up -d`. You can also use `docker compose up` to see logs.
- OpenVK will be available at `http://localhost:8080/`.
- PHPMyAdmin will be available at `http://localhost:8081/`.
- Adminer will be available at `http://localhost:8082/`.
### Running in development environment
By using additional `docker-compose.dev.yml` file you can develop OpenVK in Docker with automatic updates as you edit and save your code. Simply run:
```
docker compose -f docker-compose.yml -f docker-compose.dev.yml up --watch
```

View file

@ -0,0 +1,20 @@
services:
openvk:
build:
context: ../../..
dockerfile: install/automated/docker/openvk.Dockerfile
develop:
watch:
- path: ../../..
action: sync
target: /opt/chandler/extensions/available/openvk
ignore:
- vendor/
- path: ../../../composer.json
action: rebuild
- path: ../../../composer.lock
action: rebuild
- path: ../../../Web/static/js/package-lock.json
action: rebuild
- path: ../../../Web/static/js/package.json
action: rebuild

View file

@ -1,4 +1,4 @@
version: '3.7'
name: openvk
services:
openvk:

View file

@ -111,7 +111,7 @@
"relationship_4" = "Married";
"relationship_5" = "In a civil marriage";
"relationship_6" = "In love";
"relationship_7" = "Everything is complicated";
"relationship_7" = "It's complicated";
"relationship_8" = "Actively searching";
/* xd */
@ -122,7 +122,7 @@
"relationship_6_prefix" = "with";
"relationship_7_prefix" = "with";
"politViews" = "Polit. Views";
"politViews" = "Political views";
"politViews_0" = "Not Selected";
"politViews_1" = "Indifferent";
@ -156,7 +156,7 @@
"updated_at" = "Updated at $1";
"user_banned" = "Unfortunately, we had to block the <b>$1</b> user page.";
"user_banned" = "Unfortunately, we had to block <b>$1's</b> user page.";
"user_banned_comment" = "Moderator's comment:";
"verified_page" = "Verified page";
"user_is_blocked" = "User is blocked";
@ -201,11 +201,11 @@
"pin" = "Pin";
"unpin" = "Unpin";
"pinned" = "pinned";
"comments_tip" = "Be first, who leaves a comment at this post!";
"comments_tip" = "Be the first to leave a comment on this post!";
"your_comment" = "Your comment";
"auditory" = "Auditory";
"in_wall" = "to user's wall";
"in_group" = "to group";
"in_wall" = "to my wall";
"in_group" = "to a group";
"shown" = "Shown";
"x_out_of" = "$1 of";
"wall_zero" = "no posts";
@ -236,7 +236,7 @@
"no_posts_abstract" = "Nobody wrote anything here... So far.";
"attach_no_longer_available" = "This attachment is no longer available.";
"open_post" = "Open post";
"version_incompatibility" = "This attachment could not be displayed. Probably the database is incompatible with the current version of OpenVK.";
"version_incompatibility" = "This attachment could not be displayed. Probably because the database is incompatible with the current version of OpenVK.";
"graffiti" = "Graffiti";
@ -317,8 +317,8 @@
"create_group" = "Create group";
"group_managers" = "Managers";
"group_type" = "Group type";
"group_type_open" = "This is an open group, anyone can enter it.";
"group_type_closed" = "This is an closed group. To enter, you must submit an request.";
"group_type_open" = "This is an open group. Anyone can enter it.";
"group_type_closed" = "This is a closed group. To enter, you must submit a request.";
"creator" = "Creator";
"administrators" = "Administrators";
"add_to_left_menu" = "Add to left menu";
@ -357,12 +357,12 @@
"suggested_by_everyone_many" = "$1 suggested posts";
"suggested_by_everyone_other" = "$1 suggested posts";
"group_hide_from_global_feed" = "Don't display posts in the global feed";
"suggested_posts_by_you" = "Suggested posts by you";
"group_hide_from_global_feed" = "Don't display posts in global feed";
"suggested_posts_by_you" = "Your suggested posts";
"suggested_posts_by_everyone" = "Suggested posts";
"suggested" = "Suggested";
"suggested_posts_everyone" = "Suggested by users posts";
"no_suggested_posts_by_you" = "You haven't suggested posts to this group yet.";
"suggested_posts_everyone" = "Posts suggested by users";
"no_suggested_posts_by_you" = "You haven't suggested any post to this group yet.";
"no_suggested_posts_by_people" = "No posts have been suggested to this group yet.";
"publish_suggested" = "Accept";
@ -377,23 +377,24 @@
"suggested_posts_in_group_many" = "This group has $1 suggested posts";
"suggested_posts_in_group_other" = "This group has $1 suggested posts";
"suggested_posts_in_group_by_you_zero" = "You haven't suggested any posts to this group";
"suggested_posts_in_group_by_you_zero" = "You haven't suggested any post to this group";
"suggested_posts_in_group_by_you_one" = "You suggested one post to this group";
"suggested_posts_in_group_by_you_few" = "You suggested $1 posts to this group";
"suggested_posts_in_group_by_you_many" = "You suggested $1 posts to this group";
"suggested_posts_in_group_by_you_other" = "You suggested $1 posts to this group";
"suggestion_succefully_published" = "Post successfully published";
"suggestion_succefully_declined" = "Post successfully declined";
"suggestion_press_to_go" = "Click to show it";
"suggestion_successfully_published" = "Post successfully published";
"suggestion_successfully_declined" = "Post successfully declined";
"suggestion_press_to_go" = "Go to post";
"error_declining_invalid_post" = "Error when declining post: post does not exists";
"error_declining_not_suggested_post" = "Error when declining post: post is not suggested";
"error_declining_declined_post" = "Error when declining post: post is already declined";
"error_declining_invalid_post" = "The suggested post you attempted to decline is invalid";
"error_declining_not_suggested_post" = "The post you attempted to decline is not suggested";
"error_declining_declined_post" = "This suggested post has already been declined";
"error_accepting_invalid_post" = "The suggested post you attempted to accept is invalid";
"error_accepting_not_suggested_post" = "The post you attempted to accept is not suggested";
"error_accepting_declined_post" = "This suggested post has already been declined";
"error_accepting_invalid_post" = "Error when accepting post: post does not exists";
"error_accepting_not_suggested_post" = "Error when accepting post: post is not suggested";
"error_accepting_declined_post" = "Error when accepting post: cant accept declined post";
"statistics" = "Statistics";
"group_administrators_list" = "Admins list";
"group_display_only_creator" = "Display only group creator";
@ -483,6 +484,7 @@
"deleting_avatar" = "Deleting photo";
"deleting_avatar_sure" = "Do you sure you want to delete avatar?";
"deleted_avatar_notification" = "Picture deleted successfully";
"save_changes" = "Save changes";
"upd_m" = "updated his profile picture";
@ -493,7 +495,7 @@
"add_photos" = "Add photos";
"upload_picts" = "Upload photos";
"end_uploading" = "Finish uploading";
"photos_successfully_uploaded" = "Photos successfully uploaded";
"photos_successfully_uploaded" = "Photos uploaded successfully";
"click_to_go_to_album" = "Click here to go to album.";
"error_uploading_photo" = "Error when uploading photo";
"too_many_pictures" = "No more than 10 pictures";
@ -553,10 +555,10 @@
"error_attaching_note" = "Error when attaching note";
"select_or_create_new" = "Select existing note or <a href='/notes/create'>create new one</a>";
"select_or_create_new" = "Select an existing note or <a href='/notes/create'>create a new one</a>";
"notes_closed" = "You can't attach note to post, because only you can see them.<br> You can change it in <a href=\"/settings?act=privacy\">settings</a>.";
"do_not_attach_note" = "Do not attach note";
"notes_closed" = "You can't attach a note to the post because only you can see them.<br> You can change this in <a href=\"/settings?act=privacy\">settings</a>.";
"do_not_attach_note" = "Do not attach a note";
"something" = "Something";
"supports_xhtml" = "from (X)HTML supported.";
@ -579,15 +581,15 @@
"my_feed" = "My Feed";
"my_feedback" = "My Feedback";
"my_settings" = "My Settings";
"bug_tracker" = "Bug-tracker";
"bug_tracker" = "Bug Tracker";
"menu_settings" = "Settings";
"menu_login" = "Login";
"menu_registration" = "Registration";
"menu_registration" = "Register";
"menu_help" = "Help";
"menu_logout" = "Logout";
"menu_logout" = "Log out";
"menu_support" = "Support";
"header_home" = "home";
@ -849,16 +851,16 @@
"limits" = "Limits";
"select_audio" = "Select audio from your computer";
"audio_requirements" = "Audio must be between $1 seconds to $2 minutes, weights to $3 MB and contain audio stream.";
"audio_requirements_2" = "Audio must not infringe copyright and related rights";
"you_can_also_add_audio_using" = "You can also add audio from among the files you have already downloaded using";
"audio_requirements" = "Audio must be between $1 seconds and $2 minutes, with a file size up to $3 MB, and contain an audio stream.";
"audio_requirements_2" = "Audio must not infringe copyright and related rights.";
"you_can_also_add_audio_using" = "You can also add audio from files you have already downloaded using";
"search_audio_inst" = "audios search";
"audio_embed_not_found" = "Audio not found";
"audio_embed_deleted" = "Audio was deleted";
"audio_embed_withdrawn" = "The audio was withdrawn at the request of the copyright holder";
"audio_embed_deleted" = "Audio has been deleted";
"audio_embed_withdrawn" = "The audio has been withdrawn at the request of the copyright holder";
"audio_embed_forbidden" = "The user's privacy settings do not allow this audio to be embedded";
"audio_embed_processing" = "Audio is still being processed, or has not been processed correctly.";
"audio_embed_processing" = "Audio is still being processed or has not been processed correctly.";
"audios_count_zero" = "No audios";
"audios_count_one" = "One audio";
@ -871,7 +873,7 @@
"my_music" = "My music";
"music_user" = "User's music";
"music_club" = "Club's music";
"music_club" = "Group's music";
"audio_new" = "New";
"audio_popular" = "Popular";
"audio_search" = "Search";
@ -914,19 +916,19 @@
"delete_playlist" = "Delete playlist";
"playlist_cover" = "Playlist cover";
"playlists_user" = "Users playlists";
"playlists_club" = "Groups playlists";
"playlists_user" = "User's playlists";
"playlists_club" = "Group's playlists";
"change_cover" = "Change cover";
"playlist_cover" = "Playlist's cover";
"minutes_count_zero" = "lasts no minutes";
"minutes_count_one" = "lasts one minute";
"minutes_count_few" = "lasts $1 minutes";
"minutes_count_many" = "lasts $1 minutes";
"minutes_count_other" = "lasts $1 minutes";
"minutes_count_zero" = "Lasts no minutes";
"minutes_count_one" = "Lasts one minute";
"minutes_count_few" = "Lasts $1 minutes";
"minutes_count_many" = "Lasts $1 minutes";
"minutes_count_other" = "Lasts $1 minutes";
"listens_count_zero" = "no listens";
"listens_count_one" = "one listen";
"listens_count_zero" = "No listens";
"listens_count_one" = "One listen";
"listens_count_few" = "$1 listens";
"listens_count_many" = "$1 listens";
"listens_count_other" = "$1 listens";
@ -949,7 +951,7 @@
"audio_successfully_uploaded" = "Audio has been successfully uploaded and is currently being processed.";
"broadcast_audio" = "Broadcast audio to status";
"sure_delete_playlist" = "Do you sure want to delete this playlist?";
"sure_delete_playlist" = "Are you sure you want to delete this playlist?";
"edit_audio" = "Edit audio";
"audios_group" = "Audios from group";
"playlists_group" = "Playlists from group";
@ -1057,7 +1059,7 @@
"coins_count" = "Number of votes";
"message" = "Message";
"failed_to_tranfer_points" = "Failed to transfer votes";
"failed_to_transfer_points" = "Failed to transfer votes";
"points_transfer_successful" = "You have successfully transferred <b>$1</b> to <b><a href=\"$2\">$3</a></b>.";
"not_all_information_has_been_entered" = "Not all information has been entered.";
@ -1076,8 +1078,8 @@
"apply_voucher" = "Apply voucher";
"failed_to_increase_rating" = "Failed to increase rating";
"rating_increase_successful" = "You have successfully increased rating of <b><a href=\"$1\">$2</a></b> by <b>$3%</b>.";
"negative_rating_value" = "We cannot steal rating from another person, sorry.";
"rating_increase_successful" = "You have successfully increased the rating of <b><a href=\"$1\">$2</a></b> by <b>$3%</b>.";
"negative_rating_value" = "You can't steal ratings from another person.";
"increased_your_rating_by" = "increased your rating by";
@ -1138,43 +1140,43 @@
"app_withdrawal_empty" = "Sorry, withdrawal of emptiness is not possible.";
"app_withdrawal_created" = "A request to withdraw $1 votes has been created. Awaiting crediting.";
"appjs_payment" = "Purchase payment";
"appjs_payment" = "Purchase Payment";
"appjs_payment_intro" = "You are about to pay for an order in the application";
"appjs_order_items" = "Order items";
"appjs_payment_total" = "Total amount payable";
"appjs_payment_confirm" = "Pay";
"appjs_err_funds" = "Failed to pay: insufficient funds.";
"appjs_wall_post" = "Publish a post";
"appjs_wall_post" = "Publish a Post";
"appjs_wall_post_desc" = "wants to publish a post on your wall";
"appjs_act_friends" = "your Friends";
"appjs_act_friends" = "Your Friends";
"appjs_act_friends_desc" = "add users as friends and read your friends list";
"appjs_act_wall" = "your Wall";
"appjs_act_wall" = "Your Wall";
"appjs_act_wall_desc" = "see your news, your wall and create posts on it";
"appjs_act_messages" = "your Messages";
"appjs_act_messages" = "Your Messages";
"appjs_act_messages_desc" = "read and write messages on your behalf";
"appjs_act_groups" = "your Groups";
"appjs_act_groups_desc" = "see a list of your groups and subscribe you to other";
"appjs_act_likes" = "Likes feature";
"appjs_act_groups" = "Your Groups";
"appjs_act_groups_desc" = "see a list of your groups and subscribe you to others";
"appjs_act_likes" = "Likes Feature";
"appjs_act_likes_desc" = "give and take away likes to posts";
"appjs_act_request" = "Access request";
"appjs_act_request" = "Access Request";
"appjs_act_requests" = "requests access to";
"appjs_act_can" = "The app will be able to";
"appjs_act_allow" = "Allow";
"appjs_act_disallow" = "Disallow";
"app_uninstalled" = "Application is disabled";
"app_uninstalled" = "Application Disabled";
"app_uninstalled_desc" = "It will no longer be able to perform actions on your behalf.";
"app_err_not_found" = "Application not found";
"app_err_not_found" = "Application Not Found";
"app_err_not_found_desc" = "Incorrect identifier or it has been disabled.";
"app_err_forbidden_desc" = "This application is not yours.";
"app_err_url" = "Incorrect address";
"app_err_url_desc" = "The address of the application did not pass the check, make sure it is correct.";
"app_err_ava" = "Unable to upload an avatar";
"app_err_ava_desc" = "Avatar too big or wrong: general error #$res.";
"app_err_note" = "Failed to attach a news note";
"app_err_forbidden_desc" = "This application does not belong to you.";
"app_err_url" = "Incorrect Address";
"app_err_url_desc" = "The address of the application did not pass the check; make sure it is correct.";
"app_err_ava" = "Unable to Upload an Avatar";
"app_err_ava_desc" = "Avatar is too big or incorrect: general error #$res.";
"app_err_note" = "Failed to Attach a News Note";
"app_err_note_desc" = "Make sure the link is correct and the note belongs to you.";
"learn_more" = "Learn more";
@ -1182,7 +1184,7 @@
/* Support */
"support_opened" = "Opened";
"support_answered" = "With a response";
"support_answered" = "Has a response";
"support_closed" = "Closed";
"support_ticket" = "Ticket";
"support_tickets" = "Tickets";
@ -1190,28 +1192,28 @@
"support_status_1" = "There's a response";
"support_status_2" = "Closed";
"support_greeting_hi" = "Greetings, $1!";
"support_greeting_regards" = "Best regards,<br/>$1 support team.";
"support_greeting_regards" = "Best regards,<br/>$1 Support Team.";
"support_faq" = "Frequently Asked Questions";
"support_list" = "List of tickets";
"support_new" = "New ticket";
"support_list" = "List of Tickets";
"support_new" = "New Ticket";
"support_new_title" = "Enter the topic of your ticket";
"support_new_content" = "Describe the issue or suggestion";
"reports" = "Reports";
"support_rate_good_answer" = "This is good answer";
"support_rate_bad_answer" = "This is bad answer";
"support_good_answer_user" = "You left a positive feedback.";
"support_bad_answer_user" = "You left a negative feedback.";
"support_good_answer_agent" = "User left a positive feedback.";
"support_bad_answer_agent" = "User left a negative feedback.";
"support_rated_good" = "You left a positive feedback about the answer.";
"support_rated_bad" = "You left a negative feedback about the answer.";
"support_rate_good_answer" = "This is a good answer";
"support_rate_bad_answer" = "This is a bad answer";
"support_good_answer_user" = "You left positive feedback.";
"support_bad_answer_user" = "You left negative feedback.";
"support_good_answer_agent" = "User left positive feedback.";
"support_bad_answer_agent" = "User left negative feedback.";
"support_rated_good" = "You left positive feedback about the answer.";
"support_rated_bad" = "You left negative feedback about the answer.";
"wrong_parameters" = "Invalid request parameters.";
"fast_answers" = "Fast answers";
"fast_answers" = "Quick Answers";
"ignore_report" = "Ignore report";
"report_number" = "Report #";
@ -1306,7 +1308,7 @@
"poll_editor_tips" = "Pressing backspace in empty option will remove it. Use Tab/Enter (in last option) to create new options faster.";
"poll_embed" = "Embed code";
"poll_voter_count_zero" = "Be <b>the first one</b> to vote!";
"poll_voter_count_zero" = "Be <b>the first</b> to vote!";
"poll_voter_count_one" = "<b>Only one</b> user voted.";
"poll_voter_count_few" = "<b>$1</b> users voted.";
"poll_voter_count_many" = "<b>$1</b> users voted.";
@ -1333,7 +1335,7 @@
"messages_other" = "$1 messages";
"topic_messages_count_zero" = "Topic has no messages";
"topic_messages_count_one" = "There are one message in the topic";
"topic_messages_count_one" = "There is one message in the topic";
"topic_messages_count_other" = "There are $1 messages in the topic";
"replied" = "replied";
@ -1399,7 +1401,7 @@
"photo_saved" = "Photo saved";
"photo_saved_comment" = "New profile picture will appear on your page";
"shared_succ" = "The post will appear on your wall. Click on the notification to go to your wall.";
"shared_succ" = "The post will appear on your wall. Click on this notification to go there.";
"invalid_email_address" = "Invalid Email address";
"invalid_email_address_comment" = "The Email you entered is not correct.";

View file

@ -1,7 +1,7 @@
.page_header {
background-image: url('/themepack/midnight/0.0.2.9/resource/xheader.png') !important;
background-image: url('/themepack/midnight/0.0.3.0/resource/xheader.png') !important;
}
.page_custom_header {
background-image: url('/themepack/midnight/0.0.2.9/resource/xheader_custom.png') !important;
background-image: url('/themepack/midnight/0.0.3.0/resource/xheader_custom.png') !important;
}

View file

@ -9,7 +9,8 @@ html {
body,
#backdropDripper,
#standaloneCommentBox,
.ovk-photo-view {
.ovk-photo-view,
.articleView {
background-color: #0e0b1a;
color: #c6d2e8;
}
@ -23,7 +24,8 @@ span,
.crp-entry--message---text,
.messenger-app--messages---message .time,
.navigation-lang .link_new,
.tippy-box text {
.tippy-box text,
.articleView_author > div > span > a {
color: #8b9ab5 !important;
}
@ -130,10 +132,19 @@ th,
.borderup,
#tour,
#auth,
.ovk-photo-view {
.ovk-photo-view,
.page_wrap_content_main .def_row_content,
.topGrayBlock,
.bigPlayer {
border-color: #2c2640 !important;
}
.post-upload,
.post-has-poll,
.post-has-note {
color: #777;
}
.tippy-box[data-theme~="vk"][data-placement^='top']>.tippy-arrow::before,
.tippy-box[data-theme~="vk"][data-placement^='bottom']>.tippy-arrow::before {
border-top-color: #1e1a2b;
@ -154,22 +165,28 @@ hr {
.messagebox-content-header,
.accent-box,
.button_search,
.search_box_button {
.header_navigation #search_box .search_box_button {
background-color: #383052;
}
.header_navigation #search_box .search_box_button {
box-shadow: 0px 2px 0px 0px rgb(70, 63, 96) inset;
}
.search_option_name {
background-color: #383052 !important;
color: lightgrey !important;
}
.tab:hover {
.tab:hover,
.ntSelect:hover {
background-color: #40375e;
}
.menu_divider,
.ovk-diag-action,
.minilink .counter {
.minilink .counter,
.topGrayBlock {
background-color: #2c2640;
}
@ -266,7 +283,8 @@ center[style="background: white;border: #DEDEDE solid 1px;"],
td.e,
tr.e,
.playlistListView:hover,
.playlistListView .playlistCover {
.playlistListView .playlistCover,
.photosInsert > div {
background-color: #231e33 !important;
}
@ -295,11 +313,11 @@ tr.v,
}
.content_title_expanded {
background-image: url("/themepack/midnight/0.0.2.9/resource/flex_arrow_open.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/flex_arrow_open.png") !important;
}
.content_title_unexpanded {
background-image: url("/themepack/midnight/0.0.2.9/resource/flex_arrow_shut.gif") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/flex_arrow_shut.gif") !important;
}
.ovk-video>.preview,
@ -326,17 +344,17 @@ tr.h {
.page_yellowheader {
color: #c6d2e8;
background-image: url("/themepack/midnight/0.0.2.9/resource/header_purple.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/header_purple.png") !important;
background-color: #231f34;
border-color: #231f34;
}
.page_header {
background-image: url("/themepack/midnight/0.0.2.9/resource/header.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/header.png") !important;
}
.page_custom_header {
background-image: url("/themepack/midnight/0.0.2.9/resource/header_custom.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/header_custom.png") !important;
}
.page_yellowheader span,
@ -374,11 +392,11 @@ select,
}
input[type="checkbox"] {
background-image: url("/themepack/midnight/0.0.2.9/resource/checkbox.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/checkbox.png") !important;
}
input[type="radio"] {
background-image: url("/themepack/midnight/0.0.2.9/resource/radio.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/radio.png") !important;
}
.header_navigation .link, .header_navigation .header_divider_stick {
@ -386,20 +404,20 @@ input[type="radio"] {
}
.heart {
background-image: url("/themepack/midnight/0.0.2.9/resource/like.gif") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/like.gif") !important;
}
.pinned-mark,
.post-author .pin {
background-image: url("/themepack/midnight/0.0.2.9/resource/pin.png") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/pin.png") !important;
}
.repost-icon {
background-image: url("/themepack/midnight/0.0.2.9/resource/published.gif") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/published.gif") !important;
}
.post-author .delete {
background-image: url("/themepack/midnight/0.0.2.9/resource/input_clear.gif") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/input_clear.gif") !important;
}
.user-alert {
@ -432,7 +450,7 @@ input[type="radio"] {
}
#backdropEditor {
background-image: url("/themepack/midnight/0.0.2.9/resource/backdrop-editor.gif") !important;
background-image: url("/themepack/midnight/0.0.3.0/resource/backdrop-editor.gif") !important;
border-color: #473e66 !important;
}
@ -485,7 +503,8 @@ input[type="radio"] {
background: #19142D !important;
}
.audioEntry .performer a {
.audioEntry .performer a,
.bigPlayer .paddingLayer .trackInfo a {
color: #a2a1a1 !important;
}
@ -591,3 +610,7 @@ ul {
background: #28223a;
border: #2c2640 solid 1px;
}
#backdropFilePicker {
margin: 15px !important;
}

View file

@ -1,5 +1,5 @@
id: midnight
version: "0.0.2.9"
version: "0.0.3.0"
openvk_version: 0
enabled: 1
metadata: