From a021d61e1d7572201cb33f8e63e522eea77998f7 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 23 Apr 2012 15:13:07 +0200 Subject: [PATCH] [webui] Rails now expects '<%=' in front of *_tag, *_for functions --- src/webui/app/mobile_views/main/login.html.erb | 4 ++-- src/webui/app/models/bs_request.rb | 10 ++++++---- src/webui/app/views/attribute/edit.html.erb | 2 +- .../views/configuration/connect_instance.html.erb | 4 ++-- src/webui/app/views/configuration/index.html.erb | 4 ++-- src/webui/app/views/driver_update/create.html.erb | 4 ++-- src/webui/app/views/group/index.html.erb | 2 +- src/webui/app/views/group/show.html.erb | 2 +- .../views/layouts/_personal_navigation.html.erb | 4 ++-- .../app/views/layouts/_watch_and_search.html.erb | 2 +- src/webui/app/views/main/_add_news_dialog.html.erb | 2 +- .../app/views/main/_delete_message_dialog.html.erb | 2 +- src/webui/app/views/main/_latest_updates.erb | 2 +- src/webui/app/views/main/_news.html.erb | 2 +- src/webui/app/views/main/_systemstatus.html.erb | 2 +- src/webui/app/views/main/index.html.erb | 2 +- .../app/views/monitor/_building_table.html.erb | 2 +- src/webui/app/views/monitor/_events.html.erb | 6 +++--- src/webui/app/views/monitor/_lights.html.erb | 2 +- .../app/views/monitor/_workers_table.html.erb | 4 ++-- .../app/views/package/_branch_dialog.html.erb | 2 +- .../app/views/package/_delete_dialog.html.erb | 2 +- src/webui/app/views/package/_files_view.html.erb | 2 +- .../app/views/package/_rpmlint_result.html.erb | 2 +- .../app/views/package/_service_parameters.html.erb | 2 +- src/webui/app/views/package/_set_url_form.html.erb | 2 +- .../views/package/_submit_request_dialog.html.erb | 4 ++-- src/webui/app/views/package/_tabs.html.erb | 4 ++-- src/webui/app/views/package/add_file.html.erb | 4 ++-- src/webui/app/views/package/edit.html.erb | 2 +- src/webui/app/views/package/files.html.erb | 2 +- .../app/views/package/live_build_log.html.erb | 4 ++-- src/webui/app/views/package/revisions.html.erb | 2 +- src/webui/app/views/package/show.html.erb | 2 +- src/webui/app/views/package/view_file.html.erb | 2 +- src/webui/app/views/package/wizard.html.erb | 2 +- src/webui/app/views/package/wizard_new.html.erb | 2 +- src/webui/app/views/patchinfo/_form.html.erb | 6 +++--- .../_add_maintained_project_dialog.html.erb | 4 ++-- .../app/views/project/_delete_dialog.html.erb | 2 +- .../app/views/project/_edit_comment_form.html.erb | 2 +- .../app/views/project/_edit_repository.html.erb | 2 +- .../app/views/project/_filter_projects.html.erb | 4 ++-- .../project/_incident_request_dialog.html.erb | 2 +- .../views/project/_release_request_dialog.html.erb | 2 +- src/webui/app/views/project/_tabs.html.erb | 4 ++-- .../app/views/project/_unlock_dialog.html.erb | 2 +- .../app/views/project/add_repository.html.erb | 4 ++-- .../add_repository_from_default_list.html.erb | 9 +++------ src/webui/app/views/project/edit.html.erb | 2 +- .../app/views/project/maintained_projects.html.erb | 2 +- .../views/project/maintenance_incidents.html.erb | 2 +- src/webui/app/views/project/monitor.html.erb | 4 ++-- src/webui/app/views/project/new.html.erb | 2 +- src/webui/app/views/project/new_package.html.erb | 2 +- .../app/views/project/new_package_branch.html.erb | 4 ++-- src/webui/app/views/project/rebuild_time.html.erb | 2 +- src/webui/app/views/project/show.html.erb | 2 +- src/webui/app/views/project/status.html.erb | 4 ++-- src/webui/app/views/project/subprojects.html.erb | 2 +- .../views/request/_add_reviewer_dialog.html.erb | 12 ++++++------ .../request/_add_role_request_dialog.html.erb | 2 +- .../request/_change_devel_request_dialog.html.erb | 4 ++-- .../views/request/_delete_request_dialog.html.erb | 2 +- src/webui/app/views/request/_issues_table.html.erb | 4 ++-- .../views/request/_recent_events_table.html.erb | 2 +- .../views/request/_set_incident_dialog.html.erb | 4 ++-- src/webui/app/views/request/show.html.erb | 14 +++++++------- src/webui/app/views/search/index.html.erb | 4 ++-- src/webui/app/views/shared/_add_group.html.erb | 4 ++-- src/webui/app/views/shared/_add_user.html.erb | 4 ++-- .../app/views/shared/_buildresult_box.html.erb | 2 +- src/webui/app/views/shared/_editor.html.erb | 4 ++-- .../views/shared/_incident_table_entries.html.erb | 2 +- .../app/views/shared/_involved_users.html.erb | 8 ++++---- src/webui/app/views/shared/_repositories.html.erb | 2 +- src/webui/app/views/shared/_requests.html.erb | 4 ++-- .../app/views/shared/_select_requests.html.erb | 4 ++-- src/webui/app/views/shared/_sourcediff.html.erb | 8 ++++---- src/webui/app/views/shared/noindex.html.erb | 2 +- .../app/views/user/change_my_password.html.erb | 2 +- src/webui/app/views/user/edit.html.erb | 2 +- src/webui/app/views/user/register_user.erb | 2 +- src/webui/app/views/user/request_ichain.html.erb | 2 +- .../vendor/bento/layouts/application.html.erb | 2 +- src/webui/config/routes.rb | 2 +- 86 files changed, 140 insertions(+), 141 deletions(-) diff --git a/src/webui/app/mobile_views/main/login.html.erb b/src/webui/app/mobile_views/main/login.html.erb index e39fb0987f5..87fba0e3721 100644 --- a/src/webui/app/mobile_views/main/login.html.erb +++ b/src/webui/app/mobile_views/main/login.html.erb @@ -5,7 +5,7 @@ <% if PROXY_AUTH_MODE == :on %>
- <% form_tag(PROXY_AUTH_LOGIN_PAGE, :method => :post, :id => 'login_form', :enctype => 'application/x-www-form-urlencoded') do %> + <%= form_tag(PROXY_AUTH_LOGIN_PAGE, :method => :post, :id => 'login_form', :enctype => 'application/x-www-form-urlencoded') do %> <%= hidden_field_tag(:url, "#{@return_to_host}#{@return_to_path}") %> <%= hidden_field_tag(:context, 'default') %> <%= hidden_field_tag(:proxypath, 'reserve') %> @@ -40,7 +40,7 @@ <% else %>
- <% form_tag( :controller => :user, :action => :do_login ) do %> + <%= form_tag( :controller => :user, :action => :do_login ) do %> <%= hidden_field_tag(:return_to_path, @return_to_path) %> diff --git a/src/webui/app/models/bs_request.rb b/src/webui/app/models/bs_request.rb index f7d3fff969b..6487255ffc4 100644 --- a/src/webui/app/models/bs_request.rb +++ b/src/webui/app/models/bs_request.rb @@ -363,7 +363,8 @@ def events end def actions(with_diff = true) - return Rails.cache.fetch("request_#{value('id')}_actions", :expires_in => 7.days) do + #TODO: Fix! + #return Rails.cache.fetch("request_#{value('id')}_actions", :expires_in => 7.days) do actions, action_index = [], 0 each_action do |xml| action = {:type => xml.value('type'), :xml => xml} @@ -438,11 +439,12 @@ def actions(with_diff = true) actions << action end actions - end + #end end def actiondiffs - return Rails.cache.fetch("request_#{value('id')}_actiondiffs", :expires_in => 7.days) do + #TODO: Fix! + #return Rails.cache.fetch("request_#{value('id')}_actiondiffs", :expires_in => 7.days) do actiondiffs = [] begin transport ||= ActiveXML::Config::transport_for :bsrequest @@ -457,7 +459,7 @@ def actiondiffs rescue ActiveXML::Transport::NotFoundError, ActiveXML::Transport::Error => e end actiondiffs - end + #end end # Check if 'user' is maintainer in _all_ request targets: diff --git a/src/webui/app/views/attribute/edit.html.erb b/src/webui/app/views/attribute/edit.html.erb index 60db8987c38..ec76fcadd04 100644 --- a/src/webui/app/views/attribute/edit.html.erb +++ b/src/webui/app/views/attribute/edit.html.erb @@ -16,7 +16,7 @@

