From 4a9db192bf507cd05701baa7a69afb2a61019528 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Thu, 10 Dec 2015 10:27:37 +0100
Subject: [PATCH] PThe plugin configuration view reformated using <em> tag

---
 app/views/settings/_dmsf_settings.html.erb | 115 +++++++++++----------
 1 file changed, 61 insertions(+), 54 deletions(-)

diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 4c74c7e0..96141360 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -20,34 +20,34 @@
 
 <p>
   <%= content_tag(:label, "#{l(:label_maximum_files_upload)}:") %>
-  <%= text_field_tag 'settings[dmsf_max_file_upload]', @settings['dmsf_max_file_upload'], :size => 10 %><br/>
-  (<%= l(:label_default) %>: 0)
-  <br/>
-  <%= l(:note_maximum_number_of_files_uploaded) %>
+  <%= text_field_tag 'settings[dmsf_max_file_upload]', @settings['dmsf_max_file_upload'], :size => 10 %>
+  <em class="info">
+    <%= l(:note_maximum_number_of_files_uploaded) %> <%= l(:label_default) %>: 0    
+  </em>
 </p>
 
 <p>
   <%= content_tag(:label, "#{l(:label_maximum_files_download)}:") %>
-  <%= text_field_tag 'settings[dmsf_max_file_download]', @settings['dmsf_max_file_download'], :size => 10 %><br/>
-  (<%= l(:label_default) %>: 0)
-  <br/>
-  <%= l(:note_maximum_number_of_files_downloaded) %>
+  <%= text_field_tag 'settings[dmsf_max_file_download]', @settings['dmsf_max_file_download'], :size => 10 %>
+  <em class="info">
+    <%= l(:note_maximum_number_of_files_downloaded) %> <%= l(:label_default) %>: 0
+  </em>
 </p>
 
 <p>
   <%= content_tag(:label, "#{l(:label_maximum_email_filesize)}:") %>
-  <%= text_field_tag 'settings[dmsf_max_email_filesize]', @settings['dmsf_max_email_filesize'], :size => 10 %><br/>
-  (<%= l(:label_default) %>: 0)
-  <br/>
-  <%= l(:note_maximum_email_filesize) %>
+  <%= text_field_tag 'settings[dmsf_max_email_filesize]', @settings['dmsf_max_email_filesize'], :size => 10 %>
+  <em class="info">
+    <%= l(:note_maximum_email_filesize) %> <%= l(:label_default) %>: 0  
+  </em>
 </p>
 
 <p>
   <%= content_tag(:label, "#{l(:label_maximum_ajax_upload_filesize)}:") %>  
-  <%= text_field_tag 'settings[dmsf_max_ajax_upload_filesize]', @settings['dmsf_max_ajax_upload_filesize'], :size => 10 %><br/>
-  (<%= l(:label_default) %>: 100)
-  <br/>
-  <%= l(:note_maximum_ajax_upload_filesize) %>
+  <%= text_field_tag 'settings[dmsf_max_ajax_upload_filesize]', @settings['dmsf_max_ajax_upload_filesize'], :size => 10 %>
+  <em class="info">
+    <%= l(:note_maximum_ajax_upload_filesize) %> <%= l(:label_default) %>: 100
+  </em>
 </p>
 
 <p>
@@ -56,8 +56,10 @@
     storage_dir = @settings['dmsf_storage_directory'].strip
     storage_dir = "#{Rails.root}/files/dmsf" if storage_dir.blank?
   %>
-  <%= text_field_tag 'settings[dmsf_storage_directory]', storage_dir, :size => 50 %><br/>
-  (<%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf" %>)
+  <%= text_field_tag 'settings[dmsf_storage_directory]', storage_dir, :size => 50 %>
+  <em class="info">
+    <%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf" %>
+  </em>
 </p>
 <% unless File.exists?(storage_dir) %>
   <% begin %>
@@ -80,8 +82,10 @@
 
 <p>
   <%= content_tag(:label, "#{l(:label_physical_file_delete)}:") %>
-  <%= check_box_tag('settings[dmsf_really_delete_files]', true, @settings['dmsf_really_delete_files']) %><br/>
-  (<%=l(:label_default)%>: <%=l(:general_text_No)%>)
+  <%= check_box_tag('settings[dmsf_really_delete_files]', true, @settings['dmsf_really_delete_files']) %>
+  <em class="info">
+    <%= l(:label_default)%>: <%= l(:general_text_No)%>
+  </em>
 </p>
 
 <p>
@@ -90,8 +94,10 @@
     options_for_select([
                     [l(:select_option_deactivated), nil], 
                     [l(:select_option_activated), '1']], 
-                    :selected => @settings['dmsf_default_notifications'])) %><br/>
-  (<%= l(:label_default) %>: <%= l(:select_option_deactivated) %>)
+                    :selected => @settings['dmsf_default_notifications'])) %>
+  <em class="info">
+    <%= l(:label_default) %>: <%= l(:select_option_deactivated) %>
+  </em>
 </p>
 
 <p>
@@ -100,13 +106,13 @@
     options_for_select([
       [l(:select_option_deactivated), nil],
       [l(:select_option_activated), '1']],
-      :selected => @settings['dmsf_display_notified_recipients'])) %><br/>
-  (<%= l(:label_default) %>: <%= l(:select_option_deactivated) %>)
-  <br/>
-  <%= l(:note_display_notified_recipients).html_safe %>
+      :selected => @settings['dmsf_display_notified_recipients'])) %>
+  <em class="info">
+    <%= l(:note_display_notified_recipients).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_deactivated) %>
+  </em>
 </p>
 
