From 87730ba7b3d3e9e072056e4b480f0435c9bd390e Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Thu, 28 Sep 2017 20:34:37 +0200
Subject: [PATCH] fixed #204

---
 .../src/components/settingsTab.component.pug  | 36 ++++++++++++-------
 .../terminalSettingsTab.component.pug         | 24 ++++++++-----
 2 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/terminus-settings/src/components/settingsTab.component.pug b/terminus-settings/src/components/settingsTab.component.pug
index 57d5a90a..6ba2c88f 100644
--- a/terminus-settings/src/components/settingsTab.component.pug
+++ b/terminus-settings/src/components/settingsTab.component.pug
@@ -23,15 +23,17 @@ ngb-tabset.vertical(type='tabs')
                             (ngModelChange)='config.save()',
                             ngbRadioGroup
                         )
-                            label.btn.btn-secondary
+                            label.btn.btn-secondary(ngbButtonLabel)
                                 input(
                                     type='radio',
+                                    ngbButton,
                                     [value]='"top"'
                                 )
                                 | On the top
-                            label.btn.btn-secondary
+                            label.btn.btn-secondary(ngbButtonLabel)
                                 input(
                                     type='radio',
+                                    ngbButton,
                                     [value]='"bottom"'
                                 )
                                 | At the bottom
@@ -44,21 +46,24 @@ ngb-tabset.vertical(type='tabs')
                             '(ngModelChange)'='config.save(); config.requestRestart()'
                             ngbRadioGroup
                         )
-                            label.btn.btn-secondary
+                            label.btn.btn-secondary(ngbButtonLabel)
                                 input(
                                     type='radio',
+                                    ngbButton,
                                     [value]='"native"'
                                 )
                                 | Native
-                            label.btn.btn-secondary
+                            label.btn.btn-secondary(ngbButtonLabel)
                                 input(
                                     type='radio',
+                                    ngbButton,
                                     [value]='"thin"'
                                 )
                                 | Thin
-                            label.btn.btn-secondary
+                            label.btn.btn-secondary(ngbButtonLabel)
                                 input(
                                     type='radio',
+                                    ngbButton,
                                     [value]='"full"'
                                 )
                                 | Full
@@ -74,33 +79,38 @@ ngb-tabset.vertical(type='tabs')
                                     '(ngModelChange)'='config.save(); docking.dock()'
                                     ngbRadioGroup
                                 )
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='"off"'
                                         )
                                         | Off
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='"top"'
                                         )
                                         | Top
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='"left"'
                                         )
                                         | Left
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='"right"'
                                         )
                                         | Right
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='"bottom"'
                                         )
                                         | Bottom
@@ -113,15 +123,17 @@ ngb-tabset.vertical(type='tabs')
                                     (ngModelChange)='config.save(); docking.dock()',
                                     ngbRadioGroup
                                 )
-                                    label.btn.btn-secondary
+                                    label.btn.btn-secondary(ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             value='current'
                                         )
                                         | Current
-                                    label.btn.btn-secondary(*ngFor='let screen of screens')
+                                    label.btn.btn-secondary(*ngFor='let screen of screens', ngbButtonLabel)
                                         input(
                                             type='radio',
+                                            ngbButton,
                                             [value]='screen.id'
                                         )
                                         | {{screen.name}}
diff --git a/terminus-terminal/src/components/terminalSettingsTab.component.pug b/terminus-terminal/src/components/terminalSettingsTab.component.pug
index da2404fb..091ac1a9 100644
--- a/terminus-terminal/src/components/terminalSettingsTab.component.pug
+++ b/terminus-terminal/src/components/terminalSettingsTab.component.pug
@@ -183,15 +183,17 @@
                     (ngModelChange)='config.save()',
                     ngbRadioGroup
                 )
-                    label.btn.btn-secondary
+                    label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
+                            ngbButton,
                             [value]='"theme"'
                         )
                         | From theme
-                    label.btn.btn-secondary
+                    label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
+                            ngbButton,
                             [value]='"colorScheme"'
                         )
                         | From colors
@@ -203,21 +205,24 @@
                     (ngModelChange)='config.save()',
                     ngbRadioGroup
                 )
-                    label.btn.btn-secondary
+                    label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
+                            ngbButton,
                             [value]='"block"'
                         )
                         | █
-                    label.btn.btn-secondary
+                    label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
+                            ngbButton,
                             [value]='"beam"'
                         )
                         | |
-                    label.btn.btn-secondary
+                    label.btn.btn-secondary(ngbButtonLabel)
                         input(
                             type='radio',
+                            ngbButton,
                             [value]='"underline"'
                         )
                         | ▁
@@ -241,21 +246,24 @@
                 (ngModelChange)='config.save()',
                 ngbRadioGroup
             )
-                label.btn.btn-secondary
+                label.btn.btn-secondary(ngbButtonLabel)
                     input(
                         type='radio',
+                        ngbButton,
                         [value]='"off"'
                     )
                     | Off
-                label.btn.btn-secondary
+                label.btn.btn-secondary(ngbButtonLabel)
                     input(
                         type='radio',
+                        ngbButton,
                         [value]='"visual"'
                     )
                     | Visual
-                label.btn.btn-secondary
+                label.btn.btn-secondary(ngbButtonLabel)
                     input(
                         type='radio',
+                        ngbButton,
                         [value]='"audible"'
                     )
                     | Audible