Skip to content

Commit

Permalink
Merge pull request #16061 from snipe/moved_keywords_on_admin_settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@snipe
snipe authored Jan 13, 2025
2 parents e03ed75 + a7543b4 commit e32ed03
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
22 changes: 14 additions & 8 deletions resources/lang/en-US/admin/settings/general.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
'footer_text' => 'Additional Footer Text ',
'footer_text_help' => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
'general_settings' => 'General Settings',
'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
'general_settings_help' => 'Default EULA and more',
'generate_backup' => 'Generate Backup',
'google_workspaces' => 'Google Workspaces',
Expand Down Expand Up @@ -154,7 +153,6 @@
'php' => 'PHP Version',
'php_info' => 'PHP info',
'php_overview' => 'PHP',
'php_overview_keywords' => 'phpinfo, system, info',
'php_overview_help' => 'PHP System info',
'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.',
'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.',
Expand Down Expand Up @@ -231,7 +229,6 @@
'update' => 'Update Settings',
'value' => 'Value',
'brand' => 'Branding',
'brand_keywords' => 'footer, logo, print, theme, skin, header, colors, color, css',
'brand_help' => 'Logo, Site Name',
'web_brand' => 'Web Branding Type',
'about_settings_title' => 'About Settings',
Expand Down Expand Up @@ -319,21 +316,17 @@
'filter_by_keyword' => 'Filter by setting keyword',
'security' => 'Security',
'security_title' => 'Update Security Settings',
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
'security_help' => 'Two-factor, Password Restrictions',
'groups_keywords' => 'permissions, permission groups, authorization',
'groups_help' => 'Account permission groups',
'localization' => 'Localization',
'localization_title' => 'Update Localization Settings',
'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
'localization_help' => 'Language, date display',
'notifications' => 'Notifications',
'notifications_help' => 'Email Alerts & Audit Settings',
'asset_tags_help' => 'Incrementing and prefixes',
'labels' => 'Labels',
'labels_title' => 'Update Label Settings',
'labels_help' => 'Label sizes &amp; settings',
'purge_keywords' => 'permanently delete',
'labels_help' => 'Barcodes &amp; label settings',
'purge_help' => 'Purge Deleted Records',
'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
'ldap_ad' => 'LDAP/AD',
Expand Down Expand Up @@ -391,4 +384,17 @@
'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',


/* Keywords for settings overview help */
'keywords' => [
'brand' => 'footer, logo, print, theme, skin, header, colors, color, css',
'general_settings' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
'groups' => 'permissions, permission groups, authorization',
'labels' => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
'localization' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
'php_overview' => 'phpinfo, system, info',
'purge' => 'permanently delete',
'security' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
],

];
15 changes: 8 additions & 7 deletions resources/views/settings/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<x-icon type="branding" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.brand') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.brand_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.brand') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.brand_help') }}</p>
Expand All @@ -81,7 +81,7 @@
<x-icon type="general-settings" class="fa-4x"/>
<br><br>
<span class="name"> {{ trans('admin/settings/general.general_settings') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.general_settings_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.general_settings') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.general_settings_help') }}</p>
Expand All @@ -98,7 +98,7 @@
<x-icon type="locked" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.security') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.security_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.security') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.security_help') }}</p>
Expand All @@ -114,7 +114,7 @@
<x-icon type="groups" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('general.groups') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.groups_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.groups') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.groups_help') }}</p>
Expand All @@ -131,7 +131,7 @@
<x-icon type="globe-us" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.localization') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.localization_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.localization') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.localization_help') }}</p>
Expand Down Expand Up @@ -195,6 +195,7 @@
<x-icon type="labels" class="fa-4x"/>
<br><br>
<span class="name">{{ trans('admin/settings/general.labels') }}</span>
<span class="keywords" aria-hidden="true" style="display:none"> {{ trans('admin/settings/general.keywords.labels') }}</span>
</a>
</h5>
<p class="help-block">{!! trans('admin/settings/general.labels_help') !!}</p>
Expand Down Expand Up @@ -303,7 +304,7 @@
<i class="fab fa-php fa-4x" aria-hidden="true"></i>
<br><br>
<span class="name">{{ trans('admin/settings/general.php_overview') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.php_overview_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.php_overview') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.php_overview_help') }}</p>
Expand All @@ -321,7 +322,7 @@
<i class="fas fa-trash fa-4x" aria-hidden="true"></i>
<br><br>
<span class="name">{{ trans('admin/settings/general.purge') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.purge_keywords') }}</span>
<span class="keywords" aria-hidden="true" style="display:none">{{ trans('admin/settings/general.keywords.purge') }}</span>
</a>
</h5>
<p class="help-block">{{ trans('admin/settings/general.purge_help') }}</p>
Expand Down

0 comments on commit e32ed03

Please sign in to comment.