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

Merge pull request #3691 from emanuelschuetze/exportButton

Browse Source 
Use simple pdf export button for delegates.
This commit is contained in:
Emanuel Schütze 2018-04-11 07:39:38 +02:00 committed by GitHub
commit ad959f7856
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -83,8 +83,8 @@
<i class="fa fa-sort-numeric-asc"></i> <i class="fa fa-sort-numeric-asc"></i>
<translate>Numbering</translate> <translate>Numbering</translate>
</button> </button>
<!-- pdf --> <!-- Export drop down list (for manager) -->
<div class="pull-right" uib-dropdown> <div os-perms="motions.can_manage" class="pull-right" uib-dropdown>
<button type="button" class="btn btn-default btn-sm" id="dropdownExport" uib-dropdown-toggle> <button type="button" class="btn btn-default btn-sm" id="dropdownExport" uib-dropdown-toggle>
<i class="fa fa-upload"></i> <i class="fa fa-upload"></i>
<span ng-if="itemsFiltered.length == items.length" translate> <span ng-if="itemsFiltered.length == items.length" translate>
@ -111,6 +111,7 @@
CSV CSV
</a> </a>
</li> </li>
<!-- DOCX export -->
<li> <li>
<a href="" ng-click="docxExport()"> <a href="" ng-click="docxExport()">
<i class="fa fa-file-word-o"></i> <i class="fa fa-file-word-o"></i>
@ -119,6 +120,17 @@
</li> </li>
</ul> </ul>
</div> </div>
<!-- Export button (for normal users) -->
<button type="button" class="btn btn-default btn-sm pull-right"
os-perms="!motions.can_manage" ng-click="pdfExport()">
<i class="fa fa-file-pdf-o"></i>
<span ng-if="itemsFiltered.length == items.length" translate>
Export all
</span>
<span ng-if="itemsFiltered.length != items.length" translate>
Export filtered
</span>
</button>
</div> </div>
</div> </div>
<div uib-collapse="!isSelectMode" class="row spacer"> <div uib-collapse="!isSelectMode" class="row spacer">

32
openslides/assignments/static/templates/assignments/assignment-list.html
View File

@ -24,28 +24,16 @@
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
<translate>Select ...</translate> <translate>Select ...</translate>
</button> </button>
<!-- export dropdown --> <!-- export button -->
<div class="dropdown pull-right" uib-dropdown> <button type="button" class="btn btn-default btn-sm pull-right" ng-click="pdfExport()">
<button type="button" class="btn btn-default btn-sm" id="dropdownExport" uib-dropdown-toggle> <i class="fa fa-file-pdf-o"></i>
<i class="fa fa-upload"></i> <span ng-if="assignmentsFiltered.length == assignments.length" translate>
<span ng-if="assignmentsFiltered.length == assignments.length" translate> Export all
Export all </span>
</span> <span ng-if="assignmentsFiltered.length != assignments.length" translate>
<span ng-if="assignmentsFiltered.length != assignments.length" translate> Export filtered
Export filtered </span>
</span> </button>
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownExport">
<!-- PDF export -->
<li>
<a href="" ng-click="pdfExport()">
<i class="fa fa-file-pdf-o"></i>
<translate>PDF</translate>
</a>
</li>
</ul>
</div>
</div> </div>
</div> </div>
<div uib-collapse="!isFilterOpen" class="row"> <div uib-collapse="!isFilterOpen" class="row">