SHIMADA Koji
null+****@clear*****
Tue Oct 16 16:48:23 JST 2012
SHIMADA Koji 2012-10-16 16:48:23 +0900 (Tue, 16 Oct 2012) New Revision: 58f879ff25c9eac4e6267d2d88abc02b7f35831d https://github.com/logaling/logaling-server/commit/58f879ff25c9eac4e6267d2d88abc02b7f35831d Merged 8867d01: Merge pull request #35 from logaling/add-dialog-before-destroy-data Log: Show confirm dialog before destroy user data Modified files: app/views/dashboard/show.html.haml app/views/user_glossaries/show.html.haml Modified: app/views/dashboard/show.html.haml (+2 -2) =================================================================== --- app/views/dashboard/show.html.haml 2012-10-16 15:03:11 +0900 (ccda1c4) +++ app/views/dashboard/show.html.haml 2012-10-16 16:48:23 +0900 (d8cb5da) @@ -21,7 +21,7 @@ = f.hidden_field :target_language, value: user_glossary.target_language = f.submit '', :class => 'hidden', :id => "commit_#{user_glossary.id}" = link_to raw("<i class=icon-file></i>"), new_user_glossary_path(current_user, original_user_glossary_id: user_glossary.id), { :class => 'btn btn-mini' } - = link_to raw("<i class=icon-trash></i>"), user_glossary_path(current_user, user_glossary), method: :delete, :class => 'btn btn-mini' + = link_to raw("<i class=icon-trash></i>"), user_glossary_path(current_user, user_glossary), method: :delete, :class => 'btn btn-mini', data: { confirm: '用語集を削除します。よろしいですか?' } %h2 参加しているGitHubプロジェクトの管理 @@ -34,7 +34,7 @@ %li = github_project.full_name %span.btn-group.actions - = link_to raw("<i class=icon-trash></i>"), user_github_project_membership_path(current_user, github_project.memberships.of(current_user).first), method: :delete, :class => 'btn btn-mini' + = link_to raw("<i class=icon-trash></i>"), user_github_project_membership_path(current_user, github_project.memberships.of(current_user).first), method: :delete, :class => 'btn btn-mini', data: { confirm: '用語集を削除します。よろしいですか?' } %ul.glossariesList - github_project.glossaries.each_with_index do |glossary, j| %li Modified: app/views/user_glossaries/show.html.haml (+1 -1) =================================================================== --- app/views/user_glossaries/show.html.haml 2012-10-16 15:03:11 +0900 (9c4128e) +++ app/views/user_glossaries/show.html.haml 2012-10-16 16:48:23 +0900 (aebc75d) @@ -30,5 +30,5 @@ - if signed_in? && current_user.own?(@user_glossary) %p.btn-group.actions = link_to raw("<i class=icon-pencil></i>"), edit_user_glossary_term_path(current_user, @user_glossary, term.id), :class => 'btn btn-mini' - = link_to raw("<i class=icon-trash></i>"), user_glossary_term_path(current_user, @user_glossary, term.id), method: :delete, :class => 'btn btn-mini' + = link_to raw("<i class=icon-trash></i>"), user_glossary_term_path(current_user, @user_glossary, term.id), method: :delete, :class => 'btn btn-mini', data: { confirm: '用語を削除します。よろしいですか?' } = paginate @registered_terms -------------- next part -------------- An HTML attachment was scrubbed... ダウンロード