<p>This is a second take on <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="775040987" data-permission-text="Title is private" data-url="https://github.com/openstreetmap/openstreetmap-website/issues/3019" data-hovercard-type="pull_request" data-hovercard-url="/openstreetmap/openstreetmap-website/pull/3019/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/pull/3019">#3019</a>.</p>
<h1>Next steps</h1>
<ul class="contains-task-list">
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> Feedback on the UI / UX changes; and changes in general – especially by <a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/gravitystorm/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/gravitystorm">@gravitystorm</a></li>
<li class="task-list-item"><input type="checkbox" id="" disabled="" class="task-list-item-checkbox"> I will then look at possible test failures (especially once I get them running locally :))</li>
</ul>
<h1>What changed:</h1>
<blockquote>
<p><strong>Diary entry: move hide-button in separate box …</strong><br>
<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/699ed6652b31ebfb181db2089c04f98d6c122b64/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/699ed6652b31ebfb181db2089c04f98d6c122b64"><tt>699ed66</tt></a><br>
This is only for admins, so we can keep it in a separate box that stands out from other actions.</p>
<ul>
<li>add box</li>
<li>add button style</li>
</ul>
</blockquote>
<blockquote>
<p><strong>Diary entry: Reorder and restyle secondary actions …</strong><br>
<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/6eb624b2d0eeeea5edcbea46bab570477f67c851/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/6eb624b2d0eeeea5edcbea46bab570477f67c851"><tt>6eb624b</tt></a></p>
<ul>
<li>remove custom class and use bootstrap default classes instead <a href="https://getbootstrap.com/docs/4.5/content/typography/#inline" rel="nofollow">https://getbootstrap.com/docs/4.5/content/typography/#inline</a></li>
<li>add button link to edit action – small on #index, regular on #show</li>
<li>make edit action first item in list so it may look better as a button</li>
<li>use edit_diary_entry_path for edit action</li>
<li>place new-comment and comment-count links next to eachother by moving reply-link elsewhere</li>
<li>make reply-link visible on #show as well (was #index only, for some reason)</li>
<li>make reply-link visible to non-current-users only</li>
</ul>
</blockquote>
<blockquote>
<p><strong>Diary entry: Remove check for presence of current_user …</strong><br>
<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/0b5a2faf735493496fb3a12c73972b5cc832aa61/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/0b5a2faf735493496fb3a12c73972b5cc832aa61"><tt>0b5a2fa</tt></a><br>
"if nil == diary_entry.user" is false, so no need the presence of current_user first.</p>
</blockquote>
<blockquote>
<p><strong>Diary entry: Remove the xml:lang attribute …</strong><br>
<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/7b3233e8c57a2079957bd6931f4468dc9d8c566b/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/7b3233e8c57a2079957bd6931f4468dc9d8c566b"><tt>7b3233e</tt></a><br>
<a href="https://www.w3.org/International/questions/qa-html-language-declarations" rel="nofollow">https://www.w3.org/International/questions/qa-html-language-declarations</a> says we dont need it for html5 documents. This was the only place that had it.</p>
</blockquote>
<blockquote>
<p><strong>Diary entry: Spacing if location given …</strong><br>
<a class="commit-link" data-hovercard-type="commit" data-hovercard-url="https://github.com/openstreetmap/openstreetmap-website/commit/e4d66c09dbf21f6ea8afb94544f2d41e965848c5/hovercard" href="https://github.com/openstreetmap/openstreetmap-website/commit/e4d66c09dbf21f6ea8afb94544f2d41e965848c5"><tt>e4d66c0</tt></a><br>
The location box did not have any spacing bottom, yet.</p>
</blockquote>
<hr>
<h4>You can view, comment on, or merge this pull request online at:</h4>
<p> <a href='https://github.com/openstreetmap/openstreetmap-website/pull/3023'>https://github.com/openstreetmap/openstreetmap-website/pull/3023</a></p>
<h4>Commit Summary</h4>
<ul>
<li>Diary entry: move hide-button in separate box</li>
<li>Diary entry: Reorder and restyle secondary actions</li>
<li>Diary entry: Remove check for presence of current_user</li>
<li>Diary entry: Remove the xml:lang attribute</li>
<li>Diary entry: Spacing if location given</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>M</strong>
<a href="https://github.com/openstreetmap/openstreetmap-website/pull/3023/files#diff-19308fdc270ab97cbcfbfa5628325285149496524b767672f8e80f1079db29f9">app/views/diary_entries/_diary_entry.html.erb</a>
(57)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3023.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/3023.patch</a></li>
<li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/3023.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/3023.diff</a></li>
</ul>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/3023">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLLB54EV4YVIAKJJ3YLSXMQ6LANCNFSM4VOJ42OQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AAK2OLLEWDQPNLNEWR7O5J3SXMQ6LA5CNFSM4VOJ42O2YY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4LSHVAGA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/3023",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/3023",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>