Merge pull request #532 from conjure-up/placement-cosmetic

RFC: input colors and pin label
conjure-up · Dec 19, 2016 · 3789f4d · 3789f4d
2 parents 61c92d1 + c78bacd
commit 3789f4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/conjureup/ui/widgets/filter_box.py b/conjureup/ui/widgets/filter_box.py
@@ -38,7 +38,7 @@ def __init__(self, edit_changed_cb, label="", info_text=""):
                        edit_changed_cb)
 
         w = Pile([Columns([AttrMap(self.editbox,
-                                   'filter', 'filter_focus')])
+                                   'string_input', 'string_input_focus')])
                   # self.info_text  # -- WORKAROUND for issue #194
                   ])
         super().__init__(w)

diff --git a/conjureup/ui/widgets/juju_machine_widget.py b/conjureup/ui/widgets/juju_machine_widget.py
@@ -112,7 +112,8 @@ def build_unselected_widgets(self):
             machine_id_w = self.juju_machine_id_label
         cols = [machine_id_w, self.cores_field,
                 self.mem_field, self.disk_field]
-        cols = [AttrMap(w, 'filter', 'filter_focus') for w in cols]
+        cols = [AttrMap(w, 'string_input',
+                        'string_input_focus') for w in cols]
         cols.append(Text("placeholder"))
         self.unselected_columns = Columns(cols, dividechars=2)
         self.update_assignments()
@@ -179,9 +180,9 @@ def update_unselected(self):
             pinned_machine = self.controller.get_pin(self.juju_machine_id)
 
             if pinned_machine:
-                pin_label = ": {} \N{PENCIL}".format(pinned_machine.hostname)
+                pin_label = " {} \N{PENCIL}".format(pinned_machine.hostname)
             else:
-                pin_label = ": _____ \N{PENCIL}"
+                pin_label = " \N{PENCIL}"
             self.juju_machine_id_button.set_label('{:20s}'.format(
                 self.juju_machine_id + " " + pin_label))
         else: