Fixes #3000 - Login site wording could be better.
This commit is contained in:
parent
c1cb4fdd43
commit
3c2cea9a22
6 changed files with 20 additions and 8 deletions
|
@ -1,7 +1,7 @@
|
||||||
<div class="login fullscreen">
|
<div class="login fullscreen">
|
||||||
<div class="fullscreen-center">
|
<div class="fullscreen-center">
|
||||||
<div class="fullscreen-body">
|
<div class="fullscreen-body">
|
||||||
<p><%- @T('Login with %s', @C('fqdn')) %></p>
|
<p><%- @T('Log in to %s', @C('fqdn')) %></p>
|
||||||
|
|
||||||
<% if @C('maintenance_mode'): %>
|
<% if @C('maintenance_mode'): %>
|
||||||
<div class="hero-unit alert alert--danger js-maintenanceMode"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>
|
<div class="hero-unit alert alert--danger js-maintenanceMode"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>
|
||||||
|
|
|
@ -112,7 +112,7 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
|
||||||
|
|
||||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||||
|
|
||||||
expect(page).to have_text('Login')
|
expect(page).to have_text(Setting.get('fqdn'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -121,7 +121,7 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
|
||||||
|
|
||||||
Rake::Task['zammad:setup:auto_wizard'].execute
|
Rake::Task['zammad:setup:auto_wizard'].execute
|
||||||
|
|
||||||
expect(page).to have_text('Login')
|
expect(page).to have_text(Setting.get('fqdn'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
13
spec/system/login_spec.rb
Normal file
13
spec/system/login_spec.rb
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe 'Login', type: :system, authenticated_as: false do
|
||||||
|
before do
|
||||||
|
visit '/'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'fqdn is visible on login page' do
|
||||||
|
expect(page).to have_css('.login p', text: Setting.get('fqdn'))
|
||||||
|
end
|
||||||
|
end
|
|
@ -221,10 +221,9 @@ class KeyboardShortcutsTest < TestCase
|
||||||
|
|
||||||
shortcut(key: 'e')
|
shortcut(key: 'e')
|
||||||
watch_for(
|
watch_for(
|
||||||
css: 'body',
|
css: '#login',
|
||||||
value: 'login',
|
value: 'username',
|
||||||
timeout: 4,
|
timeout: 4,
|
||||||
)
|
)
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -55,8 +55,8 @@ class OtrsImportBrowserTest < TestCase
|
||||||
click(css: '.js-migration-start')
|
click(css: '.js-migration-start')
|
||||||
|
|
||||||
watch_for(
|
watch_for(
|
||||||
css: 'body',
|
css: '#login',
|
||||||
value: 'login',
|
value: 'username',
|
||||||
timeout: 600,
|
timeout: 600,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue