Skip to content

Commit

Permalink
Merge pull request #3422 from eduardoj/convert_erb_templates_to_haml_3
Browse files Browse the repository at this point in the history
Convert erb templates to haml (3)
  • Loading branch information
Ana06 committed Aug 1, 2017
2 parents a580a13 + 1a29028 commit fd04b2d
Show file tree
Hide file tree
Showing 14 changed files with 219 additions and 296 deletions.
6 changes: 3 additions & 3 deletions src/api/app/assets/javascripts/webui/application.js.erb
Expand Up @@ -195,12 +195,12 @@ function change_role(obj) {
var role = td.data("role");

var url;
var data = {project: $('#involved_users').data("project"), package: $('#involved_users').data("package"), role: role};
var data = {project: $('#involved-users').data("project"), package: $('#involved-users').data("package"), role: role};
data[type + 'id'] = td.data(type);
if (obj.is(':checked')) {
url = $('#involved_users').data("save-" + type);
url = $('#involved-users').data("save-" + type);
} else {
url = $('#involved_users').data("remove");
url = $('#involved-users').data("remove");
}

$('#' + type + '_spinner').show();
Expand Down
Expand Up @@ -184,7 +184,7 @@ div#log_space_wrapper {
}
}

.feedbox li, #involved_users li {
.feedbox li, #involved-users li {
list-style: none;
}

Expand Down
141 changes: 0 additions & 141 deletions src/api/app/views/shared/_involved_users.html.erb

This file was deleted.

97 changes: 97 additions & 0 deletions src/api/app/views/shared/_involved_users.html.haml
@@ -0,0 +1,97 @@
- user_is_maintainer = (@package && User.current.can_modify_package?(@package)) || (@project && User.current.can_modify_project?(@project.api_obj))
- data = { 'save-user' => url_for(action: 'save_person'),
- 'remove' => url_for(action: 'remove_role'),
- 'save-group' => url_for(action: 'save_group'),
- 'project' => @project.name }
- data[:package] = @package.name if @package
#involved-users{ data: data }
- if @users.present?
%h3
User Roles #{image_tag 'ajax-loader.gif', id: 'user_spinner', class: 'hidden'}
%table.compact.stripe#user-table
%thead
%tr
%td Username
- @roles.each do |role|
%td= role.title.capitalize
%td
%tbody
- @users.each do |user|
%tr{ id: "user-#{valid_xml_id(user.login)}" }
%td= user_with_realname_and_icon(user)
- @roles.each do |role|
%td{ data: { user: user.login, role: role.title, type: 'user' } }
- if defined? @package
= check_box_tag('user_' + role.title + '_' + user.login, '',
@package.user_has_role?(user, role), disabled: !user_is_maintainer, class: 'trigger')
- if @project.user_has_role?(user, role)
= link_to(sprite_tag('project', title: 'Inherited from project'), controller: 'project', action: 'users', project: @project)
- else
= check_box_tag('user_' + role.title + '_' + user.login, '', @project.user_has_role?(user, role), disabled: !user_is_maintainer, class: 'trigger')
%td.nowrap
- unless User.current.is_nobody?
- mail_subject = 'openSUSE Build Service - ' + @project.name
- mail_subject += '/' + @package.name if defined? @package
= mail_to user.email, sprite_tag('email', title: 'Send mail to user'), subject: mail_subject
- if user_is_maintainer
= link_to sprite_tag('user_delete', title: 'Remove user'), { action: 'remove_role', project: @project, package: @package, userid: user.login }, { data: { confirm: "Really remove '#{user.login}'?" }, method: :post, class: 'remove-user' }
- if user_is_maintainer
%p
= link_to(sprited_text('user_add', 'Add user'), { action: :add_person, package: @package, project: @project }, id: 'add-user')
- unless @groups.blank?
%h3
Group Roles #{image_tag 'ajax-loader.gif', id: 'group_spinner', class: 'hidden'}
%table.compact.stripe#group-table
%thead
%tr
%td Group name
- @roles.each do |role|
%td= role.title.capitalize
- if user_is_maintainer
%td
%tbody
- @groups.each do |group|
%tr
%td= link_to(group.title, controller: 'groups', action: 'show', title: group.title)
- @roles.each do |role|
= content_tag(:td, data: { group: group.title, role: role.title, type: 'group' }) do
- if @package
= check_box_tag('group_' + role.title + '_' + group.title, '', @package.group_has_role?(group, role), disabled: !user_is_maintainer, class: :trigger)
- if @project.group_has_role?(group, role)
= link_to(sprite_tag('project', title: 'Inherited from project'), controller: 'project', action: 'users', project: @project)
- else
= check_box_tag('group_' + role.title + '_' + group.title, '',
@project.group_has_role?(group, role), disabled: !user_is_maintainer, class: :trigger)
- if user_is_maintainer
%td
= link_to sprite_tag('group_delete', title: 'Remove group'), { action: 'remove_role', project: @project, package: @package, groupid: group }, { data: { confirm: "Really remove '#{group}'?" }, method: :post }
- if user_is_maintainer
%p
= link_to sprited_text('group_add', 'Add group'), action: :add_group, package: @package, project: @project
= content_for :ready_function do
- if @users && @users.length > 0
$('#user-table').dataTable({
'columns': [
null,
- @roles.length.times do
null,
{'orderable': false}
],
'info': false,
'paging': false,
});
- if @groups && @groups.length > 0
$('#group-table').dataTable({
'columns': [
null,
- @roles.length.times do
null,
- if user_is_maintainer
{'orderable': false}
],
'searching': false,
'info': false,
'paging': false,
});
- if user_is_maintainer
$('.trigger').click(function() { change_role($(this)) } );
27 changes: 0 additions & 27 deletions src/api/app/views/shared/_repositories.html.erb

