[Bps-public-commit] RT-BugTracker-Public branch, 4.2-4.4-compatibility, updated. 1.00-17-g24d1ce5

[Jim Brandt]

The branch, 4.2-4.4-compatibility has been updated
       via  24d1ce5e8b1bc1c5125a56134e72839e9e03cb56 (commit)
       via  c99d3c65e125fe994b6ca0334b54fd385495e192 (commit)
       via  6a5e8a262c08dbfb68c7c0fed321d3be2a0f38a0 (commit)
      from  6d2e82892e1b86dd0053ea9e4b26e688e2afa4c7 (commit)

Summary of changes:
 .../BugTracker-Public/Elements/Tabs/Privileged        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

- Log -----------------------------------------------------------------
commit 6a5e8a262c08dbfb68c7c0fed321d3be2a0f38a0
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Mar 28 11:22:29 2017 -0400

    Only add an about menu if it's defined
    
    RT::Extension::rt_cpan_org creates an about menu with some pages
    that describe the purpose of the RT system set up for cpan. Only show
    the About menu if another extension like that one has defined it.

diff --git a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
index bcb704d..d0ba881 100644
--- a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
+++ b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
@@ -75,7 +75,7 @@ Menu()->child(
     path        => '/Public/Dist/Browse.html',
 );
 
-Menu->child( "about", menu => $about );
+Menu->child( "about", menu => $about ) if $about;
 
 if ($session{CurrentUser}->Name eq RT->Config->Get("WebPublicUser")) {
     Menu->child(

commit c99d3c65e125fe994b6ca0334b54fd385495e192
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Mar 28 11:47:15 2017 -0400

    Remove the welcome message since the dead-end link is confusing
    
    Remove the 'welcome guest' menu option. It is intended as a reminder to
    the current user that they are logged in as a guest. It is confusing,
    however, because it renders as a link and the link has no target.
    
    Leave the commented code in place until RT's menus support a no-link option
    or a sensible target page is created.

diff --git a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
index d0ba881..cda5eb5 100644
--- a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
+++ b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
@@ -78,11 +78,16 @@ Menu()->child(
 Menu->child( "about", menu => $about ) if $about;
 
 if ($session{CurrentUser}->Name eq RT->Config->Get("WebPublicUser")) {
-    Menu->child(
-        'preferences' => title => loc( 'Welcome [_1]anonymous guest[_2].', '<span class="current-user">', '</span>' ),
-        escape_title  => 0,
-        sort_order    => 1000,
-    );
+
+    # This creates a welcome message that reminds the current user they are logged
+    # in as a guest. However, it renders as a link with no target
+    # because RT doesn't currently support menu items that don't link somewhere.
+    # Comment out until RT's menus support a 'no-link' option.
+#    Menu->child(
+#        'preferences' => title => loc( 'Welcome [_1]anonymous guest[_2].', '<span class="current-user">', '</span>' ),
+#        escape_title  => 0,
+#        sort_order    => 1000,
+#    );
 
     # Public user must logout to login
     Menu->child(

commit 24d1ce5e8b1bc1c5125a56134e72839e9e03cb56
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Tue Mar 28 12:03:20 2017 -0400

    Relabel log out link

diff --git a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
index cda5eb5..4d55447 100644
--- a/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
+++ b/html/Callbacks/BugTracker-Public/Elements/Tabs/Privileged
@@ -92,7 +92,7 @@ if ($session{CurrentUser}->Name eq RT->Config->Get("WebPublicUser")) {
     # Public user must logout to login
     Menu->child(
         "login",
-        title       => loc('Login as another user'),
+        title       => loc('Log out guest user'),
         path        => '/NoAuth/Logout.html',
         sort_order  => 1001,
     );

-----------------------------------------------------------------------