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

Template fixes

Browse Source
This commit is contained in:
Emanuel Schuetze 2015-12-04 12:25:39 +01:00
parent 871f911be5
commit 5c6977c46d
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@
class="btn btn-default form-control" class="btn btn-default form-control"
ng-click="autoNumbering()"> ng-click="autoNumbering()">
<i class="fa fa-sort-numeric-asc"></i> <i class="fa fa-sort-numeric-asc"></i>
<translate>Auto numbering</translate> <translate>Number agenda</translate>
</a> </a>
</div> </div>
</form> </form>
@ -94,10 +94,10 @@
</div> </div>
</div> </div>
<i class="spacer"> <div class="spacer-top-lg italic">
{{ items.length }} {{ "items" | translate }}<span ng-if="(items|filter:{selected:true}).length > 0">, {{ items.length }} {{ "items" | translate }}<span ng-if="(items|filter:{selected:true}).length > 0">,
{{(items|filter:{selected:true}).length}} {{ "selected" | translate }}</span> {{(items|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
</i> </div>
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<tr> <tr>

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

@ -68,10 +68,10 @@
</div> </div>
</div> </div>
<i class="spacer"> <div class="spacer-top-lg italic">
{{ assignments.length }} {{ "elections" | translate }}<span ng-if="(assignments|filter:{selected:true}).length > 0">, {{ assignments.length }} {{ "elections" | translate }}<span ng-if="(assignments|filter:{selected:true}).length > 0">,
{{(assignments|filter:{selected:true}).length}} {{ "selected" | translate }}</span> {{(assignments|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
</i> </div>
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<tr> <tr>

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

@ -117,7 +117,7 @@ img {
#nav { #nav {
float: left; float: left;
width: 100%; width: 100%;
height: 99px; height: auto;
background: #317796; background: #317796;
color: #fff; color: #fff;
overflow-y: hidden; overflow-y: hidden;
@ -499,10 +499,17 @@ img {
margin-top: 7px; margin-top: 7px;
} }
.spacer-top-lg {
margin-top: 25px;
}
.spacer-right { .spacer-right {
margin-right: 5px; margin-right: 5px;
} }
.italic {
font-style: italic;
}
.hoverActions { .hoverActions {
font-size: 85%; font-size: 85%;
} }

8
openslides/locale/angular-gettext/template-en.pot
View File

@ -86,10 +86,6 @@ msgstr ""
msgid "Attachment" msgid "Attachment"
msgstr "" msgstr ""
#: agenda/static/templates/agenda/item-list.html:54
msgid "Auto numbering"
msgstr ""
#: agenda/static/templates/agenda/item-detail.html:6 #: agenda/static/templates/agenda/item-detail.html:6
msgid "Back to agenda" msgid "Back to agenda"
msgstr "" msgstr ""
@ -677,6 +673,10 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: agenda/static/templates/agenda/item-list.html:54
msgid "Number agenda"
msgstr ""
#: assignments/static/js/assignments/site.js:92 #: assignments/static/js/assignments/site.js:92
#: assignments/static/templates/assignments/assignment-list.html:144 #: assignments/static/templates/assignments/assignment-list.html:144
msgid "Number of members to be elected" msgid "Number of members to be elected"

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

@ -74,10 +74,10 @@
</div> </div>
</div> </div>
<i class="spacer"> <div class="spacer-top-lg italic">
{{ motions.length }} {{ "motions" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">, {{ motions.length }} {{ "motions" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">,
{{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}</span> {{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
</i> </div>
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<tr> <tr>

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

@ -82,10 +82,10 @@
</div> </div>
</div> </div>
<i class="spacer"> <div class="spacer-top-lg italic">
{{ users.length }} {{ "participants" | translate }}<span ng-if="(users|filter:{selected:true}).length > 0">, {{ users.length }} {{ "participants" | translate }}<span ng-if="(users|filter:{selected:true}).length > 0">,
{{(users|filter:{selected:true}).length}} {{ "selected" | translate }}</span> {{(users|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
</i> </div>
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<tr> <tr>