This file was deleted.

24 changes: 24 additions & 0 deletions src/api/app/views/shared/_repositories.html.haml
@@ -0,0 +1,24 @@
.clearfix
%div{ style: 'min-width: 50%; float: left' }
%h3
Build Flag #{image_tag 'ajax-loader.gif', id: 'spinner_flag_table_build', class: 'spinner hidden'}
%span.flagerror
= render partial: 'shared/repositories_flag_table', locals: { flags: @build }
%div{ style: 'min-width: 50%; float: left' }
%h3
Publish Flag #{image_tag 'ajax-loader.gif', id: 'spinner_flag_table_publish', class: 'spinner hidden'}
%span.flagerror
= render partial: 'shared/repositories_flag_table', locals: { flags: @publish }
.clearfix
%div{ style: 'min-width: 50%; float: left' }
%h3
Debuginfo
Flag #{image_tag 'ajax-loader.gif', id: 'spinner_flag_table_debuginfo', class: 'spinner hidden'}
%span.flagerror
= render partial: 'shared/repositories_flag_table', locals: { flags: @debuginfo }
%div{ style: 'min-width: 50%; float: left' }
%h3
Use for Build
Flag #{image_tag 'ajax-loader.gif', id: 'spinner_flag_table_useforbuild', class: 'spinner hidden'}
%span.flagerror
= render partial: 'shared/repositories_flag_table', locals: { flags: @useforbuild }
49 changes: 0 additions & 49 deletions src/api/app/views/shared/_repositories_flag_table.html.erb

This file was deleted.

29 changes: 29 additions & 0 deletions src/api/app/views/shared/_repositories_flag_table.html.haml
@@ -0,0 +1,29 @@
- first_flag = flags['all'].first.flag
%table.flag_table{ 'data-flag' => first_flag, id: "flag_table_#{first_flag}" }
%tr
%th Repository
%th{ style: 'width: 6ex' } All
- @architectures.each do |architecture|
%th{ style: 'width: 6ex' }= architecture.name
%tr
%td.reponame
%strong All
- flags['all'].each_with_index do |flag, index|
%td{ class: index == 0 ? 'allrow' : 'allcolum' }
= render partial: 'shared/repositories_flag_table_column', locals: { flag: flag }
- @project.repositories.each do |repository|
%tr
%td.reponame
%strong{ title: repository.name }
- if @package
= link_to(elide(repository.name, 18), action: 'binaries', controller: :package, project: @project, package: @package, repository: repository.name)
- else
= link_to(elide(repository.name, 18), action: :state, project: @project, repository: repository.name)
- flags[repository.name].each_with_index do |flag, index|
%td{ class: index == 0 ? 'allrow' : nil }
= render partial: 'shared/repositories_flag_table_column', locals: { flag: flag }
- content_for :ready_function do
:plain
$( '.flag_spinner_trigger_#{h(first_flag)}' ).click(function() {
$( '#spinner_flag_table_#{h(first_flag)}' ).show();
});

0 comments on commit fd04b2d

Please sign in to comment.