<%= h @pagetitle %> <%= h @selected_attribute_name %>

-<% form_tag :action => "save" do %> +<%= form_tag :action => "save" do %>

<% if @selected_attribute_name %> <% values = @selected_attribute_value %> diff --git a/src/webui/app/views/configuration/connect_instance.html.erb b/src/webui/app/views/configuration/connect_instance.html.erb index 936e7eadde9..b2b3b9fe9b3 100644 --- a/src/webui/app/views/configuration/connect_instance.html.erb +++ b/src/webui/app/views/configuration/connect_instance.html.erb @@ -1,4 +1,4 @@ -<% content_for :head_javascript do %> +<%= content_for :head_javascript do %> function useOpenSUSE(){ document.getElementById('name').value = "openSUSE.org"; document.getElementById('remoteurl').value = "https://api.opensuse.org/public"; @@ -36,7 +36,7 @@ function useMeeGo(){

Add custom OBS instance

-<% form_tag :action => :save_instance do -%> +<%= form_tag :action => :save_instance do -%>
diff --git a/src/webui/app/views/configuration/index.html.erb b/src/webui/app/views/configuration/index.html.erb index d77b0c7e690..e026158c31f 100644 --- a/src/webui/app/views/configuration/index.html.erb +++ b/src/webui/app/views/configuration/index.html.erb @@ -19,7 +19,7 @@ as well as managing users and groups.

Available Scheduler Architectures

You can recommended architectures to be selected by default when a new project or package is created. The new project or package will then build against this architecture (for it's configured repositories).

- <% form_tag(:action => 'update_architectures') do %> + <%= form_tag(:action => 'update_architectures') do %>
Local Project Name:
@@ -47,7 +47,7 @@ as well as managing users and groups.

User Interface

- <% form_tag(:action => 'update_configuration') do %> + <%= form_tag(:action => 'update_configuration') do %>

<%= label_tag :title, 'Title:' %>
<%= text_field_tag :title, @configuration['title'].gsub(" Open Build Service", "") %> Open Build Service diff --git a/src/webui/app/views/driver_update/create.html.erb b/src/webui/app/views/driver_update/create.html.erb index d60cd271902..17e7de4f272 100644 --- a/src/webui/app/views/driver_update/create.html.erb +++ b/src/webui/app/views/driver_update/create.html.erb @@ -3,7 +3,7 @@ <% project_bread_crumb @package.name -%> <%= render :partial => "package/tabs" %> -<% content_for :ready_function do %> +<%= content_for :ready_function do %> $("#target_project").autocomplete({source: '<%= url_for :controller => 'project', :action => 'autocomplete_projects' %>', minLength: 2}); $('#target_project').result(function(event, data, formatted) { @@ -138,7 +138,7 @@ your workstation when using osc.

-<% form_tag :controller => "driver_update", :action => "save" do %> +<%= form_tag :controller => "driver_update", :action => "save" do %>

General Configuration:

diff --git a/src/webui/app/views/group/index.html.erb b/src/webui/app/views/group/index.html.erb index 0cd65b5dc50..97aa1db1e49 100644 --- a/src/webui/app/views/group/index.html.erb +++ b/src/webui/app/views/group/index.html.erb @@ -29,7 +29,7 @@

There are no groups configured

<% end %> -<% javascript_tag do %> +<%= javascript_tag do %> $(document).ready(function() { <% if @groups.length > 0 %> $('#group_table').dataTable(); diff --git a/src/webui/app/views/group/show.html.erb b/src/webui/app/views/group/show.html.erb index 781600c2003..4b6adc91acd 100644 --- a/src/webui/app/views/group/show.html.erb +++ b/src/webui/app/views/group/show.html.erb @@ -19,7 +19,7 @@

<%= link_to('Show all groups', groups_path) %>

-<% javascript_tag do %> +<%= javascript_tag do %> $(document).ready(function() { $('#group_members_table').dataTable(); }); diff --git a/src/webui/app/views/layouts/_personal_navigation.html.erb b/src/webui/app/views/layouts/_personal_navigation.html.erb index d7a5862e0f9..549e35783a2 100644 --- a/src/webui/app/views/layouts/_personal_navigation.html.erb +++ b/src/webui/app/views/layouts/_personal_navigation.html.erb @@ -13,7 +13,7 @@ <% end %> <%= link_to 'Login', { :controller => :user, :action => :login }, :id => "login-trigger" %>
- <% form_tag(PROXY_AUTH_LOGIN_PAGE, :method => :post, :id => 'login_form', :enctype => 'application/x-www-form-urlencoded') do %> + <%= form_tag(PROXY_AUTH_LOGIN_PAGE, :method => :post, :id => 'login_form', :enctype => 'application/x-www-form-urlencoded') do %>

<%= hidden_field_tag(:url, "#{@return_to_host}#{@return_to_path}") %> <%= hidden_field_tag(:context, 'default') %> @@ -37,7 +37,7 @@ <% end %> <%= link_to 'Login', { :controller => :user, :action => :login }, :id => 'login-trigger' %>

- <% form_tag(:controller => :user, :action => :do_login) do %> + <%= form_tag(:controller => :user, :action => :do_login) do %>

<%= hidden_field_tag(:return_to_path, @return_to_path) %> <%= label_tag(:username, 'Username') %> diff --git a/src/webui/app/views/layouts/_watch_and_search.html.erb b/src/webui/app/views/layouts/_watch_and_search.html.erb index 59664f12ca6..2edcca57dd0 100644 --- a/src/webui/app/views/layouts/_watch_and_search.html.erb +++ b/src/webui/app/views/layouts/_watch_and_search.html.erb @@ -32,7 +32,7 @@ <%- end -%> -<% form_tag({:controller => 'search', :action => 'search'}, {:method => :post, :id => "global-search-form", :class => "label-overlay"}) do -%> +<%= form_tag({:controller => 'search', :action => 'search'}, {:method => :post, :id => "global-search-form", :class => "label-overlay"}) do -%>

<%= text_field_tag 'search_text', '', :id => 'search'-%> diff --git a/src/webui/app/views/main/_add_news_dialog.html.erb b/src/webui/app/views/main/_add_news_dialog.html.erb index b34fe4c027f..4dfcd53f783 100644 --- a/src/webui/app/views/main/_add_news_dialog.html.erb +++ b/src/webui/app/views/main/_add_news_dialog.html.erb @@ -3,7 +3,7 @@

Add New Message

- <% form_tag({:controller => 'main', :action => 'add_news'}, :method => 'post') do %> + <%= form_tag({:controller => 'main', :action => 'add_news'}, :method => 'post') do %>

<%= label_tag(:message, 'Message:') %>
<%= text_area_tag(:message, '', :size => '40x3') %>
diff --git a/src/webui/app/views/main/_delete_message_dialog.html.erb b/src/webui/app/views/main/_delete_message_dialog.html.erb index 6d69cbc4c58..10428534a96 100644 --- a/src/webui/app/views/main/_delete_message_dialog.html.erb +++ b/src/webui/app/views/main/_delete_message_dialog.html.erb @@ -4,7 +4,7 @@

Delete Confirmation

Really delete this message?

- <% form_tag({:controller => 'main', :action => 'delete_message'}, :method => 'post') do %> + <%= form_tag({:controller => 'main', :action => 'delete_message'}, :method => 'post') do %> <%= hidden_field_tag(:message_id, params[:message_id]) %>
<%= submit_tag('Ok') %> diff --git a/src/webui/app/views/main/_latest_updates.erb b/src/webui/app/views/main/_latest_updates.erb index efed8b93b2b..6a291bbf96d 100644 --- a/src/webui/app/views/main/_latest_updates.erb +++ b/src/webui/app/views/main/_latest_updates.erb @@ -1,4 +1,4 @@ -<% content_for :content_for_head do %> +<%= content_for :content_for_head do %> <%= auto_discovery_link_tag(:rss, {:controller => 'main', :action => 'latest_updates', :format => 'rss'}, {:title => 'Latest updates'}) %> <% end %> diff --git a/src/webui/app/views/main/_news.html.erb b/src/webui/app/views/main/_news.html.erb index f12d711f9e5..d195b2caba3 100644 --- a/src/webui/app/views/main/_news.html.erb +++ b/src/webui/app/views/main/_news.html.erb @@ -1,4 +1,4 @@ -<% content_for :content_for_head do %> +<%= content_for :content_for_head do %> <%= auto_discovery_link_tag(:rss, {:controller => 'main', :action => 'news', :format => 'rss'}, {:title => 'News'}) %> <% end %> diff --git a/src/webui/app/views/main/_systemstatus.html.erb b/src/webui/app/views/main/_systemstatus.html.erb index 1dda10410f6..0d3153c9c84 100644 --- a/src/webui/app/views/main/_systemstatus.html.erb +++ b/src/webui/app/views/main/_systemstatus.html.erb @@ -8,7 +8,7 @@ currently <%= @workerstatus.elements("building").length %> of <%= @workerstatus["clients"] %> build hosts are busy building packages. At the moment <%= @waiting_packages %> packages are waiting on the different architectures.

- <% javascript_tag do %> + <%= javascript_tag do %> $.plot($("#overallgraph"), [ { data: <%= MonitorHelper.print_statistics_array(@busy) %>, label: "Busy workers", color: 3} ], { series: { stack: true, lines: { show: true, steps: false, fill: true } }, diff --git a/src/webui/app/views/main/index.html.erb b/src/webui/app/views/main/index.html.erb index be27f518edf..1112caa5665 100644 --- a/src/webui/app/views/main/index.html.erb +++ b/src/webui/app/views/main/index.html.erb @@ -30,7 +30,7 @@ <%= render :partial => 'news' %>
- <% javascript_tag do %> + <%= javascript_tag do %> $.ajax({ url: '<%= url_for(:controller => 'main', :action => 'systemstatus') %>', success: function(data) { $('#workerstatus_placeholder').html(data); } diff --git a/src/webui/app/views/monitor/_building_table.html.erb b/src/webui/app/views/monitor/_building_table.html.erb index 1bfd6866cb5..1de1bd1fa8c 100644 --- a/src/webui/app/views/monitor/_building_table.html.erb +++ b/src/webui/app/views/monitor/_building_table.html.erb @@ -58,7 +58,7 @@
- <% content_for :ready_function do %> + <%= content_for :ready_function do %> $('#building_table').dataTable({ 'aaSorting': [[3, 'desc']], 'bInfo': false, diff --git a/src/webui/app/views/monitor/_events.html.erb b/src/webui/app/views/monitor/_events.html.erb index 9121e14ad3c..21020c14003 100644 --- a/src/webui/app/views/monitor/_events.html.erb +++ b/src/webui/app/views/monitor/_events.html.erb @@ -3,7 +3,7 @@

Options

- <% form_tag(:controller => "main", :action => "index") do %> + <%= form_tag(:controller => "main", :action => "index") do %>

Architecture: <%= select_tag(:architecture_display, options_for_select(@available_arch_list)) %>
@@ -37,7 +37,7 @@

-<% content_for :head_javascript do %> +<%= content_for :head_javascript do %> var arch_to_show = "<%= @available_arch_list[0] %>" var time_to_show = "24"; @@ -98,7 +98,7 @@ } <% end %> -<% content_for :ready_function do %> +<%= content_for :ready_function do %> /* plot an empty set */ plotValues({ 'building': [], 'idle': [], diff --git a/src/webui/app/views/monitor/_lights.html.erb b/src/webui/app/views/monitor/_lights.html.erb index 3f61275c0a9..377299eae80 100644 --- a/src/webui/app/views/monitor/_lights.html.erb +++ b/src/webui/app/views/monitor/_lights.html.erb @@ -1,4 +1,4 @@ -<% content_for :ready_function do %> +<%= content_for :ready_function do %> monitor_ready(); <% end %> diff --git a/src/webui/app/views/monitor/_workers_table.html.erb b/src/webui/app/views/monitor/_workers_table.html.erb index 721b7d1618a..0f4d7fad9fd 100644 --- a/src/webui/app/views/monitor/_workers_table.html.erb +++ b/src/webui/app/views/monitor/_workers_table.html.erb @@ -1,4 +1,4 @@ -<% content_for :head_javascript do %> +<%= content_for :head_javascript do %> var logfileinfo = "package"; var container_width = -1; @@ -52,7 +52,7 @@ } <% end %> -<% content_for :ready_function do %> +<%= content_for :ready_function do %> $("#worker_display option:selected").each(function() { logfileinfo=$(this).attr("value"); }); resizeMonitorBoxes(); diff --git a/src/webui/app/views/package/_branch_dialog.html.erb b/src/webui/app/views/package/_branch_dialog.html.erb index f3c45fdd579..7dfc4a8581e 100644 --- a/src/webui/app/views/package/_branch_dialog.html.erb +++ b/src/webui/app/views/package/_branch_dialog.html.erb @@ -6,7 +6,7 @@

Do you really want to branch <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name'), :package => @package.value('name')} %>?

- <% form_tag({:controller => :package, :action => :branch}, :method => :post) do %> + <%= form_tag({:controller => :package, :action => :branch}, :method => :post) do %> <%= hidden_field_tag(:project, @project) %> <%= hidden_field_tag(:package, @package) %>
diff --git a/src/webui/app/views/package/_delete_dialog.html.erb b/src/webui/app/views/package/_delete_dialog.html.erb index 87fd9833374..fcfb4c2eb11 100644 --- a/src/webui/app/views/package/_delete_dialog.html.erb +++ b/src/webui/app/views/package/_delete_dialog.html.erb @@ -5,7 +5,7 @@

Delete Confirmation

Do you really want to delete <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name'), :package => @package.value('name')} %>?

- <% form_tag({:controller => :package, :action => :remove}, :method => :post) do %> + <%= form_tag({:controller => :package, :action => :remove}, :method => :post) do %> <%= hidden_field_tag(:project, @project) %> <%= hidden_field_tag(:package, @package) %>
diff --git a/src/webui/app/views/package/_files_view.html.erb b/src/webui/app/views/package/_files_view.html.erb index ec15d8a0267..b59d44c81ea 100644 --- a/src/webui/app/views/package/_files_view.html.erb +++ b/src/webui/app/views/package/_files_view.html.erb @@ -36,7 +36,7 @@ <% end %> - <% javascript_tag do %> + <%= javascript_tag do %> $(document).ready(function() { $('#files_table').dataTable({ 'aoColumns': [null, null, null, {'bSortable': false}], diff --git a/src/webui/app/views/package/_rpmlint_result.html.erb b/src/webui/app/views/package/_rpmlint_result.html.erb index 8cf03b89cd2..0386bb2f5c4 100644 --- a/src/webui/app/views/package/_rpmlint_result.html.erb +++ b/src/webui/app/views/package/_rpmlint_result.html.erb @@ -10,7 +10,7 @@ 

 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   function update_arch_display(data) {
     $('.rpmlint_arch_select_<%= index %>').hide();
     $('#rpmlint_arch_select_<%= index %>_' + $('#rpmlint_repo_select_<%= index %>').attr('value')).show();
diff --git a/src/webui/app/views/package/_service_parameters.html.erb b/src/webui/app/views/package/_service_parameters.html.erb
index fd7b6b5d875..1f4807a07b9 100644
--- a/src/webui/app/views/package/_service_parameters.html.erb
+++ b/src/webui/app/views/package/_service_parameters.html.erb
@@ -1,6 +1,6 @@
 

 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $('#add_new_row').click(insertRow);
 <% end %>
 
diff --git a/src/webui/app/views/package/_set_url_form.html.erb b/src/webui/app/views/package/_set_url_form.html.erb
index dac798dfc65..a9bffc026db 100644
--- a/src/webui/app/views/package/_set_url_form.html.erb
+++ b/src/webui/app/views/package/_set_url_form.html.erb
@@ -1,5 +1,5 @@
 
-<% form_remote_tag :url => { :action => :set_url },
+<%= form_remote_tag :url => { :action => :set_url },
   :loading => "$('#url_form_spinner').show()",
   :complete => "$('#url_form_spinner').hide()",
   :update => 'url_area' do %>
diff --git a/src/webui/app/views/package/_submit_request_dialog.html.erb b/src/webui/app/views/package/_submit_request_dialog.html.erb
index 6a319f07f4f..7c01226591f 100644
--- a/src/webui/app/views/package/_submit_request_dialog.html.erb
+++ b/src/webui/app/views/package/_submit_request_dialog.html.erb
@@ -1,4 +1,4 @@
-<% javascript_tag do %>
+<%= javascript_tag do %>
   function updateSupersedeAndDevelPackageDisplay() {
     if ($('#targetproject')[0].value.length > 0) {
       if ($('#targetproject')[0].value == $('#sourceproject')[0].value) {
@@ -72,7 +72,7 @@
       <% tprj = @package.linkinfo.project if @package.linkinfo # fill in from linkinfo %>
       <% tprj = params[:targetproject] if params[:targetproject] # allow to override by parameter %>
 
-      <% form_tag({:controller => "package", :action => "submit_request"}, :method => "post") do %>
+      <%= form_tag({:controller => "package", :action => "submit_request"}, :method => "post") do %>
         <%= hidden_field_tag(:project, @project) %>
         <%= hidden_field_tag(:package, @package) %>
         <%= hidden_field_tag(:rev, @revision) %>
diff --git a/src/webui/app/views/package/_tabs.html.erb b/src/webui/app/views/package/_tabs.html.erb
index 746e6c7ab96..6a7bce3810a 100644
--- a/src/webui/app/views/package/_tabs.html.erb
+++ b/src/webui/app/views/package/_tabs.html.erb
@@ -1,4 +1,4 @@
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $("#advanced_tabs_trigger").click(function() {
     $("#advanced_tabs").show();
     $("#advanced_tabs_trigger").remove();
@@ -19,7 +19,7 @@
       <%= tab 'Users', :controller => 'package', :action => 'users' %>
     <% end -%>
     <% if is_advanced_tab? %>
-      <% content_for :ready_function do %>
+      <%= content_for :ready_function do %>
         $("#advanced_tabs").show();
       <% end %>
     <% else %>
diff --git a/src/webui/app/views/package/add_file.html.erb b/src/webui/app/views/package/add_file.html.erb
index fb6af067287..f4058ef14d5 100644
--- a/src/webui/app/views/package/add_file.html.erb
+++ b/src/webui/app/views/package/add_file.html.erb
@@ -7,12 +7,12 @@
 
 
The filename is taken from the uploaded file if none is provided. Alternatively, if only a filename is provided, a new empty file is created (i.e. touched).

 
-<% form_tag({:action => :save_file, :project => @project, :package => @package}, {:multipart => true}) do %>
+<%= form_tag({:action => :save_file, :project => @project, :package => @package}, {:multipart => true}) do %>
   

     Filename (taken from uploaded file if empty):

     <%= text_field_tag('filename', '', :size => 80) %>

     Upload from <%= select_tag('file_type', options_for_select([['local file', 'local'], ['remote URL', 'remote']])) %> :

-    <% javascript_tag do %>
+    <%= javascript_tag do %>
       $('#file_type').change(function() {
         if ($('#file_type option:selected').attr('value') == 'local') {
           $('#file').show();
diff --git a/src/webui/app/views/package/edit.html.erb b/src/webui/app/views/package/edit.html.erb
index 6ea21660206..7dd173712b5 100644
--- a/src/webui/app/views/package/edit.html.erb
+++ b/src/webui/app/views/package/edit.html.erb
@@ -6,7 +6,7 @@
 
 
<%= @pagetitle %>

 
-<% form_tag :action => :save do %>
+<%= form_tag :action => :save do %>
   

     Title:

     <%= text_field_tag( 'title', @package.title, :size => 80 ) %>

diff --git a/src/webui/app/views/package/files.html.erb b/src/webui/app/views/package/files.html.erb
index fcfd14fd8da..49b349f2c8f 100644
--- a/src/webui/app/views/package/files.html.erb
+++ b/src/webui/app/views/package/files.html.erb
@@ -3,7 +3,7 @@
 
 <%= render :partial => "tabs" %>
 
-<% content_for :head_javascript do %>
+<%= content_for :head_javascript do %>
   function insertRow() {
     var name     = document.getElementById('add_new_parameter').value;
     var service  = document.getElementById('servicename').value;
diff --git a/src/webui/app/views/package/live_build_log.html.erb b/src/webui/app/views/package/live_build_log.html.erb
index 220bab41835..8763a60561e 100644
--- a/src/webui/app/views/package/live_build_log.html.erb
+++ b/src/webui/app/views/package/live_build_log.html.erb
@@ -5,7 +5,7 @@ package_bread_crumb 'Build Log'
 
 <%= render :partial => "tabs" %>
 
-<% content_for :head_javascript do %>
+<%= content_for :head_javascript do %>
 
   var scrollmode=0;
   var offset=<%= @offset %>;
@@ -67,7 +67,7 @@ package_bread_crumb 'Build Log'
   }
 <% end -%>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   refresh(<%= @offset %>, 1);
   $('.start_refresh').click(start_refresh);
   $('.stop_refresh').click(stop_refresh);
diff --git a/src/webui/app/views/package/revisions.html.erb b/src/webui/app/views/package/revisions.html.erb
index 5aa20340353..15a1fd02b01 100644
--- a/src/webui/app/views/package/revisions.html.erb
+++ b/src/webui/app/views/package/revisions.html.erb
@@ -20,7 +20,7 @@
   <% if @lower_bound > 1 || @max_revision > @upper_bound %>
     
<%= link_to('Show all', :action  => 'revisions', :project => @project, :package => @package, :showall => 1) %>

   <% end %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     <% if @max_revision > @upper_bound %>
       $('#go_up_button').show();
     <% end %>
diff --git a/src/webui/app/views/package/show.html.erb b/src/webui/app/views/package/show.html.erb
index b18b85c795c..34a43383c33 100644
--- a/src/webui/app/views/package/show.html.erb
+++ b/src/webui/app/views/package/show.html.erb
@@ -191,7 +191,7 @@
 

 
 <% if @files && @files.length > 0 %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $('#files_table').dataTable({
         'aoColumns': [null, null, null, {'bSortable': false}]
diff --git a/src/webui/app/views/package/view_file.html.erb b/src/webui/app/views/package/view_file.html.erb
index f27a2673761..8dd57a8d1bf 100644
--- a/src/webui/app/views/package/view_file.html.erb
+++ b/src/webui/app/views/package/view_file.html.erb
@@ -13,7 +13,7 @@
     <% if @filename.ends_with?('.changes') %>
       <%# Rather hacky attempt to provide 'osc vc'-like functionality, would benefit of proper 'snippet' support for editor: %>
       <%= link_to_function('Insert changes entry template', 'addChangesEntryTemplate()') %>


-      <% javascript_tag do %>
+      <%= javascript_tag do %>
         var DAYS = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
         var MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 
diff --git a/src/webui/app/views/package/wizard.html.erb b/src/webui/app/views/package/wizard.html.erb
index 362a83231ba..aa89fe525ab 100644
--- a/src/webui/app/views/package/wizard.html.erb
+++ b/src/webui/app/views/package/wizard.html.erb
@@ -11,7 +11,7 @@ else
   submit = "Next"
 end
 %>
-<% form_tag({:action => action}, {:multipart => true}) do %>
+<%= form_tag({:action => action}, {:multipart => true}) do %>
   <% @wizard.each_entry do |entry| %>
     

       

diff --git a/src/webui/app/views/package/wizard_new.html.erb b/src/webui/app/views/package/wizard_new.html.erb
index 4a0b6b14028..45f1d3b36e0 100644
--- a/src/webui/app/views/package/wizard_new.html.erb
+++ b/src/webui/app/views/package/wizard_new.html.erb
@@ -3,7 +3,7 @@
 
 
New Package in project <%= @project.name %>

 
-<% form_tag :action => "wizard_new" do %>
+<%= form_tag :action => "wizard_new" do %>
   Name:

   <%= text_field_tag 'name', '', :size => 80 %>

   
<%= submit_tag 'Next' %>

diff --git a/src/webui/app/views/patchinfo/_form.html.erb b/src/webui/app/views/patchinfo/_form.html.erb
index 0a05ef76891..5a7a0fb1af8 100644
--- a/src/webui/app/views/patchinfo/_form.html.erb
+++ b/src/webui/app/views/patchinfo/_form.html.erb
@@ -1,6 +1,6 @@
 <%= render :partial => "package/tabs" %>
 
-<% form_tag({:action => "save"}, :id => "patchinfo")  do %>
+<%= form_tag({:action => "save"}, :id => "patchinfo")  do %>
   

     

       

@@ -11,7 +11,7 @@
           

             Packager:

             <%= text_field_tag 'packager', @packager %>
-            <% javascript_tag do %>
+            <%= javascript_tag do %>
               $("#packager").autocomplete({source: '<%= url_for :controller => 'user', :action => 'autocomplete' %>', minLength: 2});
             <% end %>
           

@@ -119,7 +119,7 @@
         

       

     

-  <% content_for :head_javascript do %>
+  <%= content_for :head_javascript do %>
     function enable_block_reason(){
     if ($("input[name='block']:checked").val() == "true"){
     $("#block_reason").removeAttr("disabled");
diff --git a/src/webui/app/views/project/_add_maintained_project_dialog.html.erb b/src/webui/app/views/project/_add_maintained_project_dialog.html.erb
index 9e336fbf8af..46b3b3aa941 100644
--- a/src/webui/app/views/project/_add_maintained_project_dialog.html.erb
+++ b/src/webui/app/views/project/_add_maintained_project_dialog.html.erb
@@ -1,4 +1,4 @@
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $('#maintained_project').autocomplete({source: '<%= url_for :controller => 'project', :action => 'autocomplete_projects' %>', minLength: 2});
 <% end %>
 
@@ -9,7 +9,7 @@
       
Add Project to Maintenance

       
Do you want to maintain <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name')} %>?

 
-      <% form_tag({:controller => 'project', :action => 'add_maintained_project'}) do %>
+      <%= form_tag({:controller => 'project', :action => 'add_maintained_project'}) do %>
         <%= hidden_field_tag(:project, @project.value('name')) %>
         

           <%= label_tag(:maintained_project, 'Project to maintain:') %>

diff --git a/src/webui/app/views/project/_delete_dialog.html.erb b/src/webui/app/views/project/_delete_dialog.html.erb
index 3f2955f6fee..28070f17d10 100644
--- a/src/webui/app/views/project/_delete_dialog.html.erb
+++ b/src/webui/app/views/project/_delete_dialog.html.erb
@@ -5,7 +5,7 @@
       
Delete Confirmation

       
Do you really want to delete <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name')} %>?

 
-      <% form_tag({:controller => 'project', :action => 'delete'}, :method => 'post') do %>
+      <%= form_tag({:controller => 'project', :action => 'delete'}, :method => 'post') do %>
         <%= hidden_field_tag(:project, @project) %>
         <% if @linking_projects and @linking_projects.length > 0 %>
           
Other projects still have source links to this project:

diff --git a/src/webui/app/views/project/_edit_comment_form.html.erb b/src/webui/app/views/project/_edit_comment_form.html.erb
index f13df23b923..e97c1a0878e 100644
--- a/src/webui/app/views/project/_edit_comment_form.html.erb
+++ b/src/webui/app/views/project/_edit_comment_form.html.erb
@@ -1,4 +1,4 @@
- <% form_remote_tag :url => { :action => :edit_comment, :project => @project, :package => @package },
+ <%= form_remote_tag :url => { :action => :edit_comment, :project => @project, :package => @package },
    :update => valid_xml_id("comment_#{@package}") do -%>
    <%= text_field_tag('text', @comment) %>
    <%= hidden_field_tag('last_comment', @comment) %>
diff --git a/src/webui/app/views/project/_edit_repository.html.erb b/src/webui/app/views/project/_edit_repository.html.erb
index 198982f5e82..0d6f7d61f1b 100644
--- a/src/webui/app/views/project/_edit_repository.html.erb
+++ b/src/webui/app/views/project/_edit_repository.html.erb
@@ -4,7 +4,7 @@
     
<%= error %>

   <% end %>
 
-  <% form_remote_tag :update => valid_xml_id(repository.name), :url => { :action => :update_target } do %>
+  <%= form_remote_tag :update => valid_xml_id(repository.name), :url => { :action => :update_target } do %>
     

       Architectures:
       <% @repository_arch_hash.each do |arch, value| %>
diff --git a/src/webui/app/views/project/_filter_projects.html.erb b/src/webui/app/views/project/_filter_projects.html.erb
index 69ac38f14a9..2a4b4258ce9 100644
--- a/src/webui/app/views/project/_filter_projects.html.erb
+++ b/src/webui/app/views/project/_filter_projects.html.erb
@@ -1,7 +1,7 @@
 
<%= @pagetitle %>

 
 

-  <% form_tag({:controller => 'project', :action => 'list'}, {:method => :get, :id => 'filter_projects_form' }) do %>
+  <%= form_tag({:controller => 'project', :action => 'list'}, {:method => :get, :id => 'filter_projects_form' }) do %>
     

       Filter projects:
       <%= text_field_tag "searchtext", @filterstring -%>
@@ -27,7 +27,7 @@
   :url => { :controller => 'project', :action  => :list },
   :loading => '$("#searchtext").addClass( "ac_loading" )', :complete => "$('#searchtext').removeClass( 'ac_loading' )",
   :with => "'searchtext=' + encodeURIComponent($('#searchtext').attr('value')) + '&excludefilter=' + $('#excludefilter:checked').attr('value')") %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   jQuery(function($) {
     $('#searchtext').change(function() {
       $.post('<%= url_for(:controller => 'project', :action  => 'list') %>', function(data) {
diff --git a/src/webui/app/views/project/_incident_request_dialog.html.erb b/src/webui/app/views/project/_incident_request_dialog.html.erb
index 497c8ebcfe1..41623fd813e 100644
--- a/src/webui/app/views/project/_incident_request_dialog.html.erb
+++ b/src/webui/app/views/project/_incident_request_dialog.html.erb
@@ -4,7 +4,7 @@
     

       
Submit as Update

       
This will submit your project as a Maintenance Incident Request.

-      <% form_tag({:controller => 'project', :action => 'new_incident_request'}, :method => :post) do %>
+      <%= form_tag({:controller => 'project', :action => 'new_incident_request'}, :method => :post) do %>
         <%= hidden_field_tag(:project, @project) %>
         

           <%= label_tag(:sourceproject, "Project submitted as Update:") %>

diff --git a/src/webui/app/views/project/_release_request_dialog.html.erb b/src/webui/app/views/project/_release_request_dialog.html.erb
index 1f22c384138..2bad943fb10 100644
--- a/src/webui/app/views/project/_release_request_dialog.html.erb
+++ b/src/webui/app/views/project/_release_request_dialog.html.erb
@@ -5,7 +5,7 @@
       
Create Maintenance Release Request

       
Do you want to release <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name')} %> as a maintenance update?

 
-      <% form_tag({:controller => "project", :action => :new_release_request}, :method => "post") do %>
+      <%= form_tag({:controller => "project", :action => :new_release_request}, :method => "post") do %>
         <%= hidden_field_tag(:project, @project.value('name')) %>
         

           <%= label_tag(:sourceproject, "From project:") %>

diff --git a/src/webui/app/views/project/_tabs.html.erb b/src/webui/app/views/project/_tabs.html.erb
index a051d7998a7..98757353a7e 100644
--- a/src/webui/app/views/project/_tabs.html.erb
+++ b/src/webui/app/views/project/_tabs.html.erb
@@ -1,4 +1,4 @@
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $("#advanced_tabs_trigger").click(function() {
     $("#advanced_tabs").show();
     $("#advanced_tabs_trigger").remove();
@@ -24,7 +24,7 @@
     <% end -%>
 
     <% if is_advanced_tab? %>
-      <% content_for :ready_function do %>
+      <%= content_for :ready_function do %>
         $("#advanced_tabs").show();
       <% end %>
     <% else %>
diff --git a/src/webui/app/views/project/_unlock_dialog.html.erb b/src/webui/app/views/project/_unlock_dialog.html.erb
index 94bfc0a24ea..1ca6a71e5ee 100644
--- a/src/webui/app/views/project/_unlock_dialog.html.erb
+++ b/src/webui/app/views/project/_unlock_dialog.html.erb
@@ -5,7 +5,7 @@
       
Unlock Confirmation

       
Do you really want to unlock <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name')} %>?

 
-      <% form_tag({:controller => 'project', :action => 'unlock'}, :method => 'post') do %>
+      <%= form_tag({:controller => 'project', :action => 'unlock'}, :method => 'post') do %>
         <%= hidden_field_tag(:project, @project) %>
         

           <%= label_tag(:comment, 'Comment:') %>

diff --git a/src/webui/app/views/project/add_repository.html.erb b/src/webui/app/views/project/add_repository.html.erb
index 6e46605485f..7c8c344867a 100644
--- a/src/webui/app/views/project/add_repository.html.erb
+++ b/src/webui/app/views/project/add_repository.html.erb
@@ -7,7 +7,7 @@
 
 <%= render :partial => "tabs" %>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   function autocomplete_repositories(project_name) {
     $('#target_repo').hide();
     $('#target_repo_txt').show();
@@ -51,7 +51,7 @@
 
 
Advanced Search for Build Targets

 
-<% form_tag({:action => :save_targets, :project => @project}) do -%>
+<%= form_tag({:action => :save_targets, :project => @project}) do -%>
   

     Project: 

     <%= text_field_tag 'target_project', '', :size => 60, :id => 'target_project' %>

diff --git a/src/webui/app/views/project/add_repository_from_default_list.html.erb b/src/webui/app/views/project/add_repository_from_default_list.html.erb
index 5ddfd66b599..d0584d1e1b6 100644
--- a/src/webui/app/views/project/add_repository_from_default_list.html.erb
+++ b/src/webui/app/views/project/add_repository_from_default_list.html.erb
@@ -11,10 +11,8 @@
 <%= link_to "pick one via advanced interface", :action => :add_repository, :project => @project %>.
 

 
-<% form_tag( {:action => :save_targets, :project => @project} ) do -%>
-
+<%= form_tag(:action => :save_targets, :project => @project) do %>
   <% vendors = @distributions.all_vendors %>
-
   <% vendors.each do |vendor| %>
     
<%= image_tag( "distributions/#{vendor.downcase}.png", :width => 40 ) %> <%=h vendor -%> distributions

     

@@ -60,7 +58,6 @@
   

 <% end %>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $('.repocheckbox').click(function() { $('#submitrepos').enable(); } );
-<% end -%>
-
+<% end %>
diff --git a/src/webui/app/views/project/edit.html.erb b/src/webui/app/views/project/edit.html.erb
index e75ea64ae97..0b8dfbeefdc 100644
--- a/src/webui/app/views/project/edit.html.erb
+++ b/src/webui/app/views/project/edit.html.erb
@@ -7,7 +7,7 @@
 
 
<%= @pagetitle %>

 
-<% form_tag :action => :save do %>
+<%= form_tag :action => :save do %>
   

     Title:

     <%= text_field_tag 'title', @project.title, :size => 80 %>

diff --git a/src/webui/app/views/project/maintained_projects.html.erb b/src/webui/app/views/project/maintained_projects.html.erb
index dfd0af59da8..7b9f2394379 100644
--- a/src/webui/app/views/project/maintained_projects.html.erb
+++ b/src/webui/app/views/project/maintained_projects.html.erb
@@ -28,7 +28,7 @@
       <% end %>
     
   
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $('#maintained_projects_table').dataTable({
         "bSort": false,
diff --git a/src/webui/app/views/project/maintenance_incidents.html.erb b/src/webui/app/views/project/maintenance_incidents.html.erb
index 3ad2da94122..7fb0390603c 100644
--- a/src/webui/app/views/project/maintenance_incidents.html.erb
+++ b/src/webui/app/views/project/maintenance_incidents.html.erb
@@ -16,7 +16,7 @@
   <%= render(:partial => 'shared/incident_table', :locals => {:incidents => @incidents, :incident_table_id => 'incident_table'}) unless not defined?(@incidents) %>
 

 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   function updateIncidentDisplay() {
     $('#spinner').show();
     $.ajax({
diff --git a/src/webui/app/views/project/monitor.html.erb b/src/webui/app/views/project/monitor.html.erb
index 764a9990290..1a3e5d6fa07 100644
--- a/src/webui/app/views/project/monitor.html.erb
+++ b/src/webui/app/views/project/monitor.html.erb
@@ -2,7 +2,7 @@
    @metarobots = "noindex,nofollow"
    project_bread_crumb( 'Status Monitor' ) -%>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   project_monitor_ready();
 <% end %>
 
@@ -12,7 +12,7 @@
 

 
   
-  <% form_tag({:controller => 'project', :action => 'monitor'}, :method => :get) do %>
+  <%= form_tag({:controller => 'project', :action => 'monitor'}, :method => :get) do %>
     

       <%= submit_tag 'Filter:'%>
       Status <%= image_tag 'arrow.png' %>
diff --git a/src/webui/app/views/project/new.html.erb b/src/webui/app/views/project/new.html.erb
index b8f62e80d67..dca9f63ca13 100644
--- a/src/webui/app/views/project/new.html.erb
+++ b/src/webui/app/views/project/new.html.erb
@@ -15,7 +15,7 @@ end
   

 <% end %>
 
-<% form_tag :action => 'save_new' do -%>
+<%= form_tag :action => 'save_new' do -%>
   

     Project Name:

     <% if @project_name %>
diff --git a/src/webui/app/views/project/new_package.html.erb b/src/webui/app/views/project/new_package.html.erb
index 562b501c2df..a6b377ae3bb 100644
--- a/src/webui/app/views/project/new_package.html.erb
+++ b/src/webui/app/views/project/new_package.html.erb
@@ -13,7 +13,7 @@
 -->
 
<%= @pagetitle %> for <%= @project.name %>

 
-<% form_tag :controller => :package, :action => "save_new" do %>
+<%= form_tag :controller => :package, :action => "save_new" do %>
 

   Name:

   <%= text_field_tag 'name', @package_name, :size => 80 %>

diff --git a/src/webui/app/views/project/new_package_branch.html.erb b/src/webui/app/views/project/new_package_branch.html.erb
index 693b542df55..4437042f82e 100644
--- a/src/webui/app/views/project/new_package_branch.html.erb
+++ b/src/webui/app/views/project/new_package_branch.html.erb
@@ -11,7 +11,7 @@ project will also change the files in the branched package in your project.

 
You can add patches to the branched package without affecting the original
 package.

 
-<% form_tag :controller => "package", :action => "save_new_link" do %>
+<%= form_tag :controller => "package", :action => "save_new_link" do %>
 

   Name of original project:

   <%= text_field_tag 'linked_project', @linked_project, :size => 80, :id => 'linked_project' %>

@@ -27,7 +27,7 @@ package.

 
<%= submit_tag "Create Branch" %>

 <% end %>
 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $("#linked_project").autocomplete({source: '<%= url_for :controller => :project, :action => :autocomplete_projects %>', minLength: 2});
   $("#linked_package").autocomplete({
     source: 
diff --git a/src/webui/app/views/project/rebuild_time.html.erb b/src/webui/app/views/project/rebuild_time.html.erb
index 7b458553582..449187732f9 100644
--- a/src/webui/app/views/project/rebuild_time.html.erb
+++ b/src/webui/app/views/project/rebuild_time.html.erb
@@ -10,7 +10,7 @@
 may happen when there is no other trouble and with a fixed set of build jobs associated to the project (usually not the
 case). To see what happens with less or more build hosts, play with these numbers:

 
-<% form_tag(:action => :rebuild_time, :project => @project.name, :arch => @arch, :repository => @repository) do -%>
+<%= form_tag(:action => :rebuild_time, :project => @project.name, :arch => @arch, :repository => @repository) do -%>
    
Jobs: <%= select_tag("hosts", options_for_select((2..100).to_a, @hosts)) %>
    <%= submit_tag "Check" %>
    

diff --git a/src/webui/app/views/project/show.html.erb b/src/webui/app/views/project/show.html.erb
index c771a118e1d..2e055d2a35d 100644
--- a/src/webui/app/views/project/show.html.erb
+++ b/src/webui/app/views/project/show.html.erb
@@ -204,7 +204,7 @@
 <% end %>
 
 <% if @packages.length > 0 %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $('#packages_table').dataTable({
         "bSort": false,
diff --git a/src/webui/app/views/project/status.html.erb b/src/webui/app/views/project/status.html.erb
index 4f3b7ae8122..29d6e08ca34 100644
--- a/src/webui/app/views/project/status.html.erb
+++ b/src/webui/app/views/project/status.html.erb
@@ -9,7 +9,7 @@
 
 <% comments_to_clear = [] %>
 
-<% form_tag({:action => :status}, :method => :get) do %>
+<%= form_tag({:action => :status}, :method => :get) do %>
   

     <%= hidden_field_tag(:project, @project.name) -%>
     <% if @develprojects.size > 2 %>
@@ -153,7 +153,7 @@
       <% end %>
     
   
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $('#status_table').dataTable({
         'iDisplayLength': 50,
diff --git a/src/webui/app/views/project/subprojects.html.erb b/src/webui/app/views/project/subprojects.html.erb
index f075b51a061..6103c53d81c 100644
--- a/src/webui/app/views/project/subprojects.html.erb
+++ b/src/webui/app/views/project/subprojects.html.erb
@@ -55,7 +55,7 @@
 <% end %>
 
 <% if @subprojects.length > 0 %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $(document).ready(function() {
       $('#parentprojects_table').dataTable({
         'bPaginate': false,
diff --git a/src/webui/app/views/request/_add_reviewer_dialog.html.erb b/src/webui/app/views/request/_add_reviewer_dialog.html.erb
index 6b25dbad839..b96e7691549 100644
--- a/src/webui/app/views/request/_add_reviewer_dialog.html.erb
+++ b/src/webui/app/views/request/_add_reviewer_dialog.html.erb
@@ -6,7 +6,7 @@
 
       
Add a reviewer to request <%= @request_id %>

 
-      <% form_tag(:action => "add_reviewer") do %>
+      <%= form_tag(:action => "add_reviewer") do %>
         <%= hidden_field_tag(:id, @request_id) %>
         

           <%= label_tag(:review_type, "Type:") %>

@@ -14,28 +14,28 @@
           
             <%= label_tag(:review_user, "User:") %>

             <%= text_field_tag(:review_user) %>

-            <% javascript_tag do %>
+            <%= javascript_tag do %>
               $("#review_user").autocomplete('<%= url_for :controller => :user, :action => :autocomplete_users %>', {minChars: 2, matchCase: true, max: 50});
             <% end %>
           
           
           
           
           <%= label_tag(:review_comment, "Comment for reviewer:") %>

           <%= text_area_tag('review_comment', nil, :size => '80x3') %>
-          <% javascript_tag do %>
+          <%= javascript_tag do %>
             $('#review_type').change(function() {
               switch($('#review_type option:selected').attr('value')) {
                 case "user": {
diff --git a/src/webui/app/views/request/_add_role_request_dialog.html.erb b/src/webui/app/views/request/_add_role_request_dialog.html.erb
index 53d2dbabc6a..30faae5f907 100644
--- a/src/webui/app/views/request/_add_role_request_dialog.html.erb
+++ b/src/webui/app/views/request/_add_role_request_dialog.html.erb
@@ -6,7 +6,7 @@
 
       
Do you want to request a role addition to <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project, :package => @package} %>?

 
-      <% form_tag(:action => "add_role_request", :method => "post") do %>
+      <%= form_tag(:action => "add_role_request", :method => "post") do %>
         <%= hidden_field_tag(:project, @project) %>
         <%= hidden_field_tag(:package, @package) if defined? @package %>
         

diff --git a/src/webui/app/views/request/_change_devel_request_dialog.html.erb b/src/webui/app/views/request/_change_devel_request_dialog.html.erb
index 8f3f95cca90..1ada483d9c5 100644
--- a/src/webui/app/views/request/_change_devel_request_dialog.html.erb
+++ b/src/webui/app/views/request/_change_devel_request_dialog.html.erb
@@ -10,7 +10,7 @@
       <% else %>
         
Do you want to request to set the devel project for <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project.value('name'), :package => @package.value('name')} %>?

       <% end %>
-      <% form_tag(:action => 'change_devel_request', :method => 'post') do %>
+      <%= form_tag(:action => 'change_devel_request', :method => 'post') do %>
         <%= hidden_field_tag(:project, @project.value('name')) %>
         <%= hidden_field_tag(:package, @package.value('name')) %>
         

@@ -32,6 +32,6 @@
   

 

 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $("#devel_project").autocomplete({source: '<%= url_for :controller => 'project', :action => 'autocomplete_projects' %>', minLength: 2});
 <% end %>
diff --git a/src/webui/app/views/request/_delete_request_dialog.html.erb b/src/webui/app/views/request/_delete_request_dialog.html.erb
index e523d8bd5bb..e13538801a6 100644
--- a/src/webui/app/views/request/_delete_request_dialog.html.erb
+++ b/src/webui/app/views/request/_delete_request_dialog.html.erb
@@ -6,7 +6,7 @@
 
       
Do you really want to request the deletion of <%= render :partial => 'shared/project_or_package_link', :locals => {:project => @project, :package => @package} %>?

 
-      <% form_tag(:action => 'delete_request', :method => 'post') do %>
+      <%= form_tag(:action => 'delete_request', :method => 'post') do %>
         <%= hidden_field_tag(:project, @project) %>
         <%= hidden_field_tag(:package, @package) if defined? @package %>
         

diff --git a/src/webui/app/views/request/_issues_table.html.erb b/src/webui/app/views/request/_issues_table.html.erb
index ab2e3bf0ca3..8779fd6ac2c 100644
--- a/src/webui/app/views/request/_issues_table.html.erb
+++ b/src/webui/app/views/request/_issues_table.html.erb
@@ -1,5 +1,5 @@
 <% if issues && issues.length > 0 %>
-  <% content_for :ready_function do %>
+  <%= content_for :ready_function do %>
     $('.expandable_issue_description').expander({slicePoint: 50, sliceEarlierAt: '
', expandText: '[+]', expandPrefix: ' ', userCollapseText: '[-]',});
   <% end %>
 
@@ -31,7 +31,7 @@
   
   <%# Stupid XHTML-1.0 strict doesn't like 'target', but all browsers do. Thus, sneak around validation to %>
   <%# allow opening a new window upon click: %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     $('a.issue_tracker_link').attr('target', '_blank')
   <% end %>
 <% end %>
diff --git a/src/webui/app/views/request/_recent_events_table.html.erb b/src/webui/app/views/request/_recent_events_table.html.erb
index b7f87ecfb6f..cb4affd0baf 100644
--- a/src/webui/app/views/request/_recent_events_table.html.erb
+++ b/src/webui/app/views/request/_recent_events_table.html.erb
@@ -1,4 +1,4 @@
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $('.expandable_event_comment').expander({slicePoint: 48, sliceEarlierAt: '
', expandText: '[+]', expandPrefix: ' ', userCollapseText: '[-]',});
 <% end %>
 
diff --git a/src/webui/app/views/request/_set_incident_dialog.html.erb b/src/webui/app/views/request/_set_incident_dialog.html.erb
index cba75456b38..784fe00aa87 100644
--- a/src/webui/app/views/request/_set_incident_dialog.html.erb
+++ b/src/webui/app/views/request/_set_incident_dialog.html.erb
@@ -6,7 +6,7 @@
 
       
Change the submit target of this request to an already existing incident.

 
-      <% form_tag(:action => 'set_incident') do %>
+      <%= form_tag(:action => 'set_incident') do %>
         <%= hidden_field_tag(:id, @request_id) %>
         

           <%= label_tag(:incident_project, 'Incident:') %>

@@ -21,7 +21,7 @@
   

 

 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   $("#incident_project").autocomplete({
     source: '<%= url_for :controller => 'project', :action => 'autocomplete_incidents' %>',
     minLength: 2
diff --git a/src/webui/app/views/request/show.html.erb b/src/webui/app/views/request/show.html.erb
index 504620dd7e8..3ef6637758c 100644
--- a/src/webui/app/views/request/show.html.erb
+++ b/src/webui/app/views/request/show.html.erb
@@ -2,7 +2,7 @@
 <% @layouttype = 'custom' %>
 <% @crumb_list = [link_to('Requests', :controller => :home, :action => :requests), @id] %>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $('#description').expander({slicePoint: 300, expandText: '[+]', expandPrefix: ' ', userCollapseText: '[-]',});
 <% end %>
 
@@ -50,7 +50,7 @@
         <% end %>
       
     

-    <% javascript_tag do %>
+    <%= javascript_tag do %>
       $('.action_select_link').click(function (event) {
         $('#action_select li.selected').attr('class', '');
         $(event.target).parent().attr('class', 'selected')
@@ -179,7 +179,7 @@
               <% end %>
             <% end %>
           
-          <% javascript_tag do %>
+          <%= javascript_tag do %>
             $('.review_descision_link').click(function (event) {
               $('#review_descision_select li.selected').attr('class', '');
               $(event.target).parent().attr('class', 'selected')
@@ -192,7 +192,7 @@
         

         

           <% if @can_handle_request %>
-            <% form_tag({:action => 'changerequest'}, {:id => 'request_handle_form'}) do %>
+            <%= form_tag({:action => 'changerequest'}, {:id => 'request_handle_form'}) do %>
               
<%= text_area_tag(:reason, 'Please add a comment', :size => '80x2', :style => "width: 99%") %>

               

                 <%= hidden_field_tag(:id, @id) %>
@@ -222,7 +222,7 @@
                 
               

             <% end %>
-            <% javascript_tag do %>
+            <%= javascript_tag do %>
               $('#accept_request_button').click(function (data) {
                 /* Add some hidden elements to carry HTML form data that is found at other DOM places for design reasons.  */
                 if ($('.submitter_is_maintainer_checkbox').size() != 0 &&
@@ -248,7 +248,7 @@
         <% if @can_add_reviews && @my_open_reviews.length > 0 %>
           <% @my_open_reviews.each_with_index do |review, index| %>
             

-              <% form_tag(:action => "modify_review") do %>
+              <%= form_tag(:action => "modify_review") do %>
                 
<%= text_area_tag("review_comment_#{index}", review.value('comment'), :size => '80x2', :style => "width: 99%", :class => 'review_comment') %>

                 

                   <%= hidden_field_tag("review_request_id_#{index}", @id) %>
@@ -263,7 +263,7 @@
             

           <% end %>
         <% end %>
-        <% javascript_tag do %>
+        <%= javascript_tag do %>
           $('.review_comment, #reason').click(function () { $(this).text(''); });
         <% end %>
       <% else %>
diff --git a/src/webui/app/views/search/index.html.erb b/src/webui/app/views/search/index.html.erb
index 7c2fa5f440b..052d038e3c6 100644
--- a/src/webui/app/views/search/index.html.erb
+++ b/src/webui/app/views/search/index.html.erb
@@ -1,7 +1,7 @@
 <% @pagetitle = "Search" %>
 <% @crumb_list = [@pagetitle] -%>
 
-<% content_for :ready_function do %>
+<%= content_for :ready_function do %>
   $('#search_text').focus();
 <% end %>
 
@@ -11,7 +11,7 @@
 <%= link_to 'software.opensuse.org', 'http://software.opensuse.org/search' %>.

 
 

-  <% form_tag({:controller => 'search', :action => 'search'}, {:method => :get}) do -%>
+  <%= form_tag({:controller => 'search', :action => 'search'}, {:method => :get}) do -%>
     

 
       Search term: <%= text_field_tag 'search_text', params[:search_text], :size => 35 -%>
diff --git a/src/webui/app/views/shared/_add_group.html.erb b/src/webui/app/views/shared/_add_group.html.erb
index 5aabeaf0483..56c23c02d88 100644
--- a/src/webui/app/views/shared/_add_group.html.erb
+++ b/src/webui/app/views/shared/_add_group.html.erb
@@ -1,10 +1,10 @@
 
<%= @pagetitle %>

 
-<% form_tag :action => :save_group do %>
+<%= form_tag :action => :save_group do %>
   

     Group:

     <%= text_field_tag 'groupid', params[:groupid], :size => '25' %>

-    <% javascript_tag do %>
+    <%= javascript_tag do %>
       $("#groupid").autocomplete({source: '<%= url_for :controller => 'group', :action => 'autocomplete' %>', minLength: 2});
     <% end %>
     Role:

diff --git a/src/webui/app/views/shared/_add_user.html.erb b/src/webui/app/views/shared/_add_user.html.erb
index 0d40d00cddc..00623ab4667 100644
--- a/src/webui/app/views/shared/_add_user.html.erb
+++ b/src/webui/app/views/shared/_add_user.html.erb
@@ -1,10 +1,10 @@
 
<%= @pagetitle %>

 
-<% form_tag :action => :save_person do %>
+<%= form_tag :action => :save_person do %>
   

     User:

     <%= text_field_tag 'userid', params[:userid] %>

-    <% javascript_tag do %>
+    <%= javascript_tag do %>
       $("#userid").autocomplete({source: '<%= url_for :controller => 'user', :action => 'autocomplete' %>', minLength: 2});
     <% end %>
     Role:

diff --git a/src/webui/app/views/shared/_buildresult_box.html.erb b/src/webui/app/views/shared/_buildresult_box.html.erb
index ca192470eac..cb9f6b775c0 100644
--- a/src/webui/app/views/shared/_buildresult_box.html.erb
+++ b/src/webui/app/views/shared/_buildresult_box.html.erb
@@ -27,7 +27,7 @@
   

 <% end %>
 
-<% javascript_tag do %>
+<%= javascript_tag do %>
   var tab_index_<%= index %> = 0;
 
   <% if controller == 'package' %>
diff --git a/src/webui/app/views/shared/_editor.html.erb b/src/webui/app/views/shared/_editor.html.erb
index 51c21816be7..76e25492ead 100644
--- a/src/webui/app/views/shared/_editor.html.erb
+++ b/src/webui/app/views/shared/_editor.html.erb
@@ -4,7 +4,7 @@
 <% read_only ||= false %>
 <% no_border ||= false %>
 
-<% content_for :content_for_head do %>
+<%= content_for :content_for_head do %>