Skip to content

Commit

Permalink
Diff: Revision-Selector with javascript
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernd Ritter committed May 26, 2024
1 parent aef294e commit 49c141a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
12 changes: 11 additions & 1 deletion src/main/resources/assets/js/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,14 @@ FilePond.create(inputElement, {
allowFileEncode: true,
allowMultiple: true,
allowReorder: true,
});
});

// Liest die ausgewählten diffs aus und verlinkt auf die URL
function opendiff(nodeId) {
var revisionLeft = $("input[name=revisionLeftGroup]:checked").data("revision");
var revisionRight = $("input[name=revisionRightGroup]:checked").data("revision");

var url = "revisions/view/" + revisionLeft + "/" + revisionRight;
console.log(url);
window.location.href = url;
}
10 changes: 5 additions & 5 deletions src/main/webapp/WEB-INF/templates/sites/revisions/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h3 class="h4 g-mb-15">
<th>Autor</th>
<th>Changelog</th>
<th colspan="2">
<a href="#!" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15">
<a href="#!" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15" data-th-onclick="opendiff([[${view.nodeId}]])">
<i class="fa fa-exchange g-mr-3"></i>
Unterschiede anzeigen
</a>
Expand All @@ -33,26 +33,26 @@ <h3 class="h4 g-mb-15">
<td data-th-text="${revision.changelog}"></td>
<td>
<label class="form-check-inline u-check">
<input class="g-hidden-xs-up g-pos-abs g-top-0 g-left-0" name="revisionLeftGroup" type="radio" data-th-checked="${iterStat.index == 1}? #{checked}">
<input class="g-hidden-xs-up g-pos-abs g-top-0 g-left-0" name="revisionLeftGroup" type="radio" data-th-attr="data-revision=${revision.revision}" data-th-checked="${iterStat.index == 1}? #{checked}">
<div class="u-check-icon-font g-absolute-centered--y g-left-0">
<i class="fa" data-check-icon="" data-uncheck-icon=""></i>
</div>
</label>
</td>
<td>
<label class="form-check-inline u-check">
<input class="g-hidden-xs-up g-pos-abs g-top-0 g-left-0" name="revisionRightGroup" type="radio" data-th-checked="${iterStat.index == 0}? #{checked}">
<input class="g-hidden-xs-up g-pos-abs g-top-0 g-left-0" name="revisionRightGroup" type="radio" data-th-attr="data-revision=${revision.revision}" data-th-checked="${iterStat.index == 0}? #{checked}">
<div class="u-check-icon-font g-absolute-centered--y g-left-0">
<i class="fa" data-check-icon="" data-uncheck-icon=""></i>
</div>
</label>
</td>
<td colspan="2">
<a href="#!" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15">
<a href="#!" data-th-unless="${iterStat.index == 0}" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15" data-th-href="@{/wiki/{nodeId}/revisions/{revisionId}/reset(nodeId=${revision.nodeId},revisionId=${revision.revision})}">
<i class="fa fa-mail-reply g-mr-3"></i>
Zurücksetzen
</a>
<a href="#!" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15">
<a href="#!" class="btn btn-xs u-btn-primary g-mr-10 g-mb-15" data-th-href="@{/wiki/{nodeId}/revisions/{revisionId}/delete(nodeId=${revision.nodeId},revisionId=${revision.revision})}">
<i class="fa fa-trash g-mr-3"></i>
Löschen
</a>
Expand Down

0 comments on commit 49c141a

Please sign in to comment.