improve attend-buttons for events

diff --git a/src/App/Page.php b/src/App/Page.php
index 23f542f7def77545e637376ba498191272ca5446..fc1d633264928fc5c8152888e599c5ecf2b1a1fc 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -256,6 +256,7 @@ class Page implements ArrayAccess
                        '$likeError'       => $l10n->t('Like not successfull'),
                        '$dislikeError'    => $l10n->t('Dislike not successfull'),
                        '$announceError'   => $l10n->t('Sharing not successfull'),
+                       '$attendError'     => $l10n->t('Attendation not successfull'),
                        '$srvError'        => $l10n->t('Backend error'),
                        '$netError'        => $l10n->t('Network error'),
                        // Dropzone

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index a32e9ce1345d93de17782abc30f12b5ced409e90..e97f697e661b9281526f5b66c9da0ef10a4d36a1 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2023.03-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-21 21:43+0000\n"
+"POT-Creation-Date: 2023-03-23 23:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "Item not found."
 msgstr ""
 
-#: mod/item.php:435 mod/message.php:68 mod/message.php:113 mod/notes.php:45
+#: mod/item.php:435 mod/message.php:68 mod/message.php:114 mod/notes.php:45
 #: mod/photos.php:152 mod/photos.php:669 src/Model/Event.php:522
 #: src/Module/Attach.php:55 src/Module/BaseApi.php:99
 #: src/Module/BaseNotifications.php:98 src/Module/BaseSettings.php:52
@@ -219,86 +219,86 @@ msgstr ""
 msgid "Your password has been changed at %s"
 msgstr ""
 
-#: mod/message.php:46 mod/message.php:128 src/Content/Nav.php:319
+#: mod/message.php:46 mod/message.php:129 src/Content/Nav.php:319
 msgid "New Message"
 msgstr ""
 
-#: mod/message.php:82 src/Module/Profile/UnkMail.php:100
+#: mod/message.php:83 src/Module/Profile/UnkMail.php:100
 msgid "No recipient selected."
 msgstr ""
 
-#: mod/message.php:87
+#: mod/message.php:88
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: mod/message.php:91 src/Module/Profile/UnkMail.php:106
+#: mod/message.php:92 src/Module/Profile/UnkMail.php:106
 msgid "Message could not be sent."
 msgstr ""
 
-#: mod/message.php:95 src/Module/Profile/UnkMail.php:109
+#: mod/message.php:96 src/Module/Profile/UnkMail.php:109
 msgid "Message collection failure."
 msgstr ""
 
-#: mod/message.php:122 src/Module/Notifications/Introductions.php:135
+#: mod/message.php:123 src/Module/Notifications/Introductions.php:135
 #: src/Module/Notifications/Introductions.php:170
 #: src/Module/Notifications/Notification.php:85
 msgid "Discard"
 msgstr ""
 
-#: mod/message.php:135 src/Content/Nav.php:316 view/theme/frio/theme.php:241
+#: mod/message.php:136 src/Content/Nav.php:316 view/theme/frio/theme.php:241
 msgid "Messages"
 msgstr ""
 
-#: mod/message.php:148
+#: mod/message.php:149
 msgid "Conversation not found."
 msgstr ""
 
-#: mod/message.php:153
+#: mod/message.php:154
 msgid "Message was not deleted."
 msgstr ""
 
-#: mod/message.php:168
+#: mod/message.php:169
 msgid "Conversation was not removed."
 msgstr ""
 
-#: mod/message.php:181 mod/message.php:286 src/Module/Profile/UnkMail.php:145
+#: mod/message.php:182 mod/message.php:287 src/Module/Profile/UnkMail.php:145
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: mod/message.php:190 src/Module/Profile/UnkMail.php:151
+#: mod/message.php:191 src/Module/Profile/UnkMail.php:151
 msgid "Send Private Message"
 msgstr ""
 
-#: mod/message.php:191 mod/message.php:346
+#: mod/message.php:192 mod/message.php:347
 msgid "To:"
 msgstr ""
 
-#: mod/message.php:192 mod/message.php:347
+#: mod/message.php:193 mod/message.php:348
 msgid "Subject:"
 msgstr ""
 
