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

Hide change recommendation diff-box in diff version for normal users.

Browse Source
This commit is contained in:
Emanuel Schütze 2017-03-21 20:47:58 +01:00
parent b7d3acc94b
commit 70de0a6e4b
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: solid 1px #eee;
border-radius: 3px; border-radius: 3px;
margin-bottom: 0; margin-bottom: 0;
margin-top: -25px; margin-top: -24px;
padding-top: 0; padding-top: 0;
padding-right: 155px; padding-right: 155px;
} }
.diff-box-transparent {
margin-top: -24px;
}
.motion-text-with-diffs .original-text { .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 { .motion-text-with-diffs .original-text ul:last-child {
padding-bottom: 16px; 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 }}" <div class="motion-text original-text line-numbers-{{ lineNumberMode }}"
ng-bind-html="motion.getTextBetweenChangeRecommendations(version, changes[$index - 1], change, highlight) | trusted"></div> 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="action-row" ng-if="motion.isAllowed('can_manage')">
<div class="btn-group" data-toggle="buttons"> <div class="btn-group" data-toggle="buttons">
<label class="btn btn-sm btn-default" ng-class="{active: !change.rejected}" <label class="btn btn-sm btn-default" ng-class="{active: !change.rejected}"