ref: refs/heads/master
commit 4db3851004e35d93929e63a67f18d6c54453c838
Author: Martin Vidner
Date: Mon Sep 7 15:29:15 2009 +0200
Separate DNS output by spaces. Show the current interface.
---
plugins/network/app/views/network/index.html.erb | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb
index 9419b84..1bb268c 100644
--- a/plugins/network/app/views/network/index.html.erb
+++ b/plugins/network/app/views/network/index.html.erb
@@ -5,11 +5,10 @@
<!-- TODO translations -->
<h3>Interface</h3>
-
<% form_tag("/network", :method => "get") do |f| %>
- <!-- (..., :id, :name) -->
+ <!-- (collection, value, text, selected) -->
<%= select_tag(:interface,
- options_from_collection_for_select(@ifcs, :id, :id)) %>
+ options_from_collection_for_select(@ifcs, :id, :id, @iface)) %>
<%= submit_tag("Select") %>
<% end %>
@@ -22,8 +21,8 @@
<h3>DNS</h3>
<p>Hostname: <%=h @name %></p>
<p>Domain: <%=h @domain %></p>
-<p>Name Servers: <%=h @nameservers %></p>
-<p>Search Domains: <%=h @searchdomains %></p>
+<p>Name Servers: <%=h @nameservers.join " " %></p>
+<p>Search Domains: <%=h @searchdomains.join " " %></p>
<h3>Routing</h3>
<p>Default Route: <%=h @default_route %></p>
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
