Merge pull request #2083 from emanuelschuetze/responsive

Template fixes for better smartphone usage.
This commit is contained in:
Norman Jäckel 2016-04-17 20:50:30 +02:00
commit 65c9c3c693
9 changed files with 29 additions and 13 deletions

View File

@ -73,7 +73,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>
@ -124,9 +124,9 @@
<!-- agenda item column -->
<th>
<translate>Agenda item</translate>
<th os-perms="agenda.can_see_hidden_items">
<th os-perms="agenda.can_see_hidden_items" class="optional">
<translate>Duration</translate>
<th class="minimum">
<th class="minimum optional">
<translate>Done</translate>
<tbody>
<tr ng-repeat="item in itemsFiltered = (items | filter: filter.search |
@ -188,7 +188,7 @@
<td ng-show="!item.quickEdit" os-perms="agenda.can_see_hidden_items" class="optional">
{{ item.duration }}
<span ng-if="item.duration" translate-comment="'h' means time in hours" translate>h</span>
<td ng-if="!item.quickEdit">
<td ng-if="!item.quickEdit" class="optional">
<span os-perms="!agenda.can_manage">
<i ng-if="item.closed" class="fa fa-check-square-o"></i>
</span>

View File

@ -36,7 +36,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>

View File

@ -308,6 +308,8 @@ img {
#content .col2 {
float: right;
position: relative;
z-index: 10;
}
#content .col2.max {
@ -854,3 +856,17 @@ tr.selected td {
/* hide marked element / column */
.optional, .hide-sm { display: none; }
}
/* display for resolutions smaller that 560px */
@media only screen and (max-width: 560px) {
#content .containerOS {
padding: 0;
}
#content .col2.max {
width: 100%;
position: absolute;
}
.col2 .projector_full {
margin-left: 0px;
}
}

View File

@ -14,7 +14,7 @@
<div class="row form-group">
<div class="col-sm-8"></div>
<div class="col-sm-4">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate}}">
</div>
</div>

View File

@ -90,7 +90,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>

View File

@ -17,7 +17,7 @@
<div class="details">
<div class="row form-group">
<div class="col-sm-4 pull-right">
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Filter' | translate }}">
</div>
</div>

View File

@ -42,7 +42,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>
@ -95,7 +95,7 @@
<input type="checkbox" ng-model="$parent.selectedAll" ng-change="checkAll()">
<!-- agenda item column -->
<th ng-click="toggleSort('agenda_item.item_number')" class="sortable">
<th ng-click="toggleSort('agenda_item.item_number')" class="sortable optional">
<translate translate-comment="short form of agenda item">Item</translate>
<i class="pull-right fa" ng-show="sortColumn === 'agenda_item.item_number' && header.sortable != false"
ng-class="reverse ? 'fa-sort-desc' : 'fa-sort-asc'">
@ -154,7 +154,7 @@
<input type="checkbox" ng-model="motion.selected">
<!-- agenda item number -->
<td ng-if="!motion.quickEdit">{{ motion.agenda_item.item_number }}
<td ng-if="!motion.quickEdit" class="optional">{{ motion.agenda_item.item_number }}
<!-- identifier -->
<td ng-if="!motion.quickEdit">{{ motion.identifier }}

View File

@ -20,7 +20,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" class="form-control"
<input type="text" ng-model="filter.search" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>

View File

@ -52,7 +52,7 @@
<div class="form-group">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-search"></i></div>
<input type="text" os-focus-me ng-model="filter.search" ng-model-options="{debounce: 500}" class="form-control"
<input type="text" ng-model="filter.search" ng-model-options="{debounce: 500}" class="form-control"
placeholder="{{ 'Search' | translate}}">
</div>
</div>