-#: mod/message.php:196 mod/message.php:350 src/Module/Invite.php:171
+#: mod/message.php:197 mod/message.php:351 src/Module/Invite.php:171
 msgid "Your message:"
 msgstr ""
 
-#: mod/message.php:199 mod/message.php:354 src/Content/Conversation.php:352
+#: mod/message.php:200 mod/message.php:355 src/Content/Conversation.php:352
 #: src/Module/Post/Edit.php:131
 msgid "Upload photo"
 msgstr ""
 
-#: mod/message.php:200 mod/message.php:355 src/Module/Post/Edit.php:135
+#: mod/message.php:201 mod/message.php:356 src/Module/Post/Edit.php:135
 #: src/Module/Profile/UnkMail.php:153
 msgid "Insert web link"
 msgstr ""
 
-#: mod/message.php:201 mod/message.php:357 mod/photos.php:1291
+#: mod/message.php:202 mod/message.php:358 mod/photos.php:1291
 #: src/Content/Conversation.php:381 src/Content/Conversation.php:725
 #: src/Module/Item/Compose.php:204 src/Module/Post/Edit.php:145
 #: src/Module/Profile/UnkMail.php:154 src/Object/Post.php:545
 msgid "Please wait"
 msgstr ""
 
-#: mod/message.php:202 mod/message.php:356 mod/photos.php:702
+#: mod/message.php:203 mod/message.php:357 mod/photos.php:702
 #: mod/photos.php:819 mod/photos.php:1097 mod/photos.php:1138
 #: mod/photos.php:1194 mod/photos.php:1268
 #: src/Module/Calendar/Event/Form.php:250 src/Module/Contact/Advanced.php:132
@@ -317,52 +317,52 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: mod/message.php:223
+#: mod/message.php:224
 msgid "No messages."
 msgstr ""
 
-#: mod/message.php:279
+#: mod/message.php:280
 msgid "Message not available."
 msgstr ""
 
-#: mod/message.php:323
+#: mod/message.php:324
 msgid "Delete message"
 msgstr ""
 
-#: mod/message.php:325 mod/message.php:456
+#: mod/message.php:326 mod/message.php:457
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: mod/message.php:340 mod/message.php:453
+#: mod/message.php:341 mod/message.php:454
 msgid "Delete conversation"
 msgstr ""
 
-#: mod/message.php:342
+#: mod/message.php:343
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: mod/message.php:345
+#: mod/message.php:346
 msgid "Send Reply"
 msgstr ""
 
-#: mod/message.php:427
+#: mod/message.php:428
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: mod/message.php:429
+#: mod/message.php:430
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: mod/message.php:431
+#: mod/message.php:432
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: mod/message.php:459
+#: mod/message.php:460
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -686,14 +686,18 @@ msgid "Sharing not successfull"
 msgstr ""
 
 #: src/App/Page.php:259
-msgid "Backend error"
+msgid "Attendation not successfull"
 msgstr ""
 
 #: src/App/Page.php:260
+msgid "Backend error"
+msgstr ""
+
+#: src/App/Page.php:261
 msgid "Network error"
 msgstr ""
 
-#: src/App/Page.php:328
+#: src/App/Page.php:329
 msgid "toggle mobile"
 msgstr ""
 
@@ -721,8 +725,8 @@ msgid "All contacts"
 msgstr ""
 
 #: src/BaseModule.php:432 src/Content/Widget.php:235 src/Core/ACL.php:194
-#: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:122
-#: src/Module/PermissionTooltip.php:144
+#: src/Module/Contact.php:407 src/Module/PermissionTooltip.php:127
+#: src/Module/PermissionTooltip.php:149
 msgid "Followers"
 msgstr ""
 
@@ -1524,20 +1528,20 @@ msgid ""
 "Contact birthday events are private to you."
 msgstr ""
 
-#: src/Content/ForumManager.php:157 src/Content/Nav.php:276
+#: src/Content/ForumManager.php:151 src/Content/Nav.php:276
 #: src/Content/Text/HTML.php:878 src/Content/Widget.php:524
 msgid "Forums"
 msgstr ""
 
