Merging in a much-needed fix to the msfweb skins support, thanks Mike!

git-svn-id: file:///home/svn/framework3/trunk@4999 4d416f70-5f16-0410-b530-b9f4589650da

data/msfweb/app/views/exploits/list.rhtml

@@ -1,6 +1,6 @@
     <div id="module-search-box">
         <span>Search</span>
-        <input id="module_search" name="terms" type="text" size="55" value=""/>
+        <input id="module_search" name="terms" type="text" size="50" value=""/>
 		<img alt="Spinner" id="search_spinner" src="/images/spinner.gif" style="display: none;" />
         
     </div>

data/msfweb/app/views/msf/search.rhtml

@@ -1,49 +1,49 @@
 <% if @results %>
 <% unless @clean_list %>
-<table width="100%">
-	<thead>
-		<tr>
-			<th>
-				<% if (params[:terms].strip.length > 0) %>
-					<% if (@results.size > 0) %>
-						Matched <%= @results.size %> modules for term <em><%=h params[:terms] %>
-					<% else %>
-						No matching modules for term <em><%=h params[:terms] %>
-					<% end %>
-				<% else %>
-					Showing all <% @results.size %> modules
-				<% end %>
-			</th>
-		</tr>
-	</thead>
-	<tbody>
+<table width="100%" class="EAconf_moduleFull">
+    <tr>
+        <td>
+            <% if (params[:terms].strip.length > 0) %>
+                <% if (@results.size > 0) %>
+                    Matched <%= @results.size %> modules for term <em><%=h params[:terms] %>
+                <% else %>
+                    No matching modules for term <em><%=h params[:terms] %>
+                <% end %>
+            <% else %>
+                Showing all <%= @results.size %> modules
+            <% end %>
+        </td>
+    </tr>
+    <tr>
+        <td>
 <% else %>
-<ul>
+    <ul>
 <% end %>
 <% @results.each do |m| %>
 <% unless @clean_list %>
     <tr>
-        <td class="moduleTitle">
-		    <span class="moduleTitle_Text" onClick="window.parent.openModuleWindow('<%= @module_type %>', '<%= m.refname.gsub('/', ':') %>', '<%= m.name.gsub('"','').gsub("'","") %>')"><%= h(m.name) %></span>
+        <td class="EAconf_moduleName">
+            <span style="cursor:pointer;" onClick="window.parent.openModuleWindow('<%= @module_type %>', '<%= m.refname.gsub('/', ':') %>', '<%= m.name.gsub('"','').gsub("'","") %>')"><%= h(m.name) %></span>
 
             <% if m.platform and @module_type =~ /(payloads|exploits)/ %>
-            <%= module_platform_icons(m.platform) %>
+                <%= module_platform_icons(m.platform) %>
             <% else %>
-				<% if (m.arch.length > 0) %>
-					(<%= h m.arch.join(', ') %>)
-				<% end %>
+                <% if (m.arch.length > 0) %>
+                    (<%= h m.arch.join(', ') %>)
+                <% end %>
             <% end %>
         </td>
     </tr>
-    <tr class="moduleDescription">
-        <td class="moduleDescription"><%= m.description %></td>
+    <tr>
+        <td class="EAconf_moduleDescription" colspan="2">
+            <%= m.description %>
+        </td>
     </tr>
 <% else %>
     <li><%= h(m.name) %></li>
 <% end %>
 <% end %>
 <% unless @clean_list %>
-	</tbody>
 </table>
 <% else %>
 </ul>

data/msfweb/app/views/options/index.rhtml

@@ -8,9 +8,15 @@
 	end
 %>
 <form method="POST">
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
+<table cellpadding="0" border="0" width="100%" class="EAConf_moduleFull">
    <tr colspan="2">
-      <td align="center">Style Name</td>
+      <th align="center" class="moduleOptionsHeader">Style Name</td>
+   </tr>
+   <tr>
+      <td class="EAconf_moduleDescription">
+          Use the drop-down menu to select the desired theme for the Metasploit Framework Web Console<br /><br />
+          Current style: <strong><em><script language="javascript">document.writeln(styleName);</script></em></strong>
+      </td>
    </tr>
    <tr>
       <td>

data/msfweb/public/stylesheets/skins/default/content.css

@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2006 LMH <lmh[at]info-pull.com>
+ * Original Copyright (c) 2006 LMH <lmh[at]info-pull.com>
  * Added to Metasploit under the terms of the Metasploit Framework License v1.2
  * Additions Copyright (C) 2006-2007 Metasploit LLC
 */