]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'nightly' of gitorious.org:social/mainline into nightly
authorRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 19:51:53 +0000 (20:51 +0100)
committerRoland Haeder <roland@mxchange.org>
Sun, 8 Mar 2015 19:51:53 +0000 (20:51 +0100)
Conflicts:
actions/replies.php

Signed-off-by: Roland Haeder <roland@mxchange.org>
actions/replies.php
js/util.js
lib/noticelistitem.php
plugins/Favorite/FavoritePlugin.php
theme/base/css/display.css

index 11d9c7c706cc29a777a326fa5b3e96ece2799e56..5bf2f8edc429bb4829f0966c82053fccb7576045 100644 (file)
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/personalgroupnav.php';
-require_once INSTALLDIR.'/lib/noticelist.php';
-require_once INSTALLDIR.'/lib/feedlist.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * List of replies
@@ -44,55 +38,43 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class RepliesAction extends Action
+class RepliesAction extends ManagedAction
 {
     var $page = null;
     var $notice;
 
-    /**
-     * Prepare the object
-     *
-     * Check the input values and initialize the object.
-     * Shows an error page on bad input.
-     *
-     * @param array $args $_REQUEST data
-     *
-     * @return boolean success flag
-     */
-    function prepare(array $args=array())
+    protected function doPreparation()
     {
-        parent::prepare($args);
-
         $nickname = common_canonical_nickname($this->arg('nickname'));
 
         $this->user = User::getKV('nickname', $nickname);
 
-        if (!$this->user) {
+        if (!$this->user instanceof User) {
             // TRANS: Client error displayed when trying to reply to a non-exsting user.
             $this->clientError(_('No such user.'));
         }
 
-        $profile = $this->user->getProfile();
+        $this->target = $this->user->getProfile();
 
-        if (!$profile) {
+        if (!$this->target instanceof Profile) {
             // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
         }
 
-        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        $this->page = $this->int('page') ?: 1;
 
         common_set_returnto($this->selfUrl());
 
-        $stream = new ReplyNoticeStream($this->user->id,
-                                        Profile::current());
+        $stream = new ReplyNoticeStream($this->target->getID(), $this->scoped);
 
         $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE,
                                             NOTICES_PER_PAGE + 1);
 
-        if($this->page > 1 && $this->notice->N == 0){
+        if ($this->page > 1 && $this->notice->N == 0) {
             // TRANS: Client error when page not found (404)
             $this->clientError(_('No such page.'), 404);
         }
+<<<<<<< HEAD
 
         return true;
     }
@@ -110,6 +92,8 @@ class RepliesAction extends Action
     {
         parent::handle($args);
         $this->showPage();
+=======
+>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
     }
 
     /**
@@ -124,12 +108,12 @@ class RepliesAction extends Action
         if ($this->page == 1) {
             // TRANS: Title for first page of replies for a user.
             // TRANS: %s is a user nickname.
-            return sprintf(_("Replies to %s"), $this->user->nickname);
+            return sprintf(_("Replies to %s"), $this->target->getNickname());
         } else {
             // TRANS: Title for all but the first page of replies for a user.
             // TRANS: %1$s is a user nickname, %2$d is a page number.
             return sprintf(_('Replies to %1$s, page %2$d'),
-                           $this->user->nickname,
+                           $this->target->getNickname(),
                            $this->page);
         }
     }
@@ -144,7 +128,7 @@ class RepliesAction extends Action
         return array(new Feed(Feed::JSON,
                               common_local_url('ApiTimelineMentions',
                                                array(
-                                                    'id' => $this->user->nickname,
+                                                    'id' => $this->target->getNickname(),
                                                     'format' => 'as')),
                               // TRANS: Link for feed with replies for a user.
                               // TRANS: %s is a user nickname.
@@ -152,38 +136,31 @@ class RepliesAction extends Action
                                       $this->user->nickname)),
                      new Feed(Feed::RSS1,
                               common_local_url('repliesrss',
-                                               array('nickname' => $this->user->nickname)),
+                                               array('nickname' => $this->target->getNickname())),
                               // TRANS: Link for feed with replies for a user.
                               // TRANS: %s is a user nickname.
                               sprintf(_('Replies feed for %s (RSS 1.0)'),
-                                      $this->user->nickname)),
+                                      $this->target->getNickname())),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelineMentions',
                                                array(
-                                                    'id' => $this->user->nickname,
+                                                    'id' => $this->target->getNickname(),
                                                     'format' => 'rss')),
                               // TRANS: Link for feed with replies for a user.
                               // TRANS: %s is a user nickname.
                               sprintf(_('Replies feed for %s (RSS 2.0)'),
-                                      $this->user->nickname)),
+                                      $this->target->getNickname())),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelineMentions',
                                                array(
-                                                    'id' => $this->user->nickname,
+                                                    'id' => $this->target->getNickname(),
                                                     'format' => 'atom')),
                               // TRANS: Link for feed with replies for a user.
                               // TRANS: %s is a user nickname.
                               sprintf(_('Replies feed for %s (Atom)'),
-                                    $this->user->nickname)));
+                                    $this->target->getNickname())));
     }
 
-    /**
-     * Show the content
-     *
-     * A list of notices that are replies to the user, plus pagination.
-     *
-     * @return void
-     */
     function showContent()
     {
         $nl = new PrimaryNoticeList($this->notice, $this, array('show_n'=>NOTICES_PER_PAGE));
@@ -195,33 +172,30 @@ class RepliesAction extends Action
 
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'replies',
-                          array('nickname' => $this->user->nickname));
+                          array('nickname' => $this->target->getNickname()));
     }
 
     function showEmptyListMessage()
     {
         // TRANS: Empty list message for page with replies for a user.
-        // TRANS: %1$s and %s$s are the user nickname.
-        $message = sprintf(_('This is the timeline showing replies to %1$s but %2$s hasn\'t received a notice to them yet.'),
-                           $this->user->nickname,
-                           $this->user->nickname) . ' ';
+        // TRANS: %1$s is the user nickname.
+        $message = sprintf(_('This is the timeline showing replies to %1$s but no notices have arrived yet.'), $this->target->getNickname());
+        $message .= ' ';    // Spacing between this sentence and the next.
 
         if (common_logged_in()) {
-            $current_user = common_current_user();
-            if ($this->user->id === $current_user->id) {
+            if ($this->target->getID() === $this->scoped->getID()) {
                 // TRANS: Empty list message for page with replies for a user for the logged in user.
                 // TRANS: This message contains a Markdown link in the form [link text](link).
                 $message .= _('You can engage other users in a conversation, subscribe to more people or [join groups](%%action.groups%%).');
             } else {
                 // TRANS: Empty list message for page with replies for a user for all logged in users but the user themselves.
-                // TRANS: %1$s, %2$s and %3$s are a user nickname. This message contains a Markdown link in the form [link text](link).
-                $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+                // TRANS: %1$s is a user nickname and %2$s is the same but with a prepended '@' character. This message contains a Markdown link in the form [link text](link).
+                $message .= sprintf(_('You can try to [nudge %1$s](../%1$s) or [post something to them](%%%%action.newnotice%%%%?content=%2$s).'), $this->target->getNickname(), '@' . $this->target->getNickname());
             }
-        }
-        else {
+        } else {
             // TRANS: Empty list message for page with replies for a user for not logged in users.
             // TRANS: %1$s is a user nickname. This message contains a Markdown link in the form [link text](link).
-            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
+            $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->getNickname());
         }
 
         $this->elementStart('div', 'guide');
@@ -229,7 +203,11 @@ class RepliesAction extends Action
         $this->elementEnd('div');
     }
 
+<<<<<<< HEAD
     function isReadOnly(array $args=array())
+=======
+    public function isReadOnly($args)
+>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
     {
         return true;
     }
index 84a542bbda3d3f0a728760b27ad304b851842aa4..cee238836a3515d093174b8483c3db48f8b3aa65 100644 (file)
@@ -579,7 +579,7 @@ var SN = { // StatusNet
          * Setup function -- DOES NOT trigger actions immediately.
          *
          * Sets up event handlers on all visible notice's option <a> elements
-         * so they are called with AJAX enabled.
+         * with the "popup" class so they behave as expected with AJAX.
          *
          * (without javascript the link goes to a page that expects you to verify
          * the action through a form)
@@ -587,17 +587,21 @@ var SN = { // StatusNet
          * @access private
          */
         NoticeOptionsAjax: function () {
-            $(document).on('click', '.notice-options > a', function (e) {
+            $(document).on('click', '.notice-options > a.popup', function (e) {
                 e.preventDefault();
                 var noticeEl = $(this).closest('.notice');
-                $.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) {
-                    SN.U.NoticeOptionPopup(data);
+                $.ajax({
+                    url: $(this).attr('href'),
+                    data: {ajax: 1},
+                    success: function (data, textStatus, xhr) {
+                        SN.U.NoticeOptionPopup(data, noticeEl);
+                    },
                 });
                 return false;
             });
         },
 
-        NoticeOptionPopup: function (data) {
+        NoticeOptionPopup: function (data, noticeEl) {
             title = $('head > title', data).text();
             body = $('body', data).html();
             dialog = $(body).dialog({
@@ -651,18 +655,14 @@ var SN = { // StatusNet
             var parentNotice = notice;
             var stripForm = true; // strip a couple things out of reply forms that are inline
 
-            var list = notice.closest('.notices');
-            if (list.hasClass('threaded-replies')) {
-                // We're replying to a reply; use reply form on the end of this list.
-            } else {
-                // We're replying to a parent notice; pull its threaded list
-                // and we'll add on the end of it. Will add the threaded list if needed.
-                var list = $('ul.threaded-replies', notice);
-                if (list.length == 0) {
-                    list = $('<ul class="notices threaded-replies xoxo"></ul>');
-                    notice.append(list);
-                    list = notice.find('ul.threaded-replies');
-                }
+            var list = notice.find('.threaded-replies');
+            if (list.length == 0) {
+                list = notice.closest('.threaded-replies');
+            }
+            if (list.length == 0) {
+                list = $('<ul class="notices threaded-replies xoxo"></ul>');
+                notice.append(list);
+                list = notice.find('.threaded-replies');
             }
 
             var nextStep = function () {
@@ -675,6 +675,7 @@ var SN = { // StatusNet
                     replyForm.find('label[for=notice_to]').hide();
                     replyForm.find('label[for=notice_private]').hide();
                 }
+                replyItem.show();
 
                 // Set focus...
                 var text = replyForm.find('textarea');
@@ -694,29 +695,30 @@ var SN = { // StatusNet
                 }
             };
 
-            // Create the reply form entry at the end
+            // Create the reply form entry
             var replyItem = $('li.notice-reply', list);
             if (replyItem.length == 0) {
                 replyItem = $('<li class="notice-reply"></li>');
 
                 // Fetch a fresh copy of the notice form over AJAX.
                 var url = $('#input_form_status > form').attr('action');
-                $.get(url, {ajax: 1, inreplyto: id}, function (data, textStatus, xhr) {
-                    var formEl = document._importNode($('form', data)[0], true);
-                    replyItem.append(formEl);
-                    list.append(replyItem);
-
-                    replyForm = $(formEl);
-                    SN.Init.NoticeFormSetup(replyForm);
-                    nextStep();
+                $.ajax({
+                    url: url,
+                    data: {ajax: 1, inreplyto: id},
+                    success: function (data, textStatus, xhr) {
+                        var formEl = document._importNode($('form', data)[0], true);
+                        replyForm = $(formEl);
+                        replyItem.append(replyForm);
+                        list.append(replyItem);
+
+                        SN.Init.NoticeFormSetup(replyForm);
+                        nextStep();
+                    },
                 });
             } else {
                 replyForm = replyItem.children('form');
-                if (SN.Init.NoticeFormSetup(replyForm)) {
-                    nextStep();
-                }
-                replyItem.show();
-                replyItem.find('textarea').focus();
+                SN.Init.NoticeFormSetup(replyForm);
+                nextStep();
             }
         },
 
@@ -730,11 +732,15 @@ var SN = { // StatusNet
             $(document).on('click', 'li.notice-reply-comments a', function () {
                     var url = $(this).attr('href');
                     var area = $(this).closest('.threaded-replies');
-                    $.get(url, {ajax: 1}, function (data, textStatus, xhr) {
-                        var replies = $('.threaded-replies', data);
-                        if (replies.length) {
-                            area.replaceWith(document._importNode(replies[0], true));
-                        }
+                    $.ajax({
+                        url: url,
+                        data: {ajax: 1},
+                        success: function (data, textStatus, xhr) {
+                            var replies = $('.threaded-replies', data);
+                            if (replies.length) {
+                                area.replaceWith(document._importNode(replies[0], true));
+                            }
+                        },
                     });
                     return false;
                 });
index 4063699b6d52746d389a6b3a97d0a5de06881080..49e11e513a010bfa59398b002056a171f87c4c8a 100644 (file)
@@ -598,7 +598,7 @@ class NoticeListItem extends Widget
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $todel->id));
             $this->out->element('a', array('href' => $deleteurl,
-                                           'class' => 'notice_delete',
+                                           'class' => 'notice_delete popup',
                                            // TRANS: Link title in notice list item to delete a notice.
                                            'title' => _('Delete this notice from the timeline.')),
                                            // TRANS: Link text in notice list item to delete a notice.
index 810957c322fbb499f30ce6a2a386f1ee6aa6b821..49ba2b684515b425a93c791b49cb026f07ed47b1 100644 (file)
@@ -450,7 +450,7 @@ class FavoritePlugin extends ActivityHandlerPlugin
 
     public function onStartEmailSaveForm(Action $action, Profile $scoped)
     {
-        $emailfave = $action->boolean('email-notify_fave') ? 1 : 0;
+        $emailfave = $action->booleanintstring('email-notify_fave');
         try {
             if ($emailfave == $scoped->getPref('email', 'notify_fave')) {
                 // No need to update setting
index 9e0bfac3fee56a627075e34a23706cb58520cfb7..59c0078be40b2002964c132ba5c14cbe9bf13e48 100644 (file)
@@ -951,7 +951,8 @@ content: ":";
 }
 
 .threaded-replies .form_notice input.submit {
-    bottom: 0;
+    bottom: 1ex;
+    right: 1ex;
 }
 
 .threaded-replies .form_notice .error,