From e7f88557f5551c8ae2fbb799a794ea45bede7378 Mon Sep 17 00:00:00 2001 From: "sussurro@happypacket.net" Date: Tue, 25 Jan 2011 14:30:37 +0000 Subject: [PATCH] Fixes Issue 247 and Issue 252 MSF Module Panel CSS and ComboBox width git-svn-id: https://beef.googlecode.com/svn/trunk@716 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9 --- lib/modules/msfcommand.rb | 5 +++-- public/css/base.css | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/modules/msfcommand.rb b/lib/modules/msfcommand.rb index cd61afd3d..ca34e060a 100644 --- a/lib/modules/msfcommand.rb +++ b/lib/modules/msfcommand.rb @@ -80,7 +80,7 @@ class Msf < BeEF::Command msfoptions.keys.each { |k| next if msfoptions[k]['advanced'] == true next if msfoptions[k]['evasion'] == true - @info['Data'] << { 'name' => k + '_txt', 'type' => 'label', 'html' => msfoptions[k]['desc']} + @info['Data'] << { 'name' => k + '_txt', 'type' => 'label', 'text' => msfoptions[k]['desc']} case msfoptions[k]['type'] when "string","address","port" msfoptions[k]['default'] = rand(32**20).to_s(32) if k == "URIPATH" @@ -110,6 +110,7 @@ class Msf < BeEF::Command @info['Data'] << { 'name' => 'PAYLOAD', 'type' => 'combobox', + 'anchor' => '100% -100', 'ui_label' => 'Payload', 'store_type' => 'arraystore', 'store_fields' => ['payload'], @@ -137,7 +138,7 @@ class Msf < BeEF::Command payload_options.keys.each { |k| next if payload_options[k]['advanced'] == true next if payload_options[k]['evasion'] == true - info['Data'] << { 'name' => k + '_txt', 'type' => 'label', 'html' => payload_options[k]['desc']} + info['Data'] << { 'name' => k + '_txt', 'type' => 'label', 'text' => payload_options[k]['desc']} case payload_options[k]['type'] when "string","address","port","raw","path", "integer" payload_options[k]['default'] = "127.0.0.1" if k == "RHOST" diff --git a/public/css/base.css b/public/css/base.css index d069b933a..362c09fc5 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -87,3 +87,7 @@ margin-bottom: 10px; padding-top: 4px; } + +label { + font: 11px tahoma,arial,helvetica,sans-serif; +}