ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3120 from emanuelschuetze/diff-box

Browse Source 
Hide change recommendation diff-box in diff version for normal users.
This commit is contained in:
Norman Jäckel 2017-03-21 23:05:02 +01:00 committed by GitHub
commit 861df5f5c1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openslides/core/static/css/app.css
View File

@ -657,12 +657,15 @@ img {
border: solid 1px #eee;
border-radius: 3px;
margin-bottom: 0;
margin-top: -25px;
margin-top: -24px;
padding-top: 0;
padding-right: 155px;
}
.diff-box-transparent {
margin-top: -24px;
}
.motion-text-with-diffs .original-text {
min-height: 30px; // Spacer between .diff-box, in case .original-text is empty
min-height: 30px; /* Spacer between .diff-box, in case .original-text is empty */
}
.motion-text-with-diffs .original-text ul:last-child {
padding-bottom: 16px;

3
openslides/motions/static/templates/motions/motion-detail/view-diff.html
View File

@ -6,7 +6,8 @@
<div class="motion-text original-text line-numbers-{{ lineNumberMode }}"
ng-bind-html="motion.getTextBetweenChangeRecommendations(version, changes[$index - 1], change, highlight) | trusted"></div>
<div class="diff-box diff-box-{{ change.id }} clearfix">
<div ng-class="motion.isAllowed('can_manage') ? 'diff-box' : 'diff-box-transparent'"
class="diff-box-{{ change.id }} clearfix">
<div class="action-row" ng-if="motion.isAllowed('can_manage')">
<div class="btn-group" data-toggle="buttons">
<label class="btn btn-sm btn-default" ng-class="{active: !change.rejected}"