From 407d56384460806ed2e2c88657ce35750527aae5 Mon Sep 17 00:00:00 2001 From: Jose Ivan Vargas Date: Thu, 11 Jan 2018 08:23:44 +0000 Subject: Fix up Web IDE user preference copy and buttons --- app/assets/images/multi-editor-on.png | Bin 5464 -> 3971 bytes app/helpers/blob_helper.rb | 2 +- app/views/layouts/header/_default.html.haml | 2 -- app/views/profiles/preferences/show.html.haml | 4 ++-- 4 files changed, 3 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/assets/images/multi-editor-on.png b/app/assets/images/multi-editor-on.png index 2bcd29abf13..d51b68da985 100644 Binary files a/app/assets/images/multi-editor-on.png and b/app/assets/images/multi-editor-on.png differ diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index f9dcb32f7c4..5e3b2e5581c 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -46,7 +46,7 @@ module BlobHelper end def ide_edit_text - "#{_('Multi Edit')} #{_('Beta')}".html_safe + "#{_('Web IDE')}" end def ide_blob_link(project = @project, ref = @ref, path = @path, options = {}) diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 39eb71c2bac..99e7f3b568d 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -56,8 +56,6 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - %li - = link_to "Turn on multi edit", profile_preferences_path - if current_user %li = link_to "Help", help_path diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 65328791ce5..aeae7455a1c 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -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| .col-lg-4 %h4.prepend-top-0 - GitLab multi file editor - %p Unlock an additional editing experience which makes it possible to edit and commit multiple files + Web IDE (Beta) + %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 = label_tag do .preview.append-bottom-10= image_tag "multi-editor-off.png" -- cgit v1.2.3