status: Rebrand the user menu as the system menu

As the user menu no longer really shows anything about the user, and just
power menu and settings, it's not really deserving of the "user menu" name,
so rename it to the ever-blandly-named "system menu".

This is a part of the new system status design, see
https://wiki.gnome.org/GnomeShell/Design/Guidelines/SystemStatus/
for design details.

https://bugzilla.gnome.org/show_bug.cgi?id=704368

js/Makefile.am

@@ -95,10 +95,10 @@ nobase_dist_js_DATA = 	\
 	ui/status/power.js	\
 	ui/status/volume.js	\
 	ui/status/bluetooth.js	\
+	ui/status/system.js	\
 	ui/switcherPopup.js	\
 	ui/tweener.js		\
 	ui/unlockDialog.js	\
-	ui/userMenu.js		\
 	ui/userWidget.js	\
 	ui/viewSelector.js	\
 	ui/wanda.js		\

js/ui/panel.js

@@ -857,7 +857,7 @@ const PANEL_ITEM_IMPLEMENTATIONS = {
     'lockScreen': imports.ui.status.lockScreenMenu.Indicator,
     'keyboard': imports.ui.status.keyboard.InputSourceIndicator,
     'powerMenu': imports.gdm.powerMenu.PowerMenuButton,
-    'userMenu': imports.ui.userMenu.UserMenuButton
+    'system': imports.ui.status.system.Indicator,
 };
 
 if (Config.HAVE_BLUETOOTH)

js/ui/sessionMode.js

@@ -60,7 +60,7 @@ const _modes = {
         unlockDialog: undefined,
         components: ['polkitAgent', 'telepathyClient'],
         panel: {
-            left: ['userMenu'],
+            left: [],
             center: [],
             right: ['lockScreen']
         },
@@ -72,7 +72,7 @@ const _modes = {
         unlockDialog: undefined,
         components: ['polkitAgent', 'telepathyClient'],
         panel: {
-            left: ['userMenu'],
+            left: [],
             center: [],
             right: ['a11y', 'keyboard', 'lockScreen']
         },
@@ -97,7 +97,7 @@ const _modes = {
             left: ['activities', 'appMenu'],
             center: ['dateMenu'],
             right: ['a11y', 'keyboard', 'volume', 'bluetooth',
-                    'network', 'battery', 'userMenu']
+                    'network', 'battery', 'system']
         }
     }
 };

js/ui/status/system.js

@@ -39,12 +39,12 @@ const SystemdLoginSessionIface = <interface name='org.freedesktop.login1.Session
 
 const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
 
-const UserMenuButton = new Lang.Class({
-    Name: 'UserMenuButton',
+const Indicator = new Lang.Class({
+    Name: 'SystemIndicator',
     Extends: PanelMenu.SystemStatusButton,
 
     _init: function() {
-        this.parent('user-available-symbolic', _("User Menu"));
+        this.parent('system-shutdown-symbolic', _("System"));
 
         this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });