MDL-67577 core_message: navbar_output order

* moved the logic from core_message_popup_render_navbar_output to message_popup_render_navbar_output in message/output/popup/lib.php * using float: left instead of float: right in theme
moodle · Jan 27, 2020 · f18444a · f18444a
1 parent 77a359c
commit f18444a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 42 deletions.
diff --git a/message/lib.php b/message/lib.php
@@ -783,39 +783,6 @@ function core_message_user_preferences() {
     return $preferences;
 }
 
-/**
- * Renders the popup.
- *
- * @param renderer_base $renderer
- * @return string The HTML
- */
-function core_message_render_navbar_output(\renderer_base $renderer) {
-    global $USER, $CFG;
-
-    // Early bail out conditions.
-    if (!isloggedin() || isguestuser() || user_not_fully_set_up($USER) ||
-        get_user_preferences('auth_forcepasswordchange') ||
-        (!$USER->policyagreed && !is_siteadmin() &&
-            ($manager = new \core_privacy\local\sitepolicy\manager()) && $manager->is_defined())) {
-        return '';
-    }
-
-    $output = '';
-
-    // Add the messages popover.
-    if (!empty($CFG->messaging)) {
-        $unreadcount = \core_message\api::count_unread_conversations($USER);
-        $requestcount = \core_message\api::get_received_contact_requests_count($USER->id);
-        $context = [
-            'userid' => $USER->id,
-            'unreadcount' => $unreadcount + $requestcount
-        ];
-        $output .= $renderer->render_from_template('core_message/message_popover', $context);
-    }
-
-    return $output;
-}
-
 /**
  * Render the message drawer to be included in the top of the body of each page.
  *

diff --git a/message/output/popup/lib.php b/message/output/popup/lib.php
@@ -58,5 +58,16 @@ function message_popup_render_navbar_output(\renderer_base $renderer) {
         $output .= $renderer->render_from_template('message_popup/notification_popover', $context);
     }
 
+    // Add the messages popover.
+    if (!empty($CFG->messaging)) {
+        $unreadcount = \core_message\api::count_unread_conversations($USER);
+        $requestcount = \core_message\api::get_received_contact_requests_count($USER->id);
+        $context = [
+            'userid' => $USER->id,
+            'unreadcount' => $unreadcount + $requestcount
+        ];
+        $output .= $renderer->render_from_template('core_message/message_popover', $context);
+    }
+
     return $output;
 }
diff --git a/message/templates/message_popover.mustache b/message/templates/message_popover.mustache
@@ -35,7 +35,7 @@
     }
 
 }}
-<div class="float-right popover-region collapsed">
+<div class="popover-region collapsed" data-region="popover-region-messages">
     <a id="message-drawer-toggle-{{uniqid}}" class="nav-link d-inline-block popover-region-toggle position-relative" href="#"
             role="button">
         {{#pix}} t/message, core, {{#str}} togglemessagemenu, message {{/str}} {{/pix}}

diff --git a/message/tests/behat/message_drawer_manage_contacts.feature b/message/tests/behat/message_drawer_manage_contacts.feature
@@ -44,7 +44,7 @@ Feature: Manage contacts
     And I should see "Contact request sent"
     And I log out
     And I log in as "student4"
-    Then I should see "2" in the "//*[@data-region='count-container']" "xpath_element"
+    Then I should see "2" in the "//div[@data-region='popover-region-messages']//*[@data-region='count-container']" "xpath_element"
     And I open messaging
     And I click on "Contacts" "link"
     Then I should see "2" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"
@@ -69,7 +69,7 @@ Feature: Manage contacts
     And I should see "Contact request sent"
     And I log out
     And I log in as "student3"
-    Then I should see "1" in the "//*[@data-region='count-container']" "xpath_element"
+    Then I should see "1" in the "//div[@data-region='popover-region-messages']//*[@data-region='count-container']" "xpath_element"
     And I open messaging
     And I click on "Contacts" "link"
     Then I should see "1" in the "//div[@data-region='view-contacts']//*[@data-region='contact-request-count']" "xpath_element"

diff --git a/theme/boost/scss/moodle/popover-region.scss b/theme/boost/scss/moodle/popover-region.scss
@@ -22,7 +22,6 @@ $content-header-footer-height: $region-header-height + $region-footer-height;
 }
 
 .popover-region {
-    float: right;
     position: relative;
 
     &.collapsed {
@@ -177,7 +176,7 @@ $content-header-footer-height: $region-header-height + $region-footer-height;
 
 .navbar {
     .popover-region {
-        float: right;
+        float: left;
         margin-right: 10px;
 
         &.collapsed {

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -16265,7 +16265,6 @@ body {
     flex-shrink: 0; }
 
 .popover-region {
-  float: right;
   position: relative; }
   .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {
     display: none; }
@@ -16380,7 +16379,7 @@ body {
     display: none; }
 
 .navbar .popover-region {
-  float: right;
+  float: left;
   margin-right: 10px; }
   .navbar .popover-region.collapsed .popover-region-container {
     opacity: 0;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -16527,7 +16527,6 @@ body {
     flex-shrink: 0; }
 
 .popover-region {
-  float: right;
   position: relative; }
   .popover-region.collapsed .popover-region-toggle:before, .popover-region.collapsed .popover-region-toggle:after {
     display: none; }
@@ -16642,7 +16641,7 @@ body {
     display: none; }
 
 .navbar .popover-region {
-  float: right;
+  float: left;
   margin-right: 10px; }
   .navbar .popover-region.collapsed .popover-region-container {
     opacity: 0;