Upd. Settings. Improved UX. (#432)

inc/admin-bar.php

@@ -244,6 +244,13 @@ function spbc_admin__admin_bar__add_child_nodes($wp_admin_bar)
         ));
     }
 
+    // Critical updates
+    $wp_admin_bar->add_node(array(
+        'parent' => 'spbc__parent_node',
+        'id'     => 'spbc_admin_bar__critical_updates_link',
+        'title'  => '<a href="' . $spbc->settings_link . '&spbc_tab=critical_updates">' . __('Critical updates', 'security-malware-firewall') . '</a>',
+    ));
+
     // FireWall
     if ( (int) $spbc->settings['secfw__enabled'] ) {
         $wp_admin_bar->add_node(array(
@@ -306,13 +313,6 @@ function spbc_admin__admin_bar__add_child_nodes($wp_admin_bar)
         'title'  => '<a href="' . $spbc->settings_link . '&spbc_tab=summary">' . __('Summary', 'security-malware-firewall') . '</a>',
     ));
 
-    // Critical updates
-    $wp_admin_bar->add_node(array(
-        'parent' => 'spbc__parent_node',
-        'id'     => 'spbc_admin_bar__critical_updates_link',
-        'title'  => '<a href="' . $spbc->settings_link . '&spbc_tab=critical_updates">' . __('Critical updates', 'security-malware-firewall') . '</a>',
-    ));
-
     // Support link
     $wp_admin_bar->add_node(array(
         'parent' => 'spbc__parent_node',

inc/spbc-settings.php

@@ -1935,7 +1935,7 @@ function spbc_field_key()
             echo '<a id="spbc-key-manually-link" target="_blank" href="https://cleantalk.org/register?platform=wordpress&email=' . urlencode(spbc_get_admin_email()) . '&website=' . urlencode(parse_url(get_option('home'), PHP_URL_HOST)) . '&product_name=security" style="display: inline-block;">
 						<input style="color:#666;" type="button" class="spbc_auto_link" value="' . __('Get access key manually', 'security-malware-firewall') . '" />
 					</a>';
-            echo '&nbsp;' . __('or', 'security-malware-firewall') . '&nbsp;';
+            echo '<span id="spbc_get_key_or_text">&nbsp;' . __('or', 'security-malware-firewall') . '&nbsp;</span>';
             echo '<button class="spbc_manual_link" id="spbc_setting_get_key_auto" name="spbc_get_apikey_auto" type="button"  value="get_key_auto">'
                  . __('Get access key automatically', 'security-malware-firewall')
                  . '<img style="margin-left: 10px;" class="spbc_preloader_button" src="' . SPBC_PATH . '/images/preloader2.gif" />'