Merge the sidebar and secondary menu instances

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/django_gpg/apps.py

@@ -7,7 +7,7 @@ from mayan.apps.acls.links import link_acl_list
 from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
 from mayan.apps.common.apps import MayanAppConfig
 from mayan.apps.common.menus import (
-    menu_facet, menu_object, menu_setup, menu_sidebar
+    menu_facet, menu_object, menu_secondary, menu_setup
 )
 from mayan.apps.navigation import SourceColumn
 
@@ -70,7 +70,6 @@ class DjangoGPGApp(MayanAppConfig):
             links=(link_acl_list, link_key_delete, link_key_download,),
             sources=(Key,)
         )
-        menu_setup.bind_links(links=(link_key_setup,))
         menu_facet.bind_links(
             links=(link_private_keys, link_public_keys),
             sources=(
@@ -79,7 +78,7 @@ class DjangoGPGApp(MayanAppConfig):
                 'django_gpg:key_upload', Key, KeyStub
             )
         )
-        menu_sidebar.bind_links(
+        menu_secondary.bind_links(
             links=(link_key_query, link_key_upload),
             sources=(
                 'django_gpg:key_public_list', 'django_gpg:key_private_list',
@@ -87,3 +86,4 @@ class DjangoGPGApp(MayanAppConfig):
                 'django_gpg:key_upload', Key, KeyStub
             )
         )
+        menu_setup.bind_links(links=(link_key_setup,))