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

Merge pull request #2928 from emanuelschuetze/template-style

Browse Source 
Template style improvements and motion block fix
This commit is contained in:
Norman Jäckel 2017-02-03 13:09:32 +01:00 committed by GitHub
commit 45c3da22f9
18 changed files with 89 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/agenda/static/js/agenda/site.js
View File

@ -572,6 +572,7 @@ angular.module('OpenSlidesApp.agenda.site', [
}, function () { }, function () {
$scope.items = AgendaTree.getTree(Agenda.getAll()); $scope.items = AgendaTree.getTree(Agenda.getAll());
}); });
$scope.showInternalItems = true;
// save parent and weight of moved agenda item (and all items on same level) // save parent and weight of moved agenda item (and all items on same level)
$scope.treeOptions = { $scope.treeOptions = {

4
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -170,11 +170,11 @@
<select> <select>
</div> </div>
<p class="spacer"> <p class="spacer">
<button ng-if="isAllowed('add')" ng-click="addSpeaker()" class="btn btn-default"> <button ng-if="isAllowed('add')" ng-click="addSpeaker()" class="btn btn-default btn-sm">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<translate>Add me</translate> <translate>Add me</translate>
</button> </button>
<button ng-if="isAllowed('remove')" ng-click="removeSpeaker()" class="btn btn-default"> <button ng-if="isAllowed('remove')" ng-click="removeSpeaker()" class="btn btn-default btn-sm">
<i class="fa fa-minus"></i> <i class="fa fa-minus"></i>
<translate>Remove me</translate> <translate>Remove me</translate>
</button> </button>

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

@ -85,7 +85,7 @@
</button> </button>
<!-- pdf --> <!-- pdf -->
<div class="pull-right" uib-dropdown> <div class="pull-right" uib-dropdown>
<button type="button" class="btn btn-default" 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>
Export all Export all
@ -99,7 +99,7 @@
<!-- PDF export --> <!-- PDF export -->
<li> <li>
<a href="" ng-click="pdfExport()"> <a href="" ng-click="pdfExport()">
<i class="fa fa-file-pdf-o fa-lg"></i> <i class="fa fa-file-pdf-o"></i>
PDF PDF
</a> </a>
</li> </li>
@ -107,7 +107,7 @@
<li> <li>
<a href="" id="downloadLinkCSV" <a href="" id="downloadLinkCSV"
ng-click="csvExport()"> ng-click="csvExport()">
<i class="fa fa-file-text-o fa-lg"></i> <i class="fa fa-file-text-o"></i>
CSV CSV
</a> </a>
</li> </li>
@ -121,7 +121,7 @@
<a ng-show="isSelectMode" os-perms="agenda.can_manage" <a ng-show="isSelectMode" os-perms="agenda.can_manage"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected agenda items?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected agenda items?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-primary"> class="btn btn-default btn-sm">
<i class="fa fa-trash fa-lg"></i> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected items</translate> <translate>Delete selected items</translate>
</a> </a>

19
openslides/agenda/static/templates/agenda/item-sort.html
View File

@ -10,24 +10,33 @@
</div> </div>
</div> </div>
<div class="details"> <div class="details agenda-sort">
<p class="lead" translate>Drag and drop items to change the order of the agenda. Your modification will be saved immediately.</p> <p translate>Drag and drop items to change the order of the agenda. Your modification will be saved immediately.</p>
<p>
<button class="btn btn-default btn-sm" ng-click="showInternalItems=!showInternalItems">
<translate ng-if="showInternalItems">Hide internal items</translate>
<translate ng-if="!showInternalItems">Show internal items</translate>
</button>
<div ui-tree="treeOptions" id="tree-root"> <div ui-tree="treeOptions" id="tree-root">
<ol ui-tree-nodes ng-model="items"> <ol ui-tree-nodes ng-model="items">
<li ng-repeat="item in items" ui-tree-node ng-include="'nodes_renderer.html'"> <li ng-repeat="item in items" ui-tree-node ng-include="'nodes_renderer.html'">
</ol> </ol>
</div> </div>
<p class="spacer">* <translate>Internal item</translate</p>
</div> </div>
<!-- Nested node template --> <!-- Nested node template -->
<script type="text/ng-template" id="nodes_renderer.html"> <script type="text/ng-template" id="nodes_renderer.html">
<div ui-tree-handle> <div ui-tree-handle ng-if="!item.item.is_hidden">
<span ng-if="item.item.is_hidden">*</span>
{{ item.item.getListViewTitle() }} {{ item.item.getListViewTitle() }}
</div> </div>
<div ui-tree-handle ng-if="item.item.is_hidden && showInternalItems" class="internal">
<i class="fa fa-ban"></i> &nbsp;
{{ item.item.getListViewTitle() }}
</div>
<ol ui-tree-nodes="" ng-model="item.children"> <ol ui-tree-nodes="" ng-model="item.children">
<li ng-repeat="item in item.children" ui-tree-node ng-include="'nodes_renderer.html'"> <li ng-repeat="item in item.children" ui-tree-node ng-include="'nodes_renderer.html'">
</ol> </ol>

4
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -110,11 +110,11 @@
<select> <select>
</div> </div>
<p os-perms="assignments.can_nominate_self" class="spacer"> <p os-perms="assignments.can_nominate_self" class="spacer">
<button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default"> <button ng-if="!isCandidate()" ng-click="addMe()" class="btn btn-default btn-sm">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<translate>Add me</translate> <translate>Add me</translate>
</button> </button>
<button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default"> <button ng-if="isCandidate()" ng-click="removeMe()" class="btn btn-default btn-sm">
<i class="fa fa-minus"></i> <i class="fa fa-minus"></i>
<translate>Remove me</translate> <translate>Remove me</translate>
</button> </button>

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

@ -17,8 +17,8 @@
<div class="details"> <div class="details">
<div class="row form-group"> <div class="row form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<!-- delete mode --> <!-- select mode -->
<button os-perms="assignments.can_manage" class="btn" <button os-perms="assignments.can_manage" class="btn btn-sm"
ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'" ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'"
ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()"> ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
@ -26,7 +26,7 @@
</button> </button>
<!-- export dropdown --> <!-- export dropdown -->
<div class="dropdown pull-right" uib-dropdown> <div class="dropdown pull-right" uib-dropdown>
<button type="button" class="btn btn-default" 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="assignmentsFiltered.length == assignments.length" translate> <span ng-if="assignmentsFiltered.length == assignments.length" translate>
Export all Export all
@ -40,7 +40,7 @@
<!-- PDF export --> <!-- PDF export -->
<li> <li>
<a href="" ng-click="makePDF_assignmentList()"> <a href="" ng-click="makePDF_assignmentList()">
<i class="fa fa-file-pdf-o fa-lg"></i> <i class="fa fa-file-pdf-o"></i>
<translate>PDF</translate> <translate>PDF</translate>
</a> </a>
</li> </li>
@ -64,7 +64,7 @@
<a ng-show="isSelectMode" os-perms="assignments.can_manage" <a ng-show="isSelectMode" os-perms="assignments.can_manage"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected elections?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected elections?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-primary"> class="btn btn-default btn-sm">
<i class="fa fa-trash fa-lg"></i> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected elections</translate> <translate>Delete selected elections</translate>
</a> </a>

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

@ -1128,6 +1128,15 @@ img {
width: 120px; width: 120px;
} }
/** Agenda sort view **/
.agenda-sort .internal {
padding: 7px;
opacity: 0.6;
}
.agenda-sort .angular-ui-tree-node {
min-height: 0;
}
/** Footer **/ /** Footer **/
#footer { #footer {
float: left; float: left;

9
openslides/core/static/templates/core/manage-projectors.html
View File

@ -2,14 +2,14 @@
<div class="title"> <div class="title">
<div class="submenu" os-perms="core.can_manage_projector"> <div class="submenu" os-perms="core.can_manage_projector">
<!-- New --> <!-- New -->
<button class="btn btn-primary" ng-bootbox-prompt="{{ 'Please enter a name for the new projector' | translate }}" <button class="btn btn-primary btn-sm" ng-bootbox-prompt="{{ 'Please enter a name for the new projector' | translate }}"
ng-bootbox-prompt-action="createProjector(result)"> ng-bootbox-prompt-action="createProjector(result)">
<i class="fa fa-plus"></i> <i class="fa fa-plus"></i>
<translate>New</translate> <translate>New</translate>
</button> </button>
<!-- Reference for current list of speakers --> <!-- Reference for current list of speakers -->
<div class="btn-group" uib-dropdown> <div class="btn-group" uib-dropdown>
<button class="btn btn-default" id="menuListofSpeakers" uib-dropdown-toggle <button class="btn btn-default btn-sm" id="menuListofSpeakers" uib-dropdown-toggle
uib-tooltip="{{ 'Select the projector to which the current list of speakers refers to.' | translate }}" uib-tooltip="{{ 'Select the projector to which the current list of speakers refers to.' | translate }}"
aria-haspopup="true" aria-expanded="true"> aria-haspopup="true" aria-expanded="true">
<i class="fa fa-microphone"></i> <i class="fa fa-microphone"></i>
@ -26,7 +26,7 @@
</ul> </ul>
</div> </div>
<!-- Identity --> <!-- Identity -->
<button class="btn" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'" <button class="btn btn-sm" ng-click="identifyProjectors()" ng-class="identifyPromise ? 'btn-primary' : 'btn-default'"
uib-tooltip="{{ 'Display an identifier message on all projectors with the id and the name.' | translate }}"> uib-tooltip="{{ 'Display an identifier message on all projectors with the id and the name.' | translate }}">
<i class="fa fa-binoculars"></i> <i class="fa fa-binoculars"></i>
<translate>Identify</translate> <translate>Identify</translate>
@ -186,7 +186,8 @@
<button class="btn btn-sm" ng-class="broadcast == projector.id ? 'btn-primary' : 'btn-default'" <button class="btn btn-sm" ng-class="broadcast == projector.id ? 'btn-primary' : 'btn-default'"
ng-click="projector.toggleBroadcast(projector)" ng-click="projector.toggleBroadcast(projector)"
ng-disabled="broadcast > 0 && broadcast != projector.id" ng-disabled="broadcast > 0 && broadcast != projector.id"
uib-tooltip="{{ 'Broadcast the content of this projector to all other projectors.' | translate }}"> uib-tooltip="{{ 'Broadcast the content of this projector to all other projectors.' | translate }}"
tooltip-placement="bottom">
<i class="fa" ng-class="broadcast == projector.id ? 'fa-star' : 'fa-star-o'"></i> <i class="fa" ng-class="broadcast == projector.id ? 'fa-star' : 'fa-star-o'"></i>
<translate>Broadcast</translate> <translate>Broadcast</translate>
</button> </button>

4
openslides/mediafiles/static/templates/mediafiles/mediafile-list.html
View File

@ -116,7 +116,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<form class="form-inline"> <form class="form-inline">
<!-- select mode --> <!-- select mode -->
<button os-perms="mediafiles.can_manage" class="btn" <button os-perms="mediafiles.can_manage" class="btn btn-sm"
ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'" ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'"
ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()"> ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
@ -131,7 +131,7 @@
<!-- delete button --> <!-- delete button -->
<a ng-show="isSelectMode" <a ng-show="isSelectMode"
os-perms="mediafiles.can_manage" ng-click="deleteMultiple()" os-perms="mediafiles.can_manage" ng-click="deleteMultiple()"
class="btn btn-primary"> class="btn btn-default btn-sm">
<i class="fa fa-trash fa-lg"></i> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected mediafiles</translate> <translate>Delete selected mediafiles</translate>
</a> </a>

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

@ -147,7 +147,7 @@ angular.module('OpenSlidesApp.motions.motionBlock', [])
ngDialog.open(MotionBlockForm.getDialog(motionBlock)); ngDialog.open(MotionBlockForm.getDialog(motionBlock));
}; };
$scope.followRecommendations = function () { $scope.followRecommendations = function () {
$http.post('/rest/motions/motion-block/' + motionBlock.id + '/follow_recommendations/') $http.post('/rest/motions/motion-block/' + motionBlockId + '/follow_recommendations/')
.success(function(data) { .success(function(data) {
$scope.alert = { type: 'success', msg: data.detail, show: true }; $scope.alert = { type: 'success', msg: data.detail, show: true };
}) })

2
openslides/motions/static/templates/motions/category-sort.html
View File

@ -12,7 +12,7 @@
<div class="details"> <div class="details">
<div class="lead-div"> <div class="lead-div">
<p class="lead" translate> <p translate>
Drag and drop motions to reorder the category. Then click the button to renumber. Drag and drop motions to reorder the category. Then click the button to renumber.
</p> </p>
<a os-perms="motions.can_manage" class="btn btn-primary btn-sm" ng-click="numbering()"> <a os-perms="motions.can_manage" class="btn btn-primary btn-sm" ng-click="numbering()">

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

@ -26,7 +26,7 @@
</div> </div>
<div class="details"> <div class="details">
<a os-perms="motions.can_manage" class="btn btn-default btn" <a os-perms="motions.can_manage" class="btn btn-default btn btn-sm"
ng-bootbox-confirm="{{ 'Are you sure you want to override the state of all motions of this motion block?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to override the state of all motions of this motion block?' | translate }}"
ng-bootbox-confirm-action="followRecommendations()"> ng-bootbox-confirm-action="followRecommendations()">
<i class="fa fa-magic fa-lg"></i> <i class="fa fa-magic fa-lg"></i>

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

@ -114,15 +114,15 @@
</div> </div>
<div class="spacer"> <div class="spacer">
<button ng-click="clear()" class="btn btn-default" translate> <button ng-click="clear()" class="btn btn-default btn-sm" translate>
Clear preview Clear preview
</button> </button>
<button ng-if="!csvImporting && motionsWillBeImported > 0" ng-click="import()" class="btn btn-primary" translate> <button ng-if="!csvImporting && motionsWillBeImported > 0" ng-click="import()" class="btn btn-primary btn-sm" translate>
Import {{ motionsWillBeImported }} motions Import {{ motionsWillBeImported }} motions
</button> </button>
</div> </div>
<div class="spacer"> <div class="spacer">
<a ng-if="csvimported" ui-sref="motions.motion.list" class="btn btn-default"> <a ng-if="csvimported" ui-sref="motions.motion.list" class="btn btn-default btn-sm">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to motions overview</translate> <translate>Back to motions overview</translate>
</a> </a>

26
openslides/motions/static/templates/motions/motion-list.html
View File

@ -30,7 +30,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<!-- select mode --> <!-- select mode -->
<button os-perms="motions.can_manage" class="btn" <button os-perms="motions.can_manage" class="btn btn-sm"
ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'" ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'"
ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()"> ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
@ -38,7 +38,7 @@
</button> </button>
<!-- Export dropdown --> <!-- Export dropdown -->
<div class="dropdown pull-right" uib-dropdown> <div class="dropdown pull-right" uib-dropdown>
<button type="button" class="btn btn-default" 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="motionsFiltered.length == motions.length" translate> <span ng-if="motionsFiltered.length == motions.length" translate>
Export all Export all
@ -52,7 +52,7 @@
<!-- PDF export --> <!-- PDF export -->
<li> <li>
<a href="" ng-click="pdfExport()"> <a href="" ng-click="pdfExport()">
<i class="fa fa-file-pdf-o fa-lg"></i> <i class="fa fa-file-pdf-o"></i>
PDF PDF
</a> </a>
</li> </li>
@ -60,14 +60,14 @@
<li> <li>
<a href="" id="downloadLinkCSV" <a href="" id="downloadLinkCSV"
ng-click="csvExport()"> ng-click="csvExport()">
<i class="fa fa-file-text-o fa-lg"></i> <i class="fa fa-file-text-o"></i>
CSV CSV
</a> </a>
</li> </li>
<!-- DOCX export --> <!-- DOCX export -->
<li> <li>
<a href="" ng-click="docxExport()"> <a href="" ng-click="docxExport()">
<i class="fa fa-file-word-o fa-lg"></i> <i class="fa fa-file-word-o"></i>
DOCX DOCX
</a> </a>
</li> </li>
@ -79,7 +79,7 @@
<div uib-collapse="!isSelectMode" class="row spacer"> <div uib-collapse="!isSelectMode" class="row spacer">
<div class="col-sm-12 text-left form-inline" ng-show="isSelectMode" os-perms="motions.can_manage"> <div class="col-sm-12 text-left form-inline" ng-show="isSelectMode" os-perms="motions.can_manage">
<!-- actions --> <!-- actions -->
<select ng-model="selectedAction" class="form-control"> <select ng-model="selectedAction" class="form-control input-sm">
<option value="" translate>--- Select action ---</option> <option value="" translate>--- Select action ---</option>
<option value="delete" translate>Delete</option> <option value="delete" translate>Delete</option>
<option value="setStatus" translate>Set status</option> <option value="setStatus" translate>Set status</option>
@ -87,7 +87,7 @@
<option value="setMotionBlock" ng-if="motionBlocks.length" translate>Set motion block</option> <option value="setMotionBlock" ng-if="motionBlocks.length" translate>Set motion block</option>
</select> </select>
<!-- state select --> <!-- state select -->
<select ng-show="selectedAction == 'setStatus'" ng-model="selectedState" class="form-control"> <select ng-show="selectedAction == 'setStatus'" ng-model="selectedState" class="form-control input-sm">
<option value="" translate>--- Select state ---</option> <option value="" translate>--- Select state ---</option>
<option ng-repeat="state in states" ng-disabled="state.workflowHeader" value="{{ state.id }}"> <option ng-repeat="state in states" ng-disabled="state.workflowHeader" value="{{ state.id }}">
{{ (state.workflowHeader ? state.headername : state.name) | translate }} {{ (state.workflowHeader ? state.headername : state.name) | translate }}
@ -95,11 +95,11 @@
</select> </select>
<!-- set state button --> <!-- set state button -->
<a ng-show="selectedAction == 'setStatus' && selectedState" <a ng-show="selectedAction == 'setStatus' && selectedState"
ng-click="setStatusMultiple(selectedState)" class="btn btn-default"> ng-click="setStatusMultiple(selectedState)" class="btn btn-default btn-sm">
<translate>Set status</translate> <translate>Set status</translate>
</a> </a>
<!-- category select --> <!-- category select -->
<select ng-show="selectedAction == 'setCategory'" ng-model="selectedCategory" class="form-control"> <select ng-show="selectedAction == 'setCategory'" ng-model="selectedCategory" class="form-control input-sm">
<option value="" translate>--- Select category ---</option> <option value="" translate>--- Select category ---</option>
<option ng-repeat="category in categories" value="{{ category.id }}"> <option ng-repeat="category in categories" value="{{ category.id }}">
{{ category.name }} {{ category.name }}
@ -108,11 +108,11 @@
</select> </select>
<!-- set category button --> <!-- set category button -->
<a ng-show="selectedAction == 'setCategory' && selectedCategory" <a ng-show="selectedAction == 'setCategory' && selectedCategory"
ng-click="setCategoryMultiple(selectedCategory)" class="btn btn-default"> ng-click="setCategoryMultiple(selectedCategory)" class="btn btn-default btn-sm">
<translate>Set category</translate> <translate>Set category</translate>
</a> </a>
<!-- motionBlock select --> <!-- motionBlock select -->
<select ng-show="selectedAction == 'setMotionBlock'" ng-model="selectedMotionBlock" class="form-control"> <select ng-show="selectedAction == 'setMotionBlock'" ng-model="selectedMotionBlock" class="form-control input-sm">
<option value="" translate>--- Select motion block ---</option> <option value="" translate>--- Select motion block ---</option>
<option ng-repeat="motionBlock in motionBlocks" value="{{ motionBlock.id }}"> <option ng-repeat="motionBlock in motionBlocks" value="{{ motionBlock.id }}">
{{ motionBlock.title }} {{ motionBlock.title }}
@ -121,14 +121,14 @@
</select> </select>
<!-- set motion block button --> <!-- set motion block button -->
<a ng-show="selectedAction == 'setMotionBlock' && selectedMotionBlock" <a ng-show="selectedAction == 'setMotionBlock' && selectedMotionBlock"
ng-click="setMotionBlockMultiple(selectedMotionBlock)" class="btn btn-default"> ng-click="setMotionBlockMultiple(selectedMotionBlock)" class="btn btn-default btn-sm">
<translate>Set motion block</translate> <translate>Set motion block</translate>
</a> </a>
<!-- delete button --> <!-- delete button -->
<a ng-show="selectedAction == 'delete'" <a ng-show="selectedAction == 'delete'"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected motions?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected motions?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-danger"> class="btn btn-default btn-sm">
<i class="fa fa-trash fa-lg"></i> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected motions</translate> <translate>Delete selected motions</translate>
</a> </a>

10
openslides/topics/static/templates/topics/topic-import.html
View File

@ -21,7 +21,7 @@
</div> </div>
<div class="clearfix"> <div class="clearfix">
<button ng-click="importByLine()" class="btn btn-primary pull-left" translate>Import</button> <button ng-click="importByLine()" class="btn btn-primary btn-sm pull-left" translate>Import</button>
<div class="col-xs-5" ng-if="titleItems"> <div class="col-xs-5" ng-if="titleItems">
<progressbar animate="false" type="success" max="titleItems.length" value="importcounter"> <progressbar animate="false" type="success" max="titleItems.length" value="importcounter">
<i>{{ importcounter }} / {{ titleItems.length }} {{ "imported" | translate }}</i> <i>{{ importcounter }} / {{ titleItems.length }} {{ "imported" | translate }}</i>
@ -30,7 +30,7 @@
</div> </div>
<div class="spacer"> <div class="spacer">
<a ng-if="importcounter > 0 && importcounter == titleItems.length" ui-sref="agenda.item.list" <a ng-if="importcounter > 0 && importcounter == titleItems.length" ui-sref="agenda.item.list"
class="btn btn-default"> class="btn btn-default btn-sm">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to agenda</translate> <translate>Back to agenda</translate>
</a> </a>
@ -117,15 +117,15 @@
</div> </div>
<div class="spacer"> <div class="spacer">
<button ng-click="clear()" class="btn btn-default" translate> <button ng-click="clear()" class="btn btn-default btn-sm" translate>
Clear preview Clear preview
</button> </button>
<button ng-if="!csvImporting && itemsWillBeImported > 0" ng-click="import()" class="btn btn-primary" translate> <button ng-if="!csvImporting && itemsWillBeImported > 0" ng-click="import()" class="btn btn-primary btn-sm" translate>
Import {{ itemsWillBeImported }} topics Import {{ itemsWillBeImported }} topics
</button> </button>
</div> </div>
<div class="spacer"> <div class="spacer">
<a ng-if="csvimported" ui-sref="agenda.item.list" class="btn btn-default"> <a ng-if="csvimported" ui-sref="agenda.item.list" class="btn btn-default btn-sm">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to agenda</translate> <translate>Back to agenda</translate>
</a> </a>

4
openslides/users/static/templates/users/user-change-password.html
View File

@ -40,10 +40,10 @@
</span> </span>
</div> </div>
</div> </div>
<button type="submit" ng-click="save(user)" class="btn btn-primary" translate> <button type="submit" ng-click="save(user)" class="btn btn-primary btn-sm" translate>
Change password Change password
</button> </button>
<button ui-sref="users.user.list" class="btn btn-default" translate> <button ui-sref="users.user.list" class="btn btn-default btn-sm" translate>
Cancel Cancel
</button> </button>
</form> </form>

10
openslides/users/static/templates/users/user-import.html
View File

@ -22,7 +22,7 @@
</div> </div>
<div class="clearfix"> <div class="clearfix">
<button ng-click="importByLine()" class="btn btn-primary pull-left" translate>Import</button> <button ng-click="importByLine()" class="btn btn-primary btn-sm pull-left" translate>Import</button>
<div class="col-xs-5" ng-if="usernames"> <div class="col-xs-5" ng-if="usernames">
<progressbar animate="false" type="success" max="usernames.length" value="importcounter"> <progressbar animate="false" type="success" max="usernames.length" value="importcounter">
<i>{{ importcounter }} / {{ usernames.length }} {{ "imported" | translate }}</i> <i>{{ importcounter }} / {{ usernames.length }} {{ "imported" | translate }}</i>
@ -31,7 +31,7 @@
</div> </div>
<div class="spacer"> <div class="spacer">
<a ng-if="importcounter > 0 && importcounter == usernames.length" ui-sref="users.user.list" <a ng-if="importcounter > 0 && importcounter == usernames.length" ui-sref="users.user.list"
class="btn btn-default"> class="btn btn-default btn-sm">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to users overview</translate> <translate>Back to users overview</translate>
</a> </a>
@ -205,15 +205,15 @@
</div> </div>
<div class="spacer"> <div class="spacer">
<button ng-click="clear()" class="btn btn-default" translate> <button ng-click="clear()" class="btn btn-default btn-sm" translate>
Clear preview Clear preview
</button> </button>
<button ng-if="!csvImporting && usersWillBeImported > 0" ng-click="import()" class="btn btn-primary" translate> <button ng-if="!csvImporting && usersWillBeImported > 0" ng-click="import()" class="btn btn-primary btn-sm" translate>
Import {{ usersWillBeImported }} participants Import {{ usersWillBeImported }} participants
</button> </button>
</div> </div>
<div class="spacer"> <div class="spacer">
<a ng-if="csvimported" ui-sref="users.user.list" class="btn btn-default"> <a ng-if="csvimported" ui-sref="users.user.list" class="btn btn-default btn-sm">
<i class="fa fa-angle-double-left fa-lg"></i> <i class="fa fa-angle-double-left fa-lg"></i>
<translate>Back to users overview</translate> <translate>Back to users overview</translate>
</a> </a>

26
openslides/users/static/templates/users/user-list.html
View File

@ -22,7 +22,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<!-- select mode --> <!-- select mode -->
<button os-perms="users.can_manage" class="btn" <button os-perms="users.can_manage" class="btn btn-sm"
ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'" ng-class="$parent.isSelectMode ? 'btn-primary' : 'btn-default'"
ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()"> ng-click="$parent.isSelectMode = !$parent.isSelectMode; uncheckAll()">
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
@ -31,7 +31,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="dropdown pull-right" uib-dropdown> <div class="dropdown pull-right" uib-dropdown>
<button os-perms="users.can_manage" class="btn btn-default" uib-dropdown-toggle <button os-perms="users.can_manage" class="btn btn-default btn-sm" uib-dropdown-toggle
id="user-pdf-dropdown"> id="user-pdf-dropdown">
<i class="fa fa-upload"></i> <i class="fa fa-upload"></i>
<span ng-if="usersFiltered.length == users.length" translate> <span ng-if="usersFiltered.length == users.length" translate>
@ -65,7 +65,7 @@
<div uib-collapse="!isSelectMode" class="row spacer"> <div uib-collapse="!isSelectMode" class="row spacer">
<div os-perms="users.can_manage" ng-show="isSelectMode" class="col-sm-12 text-left form-inline"> <div os-perms="users.can_manage" ng-show="isSelectMode" class="col-sm-12 text-left form-inline">
<!-- actions --> <!-- actions -->
<select ng-model="selectedAction" class="form-control"> <select ng-model="selectedAction" class="form-control input-sm">
<option value="" translate>--- Select action ---</option> <option value="" translate>--- Select action ---</option>
<option value="delete" translate>Delete</option> <option value="delete" translate>Delete</option>
<option value="addGroup" translate>Add group</option> <option value="addGroup" translate>Add group</option>
@ -79,44 +79,46 @@
<a ng-show="selectedAction == 'delete'" <a ng-show="selectedAction == 'delete'"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}" ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()" ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-default"> class="btn btn-default btn-sm">
<i class="fa fa-trash fa-lg"></i> <i class="fa fa-trash fa-lg"></i>
<translate>Delete selected participants</translate> <translate>Delete selected participants</translate>
</a> </a>
<!-- group select --> <!-- group select -->
<select ng-show="selectedAction == 'addGroup' || selectedAction == 'removeGroup'" <select ng-show="selectedAction == 'addGroup' || selectedAction == 'removeGroup'"
ng-model="selectedGroup" class="form-control"> ng-model="selectedGroup" class="form-control input-sm">
<option value="" translate>--- Select group ---</option> <option value="" translate>--- Select group ---</option>
<option ng-repeat="group in groups" value="{{ group.id }}">{{ group.name | translate }}</option> <option ng-repeat="group in groups" value="{{ group.id }}">{{ group.name | translate }}</option>
</select> </select>
<!-- add group button --> <!-- add group button -->
<a ng-show="selectedAction == 'addGroup'" <a ng-show="selectedAction == 'addGroup'"
ng-click="addGroupMultiple(selectedGroup)" class="btn btn-default"> ng-click="addGroupMultiple(selectedGroup)" class="btn btn-default btn-sm">
<i class="fa fa-plus fa-lg"></i> <i class="fa fa-plus"></i>
<translate>Add group</translate> <translate>Add group</translate>
</a> </a>
<!-- remove group button --> <!-- remove group button -->
<a ng-show="selectedAction == 'removeGroup'" <a ng-show="selectedAction == 'removeGroup'"
ng-click="removeGroupMultiple(selectedGroup)" class="btn btn-default"> ng-click="removeGroupMultiple(selectedGroup)" class="btn btn-default btn-sm">
<i class="fa fa-minus fa-lg"></i> <i class="fa fa-minus"></i>
<translate>Remove group</translate> <translate>Remove group</translate>
</a> </a>
<!-- generate new password button --> <!-- generate new password button -->
<a ng-show="selectedAction == 'generatePasswords'" class="btn btn-default" <a ng-show="selectedAction == 'generatePasswords'" class="btn btn-default btn-sm"
ng-click="generateNewPasswordsMultiple()"> ng-click="generateNewPasswordsMultiple()">
<i class="fa fa-magic"></i> <i class="fa fa-magic"></i>
<translate>Generate new passwords</translate> <translate>Generate new passwords</translate>
</a> </a>
<!-- set bool property button --> <!-- set bool property button -->
<a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)" <a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)"
ng-click="setBoolPropertyMultiple(selectedAction, true)" class="btn btn-default"> ng-click="setBoolPropertyMultiple(selectedAction, true)" class="btn btn-default btn-sm">
<i class="fa fa-check"></i>
<span ng-if="selectedAction == 'is_active'" translate>Is active</span> <span ng-if="selectedAction == 'is_active'" translate>Is active</span>
<span ng-if="selectedAction == 'is_present'" translate>Is present</span> <span ng-if="selectedAction == 'is_present'" translate>Is present</span>
<span ng-if="selectedAction == 'is_committee'" translate>Is committee</span> <span ng-if="selectedAction == 'is_committee'" translate>Is committee</span>
</a> </a>
<!-- unset bool property button --> <!-- unset bool property button -->
<a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)" <a ng-show="inArray(['is_active', 'is_present', 'is_committee'], selectedAction)"
ng-click="setBoolPropertyMultiple(selectedAction, false)" class="btn btn-default"> ng-click="setBoolPropertyMultiple(selectedAction, false)" class="btn btn-default btn-sm">
<i class="fa fa-ban"></i>
<span ng-if="selectedAction == 'is_active'" translate>Is not active</span> <span ng-if="selectedAction == 'is_active'" translate>Is not active</span>
<span ng-if="selectedAction == 'is_present'" translate>Is not present</span> <span ng-if="selectedAction == 'is_present'" translate>Is not present</span>
<span ng-if="selectedAction == 'is_committee'" translate>Is not a committee</span> <span ng-if="selectedAction == 'is_committee'" translate>Is not a committee</span>