-#: src/Content/ForumManager.php:159
+#: src/Content/ForumManager.php:153
 msgid "External link to forum"
 msgstr ""
 
-#: src/Content/ForumManager.php:162 src/Content/Widget.php:503
+#: src/Content/ForumManager.php:156 src/Content/Widget.php:503
 msgid "show less"
 msgstr ""
 
-#: src/Content/ForumManager.php:163 src/Content/Widget.php:405
+#: src/Content/ForumManager.php:157 src/Content/Widget.php:405
 #: src/Content/Widget.php:504
 msgid "show more"
 msgstr ""
@@ -2208,8 +2212,8 @@ msgstr ""
 msgid "Yourself"
 msgstr ""
 
-#: src/Core/ACL.php:201 src/Module/PermissionTooltip.php:128
-#: src/Module/PermissionTooltip.php:150
+#: src/Core/ACL.php:201 src/Module/PermissionTooltip.php:133
+#: src/Module/PermissionTooltip.php:155
 msgid "Mutuals"
 msgstr ""
 
@@ -2217,8 +2221,8 @@ msgstr ""
 msgid "Post to Email"
 msgstr ""
 
-#: src/Core/ACL.php:320 src/Module/PermissionTooltip.php:85
-#: src/Module/PermissionTooltip.php:197
+#: src/Core/ACL.php:320 src/Module/PermissionTooltip.php:90
+#: src/Module/PermissionTooltip.php:201
 msgid "Public"
 msgstr ""
 
@@ -2228,7 +2232,7 @@ msgid ""
 "community pages and by anyone with its link."
 msgstr ""
 
-#: src/Core/ACL.php:322 src/Module/PermissionTooltip.php:93
+#: src/Core/ACL.php:322 src/Module/PermissionTooltip.php:98
 msgid "Limited/Private"
 msgstr ""
 
@@ -3204,7 +3208,7 @@ msgstr ""
 msgid "View on separate page"
 msgstr ""
 
-#: src/Model/Mail.php:136 src/Model/Mail.php:264
+#: src/Model/Mail.php:137 src/Model/Mail.php:266
 msgid "[no subject]"
 msgstr ""
 
@@ -8138,48 +8142,48 @@ msgstr ""
 msgid "Wrong type \"%s\", expected one of: %s"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:66
+#: src/Module/PermissionTooltip.php:79
 msgid "Model not found"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:89
+#: src/Module/PermissionTooltip.php:94
 msgid "Unlisted"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:107
+#: src/Module/PermissionTooltip.php:112
 msgid "Remote privacy information not available."
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:116
+#: src/Module/PermissionTooltip.php:121
 msgid "Visible to:"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:200
+#: src/Module/PermissionTooltip.php:204
 #, php-format
 msgid "Collection (%s)"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:204
+#: src/Module/PermissionTooltip.php:208
 #, php-format
 msgid "Followers (%s)"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:223
+#: src/Module/PermissionTooltip.php:227
 #, php-format
 msgid "%d more"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:227
+#: src/Module/PermissionTooltip.php:231
 #, php-format
 msgid "<b>To:</b> %s<br>"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:230
+#: src/Module/PermissionTooltip.php:234
 #, php-format
 msgid "<b>CC:</b> %s<br>"
 msgstr ""
 
