Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hypha
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ots
hypha
Commits
2dcdc64f
Commit
2dcdc64f
authored
5 years ago
by
Chris Lawton
Browse files
Options
Downloads
Patches
Plain Diff
don't duplicate markup
parent
b27ad93d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
opentech/apply/activity/templates/activity/include/listing_base.html
+3
-3
3 additions, 3 deletions
...ply/activity/templates/activity/include/listing_base.html
opentech/static_src/src/javascript/apply/edit-comment.js
+2
-6
2 additions, 6 deletions
opentech/static_src/src/javascript/apply/edit-comment.js
with
5 additions
and
9 deletions
opentech/apply/activity/templates/activity/include/listing_base.html
+
3
−
3
View file @
2dcdc64f
...
@@ -17,9 +17,9 @@
...
@@ -17,9 +17,9 @@
</a>
</a>
</p>
</p>
{% endif %}
{% endif %}
{% if activity.edited %}
<p
class=
"feed__meta-item feed__meta-item--last-edited"
{%
if
not
activity.edited
%}
hidden
{%
endif
%}
>
<p
class=
"feed__meta-item feed__meta-item--last-edited"
>
(Last edited:
<span
class=
"js-last-edited"
>
{{ activity.edited|date:"Y-m-d H:i" }}
</span>
)
</p>
(Last edited:
<span
class=
"js-last-edited"
>
{{ activity.edited|date:"Y-m-d H:i" }}
</span>
)
{% endif %}
</p>
{% endif %}
{% endif %}
{% if activity.private %}
{% if activity.private %}
...
...
This diff is collapsed.
Click to expand it.
opentech/static_src/src/javascript/apply/edit-comment.js
+
2
−
6
View file @
2dcdc64f
...
@@ -123,12 +123,8 @@
...
@@ -123,12 +123,8 @@
const
updateLastEdited
=
(
el
,
date
)
=>
{
const
updateLastEdited
=
(
el
,
date
)
=>
{
const
parsedDate
=
new
Date
(
date
).
toISOString
().
split
(
'
T
'
)[
0
];
const
parsedDate
=
new
Date
(
date
).
toISOString
().
split
(
'
T
'
)[
0
];
const
time
=
new
Date
(
date
).
toLocaleTimeString
([],
{
hour
:
'
2-digit
'
,
minute
:
'
2-digit
'
});
const
time
=
new
Date
(
date
).
toLocaleTimeString
([],
{
hour
:
'
2-digit
'
,
minute
:
'
2-digit
'
});
if
(
$
(
el
).
closest
(
feedContent
).
find
(
lastEdited
).
length
)
{
$
(
el
).
closest
(
feedContent
).
find
(
lastEdited
).
parent
().
attr
(
'
hidden
'
,
false
);
$
(
el
).
closest
(
feedContent
).
find
(
lastEdited
).
html
(
`
${
parsedDate
}
${
time
}
`
);
$
(
el
).
closest
(
feedContent
).
find
(
lastEdited
).
html
(
`
${
parsedDate
}
${
time
}
`
);
}
else
{
$
(
`<p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">
${
parsedDate
}
${
time
}
</span>)</p>`
).
insertAfter
(
$
(
el
).
closest
(
feedContent
).
find
(
editButton
).
parent
());
}
};
};
const
updateComment
=
(
el
,
id
,
comment
,
editUrl
,
commentMarkdown
)
=>
{
const
updateComment
=
(
el
,
id
,
comment
,
editUrl
,
commentMarkdown
)
=>
{
...
...
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