From 93c2e08194af9403af86246720ea6694a4650461 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 10 Mar 2024 18:54:26 +0000 Subject: [PATCH] The "summary" has now a dedicated field when creating and editing posts --- mod/item.php | 32 +- src/Content/Conversation.php | 2 + src/Content/Feature.php | 3 +- src/Model/Item.php | 2 +- src/Module/Item/Compose.php | 4 + src/Module/Post/Edit.php | 4 +- src/Protocol/ActivityPub/Transmitter.php | 2 +- view/lang/C/messages.po | 472 ++++++++++++----------- view/templates/item/compose.tpl | 5 + view/templates/jot.tpl | 3 + view/theme/frio/css/style.css | 1 + view/theme/frio/templates/jot.tpl | 3 + view/theme/quattro/templates/jot.tpl | 3 + view/theme/smoothly/style.css | 1 + view/theme/smoothly/templates/jot.tpl | 5 + 15 files changed, 292 insertions(+), 250 deletions(-) diff --git a/mod/item.php b/mod/item.php index 5d20cc04a6..40bbcc54fb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -110,14 +110,15 @@ function item_edit(int $uid, array $request, bool $preview, string $return_path) $post = item_process($post, $request, $preview, $return_path); $fields = [ - 'title' => $post['title'], - 'body' => $post['body'], - 'attach' => $post['attach'], - 'file' => $post['file'], - 'location' => $post['location'], - 'coord' => $post['coord'], - 'edited' => DateTimeFormat::utcNow(), - 'changed' => DateTimeFormat::utcNow() + 'title' => $post['title'], + 'content-warning' => $post['content-warning'], + 'body' => $post['body'], + 'attach' => $post['attach'], + 'file' => $post['file'], + 'location' => $post['location'], + 'coord' => $post['coord'], + 'edited' => DateTimeFormat::utcNow(), + 'changed' => DateTimeFormat::utcNow() ]; $fields['body'] = Item::setHashtags($fields['body']); @@ -233,13 +234,14 @@ function item_insert(int $uid, array $request, bool $preview, string $return_pat function item_process(array $post, array $request, bool $preview, string $return_path): array { - $post['self'] = true; - $post['api_source'] = false; - $post['attach'] = ''; - $post['title'] = trim($request['title'] ?? ''); - $post['body'] = $request['body'] ?? ''; - $post['location'] = trim($request['location'] ?? ''); - $post['coord'] = trim($request['coord'] ?? ''); + $post['self'] = true; + $post['api_source'] = false; + $post['attach'] = ''; + $post['title'] = trim($request['title'] ?? ''); + $post['content-warning'] = trim($request['summary'] ?? ''); + $post['body'] = $request['body'] ?? ''; + $post['location'] = trim($request['location'] ?? ''); + $post['coord'] = trim($request['coord'] ?? ''); $post = DI::contentItem()->addCategories($post, $request['category'] ?? ''); diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 6edef06fc6..46ad721b4b 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -388,6 +388,8 @@ class Conversation '$shortnoloc' => $this->l10n->t('clear location'), '$title' => $x['title'] ?? '', '$placeholdertitle' => $this->l10n->t('Set title'), + '$summary' => $x['summary'] ?? '', + '$placeholdersummary' => Feature::isEnabled($this->session->getLocalUserId(), 'summary') ? $this->l10n->t('Set summary, abstract or spoiler text') : '', '$category' => $x['category'] ?? '', '$placeholdercategory' => Feature::isEnabled($this->session->getLocalUserId(), 'categories') ? $this->l10n->t("Categories \x28comma-separated list\x29") : '', '$scheduled_at' => Temporal::getDateTimeField( diff --git a/src/Content/Feature.php b/src/Content/Feature.php index a95d3779d3..77f9e4152a 100644 --- a/src/Content/Feature.php +++ b/src/Content/Feature.php @@ -110,7 +110,8 @@ class Feature // Item tools 'tools' => [ DI::l10n()->t('Post/Comment Tools'), - ['categories', DI::l10n()->t('Post Categories'), DI::l10n()->t('Add categories to your posts'), false, DI::config()->get('feature_lock', 'categories', false)], + ['categories', DI::l10n()->t('Post Categories'), DI::l10n()->t('Add categories to your posts'), false, DI::config()->get('feature_lock', 'categories', false)], + ['summary', DI::l10n()->t('Summary'), DI::l10n()->t('Add a summary, abstract or spoiler text to your posts'), false, DI::config()->get('feature_lock', 'summary', false)], ], // Advanced Profile Settings diff --git a/src/Model/Item.php b/src/Model/Item.php index a3a9fdb184..347ba55ce8 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -121,7 +121,7 @@ class Item const DELIVER_FIELDLIST = [ 'uid', 'id', 'parent', 'uri-id', 'uri', 'thr-parent', 'parent-uri', 'guid', 'parent-guid', 'conversation', 'received', 'created', 'edited', 'verb', 'object-type', 'object', 'target', - 'private', 'title', 'body', 'raw-body', 'language', 'location', 'coord', 'app', 'sensitive', + 'private', 'title', 'content-warning', 'body', 'raw-body', 'language', 'location', 'coord', 'app', 'sensitive', 'inform', 'deleted', 'extid', 'post-type', 'post-reason', 'gravity', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'author-id', 'author-addr', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid', diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 70f5d50ef6..9ba514ecb4 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -152,6 +152,7 @@ class Compose extends BaseModule } $title = $_REQUEST['title'] ?? ''; + $summary = $_REQUEST['summary'] ?? ''; $category = $_REQUEST['category'] ?? ''; $body = $_REQUEST['body'] ?? ''; $location = $_REQUEST['location'] ?? $user['default-location']; @@ -184,6 +185,7 @@ class Compose extends BaseModule '$l10n' => [ 'compose_title' => $compose_title, 'default' => '', + 'summary' => $this->l10n->t('Summary'), 'visibility_title' => $this->l10n->t('Visibility'), 'mytitle' => $this->l10n->t('This is you'), 'submit' => $this->l10n->t('Submit'), @@ -205,6 +207,7 @@ class Compose extends BaseModule 'location_disabled' => $this->l10n->t('Location services are disabled. Please check the website\'s permissions on your device'), 'wait' => $this->l10n->t('Please wait'), 'placeholdertitle' => $this->l10n->t('Set title'), + 'placeholdersummary' => Feature::isEnabled(DI::userSession()->getLocalUserId(), 'summary') ? $this->l10n->t('Set summary, abstract or spoiler text') : '', 'placeholdercategory' => Feature::isEnabled(DI::userSession()->getLocalUserId(),'categories') ? $this->l10n->t('Categories (comma-separated list)') : '', 'always_open_compose' => $this->pConfig->get(DI::userSession()->getLocalUserId(), 'frio', 'always_open_compose', $this->config->get('frio', 'always_open_compose', false)) ? '' : @@ -226,6 +229,7 @@ class Compose extends BaseModule ), '$created_at' => $created_at, '$title' => $title, + '$summary' => $summary, '$category' => $category, '$body' => $body, '$location' => $location, diff --git a/src/Module/Post/Edit.php b/src/Module/Post/Edit.php index 62ecedbc76..be82619dd4 100644 --- a/src/Module/Post/Edit.php +++ b/src/Module/Post/Edit.php @@ -84,7 +84,7 @@ class Edit extends BaseModule $fields = [ 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'gravity', - 'body', 'title', 'uri-id', 'wall', 'post-type', 'guid' + 'body', 'title', 'content-warning', 'uri-id', 'wall', 'post-type', 'guid' ]; $item = Post::selectFirstForUser($this->session->getLocalUserId(), $fields, [ @@ -155,6 +155,8 @@ class Edit extends BaseModule '$public' => $this->t('Public post'), '$title' => $item['title'], '$placeholdertitle' => $this->t('Set title'), + '$summary' => $item['content-warning'], + '$placeholdersummary' => (Feature::isEnabled($this->session->getLocalUserId(), 'summary') ? $this->t('Set summary, abstract or spoiler text') : ''), '$category' => Post\Category::getCSVByURIId($item['uri-id'], $this->session->getLocalUserId(), Post\Category::CATEGORY), '$placeholdercategory' => (Feature::isEnabled($this->session->getLocalUserId(), 'categories') ? $this->t("Categories \x28comma-separated list\x29") : ''), '$emtitle' => $this->t('Example: bob@example.com, mary@example.com'), diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index f322278574..98059ae8d9 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -1780,7 +1780,7 @@ class Transmitter return $data; } - $data['summary'] = BBCode::toPlaintext(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB)); + $data['summary'] = $item['content-warning'] ?: BBCode::toPlaintext(BBCode::getAbstract($item['body'], Protocol::ACTIVITYPUB)); if ($item['uri'] != $item['thr-parent']) { $data['inReplyTo'] = $item['thr-parent']; diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 75360cc507..6641ce1054 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2024.06-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-21 13:12+0000\n" +"POT-Creation-Date: 2024-03-22 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,33 +18,33 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" -#: mod/item.php:100 mod/item.php:103 mod/item.php:170 mod/item.php:173 +#: mod/item.php:100 mod/item.php:103 mod/item.php:171 mod/item.php:174 msgid "Unable to locate original post." msgstr "" -#: mod/item.php:138 +#: mod/item.php:139 msgid "Post updated." msgstr "" -#: mod/item.php:203 mod/item.php:207 +#: mod/item.php:204 mod/item.php:208 msgid "Item wasn't stored." msgstr "" -#: mod/item.php:217 +#: mod/item.php:218 msgid "Item couldn't be fetched." msgstr "" -#: mod/item.php:259 mod/item.php:263 +#: mod/item.php:261 mod/item.php:265 msgid "Empty post discarded." msgstr "" -#: mod/item.php:433 src/Module/Admin/Themes/Details.php:39 +#: mod/item.php:435 src/Module/Admin/Themes/Details.php:39 #: src/Module/Admin/Themes/Index.php:59 src/Module/Debug/ItemBody.php:42 #: src/Module/Debug/ItemBody.php:57 src/Module/Item/Feed.php:80 msgid "Item not found." msgstr "" -#: mod/item.php:457 mod/message.php:67 mod/message.php:113 mod/notes.php:45 +#: mod/item.php:459 mod/message.php:67 mod/message.php:113 mod/notes.php:45 #: mod/photos.php:150 mod/photos.php:666 src/Model/Event.php:520 #: src/Module/Attach.php:55 src/Module/BaseApi.php:103 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:50 @@ -290,9 +290,9 @@ msgid "Insert web link" msgstr "" #: mod/message.php:201 mod/message.php:357 mod/photos.php:1297 -#: src/Content/Conversation.php:401 src/Content/Conversation.php:1586 -#: src/Module/Item/Compose.php:206 src/Module/Post/Edit.php:145 -#: src/Object/Post.php:609 +#: src/Content/Conversation.php:403 src/Content/Conversation.php:1588 +#: src/Module/Item/Compose.php:208 src/Module/Post/Edit.php:145 +#: src/Object/Post.php:624 msgid "Please wait" msgstr "" @@ -306,7 +306,7 @@ msgstr "" #: src/Module/Debug/Probe.php:54 src/Module/Debug/WebFinger.php:51 #: src/Module/FriendSuggest.php:145 src/Module/Install.php:234 #: src/Module/Install.php:274 src/Module/Install.php:309 -#: src/Module/Invite.php:178 src/Module/Item/Compose.php:189 +#: src/Module/Invite.php:178 src/Module/Item/Compose.php:191 #: src/Module/Moderation/Item/Source.php:79 #: src/Module/Moderation/Report/Create.php:168 #: src/Module/Moderation/Report/Create.php:183 @@ -314,7 +314,7 @@ msgstr "" #: src/Module/Moderation/Report/Create.php:263 #: src/Module/Profile/Profile.php:274 src/Module/Settings/Profile/Index.php:257 #: src/Module/Settings/Server/Action.php:79 src/Module/User/Delegation.php:189 -#: src/Object/Post.php:1154 view/theme/duepuntozero/config.php:85 +#: src/Object/Post.php:1169 view/theme/duepuntozero/config.php:85 #: view/theme/frio/config.php:150 view/theme/quattro/config.php:87 #: view/theme/vier/config.php:135 msgid "Submit" @@ -478,8 +478,8 @@ msgstr "" msgid "Do not show a status post for this upload" msgstr "" -#: mod/photos.php:732 mod/photos.php:1093 src/Content/Conversation.php:403 -#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:183 +#: mod/photos.php:732 mod/photos.php:1093 src/Content/Conversation.php:405 +#: src/Module/Calendar/Event/Form.php:253 src/Module/Post/Edit.php:185 msgid "Permissions" msgstr "" @@ -491,11 +491,11 @@ msgstr "" msgid "Delete Album" msgstr "" -#: mod/photos.php:799 mod/photos.php:899 src/Content/Conversation.php:419 +#: mod/photos.php:799 mod/photos.php:899 src/Content/Conversation.php:421 #: src/Module/Contact/Follow.php:173 src/Module/Contact/Revoke.php:109 #: src/Module/Contact/Unfollow.php:126 #: src/Module/Media/Attachment/Browser.php:77 -#: src/Module/Media/Photo/Browser.php:88 src/Module/Post/Edit.php:167 +#: src/Module/Media/Photo/Browser.php:88 src/Module/Post/Edit.php:169 #: src/Module/Post/Tag/Remove.php:109 src/Module/Profile/RemoteFollow.php:134 #: src/Module/Security/TwoFactor/SignOut.php:125 msgid "Cancel" @@ -598,35 +598,35 @@ msgid "Rotate CCW (left)" msgstr "" #: mod/photos.php:1135 mod/photos.php:1191 mod/photos.php:1271 -#: src/Module/Contact.php:618 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1151 +#: src/Module/Contact.php:618 src/Module/Item/Compose.php:190 +#: src/Object/Post.php:1166 msgid "This is you" msgstr "" #: mod/photos.php:1137 mod/photos.php:1193 mod/photos.php:1273 -#: src/Module/Moderation/Reports.php:95 src/Object/Post.php:603 -#: src/Object/Post.php:1153 +#: src/Module/Moderation/Reports.php:95 src/Object/Post.php:618 +#: src/Object/Post.php:1168 msgid "Comment" msgstr "" #: mod/photos.php:1139 mod/photos.php:1195 mod/photos.php:1275 -#: src/Content/Conversation.php:416 src/Module/Calendar/Event/Form.php:248 -#: src/Module/Item/Compose.php:201 src/Module/Post/Edit.php:165 -#: src/Object/Post.php:1167 +#: src/Content/Conversation.php:418 src/Module/Calendar/Event/Form.php:248 +#: src/Module/Item/Compose.php:203 src/Module/Post/Edit.php:167 +#: src/Object/Post.php:1182 msgid "Preview" msgstr "" #: mod/photos.php:1140 src/Content/Conversation.php:369 -#: src/Module/Post/Edit.php:130 src/Object/Post.php:1155 +#: src/Module/Post/Edit.php:130 src/Object/Post.php:1170 msgid "Loading..." msgstr "" -#: mod/photos.php:1232 src/Content/Conversation.php:1501 -#: src/Object/Post.php:261 +#: mod/photos.php:1232 src/Content/Conversation.php:1503 +#: src/Object/Post.php:274 msgid "Select" msgstr "" -#: mod/photos.php:1233 src/Content/Conversation.php:1502 +#: mod/photos.php:1233 src/Content/Conversation.php:1504 #: src/Module/Moderation/Users/Active.php:136 #: src/Module/Moderation/Users/Blocked.php:136 #: src/Module/Moderation/Users/Index.php:151 @@ -635,19 +635,19 @@ msgstr "" msgid "Delete" msgstr "" -#: mod/photos.php:1294 src/Object/Post.php:426 +#: mod/photos.php:1294 src/Object/Post.php:440 msgid "Like" msgstr "" -#: mod/photos.php:1295 src/Object/Post.php:426 +#: mod/photos.php:1295 src/Object/Post.php:440 msgid "I like this (toggle)" msgstr "" -#: mod/photos.php:1296 src/Object/Post.php:427 +#: mod/photos.php:1296 src/Object/Post.php:441 msgid "Dislike" msgstr "" -#: mod/photos.php:1298 src/Object/Post.php:427 +#: mod/photos.php:1298 src/Object/Post.php:441 msgid "I don't like this (toggle)" msgstr "" @@ -1243,8 +1243,8 @@ msgstr[1] "" msgid "Visible to everybody" msgstr "" -#: src/Content/Conversation.php:339 src/Module/Item/Compose.php:200 -#: src/Object/Post.php:1166 +#: src/Content/Conversation.php:339 src/Module/Item/Compose.php:202 +#: src/Object/Post.php:1181 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1264,7 +1264,7 @@ msgstr "" msgid "Delete item(s)?" msgstr "" -#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:175 +#: src/Content/Conversation.php:355 src/Module/Item/Compose.php:176 msgid "Created at" msgstr "" @@ -1288,53 +1288,53 @@ msgstr "" msgid "attach file" msgstr "" -#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:190 -#: src/Module/Post/Edit.php:171 src/Object/Post.php:1156 +#: src/Content/Conversation.php:374 src/Module/Item/Compose.php:192 +#: src/Module/Post/Edit.php:173 src/Object/Post.php:1171 msgid "Bold" msgstr "" -#: src/Content/Conversation.php:375 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:172 src/Object/Post.php:1157 +#: src/Content/Conversation.php:375 src/Module/Item/Compose.php:193 +#: src/Module/Post/Edit.php:174 src/Object/Post.php:1172 msgid "Italic" msgstr "" -#: src/Content/Conversation.php:376 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:173 src/Object/Post.php:1158 +#: src/Content/Conversation.php:376 src/Module/Item/Compose.php:194 +#: src/Module/Post/Edit.php:175 src/Object/Post.php:1173 msgid "Underline" msgstr "" -#: src/Content/Conversation.php:377 src/Module/Item/Compose.php:193 -#: src/Module/Post/Edit.php:174 src/Object/Post.php:1160 +#: src/Content/Conversation.php:377 src/Module/Item/Compose.php:195 +#: src/Module/Post/Edit.php:176 src/Object/Post.php:1175 msgid "Quote" msgstr "" -#: src/Content/Conversation.php:378 src/Module/Item/Compose.php:194 -#: src/Module/Post/Edit.php:175 src/Object/Post.php:1161 +#: src/Content/Conversation.php:378 src/Module/Item/Compose.php:196 +#: src/Module/Post/Edit.php:177 src/Object/Post.php:1176 msgid "Add emojis" msgstr "" -#: src/Content/Conversation.php:379 src/Module/Item/Compose.php:195 -#: src/Object/Post.php:1159 +#: src/Content/Conversation.php:379 src/Module/Item/Compose.php:197 +#: src/Object/Post.php:1174 msgid "Content Warning" msgstr "" -#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:196 -#: src/Module/Post/Edit.php:176 src/Object/Post.php:1162 +#: src/Content/Conversation.php:380 src/Module/Item/Compose.php:198 +#: src/Module/Post/Edit.php:178 src/Object/Post.php:1177 msgid "Code" msgstr "" -#: src/Content/Conversation.php:381 src/Module/Item/Compose.php:197 -#: src/Object/Post.php:1163 +#: src/Content/Conversation.php:381 src/Module/Item/Compose.php:199 +#: src/Object/Post.php:1178 msgid "Image" msgstr "" -#: src/Content/Conversation.php:382 src/Module/Item/Compose.php:198 -#: src/Module/Post/Edit.php:177 src/Object/Post.php:1164 +#: src/Content/Conversation.php:382 src/Module/Item/Compose.php:200 +#: src/Module/Post/Edit.php:179 src/Object/Post.php:1179 msgid "Link" msgstr "" -#: src/Content/Conversation.php:383 src/Module/Item/Compose.php:199 -#: src/Module/Post/Edit.php:178 src/Object/Post.php:1165 +#: src/Content/Conversation.php:383 src/Module/Item/Compose.php:201 +#: src/Module/Post/Edit.php:180 src/Object/Post.php:1180 msgid "Link or Media" msgstr "" @@ -1342,7 +1342,7 @@ msgstr "" msgid "Video" msgstr "" -#: src/Content/Conversation.php:385 src/Module/Item/Compose.php:202 +#: src/Content/Conversation.php:385 src/Module/Item/Compose.php:204 #: src/Module/Post/Edit.php:141 msgid "Set your location" msgstr "" @@ -1359,161 +1359,166 @@ msgstr "" msgid "clear location" msgstr "" -#: src/Content/Conversation.php:390 src/Module/Item/Compose.php:207 +#: src/Content/Conversation.php:390 src/Module/Item/Compose.php:209 #: src/Module/Post/Edit.php:157 msgid "Set title" msgstr "" -#: src/Content/Conversation.php:392 src/Module/Item/Compose.php:208 +#: src/Content/Conversation.php:392 src/Module/Item/Compose.php:210 #: src/Module/Post/Edit.php:159 +msgid "Set summary, abstract or spoiler text" +msgstr "" + +#: src/Content/Conversation.php:394 src/Module/Item/Compose.php:211 +#: src/Module/Post/Edit.php:161 msgid "Categories (comma-separated list)" msgstr "" -#: src/Content/Conversation.php:397 src/Module/Item/Compose.php:224 +#: src/Content/Conversation.php:399 src/Module/Item/Compose.php:227 msgid "Scheduled at" msgstr "" -#: src/Content/Conversation.php:402 src/Module/Post/Edit.php:146 +#: src/Content/Conversation.php:404 src/Module/Post/Edit.php:146 msgid "Permission settings" msgstr "" -#: src/Content/Conversation.php:412 src/Module/Post/Edit.php:155 +#: src/Content/Conversation.php:414 src/Module/Post/Edit.php:155 msgid "Public post" msgstr "" -#: src/Content/Conversation.php:426 src/Content/Widget/VCard.php:130 +#: src/Content/Conversation.php:428 src/Content/Widget/VCard.php:130 #: src/Model/Profile.php:482 src/Module/Admin/Logs/View.php:92 -#: src/Module/Post/Edit.php:181 +#: src/Module/Post/Edit.php:183 msgid "Message" msgstr "" -#: src/Content/Conversation.php:427 src/Module/Post/Edit.php:182 +#: src/Content/Conversation.php:429 src/Module/Post/Edit.php:184 #: src/Module/Settings/TwoFactor/Trusted.php:143 msgid "Browser" msgstr "" -#: src/Content/Conversation.php:429 src/Module/Post/Edit.php:185 +#: src/Content/Conversation.php:431 src/Module/Post/Edit.php:187 msgid "Open Compose page" msgstr "" -#: src/Content/Conversation.php:597 +#: src/Content/Conversation.php:599 msgid "remove" msgstr "" -#: src/Content/Conversation.php:601 +#: src/Content/Conversation.php:603 msgid "Delete Selected Items" msgstr "" -#: src/Content/Conversation.php:729 src/Content/Conversation.php:732 -#: src/Content/Conversation.php:735 src/Content/Conversation.php:738 -#: src/Content/Conversation.php:741 +#: src/Content/Conversation.php:731 src/Content/Conversation.php:734 +#: src/Content/Conversation.php:737 src/Content/Conversation.php:740 +#: src/Content/Conversation.php:743 #, php-format msgid "You had been addressed (%s)." msgstr "" -#: src/Content/Conversation.php:744 +#: src/Content/Conversation.php:746 #, php-format msgid "You are following %s." msgstr "" -#: src/Content/Conversation.php:749 +#: src/Content/Conversation.php:751 #, php-format msgid "You subscribed to %s." msgstr "" -#: src/Content/Conversation.php:751 +#: src/Content/Conversation.php:753 msgid "You subscribed to one or more tags in this post." msgstr "" -#: src/Content/Conversation.php:771 +#: src/Content/Conversation.php:773 #, php-format msgid "%s reshared this." msgstr "" -#: src/Content/Conversation.php:773 +#: src/Content/Conversation.php:775 msgid "Reshared" msgstr "" -#: src/Content/Conversation.php:773 +#: src/Content/Conversation.php:775 #, php-format msgid "Reshared by %s <%s>" msgstr "" -#: src/Content/Conversation.php:776 +#: src/Content/Conversation.php:778 #, php-format msgid "%s is participating in this thread." msgstr "" -#: src/Content/Conversation.php:779 +#: src/Content/Conversation.php:781 msgid "Stored for general reasons" msgstr "" -#: src/Content/Conversation.php:782 +#: src/Content/Conversation.php:784 msgid "Global post" msgstr "" -#: src/Content/Conversation.php:785 +#: src/Content/Conversation.php:787 msgid "Sent via an relay server" msgstr "" -#: src/Content/Conversation.php:785 +#: src/Content/Conversation.php:787 #, php-format msgid "Sent via the relay server %s <%s>" msgstr "" -#: src/Content/Conversation.php:788 +#: src/Content/Conversation.php:790 msgid "Fetched" msgstr "" -#: src/Content/Conversation.php:788 +#: src/Content/Conversation.php:790 #, php-format msgid "Fetched because of %s <%s>" msgstr "" -#: src/Content/Conversation.php:791 +#: src/Content/Conversation.php:793 msgid "Stored because of a child post to complete this thread." msgstr "" -#: src/Content/Conversation.php:794 +#: src/Content/Conversation.php:796 msgid "Local delivery" msgstr "" -#: src/Content/Conversation.php:797 +#: src/Content/Conversation.php:799 msgid "Stored because of your activity (like, comment, star, ...)" msgstr "" -#: src/Content/Conversation.php:800 +#: src/Content/Conversation.php:802 msgid "Distributed" msgstr "" -#: src/Content/Conversation.php:803 +#: src/Content/Conversation.php:805 msgid "Pushed to us" msgstr "" -#: src/Content/Conversation.php:1529 src/Object/Post.php:248 +#: src/Content/Conversation.php:1531 src/Object/Post.php:261 msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1546 src/Object/Post.php:548 -#: src/Object/Post.php:549 +#: src/Content/Conversation.php:1548 src/Object/Post.php:563 +#: src/Object/Post.php:564 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1559 src/Object/Post.php:536 +#: src/Content/Conversation.php:1561 src/Object/Post.php:551 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1560 src/Object/Post.php:537 +#: src/Content/Conversation.php:1562 src/Object/Post.php:552 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1568 src/Object/Post.php:562 +#: src/Content/Conversation.php:1570 src/Object/Post.php:577 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:1584 +#: src/Content/Conversation.php:1586 msgid "View in context" msgstr "" @@ -1646,7 +1651,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: src/Content/Conversation/Factory/Network.php:42 src/Object/Post.php:398 +#: src/Content/Conversation/Factory/Network.php:42 src/Object/Post.php:411 msgid "Starred" msgstr "" @@ -1724,43 +1729,54 @@ msgstr "" msgid "Add categories to your posts" msgstr "" -#: src/Content/Feature.php:118 +#: src/Content/Feature.php:114 src/Model/Profile.php:1042 +#: src/Module/Admin/Summary.php:197 src/Module/Item/Compose.php:188 +#: src/Module/Moderation/Report/Create.php:280 +#: src/Module/Moderation/Summary.php:76 +msgid "Summary" +msgstr "" + +#: src/Content/Feature.php:114 +msgid "Add a summary, abstract or spoiler text to your posts" +msgstr "" + +#: src/Content/Feature.php:119 msgid "Advanced Profile Settings" msgstr "" -#: src/Content/Feature.php:119 +#: src/Content/Feature.php:120 msgid "List Groups" msgstr "" -#: src/Content/Feature.php:119 +#: src/Content/Feature.php:120 msgid "Show visitors public groups at the Advanced Profile Page" msgstr "" -#: src/Content/Feature.php:120 +#: src/Content/Feature.php:121 msgid "Tag Cloud" msgstr "" -#: src/Content/Feature.php:120 +#: src/Content/Feature.php:121 msgid "Provide a personal tag cloud on your profile page" msgstr "" -#: src/Content/Feature.php:121 +#: src/Content/Feature.php:122 msgid "Display Membership Date" msgstr "" -#: src/Content/Feature.php:121 +#: src/Content/Feature.php:122 msgid "Display membership date in profile" msgstr "" -#: src/Content/Feature.php:126 +#: src/Content/Feature.php:127 msgid "Advanced Calendar Settings" msgstr "" -#: src/Content/Feature.php:127 +#: src/Content/Feature.php:128 msgid "Allow anonymous access to your calendar" msgstr "" -#: src/Content/Feature.php:127 +#: src/Content/Feature.php:128 msgid "" "Allows anonymous visitors to consult your calendar and your public events. " "Contact birthday events are private to you." @@ -1789,7 +1805,7 @@ msgstr "" msgid "Create new group" msgstr "" -#: src/Content/Item.php:332 src/Model/Item.php:3224 +#: src/Content/Item.php:332 src/Model/Item.php:3255 msgid "event" msgstr "" @@ -1797,7 +1813,7 @@ msgstr "" msgid "status" msgstr "" -#: src/Content/Item.php:341 src/Model/Item.php:3226 +#: src/Content/Item.php:341 src/Model/Item.php:3257 #: src/Module/Post/Tag/Add.php:123 msgid "photo" msgstr "" @@ -1860,13 +1876,13 @@ msgstr "" msgid "Collapse" msgstr "" -#: src/Content/Item.php:439 src/Object/Post.php:289 +#: src/Content/Item.php:439 src/Object/Post.php:302 #, php-format msgid "Ignore %s server" msgstr "" #: src/Content/Item.php:443 src/Module/Settings/Channels.php:196 -#: src/Module/Settings/Channels.php:217 src/Object/Post.php:509 +#: src/Module/Settings/Channels.php:217 src/Object/Post.php:524 msgid "Languages" msgstr "" @@ -2201,8 +2217,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1010 src/Model/Item.php:3978 -#: src/Model/Item.php:3984 src/Model/Item.php:3985 +#: src/Content/Text/BBCode.php:1010 src/Model/Item.php:4009 +#: src/Model/Item.php:4015 src/Model/Item.php:4016 msgid "Link to source" msgstr "" @@ -2322,7 +2338,7 @@ msgstr "" msgid "Relationships" msgstr "" -#: src/Content/Widget.php:250 src/Module/Circle.php:292 +#: src/Content/Widget.php:250 src/Module/Circle.php:294 #: src/Module/Contact.php:344 msgid "All Contacts" msgstr "" @@ -2535,7 +2551,7 @@ msgstr "" msgid "CC: email addresses" msgstr "" -#: src/Core/ACL.php:328 src/Module/Post/Edit.php:160 +#: src/Core/ACL.php:328 src/Module/Post/Edit.php:162 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2865,7 +2881,7 @@ msgstr "" msgid "Could not connect to database." msgstr "" -#: src/Core/L10n.php:444 src/Model/Item.php:2268 +#: src/Core/L10n.php:444 src/Model/Item.php:2299 msgid "Undetermined" msgstr "" @@ -3226,7 +3242,7 @@ msgstr "" msgid "Edit circle" msgstr "" -#: src/Model/Circle.php:606 src/Module/Circle.php:193 +#: src/Model/Circle.php:606 src/Module/Circle.php:195 msgid "Contacts not in any circle" msgstr "" @@ -3234,8 +3250,8 @@ msgstr "" msgid "Create a new circle" msgstr "" -#: src/Model/Circle.php:609 src/Module/Circle.php:178 src/Module/Circle.php:201 -#: src/Module/Circle.php:276 +#: src/Model/Circle.php:609 src/Module/Circle.php:180 src/Module/Circle.php:203 +#: src/Module/Circle.php:278 msgid "Circle Name: " msgstr "" @@ -3431,91 +3447,91 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: src/Model/Item.php:2275 +#: src/Model/Item.php:2306 #, php-format msgid "%s (%s - %s): %s" msgstr "" -#: src/Model/Item.php:2277 +#: src/Model/Item.php:2308 #, php-format msgid "%s (%s): %s" msgstr "" -#: src/Model/Item.php:2280 +#: src/Model/Item.php:2311 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:3228 +#: src/Model/Item.php:3259 msgid "activity" msgstr "" -#: src/Model/Item.php:3230 +#: src/Model/Item.php:3261 msgid "comment" msgstr "" -#: src/Model/Item.php:3233 src/Module/Post/Tag/Add.php:123 +#: src/Model/Item.php:3264 src/Module/Post/Tag/Add.php:123 msgid "post" msgstr "" -#: src/Model/Item.php:3404 +#: src/Model/Item.php:3435 #, php-format msgid "%s is blocked" msgstr "" -#: src/Model/Item.php:3406 +#: src/Model/Item.php:3437 #, php-format msgid "%s is ignored" msgstr "" -#: src/Model/Item.php:3408 +#: src/Model/Item.php:3439 #, php-format msgid "Content from %s is collapsed" msgstr "" -#: src/Model/Item.php:3412 +#: src/Model/Item.php:3443 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3885 +#: src/Model/Item.php:3916 msgid "bytes" msgstr "" -#: src/Model/Item.php:3916 +#: src/Model/Item.php:3947 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3918 +#: src/Model/Item.php:3949 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3923 +#: src/Model/Item.php:3954 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3925 +#: src/Model/Item.php:3956 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3927 +#: src/Model/Item.php:3958 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3961 src/Model/Item.php:3962 +#: src/Model/Item.php:3992 src/Model/Item.php:3993 msgid "View on separate page" msgstr "" @@ -3631,12 +3647,6 @@ msgstr "" msgid "Title/Description:" msgstr "" -#: src/Model/Profile.php:1042 src/Module/Admin/Summary.php:197 -#: src/Module/Moderation/Report/Create.php:280 -#: src/Module/Moderation/Summary.php:76 -msgid "Summary" -msgstr "" - #: src/Model/Profile.php:1043 msgid "Musical interests" msgstr "" @@ -6253,7 +6263,7 @@ msgstr "" msgid "Could not create circle." msgstr "" -#: src/Module/Circle.php:68 src/Module/Circle.php:214 src/Module/Circle.php:238 +#: src/Module/Circle.php:68 src/Module/Circle.php:216 src/Module/Circle.php:240 msgid "Circle not found." msgstr "" @@ -6306,47 +6316,47 @@ msgstr "" msgid "Bad request." msgstr "" -#: src/Module/Circle.php:170 +#: src/Module/Circle.php:172 msgid "Save Circle" msgstr "" -#: src/Module/Circle.php:171 +#: src/Module/Circle.php:173 msgid "Filter" msgstr "" -#: src/Module/Circle.php:177 +#: src/Module/Circle.php:179 msgid "Create a circle of contacts/friends." msgstr "" -#: src/Module/Circle.php:219 +#: src/Module/Circle.php:221 msgid "Unable to remove circle." msgstr "" -#: src/Module/Circle.php:270 +#: src/Module/Circle.php:272 msgid "Delete Circle" msgstr "" -#: src/Module/Circle.php:280 +#: src/Module/Circle.php:282 msgid "Edit Circle Name" msgstr "" -#: src/Module/Circle.php:290 +#: src/Module/Circle.php:292 msgid "Members" msgstr "" -#: src/Module/Circle.php:293 +#: src/Module/Circle.php:295 msgid "Circle is empty" msgstr "" -#: src/Module/Circle.php:306 +#: src/Module/Circle.php:311 msgid "Remove contact from circle" msgstr "" -#: src/Module/Circle.php:329 +#: src/Module/Circle.php:334 msgid "Click on a contact to add or remove." msgstr "" -#: src/Module/Circle.php:343 +#: src/Module/Circle.php:351 msgid "Add contact to circle" msgstr "" @@ -6380,7 +6390,7 @@ msgid "Only show blocked contacts" msgstr "" #: src/Module/Contact.php:368 src/Module/Contact.php:440 -#: src/Module/Settings/Server/Index.php:107 src/Object/Post.php:386 +#: src/Module/Settings/Server/Index.php:107 src/Object/Post.php:399 msgid "Ignored" msgstr "" @@ -7766,25 +7776,25 @@ msgstr "" msgid "Compose new post" msgstr "" -#: src/Module/Item/Compose.php:187 +#: src/Module/Item/Compose.php:189 msgid "Visibility" msgstr "" -#: src/Module/Item/Compose.php:203 +#: src/Module/Item/Compose.php:205 msgid "Clear the location" msgstr "" -#: src/Module/Item/Compose.php:204 +#: src/Module/Item/Compose.php:206 msgid "Location services are unavailable on your device" msgstr "" -#: src/Module/Item/Compose.php:205 +#: src/Module/Item/Compose.php:207 msgid "" "Location services are disabled. Please check the website's permissions on " "your device" msgstr "" -#: src/Module/Item/Compose.php:211 +#: src/Module/Item/Compose.php:214 msgid "" "You can make this page always open when you use the New Post button in the " "Theme Customization settings." @@ -12260,266 +12270,266 @@ msgstr "" msgid "Connector Message" msgstr "" -#: src/Object/Post.php:226 src/Object/Post.php:228 +#: src/Object/Post.php:239 src/Object/Post.php:241 msgid "Edit" msgstr "" -#: src/Object/Post.php:262 +#: src/Object/Post.php:275 msgid "Delete globally" msgstr "" -#: src/Object/Post.php:262 +#: src/Object/Post.php:275 msgid "Remove locally" msgstr "" -#: src/Object/Post.php:269 +#: src/Object/Post.php:282 #, php-format msgid "Block %s" msgstr "" -#: src/Object/Post.php:274 +#: src/Object/Post.php:287 #, php-format msgid "Ignore %s" msgstr "" -#: src/Object/Post.php:279 +#: src/Object/Post.php:292 #, php-format msgid "Collapse %s" msgstr "" -#: src/Object/Post.php:283 +#: src/Object/Post.php:296 msgid "Report post" msgstr "" -#: src/Object/Post.php:294 +#: src/Object/Post.php:307 msgid "Save to folder" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:347 msgid "I will attend" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:347 msgid "I will not attend" msgstr "" -#: src/Object/Post.php:334 +#: src/Object/Post.php:347 msgid "I might attend" msgstr "" -#: src/Object/Post.php:381 +#: src/Object/Post.php:394 msgid "Ignore thread" msgstr "" -#: src/Object/Post.php:382 +#: src/Object/Post.php:395 msgid "Unignore thread" msgstr "" -#: src/Object/Post.php:383 +#: src/Object/Post.php:396 msgid "Toggle ignore status" msgstr "" -#: src/Object/Post.php:393 +#: src/Object/Post.php:406 msgid "Add star" msgstr "" -#: src/Object/Post.php:394 +#: src/Object/Post.php:407 msgid "Remove star" msgstr "" -#: src/Object/Post.php:395 +#: src/Object/Post.php:408 msgid "Toggle star status" msgstr "" -#: src/Object/Post.php:406 +#: src/Object/Post.php:419 msgid "Pin" msgstr "" -#: src/Object/Post.php:407 +#: src/Object/Post.php:420 msgid "Unpin" msgstr "" -#: src/Object/Post.php:408 +#: src/Object/Post.php:421 msgid "Toggle pin status" msgstr "" -#: src/Object/Post.php:411 +#: src/Object/Post.php:424 msgid "Pinned" msgstr "" -#: src/Object/Post.php:416 +#: src/Object/Post.php:429 msgid "Add tag" msgstr "" -#: src/Object/Post.php:429 +#: src/Object/Post.php:444 msgid "Quote share this" msgstr "" -#: src/Object/Post.php:429 +#: src/Object/Post.php:444 msgid "Quote Share" msgstr "" -#: src/Object/Post.php:432 +#: src/Object/Post.php:447 msgid "Reshare this" msgstr "" -#: src/Object/Post.php:432 +#: src/Object/Post.php:447 msgid "Reshare" msgstr "" -#: src/Object/Post.php:433 +#: src/Object/Post.php:448 msgid "Cancel your Reshare" msgstr "" -#: src/Object/Post.php:433 +#: src/Object/Post.php:448 msgid "Unshare" msgstr "" -#: src/Object/Post.php:485 +#: src/Object/Post.php:500 #, php-format msgid "%s (Received %s)" msgstr "" -#: src/Object/Post.php:491 +#: src/Object/Post.php:506 msgid "Comment this item on your system" msgstr "" -#: src/Object/Post.php:491 +#: src/Object/Post.php:506 msgid "Remote comment" msgstr "" -#: src/Object/Post.php:513 +#: src/Object/Post.php:528 msgid "Share via ..." msgstr "" -#: src/Object/Post.php:513 +#: src/Object/Post.php:528 msgid "Share via external services" msgstr "" -#: src/Object/Post.php:520 +#: src/Object/Post.php:535 msgid "Unknown parent" msgstr "" -#: src/Object/Post.php:524 +#: src/Object/Post.php:539 #, php-format msgid "in reply to %s" msgstr "" -#: src/Object/Post.php:526 +#: src/Object/Post.php:541 msgid "Parent is probably private or not federated." msgstr "" -#: src/Object/Post.php:550 +#: src/Object/Post.php:565 msgid "to" msgstr "" -#: src/Object/Post.php:551 +#: src/Object/Post.php:566 msgid "via" msgstr "" -#: src/Object/Post.php:552 +#: src/Object/Post.php:567 msgid "Wall-to-Wall" msgstr "" -#: src/Object/Post.php:553 +#: src/Object/Post.php:568 msgid "via Wall-To-Wall:" msgstr "" -#: src/Object/Post.php:604 +#: src/Object/Post.php:619 #, php-format msgid "Reply to %s" msgstr "" -#: src/Object/Post.php:607 +#: src/Object/Post.php:622 msgid "More" msgstr "" -#: src/Object/Post.php:626 +#: src/Object/Post.php:641 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:627 +#: src/Object/Post.php:642 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:628 +#: src/Object/Post.php:643 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:629 +#: src/Object/Post.php:644 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:630 +#: src/Object/Post.php:645 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:652 +#: src/Object/Post.php:667 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:653 +#: src/Object/Post.php:668 msgid "Show more" msgstr "" -#: src/Object/Post.php:654 +#: src/Object/Post.php:669 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:691 -#, php-format -msgid "Reshared by: %s" -msgstr "" - -#: src/Object/Post.php:696 -#, php-format -msgid "Viewed by: %s" -msgstr "" - -#: src/Object/Post.php:701 -#, php-format -msgid "Read by: %s" -msgstr "" - #: src/Object/Post.php:706 #, php-format -msgid "Liked by: %s" +msgid "Reshared by: %s" msgstr "" #: src/Object/Post.php:711 #, php-format -msgid "Disliked by: %s" +msgid "Viewed by: %s" msgstr "" #: src/Object/Post.php:716 #, php-format -msgid "Attended by: %s" +msgid "Read by: %s" msgstr "" #: src/Object/Post.php:721 #, php-format -msgid "Maybe attended by: %s" +msgid "Liked by: %s" msgstr "" #: src/Object/Post.php:726 #, php-format -msgid "Not attended by: %s" +msgid "Disliked by: %s" msgstr "" #: src/Object/Post.php:731 #, php-format -msgid "Commented by: %s" +msgid "Attended by: %s" msgstr "" #: src/Object/Post.php:736 #, php-format +msgid "Maybe attended by: %s" +msgstr "" + +#: src/Object/Post.php:741 +#, php-format +msgid "Not attended by: %s" +msgstr "" + +#: src/Object/Post.php:746 +#, php-format +msgid "Commented by: %s" +msgstr "" + +#: src/Object/Post.php:751 +#, php-format msgid "Reacted with %s by: %s" msgstr "" -#: src/Object/Post.php:759 +#: src/Object/Post.php:774 #, php-format msgid "Quote shared by: %s" msgstr "" diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl index 051cb3b088..c67411abb2 100644 --- a/view/templates/item/compose.tpl +++ b/view/templates/item/compose.tpl @@ -13,6 +13,11 @@
+ {{if $l10n.placeholdersummary}} +
+ +
+ {{/if}} {{if $l10n.placeholdercategory}}
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl index 07824c6e32..b263cf33bf 100644 --- a/view/templates/jot.tpl +++ b/view/templates/jot.tpl @@ -18,6 +18,9 @@ {{/if}}
+ {{if $placeholdersummary}} +
+ {{/if}} {{if $placeholdercategory}}
{{/if}} diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index be71399a86..b053a7739f 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1444,6 +1444,7 @@ section #jotOpen { margin-right: 20px; } #jot-title-wrap, +#jot-summary-wrap, #jot-category-wrap { margin-bottom: 5px; } diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index cfab144569..72799e86d7 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -94,6 +94,9 @@ {{/if}}
+ {{if $placeholdersummary}} +
+ {{/if}} {{if $placeholdercategory}}
{{/if}} diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl index 8823fb8b45..e3c1e20034 100644 --- a/view/theme/quattro/templates/jot.tpl +++ b/view/theme/quattro/templates/jot.tpl @@ -2,6 +2,9 @@
 
+ {{if $placeholdersummary}} + + {{/if}} {{if $placeholdercategory}} {{/if}} diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index dd15aafc8a..4131e82aab 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -1414,6 +1414,7 @@ ul .sidebar-circle-li .icon { #jot-coord, #jot-preview, #jot-title-wrap, +#jot-summary-wrap, #jot-category-wrap, #jot-text-wrap, #profile-jot-text-loading, diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl index 86485cad12..f51cb291a7 100644 --- a/view/theme/smoothly/templates/jot.tpl +++ b/view/theme/smoothly/templates/jot.tpl @@ -18,6 +18,11 @@
+ {{if $placeholdersummary}} +
+ +
+ {{/if}} {{if $placeholdercategory}}