Merge pull request #1361 from opf/bugfix/hacky-responsive-sorting-dropdowns

Bugfix/hacky responsive sorting dropdowns
pull/1338/merge
manwithtwowatches 11 years ago
commit eb5882826b
  1. 2
      app/assets/javascripts/angular/services/user-service.js
  2. 13
      app/assets/stylesheets/content/_modal.sass
  3. 2
      public/templates/work_packages/modals/sorting.html

@ -31,7 +31,7 @@ angular.module('openproject.services')
.service('UserService', ['$http', 'PathHelper', function($http, PathHelper) { .service('UserService', ['$http', 'PathHelper', function($http, PathHelper) {
var registeredUserIds = [], cachedUsers = {}; var registeredUserIds = [], cachedUsers = {};
UserService = { var UserService = {
getUsers: function(projectIdentifier) { getUsers: function(projectIdentifier) {
var url, params; var url, params;

@ -74,3 +74,16 @@ $ng-modal-image-width: $ng-modal-image-height
margin: 30px 7px 0 0 margin: 30px 7px 0 0
.select2-container .select2-container
margin: 0 0 10px 0 margin: 0 0 10px 0
#modal-sorting
min-width: 900px
.select2-container
@media(max-width: 1800px)
width: 280px
@media(max-width: 1400px)
width: 230px
@media(max-width: 1100px)
width: 160px
@media(max-width: 800px)
width: 120px

@ -4,6 +4,7 @@
<h3>Sorting</h3> <h3>Sorting</h3>
<div id="modal-sorting" class="modal-content-container">
<div ng-repeat="element in sortElements"> <div ng-repeat="element in sortElements">
<input type="hidden" <input type="hidden"
ui-select2-sortable="sortByOptions" ui-select2-sortable="sortByOptions"
@ -14,6 +15,7 @@
simple-query="getDirectionsData" simple-query="getDirectionsData"
ng-model="element[1]"></input> ng-model="element[1]"></input>
</div> </div>
</div>
<div> <div>
<button class="button_highlight" ng-click="updateSortation()">Apply</button> <button class="button_highlight" ng-click="updateSortation()">Apply</button>

Loading…
Cancel
Save