diff options
author | Benjamin Neff <benjamin@coding4coffee.ch> | 2021-06-13 02:27:34 +0300 |
---|---|---|
committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2021-06-13 02:27:34 +0300 |
commit | a17fca02ffc649dcccc4c04e6dca769f78466e23 (patch) | |
tree | 8e1a5fb30cb47649350ea60eccc42e0dd933c338 /app/assets | |
parent | 85bb022b2a36969ddf2050624ba59cd7eb1882b9 (diff) | |
parent | 43d489edda2956143745c2b25705d3bbe8f311fe (diff) |
Merge branch 'next-minor' into develop
Diffstat (limited to 'app/assets')
8 files changed, 22 insertions, 22 deletions
diff --git a/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs b/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs index 03e24c939..f4a96f1c2 100644 --- a/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs +++ b/app/assets/templates/aspect_membership_dropdown_tpl.jst.hbs @@ -10,7 +10,7 @@ {{ t "aspect_dropdown.toggle" count=aspectMembershipsLength }} {{/if}} </span> - <span class="caret" /> + <span class="caret"></span> </button> <ul class="dropdown-menu aspect-membership pull-right" unselectable="on"> @@ -29,8 +29,8 @@ > <a> <span class="status_indicator"> - <i class="glyphicon glyphicon-ok" /> - <i class="glyphicon glyphicon-refresh" /> + <i class="glyphicon glyphicon-ok"></i> + <i class="glyphicon glyphicon-refresh"></i> </span> <span class="text"> {{name}} @@ -39,7 +39,7 @@ </li> {{/each}} {{#if dropdownMayCreateNewAspect}} - <li class="divider" /> + <li class="divider"></li> <li class="newItem add_aspect"> <a data-target="#newAspectModal" data-toggle="modal" href="#"> {{ t "aspects.create.add_a_new_aspect" }} @@ -48,5 +48,5 @@ {{/if}} </ul> {{#if dropdownMayCreateNewAspect}} - <div class="newAspectContainer"/> + <div class="newAspectContainer"></div> {{/if}} diff --git a/app/assets/templates/comment-stream_tpl.jst.hbs b/app/assets/templates/comment-stream_tpl.jst.hbs index 9e0da98b7..6ed798237 100644 --- a/app/assets/templates/comment-stream_tpl.jst.hbs +++ b/app/assets/templates/comment-stream_tpl.jst.hbs @@ -29,7 +29,7 @@ class="new-comment" id="new-comment-on-{{id}}" method="post"> <textarea class="comment-box form-control mention-textarea" - id="comment_text_on_{{id}}" name="text" rows="1" required placeholder="{{t "stream.comment"}}" /> + id="comment_text_on_{{id}}" name="text" rows="1" required placeholder="{{t "stream.comment"}}"></textarea> <div class="typeahead-mention-box-wrap"> <input class="typeahead-mention-box hidden" type="text"> </div> diff --git a/app/assets/templates/comment_tpl.jst.hbs b/app/assets/templates/comment_tpl.jst.hbs index 81c2d5064..36d56ef1c 100644 --- a/app/assets/templates/comment_tpl.jst.hbs +++ b/app/assets/templates/comment_tpl.jst.hbs @@ -11,7 +11,7 @@ {{#if canRemove}} <a href="#" class="delete comment_delete" title="{{t "delete"}}"> <i class="entypo-trash"></i> - <a/> + </a> {{else}} <a href="#" data-type="Comment" class="comment_report" title="{{t "report.name"}}"> <i class="entypo-warning"></i> @@ -26,7 +26,7 @@ {{/linkToAuthor}} - <a href="/posts/{{parent.id}}#{{guid}}" class="permalink_comment"> - <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"/> + <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"></time> </a> <a href="/posts/{{parent.guid}}#{{guid}}" class="permalink gray" title="{{t "stream.permalink"}}"> <i class="entypo-link"></i> diff --git a/app/assets/templates/photo_tpl.jst.hbs b/app/assets/templates/photo_tpl.jst.hbs index 388ddaf0b..9c5e4a4d2 100644 --- a/app/assets/templates/photo_tpl.jst.hbs +++ b/app/assets/templates/photo_tpl.jst.hbs @@ -27,10 +27,10 @@ <div class="footer-container"> {{#if status_message}} <a href="{{urlTo "post" status_message.id}}"> - <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" /> + <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"></time> </a> {{else}} - <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" /> + <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"></time> {{/if}} </div> </div> diff --git a/app/assets/templates/pod_table_entry_tpl.jst.hbs b/app/assets/templates/pod_table_entry_tpl.jst.hbs index e43ee6c6f..46f0a9909 100644 --- a/app/assets/templates/pod_table_entry_tpl.jst.hbs +++ b/app/assets/templates/pod_table_entry_tpl.jst.hbs @@ -9,7 +9,7 @@ </td> <td class="pod-title" title="{{host}}">{{host}}</td> <td class="added"> - <small><time datetime="{{created_at}}" title="{{localTime created_at}}" /></small> + <small><time datetime="{{created_at}}" title="{{localTime created_at}}"></time></small> </td> <td> {{#if has_no_errors}} @@ -18,10 +18,10 @@ {{status_text}} {{/if}} {{#unless is_unchecked}} - <br><small>{{t 'admin.pods.last_check'}} <time datetime="{{checked_at}}" title="{{localTime checked_at}}" /></small> + <br><small>{{t 'admin.pods.last_check'}} <time datetime="{{checked_at}}" title="{{localTime checked_at}}"></time></small> {{/unless}} {{#if offline}} - | <small>{{t 'admin.pods.offline_since'}} <time datetime="{{offline_since}}" title="{{localTime offline_since}}" /></small> + | <small>{{t 'admin.pods.offline_since'}} <time datetime="{{offline_since}}" title="{{localTime offline_since}}"></time></small> {{/if}} {{#if is_unchecked}}<br><small class="text-muted">{{t 'admin.pods.no_info'}}</small>{{/if}} <pre class="details" style="display: none;"> diff --git a/app/assets/templates/reshare_tpl.jst.hbs b/app/assets/templates/reshare_tpl.jst.hbs index 048b789f1..c8aa22095 100644 --- a/app/assets/templates/reshare_tpl.jst.hbs +++ b/app/assets/templates/reshare_tpl.jst.hbs @@ -15,7 +15,7 @@ <span class="details gray"> - <a href="/posts/{{id}}"> - <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" /> + <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"></time> </a> </span> </div> diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs index dd96957c5..94995cb12 100644 --- a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs +++ b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs @@ -40,11 +40,11 @@ <span class="post-time"> {{#if root}} <a href="/posts/{{root.guid}}"> - <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" /> + <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}"></time> </a> {{else}} <a href="/posts/{{guid}}"> - <time datetime="{{created_at}}" title="{{localTime created_at}}" /> + <time datetime="{{created_at}}" title="{{localTime created_at}}"></time> </a> {{/if}} </span> @@ -59,12 +59,12 @@ {{/if}} </div> {{#unless root}} - <div id="single-post-moderation" /> + <div id="single-post-moderation"></div> {{/unless}} </div> </div> {{#unless root}} - <div id="single-post-actions" class="col-md-4" /> + <div id="single-post-actions" class="col-md-4"></div> {{/unless}} </div> {{#if location.lat}} @@ -92,13 +92,13 @@ <div class="post-context"> <span class="post-time"> <a href="/posts/{{guid}}"> - <time datetime="{{created_at}}" title="{{localTime created_at}}" /> + <time datetime="{{created_at}}" title="{{localTime created_at}}"></time> </a> </span> - <span id="single-post-moderation" /> + <span id="single-post-moderation"></span> </div> </div> - <div id="single-post-actions" class="col-md-4" /> + <div id="single-post-actions" class="col-md-4"></div> </div> {{/if}} </div> diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs index 9240a3bfd..cb860b63a 100644 --- a/app/assets/templates/stream-element_tpl.jst.hbs +++ b/app/assets/templates/stream-element_tpl.jst.hbs @@ -22,7 +22,7 @@ <span class="details gray post-timestamp"> - <a href="/posts/{{id}}"> - <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" /> + <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}"></time> </a> <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}"> |