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

Small template improvements

Browse Source
This commit is contained in:
FinnStutzenstein 2017-03-03 10:25:03 +01:00
parent ebf90e4217
commit 606c17ef43
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1331,6 +1331,10 @@ img {
.scroll-x-container { .scroll-x-container {
overflow-x: auto; overflow-x: auto;
} }
.import-preview p {
margin: 0;
padding: 0;
}
/* user details */ /* user details */
.user_details fieldset { .user_details fieldset {

2
openslides/motions/static/js/motions/motion-services.js
View File

@ -79,8 +79,8 @@ angular.module('OpenSlidesApp.motions.motionservices', ['OpenSlidesApp.motions',
motion = _motion; // If this is not updated, motion = _motion; // If this is not updated,
obj.originalHtml = motion.getTextWithLineBreaks(versionId); obj.originalHtml = motion.getTextWithLineBreaks(versionId);
obj.changed = false; obj.changed = false;
obj.editor.setReadOnly(true);
if (obj.editor) { if (obj.editor) {
obj.editor.setReadOnly(true);
obj.editor.setData(obj.originalHtml); obj.editor.setData(obj.originalHtml);
} }
}; };

2
openslides/motions/static/js/motions/site.js
View File

@ -1263,7 +1263,7 @@ angular.module('OpenSlidesApp.motions.site', [
{headers: {'Content-Type': 'application/json'}, {headers: {'Content-Type': 'application/json'},
data: JSON.stringify({version_number: version.version_number})}) data: JSON.stringify({version_number: version.version_number})})
.then(function(success) { .then(function(success) {
$scope.showVersion(motion.active_version); $scope.showVersion({id: motion.active_version});
}); });
}; };
// check if user is allowed to see at least one comment field // check if user is allowed to see at least one comment field

2
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -495,7 +495,7 @@
<span ng-if="$parent.version == version.id"> <span ng-if="$parent.version == version.id">
<strong><translate>Version</translate> {{ version.version_number }}</strong> <strong><translate>Version</translate> {{ version.version_number }}</strong>
</span> </span>
<a ng-if="$parent.version != version.id" ng-click="showVersion(version)"> <a href="" ng-if="$parent.version != version.id" ng-click="showVersion(version)">
<translate>Version</translate> {{ version.version_number }} <translate>Version</translate> {{ version.version_number }}
</a> </a>
<!-- active version --> <!-- active version -->

4
openslides/motions/static/templates/motions/motion-detail/toolbar.html
View File

@ -54,7 +54,9 @@
</span> </span>
<button type="button" class="btn btn-sm btn-default" <button type="button" class="btn btn-sm btn-default"
ng-click="lineNumberForm.$show()" ng-click="lineNumberForm.$show()"
ng-if="lineNumberMode != 'none'"> ng-if="lineNumberMode != 'none'"
uib-tooltip="{{ 'Jump to a given line' | translate }}"
tooltip-class="nobr">
<i class="fa fa-share"></i> <i class="fa fa-share"></i>
<translate>go</translate> <translate>go</translate>
</button> </button>

7
openslides/motions/static/templates/motions/motion-import.html
View File

@ -77,8 +77,11 @@
<span ng-if="motion.text_error" title="{{ motion.text_error | translate }}"> <span ng-if="motion.text_error" title="{{ motion.text_error | translate }}">
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>
</span> </span>
{{ motion.text | limitTo:80 }}{{ motion.text.length > 80 ? '...' : '' }} <span class="import-preview" ng-bind-html="motion.text | limitTo:90 | trusted"></span>
<td>{{ motion.reason | limitTo:80 }}{{ motion.reason.length > 80 ? '...' : '' }} {{ motion.text.length > 90 ? '...' : '' }}
<td>
<span class="import-preview" ng-bind-html="motion.reason | limitTo:90 | trusted"></span>
{{ motion.reason.length > 90 ? '...' : '' }}
<td ng-class="{ 'text-warning': motion.submitter_create }"> <td ng-class="{ 'text-warning': motion.submitter_create }">
<span ng-if="motion.submitter_create" title="{{ motion.submitter_create | translate }}"> <span ng-if="motion.submitter_create" title="{{ motion.submitter_create | translate }}">
<i class="fa fa-plus-circle"></i> <i class="fa fa-plus-circle"></i>