-<hr />
+<hr/>
 
 <p>
   <%= content_tag(:label, "#{l(:label_webdav)}:") %>
@@ -114,10 +120,10 @@
     options_for_select([
       [l(:select_option_deactivated), nil],
       [l(:select_option_activated), '1']],
-      :selected => @settings['dmsf_webdav'])) %><br/>
-  (<%= l(:label_default) %>: <%= l(:select_option_activated) %>)
-  <br/>
-  <%= l(:note_webdav, :protocol => Setting.protocol, :domain => Setting.host_name).html_safe %>
+      :selected => @settings['dmsf_webdav'])) %>
+  <em class="info">
+    <%= l(:note_webdav, :protocol => Setting.protocol, :domain => Setting.host_name).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_activated) %>
+  </em>  
 </p>
 
 <% if @settings['dmsf_webdav'].nil? || !@settings['dmsf_webdav'].empty? %>
@@ -128,13 +134,13 @@
         [l(:select_option_webdav_readonly), 'WEBDAV_READ_ONLY'],
         [l(:select_option_webdav_readwrite), 'WEBDAV_READ_WRITE']],
         :selected => @settings['dmsf_webdav_strategy'])) %><br/>
-    (<%= l(:label_default) %>: <%= l(:select_option_webdav_readonly) %>)
-    <br/>
-    <%= l(:note_webdav_strategy).html_safe %>
+    <em class="info">
+      <%= l(:note_webdav_strategy).html_safe %> <%= l(:label_default) %>: <%= l(:select_option_webdav_readonly) %>    
+    </em>
   </p>
 <% end %>
 
-<hr />
+<hr/>
 
 <% begin %>
   <% require 'xapian' %>
@@ -146,29 +152,30 @@
 
 <p>
   <%= content_tag(:label, "#{l(:label_index_database)}:") %>
-  <%= text_field_tag 'settings[dmsf_index_database]', @settings['dmsf_index_database'], :disabled => xapian_disabled, :size => 50 %><br/>
-  (<%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf_index" %>)
+  <%= text_field_tag 'settings[dmsf_index_database]', @settings['dmsf_index_database'], :disabled => xapian_disabled, :size => 50 %>
+  <em class="info">
+    <%= l(:label_default) %>: <%= "#{Rails.root}/files/dmsf_index" %>
+  </em>
 </p>
 
 <p>
   <%= content_tag(:label, "#{l(:label_stemming_language)}:") %>
-  <%= text_field_tag 'settings[dmsf_stemming_lang]', @settings['dmsf_stemming_lang'], :disabled => xapian_disabled %><br/>
-  (<%= l(:label_default)%>: english )<br/>
-  <br/>
-  <%= l(:note_possible_values)%>: danish dutch english finnish french german german2 hungarian italian kraaij_pohlmann lovins norwegian porter portuguese romanian russian spanish swedish turkish (<%= l(:note_pass_none_to_disable_stemming) %>)
+  <%= text_field_tag 'settings[dmsf_stemming_lang]', @settings['dmsf_stemming_lang'], :disabled => xapian_disabled %><br/>    
+  <em class="info">
+    <%= l(:note_possible_values)%>: danish dutch english finnish french german german2 hungarian italian kraaij_pohlmann lovins norwegian porter portuguese romanian russian spanish swedish turkish (<%= l(:note_pass_none_to_disable_stemming) %>)
+  </em>
 </p>
 
 <p>
-  <%= content_tag(:label, l(:label_stem_strategy) + ":")%>
-  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_NONE', @settings['dmsf_stemming_strategy'] == 'STEM_NONE', :disabled => xapian_disabled, :checked=>true  %> <%= l(:option_stem_none) %><br>
-  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_SOME', @settings['dmsf_stemming_strategy'] == 'STEM_SOME', :disabled => xapian_disabled  %> <%= l(:option_stem_some) %><br>
-  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_ALL', @settings['dmsf_stemming_strategy'] == 'STEM_ALL', :disabled => xapian_disabled  %> <%= l(:option_stem_all) %><br>
-  <br/>
-  <%= l(:label_stemming_description) %>:
-  <br>
-    STEM_NONE: <%=l(:note_do_not_stem) %><br>
-    STEM_SOME: <%=l(:note_stem_some) %><br>
-    STEM_ALL: <%=l(:note_stem_all) %><br>
-  <br/>
-  <%= l(:note_stemming_applied) %><br>
-</p>
+  <%= content_tag(:label, l(:label_stem_strategy) + ':')%>
+  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_NONE', @settings['dmsf_stemming_strategy'] == 'STEM_NONE', :disabled => xapian_disabled, :checked => true  %> <%= l(:option_stem_none) %><br/>
+  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_SOME', @settings['dmsf_stemming_strategy'] == 'STEM_SOME', :disabled => xapian_disabled  %> <%= l(:option_stem_some) %><br/>
+  <%= radio_button_tag 'settings[dmsf_stemming_strategy]', 'STEM_ALL', @settings['dmsf_stemming_strategy'] == 'STEM_ALL', :disabled => xapian_disabled  %> <%= l(:option_stem_all) %><br/>
+  <em class="info">
+    <%= l(:label_stemming_description) %>:<br/>    
+    &nbsp;&nbsp;STEM_NONE: <%= l(:note_do_not_stem) %><br/>
+    &nbsp;&nbsp;STEM_SOME: <%= l(:note_stem_some) %><br/>
+    &nbsp;&nbsp;STEM_ALL: <%= l(:note_stem_all) %><br/>    
+    <%= l(:note_stemming_applied) %>
+  </em>
+</p>
\ No newline at end of file