Do not use javascript to hide tabs content on page loading and make tabs work with javascript disabled.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1293 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 16 insertions, 11 deletions

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index c7b47b6d0..c99a13960 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,18 +1,23 @@
 <h2><%= l(:label_settings) %></h2>
 
+<% selected_tab = params[:tab] ? params[:tab].to_s : administration_settings_tabs.first[:name] %>
+
 <div class="tabs">
-    <ul>
-    <% administration_settings_tabs.each do |tab| -%>
-        <li><%= link_to l(tab[:label]), {}, :id => "tab-#{tab[:name]}", :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
-    <% end -%>
-    </ul>
+<ul>
+<% administration_settings_tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
+</ul>
 </div>
 
-<% administration_settings_tabs.each do |tab| %>
-    <%= content_tag('div', render(:partial => tab[:partial]), :id => "tab-content-#{tab[:name]}", :class => 'tab-content') %>
-<% end %>
-
-<%= tab = params[:tab] ? h(params[:tab]) : administration_settings_tabs.first[:name]
-javascript_tag "showTab('#{tab}');" %>
+<% administration_settings_tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
 
 <% html_title(l(:label_settings), l(:label_administration)) -%>