-#: src/Module/PermissionTooltip.php:233
+#: src/Module/PermissionTooltip.php:237
 #, php-format
 msgid "<b>BCC:</b> %s<br>"
 msgstr ""

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 9196858bb7cb11178e9837a3051b35355b4bf604..715d3b77304d31549330ea3487cf958a712e528c 100644 (file)
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -775,6 +775,15 @@ function doActivityItemAction(ident, verb, un) {
                        break;
                case 'announce':
                        thumbsClass = 'fa-retweet';
+                       break;
+               case 'attendyes':
+                       thumbsClass = 'fa-check';
+                       break;
+               case 'attendno':
+                       thumbsClass = 'fa-times';
+                       break;
+               case 'attendmaybe':
+                       thumbsClass = 'fa-question';
        }
        if (verb.indexOf('announce') === 0 ) {
                // Share-Button(s)
@@ -802,6 +811,12 @@ function doActivityItemAction(ident, verb, un) {
        .success(function(data){
                $('img[id^=waitfor-' + verb + '-' + ident.toString() + ']').remove();
                if (data.status == 'ok') {
+                       if (verb.indexOf('attend') === 0) {
+                               $('button[id^=attend][id$=' + ident.toString() + ']').removeClass('active')
+                               $('button#attendyes-' + ident.toString()).attr('onclick', 'javascript:doActivityItemAction(' + ident +', "attendyes" )');
+                               $('button#attendno-' + ident.toString()).attr('onclick', 'javascript:doActivityItemAction(' + ident +', "attendno" )');
+                               $('button#attendmaybe-' + ident.toString()).attr('onclick', 'javascript:doActivityItemAction(' + ident +', "attendmaybe" )');
+                       }
                        if (data.verb == 'un' + verb) {
                                // like/dislike buttons
                                $('button[id^=' + verb + '-' + ident.toString() + ']' )
@@ -810,7 +825,7 @@ function doActivityItemAction(ident, verb, un) {
                                // link in share-menu
                                $('a[id^=' + verb + '-' + ident.toString() + ']' )
                                        .removeClass('active')
-                                       .attr('href', 'javascript:doActivityItemAction(' + ident +', "' + verb + '",false )');
+                                       .attr('href', 'javascript:doActivityItemAction(' + ident +', "' + verb + '")');
                                $('a[id^=' + verb + '-' + ident.toString() + '] i:first-child' ).addClass('fa-retweet').removeClass('fa-ban');
                        } else {
                                // like/dislike buttons
@@ -823,7 +838,7 @@ function doActivityItemAction(ident, verb, un) {
                                        .attr('href', 'javascript:doActivityItemAction(' + ident + ', "' + verb + '", true )');
                                $('a[id^=' + verb + '-' + ident.toString() + '] i:first-child' ).removeClass('fa-retweet').addClass('fa-ban');
                        }
-                       $('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass).show();
+                       $('button[id^=' + verb + '-' + ident.toString() + '] i:first-child').addClass(thumbsClass);
                        if (verb.indexOf('announce') === 0 ) {
                                // ShareMenuButton
                                $('button[id^=shareMenuOptions-' + ident.toString() + '] i:first-child').addClass('fa-share');

diff --git a/view/theme/frio/templates/js_strings.tpl b/view/theme/frio/templates/js_strings.tpl
index 39445a0ac1861f17f49857376f2b0ff13d9ab6b2..bf418a4be259a35e2b80eed5a4faf90a0086d884 100644 (file)
--- a/view/theme/frio/templates/js_strings.tpl
+++ b/view/theme/frio/templates/js_strings.tpl
@@ -14,6 +14,9 @@ They are loaded into the html <head> so that js functions can use them *}}
                'like'          : "{{$likeError}}",
                'dislike'       : "{{$dislikeError}}",
                'announce'      : "{{$announceError}}",
+               'attendyes'     : "{{$attendError}}",
+               'attendno'      : "{{$attendError}}",
+               'attendmaybe'   : "{{$attendError}}",
         };
         var aErrType = {
                'srvErr'        : "{{$srvError}}",

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 0ddf029945e39d81a55d46fa23fc80e5e7d30de2..b4cd291b013e5b8cabdae41d3674ce2021ea20a8 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -316,7 +316,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                        {{/if}}
                                {{/if}}
                                {{if $item.vote.announce}}
-                               <button type="button" class="btn-link button-announces{{if $item.responses.announce.self and $item.reshared }} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" ><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.announce.1}}</button>
+                               <button type="button" class="btn-link button-announces{{if $item.responses.announce.self}} active" aria-pressed="true{{/if}}" id="announce-{{$item.id}}" title="{{$item.vote.announce.0}}" onclick="doActivityItemAction({{$item.id}}, 'announce'{{if $item.responses.announce.self}}, true{{/if}});" ><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.announce.1}}</button>
                                <span role="presentation" class="separator"></span>
                                {{/if}}
                                {{if $item.vote.share}}