Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mastodon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Mastodon
Commits
74c474a6
Commit
74c474a6
authored
7 years ago
by
Sebastian Morr
Committed by
Eugen
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Display remaining characters when editing display name and bio (#2219)
parent
5e33ad29
Loading
Loading
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/assets/javascripts/extras.jsx
+8
-0
8 additions, 0 deletions
app/assets/javascripts/extras.jsx
app/views/settings/profiles/show.html.haml
+2
-2
2 additions, 2 deletions
app/views/settings/profiles/show.html.haml
config/locales/simple_form.en.yml
+2
-2
2 additions, 2 deletions
config/locales/simple_form.en.yml
with
12 additions
and
4 deletions
app/assets/javascripts/extras.jsx
+
8
−
0
View file @
74c474a6
...
...
@@ -37,4 +37,12 @@ $(() => {
$
(
e
.
target
).
parent
().
attr
(
'
style
'
,
null
);
}
});
// used on /settings/profile
$
(
'
.account_display_name
'
).
on
(
'
input
'
,
e
=>
{
$
(
'
.name-counter
'
).
text
(
30
-
$
(
e
.
target
).
val
().
length
)
});
$
(
'
.account_note
'
).
on
(
'
input
'
,
e
=>
{
$
(
'
.note-counter
'
).
text
(
160
-
$
(
e
.
target
).
val
().
length
)
});
});
This diff is collapsed.
Click to expand it.
app/views/settings/profiles/show.html.haml
+
2
−
2
View file @
74c474a6
...
...
@@ -5,8 +5,8 @@
=
render
'shared/error_messages'
,
object:
@account
.fields-group
=
f
.
input
:display_name
,
placeholder:
t
(
'simple_form.labels.defaults.display_name'
)
=
f
.
input
:note
,
placeholder:
t
(
'simple_form.labels.defaults.note'
)
=
f
.
input
:display_name
,
placeholder:
t
(
'simple_form.labels.defaults.display_name'
)
,
hint:
t
(
'simple_form.hints.defaults.display_name'
,
counter:
"<span class=
\"
name-counter
\"
>
#{
30
-
@account
.
display_name
.
size
}
</span>"
).
html_safe
=
f
.
input
:note
,
placeholder:
t
(
'simple_form.labels.defaults.note'
)
,
hint:
t
(
'simple_form.hints.defaults.note'
,
counter:
"<span class=
\"
note-counter
\"
>
#{
160
-
@account
.
note
.
size
}
</span>"
).
html_safe
=
f
.
input
:avatar
,
wrapper: :with_label
,
hint:
t
(
'simple_form.hints.defaults.avatar'
)
=
f
.
input
:header
,
wrapper: :with_label
,
hint:
t
(
'simple_form.hints.defaults.header'
)
...
...
This diff is collapsed.
Click to expand it.
config/locales/simple_form.en.yml
+
2
−
2
View file @
74c474a6
...
...
@@ -4,10 +4,10 @@ en:
hints
:
defaults
:
avatar
:
PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
display_name
:
At most 30
characters
display_name
:
'
%{counter}
characters
left'
header
:
PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
locked
:
Requires you to manually approve followers and defaults post privacy to followers-only
note
:
At most 160
characters
note
:
'
%{counter}
characters
left'
imports
:
data
:
CSV file exported from another Mastodon instance
sessions
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment