kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix up Web IDE user preference copy and buttons

Browse source
This commit is contained in:
Jose Ivan Vargas 2018-01-11 08:23:44 +00:00 committed by Tim Zallmann
parent c90fcf1a29
commit 407d563844
8 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/multi-editor-on.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

2
app/helpers/blob_helper.rb
View file

@ -46,7 +46,7 @@ module BlobHelper
end end
def ide_edit_text def ide_edit_text
"#{_('Multi Edit')} <span class='label label-primary'>#{_('Beta')}</span>".html_safe "#{_('Web IDE')}"
end end
def ide_blob_link(project = @project, ref = @ref, path = @path, options = {}) def ide_blob_link(project = @project, ref = @ref, path = @path, options = {})

2
app/views/layouts/header/_default.html.haml
View file

@ -56,8 +56,6 @@
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
%li %li
= link_to "Settings", profile_path = link_to "Settings", profile_path
%li
= link_to "Turn on multi edit", profile_preferences_path
- if current_user - if current_user
%li %li
= link_to "Help", help_path = link_to "Help", help_path

4
app/views/profiles/preferences/show.html.haml
View file

@ -5,8 +5,8 @@
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
.col-lg-4 .col-lg-4
%h4.prepend-top-0 %h4.prepend-top-0
GitLab multi file editor Web IDE (Beta)
%p Unlock an additional editing experience which makes it possible to edit and commit multiple files %p Enable the new web IDE on this device to make it possible to open and edit multiple files with a single commit
.col-lg-8.multi-file-editor-options .col-lg-8.multi-file-editor-options
= label_tag do = label_tag do
.preview.append-bottom-10= image_tag "multi-editor-off.png" .preview.append-bottom-10= image_tag "multi-editor-off.png"

5
changelogs/unreleased/41789-fix-up-web-ide-user-preference-copy-and-buttons.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix web ide user preferences copy and buttons
merge_request: 41789
author:
type: other

2
spec/features/projects/tree/create_directory_spec.rb
View file

@ -14,7 +14,7 @@ feature 'Multi-file editor new directory', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end

2
spec/features/projects/tree/create_file_spec.rb
View file

@ -14,7 +14,7 @@ feature 'Multi-file editor new file', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end

2
spec/features/projects/tree/upload_file_spec.rb
View file

@ -16,7 +16,7 @@ feature 'Multi-file editor upload file', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end