Merge b97783f144 into 4b7d2b9b17

VKAPI/Handlers/Gifts.php

@@ -37,7 +37,6 @@ final class Gifts extends VKAPIRequestHandler
 
         foreach ($user_gifts as $gift) {
             $gift_item[] = [
-                "id"        => $i,
                 "from_id"   => $gift->anon == true ? 0 : $gift->sender->getId(),
                 "message"   => $gift->caption == null ? "" : $gift->caption,
                 "date"      => $gift->sent->timestamp(),

VKAPI/Handlers/Notes.php

@@ -106,7 +106,7 @@ final class Notes extends VKAPIRequestHandler
         return 1;
     }
 
-    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10)
+    public function get(int $user_id, string $note_ids = "", int $offset = 0, int $count = 10, int $sort = 0)
     {
         $this->requireUser();
 

Web/Models/Entities/Photo.php

@@ -336,7 +336,12 @@ class Photo extends Media
 
     public function getAlbum(): ?Album
     {
-        return (new Albums())->getAlbumByPhotoId($this);
+        $album = (new Albums())->getAlbumByPhotoId($this);
+        if (!$album || $album->isDeleted()) {
+            return null;
+        }
+
+        return $album;
     }
 
     public function toVkApiStruct(bool $photo_sizes = true, bool $extended = false): object

Web/Presenters/templates/Gifts/UserGifts.xml

@@ -34,6 +34,12 @@
                     </a>
                 </td>
             </tr>
+            <tr>
+                <td><span class="nobold">{_sent}: </span></td>
+                <td>
+                    {$x->sent}
+                </td>
+            </tr>
             <tr n:if="!empty($x->caption)">
                 <td><span class="nobold">{_comment}: </span></td>
                 <td>{$x->caption}</td>

Web/Presenters/templates/Topics/Create.xml

@@ -76,14 +76,4 @@
 
         <input type="hidden" name="hash" value="{$csrfToken}" />
     </form>
-
-    <script>
-        $(document).ready(() => {
-            u("#post-buttons1 .postFileSel").on("change", function() {
-                handleUpload.bind(this, 1)();
-            });
-
-            setupWallPostInputHandlers(1);
-        });
-    </script>
 {/block}

Web/Presenters/templates/Topics/Edit.xml

@@ -33,9 +33,9 @@
                     </td>
                     <td>
                         {if $topic->getClub()->canBeModifiedBy($thisUser)}
-                            <input type="checkbox" name="pin" n:attr="checked => $topic->isPinned()" /> {_pin_topic}<br />
+                            <label><input type="checkbox" name="pin" n:attr="checked => $topic->isPinned()" /> {_pin_topic}</label><br />
                         {/if}
-                        <input type="checkbox" name="close" n:attr="checked => $topic->isClosed()" /> {_close_topic}
+                        <label><input type="checkbox" name="close" n:attr="checked => $topic->isClosed()" /> {_close_topic}</label>
                     </td>
                 </tr>
                 <tr>

Web/Presenters/templates/components/comments.xml

@@ -24,7 +24,7 @@
 {if sizeof($comments) > 0}
     <div class='scroll_container'>
         <div class='scroll_node' n:foreach="$comments as $comment">
-            {include "comment.xml", comment => $comment}
+            {include "comment.xml", comment => $comment, no_reply_button => $readOnly}
         </div>
     </div>
     <div style="margin-top: 11px;">

Web/static/css/main.css

@@ -3840,12 +3840,13 @@ hr {
     display: none;
     position: fixed;
     top: -10%;
-    background: rgba(26, 26, 26, 0.9);;
+    background: rgba(0, 0, 0, 0.8);
+    box-shadow: 0px 0px 2px 0px black;
     padding-top: 12px;
     width: 91px;
     height: 25px;
     text-align: center;
-    border-radius: 1px;
+    border-radius: 2px;
     margin: auto;
     left: 0;
     right: 0;

locales/en.strings

@@ -1200,6 +1200,7 @@
 "coins_other" = "$1 votes";
 
 "users_gifts" = "Gifts";
+"sent" = "Sent";
 
 /* Apps */
 "app" = "Application";

locales/ru.strings

@@ -1142,6 +1142,7 @@
 "coins_many" = "$1 голосов";
 "coins_other" = "$1 голосов";
 "users_gifts" = "Подарки";
+"sent" = "Отправлено";
 
 /* Apps */
 "app" = "Приложение";