Skip to content

Commit 221bf48

Browse files
committed
Fixed mobile UI problems
1 parent 234ae86 commit 221bf48

24 files changed

+106
-1897
lines changed

browse.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function parseTerm($term) {
9696
</div>
9797
<div browse-list="school" ng-repeat="school in schools" class="list-group-item" ng-class="{active: school.ui.expanded && school.departments.length > 0}">
9898
<div class="browse-heading" ng-click="school.ui.toggleDisplay()">
99-
<button class="btn pull-right btn-default">
99+
<button class="btn pull-left btn-default">
100100
<i class="fa" ng-class="school.ui.buttonClass"></i>
101101
</button>
102102
<h4 class="list-group-item-heading">{{school | codeOrNumber}}</h4>
@@ -106,7 +106,7 @@ function parseTerm($term) {
106106
<div class="list-group">
107107
<div browse-list="department" class="list-group-item" ng-repeat="department in school.departments" ng-class="{active: department.ui.expanded && department.courses.length > 0}">
108108
<div class="browse-heading" ng-click="department.ui.toggleDisplay()">
109-
<button class="btn pull-right btn-default">
109+
<button class="btn pull-left btn-default">
110110
<i class="fa" ng-class="department.ui.buttonClass"></i>
111111
</button>
112112
<h4 class="list-group-item-heading">{{department.code?department.code:department.number}}</h4>
@@ -116,7 +116,7 @@ function parseTerm($term) {
116116
<div class="list-group">
117117
<div browse-list="course" class="list-group-item" ng-repeat="course in department.courses" ng-class="{'active-nostyle': course.ui.expanded && course.sections.length > 0}" ng-init="course.selected = courseCart.selection.course.is(course)">
118118
<div class="browse-heading" ng-click="course.ui.toggleDisplay()">
119-
<button class="btn pull-right btn-default">
119+
<button class="btn pull-left btn-default">
120120
<i class="fa" ng-class="course.ui.buttonClass"></i>
121121
</button>
122122
<h4 class="list-group-item-heading">{{course | courseNum}}</h4>
@@ -128,7 +128,7 @@ function parseTerm($term) {
128128
<div class="center">
129129
<button type="button" class="btn" ng-click="courseCart.selection.course.toggle(course); course.selected = !course.selected" ng-class="{'btn-danger':course.selected, 'btn-success':!course.selected}">
130130
<i class="fa" ng-class="{'fa-minus':course.selected, 'fa-plus':!course.selected}"></i> <i class="fa fa-shopping-cart"></i>
131-
{{course.selected ? 'Remove all sections from cart':'Add all sections to cart'}}
131+
{{course.selected ? 'Remove all':'Add all'}}
132132
</button>
133133
</div>
134134
<div class="vert-spacer-static-sm clearfix">

generate.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@
7373
<div class="col-lg-5 col-md-6 col-sm-6">
7474
<div class="row form-inline">
7575
<div class="col-xs-12">
76-
<div class="form-group">
76+
<div class="form-group inline-sm">
7777
<select id="options-startTime" ng-change="ensureCorrectEndTime($index)" class="form-control" ng-model="nonCourse.startTime" ng-options="key as ui.optionLists.timesHalfHours.values[key] for key in ui.optionLists.timesHalfHours.keys"><option value="">Start</option></select>
7878
</div>
79-
<div class="form-group">to</div>
80-
<div class="form-group">
79+
<div class="form-group inline-sm">to</div>
80+
<div class="form-group inline-sm">
8181
<select id="options-endTime" class="form-control" ng-model="nonCourse.endTime" ng-options="key as ui.optionLists.timesHalfHours.values[key] for key in ui.optionLists.timesHalfHours.keys | startFrom: ui.optionLists.timesHalfHours.keys.indexOf(nonCourse.startTime) + 1"><option value="">End</option></select>
8282
</div>
8383
</div>
@@ -125,11 +125,11 @@
125125
<div class="col-sm-6">
126126
<div class="row form-inline">
127127
<div class="col-xs-12">
128-
<div class="form-group">
128+
<div class="form-group inline-sm">
129129
<select id="options-startTime" ng-change="ensureCorrectEndTime($index)" class="form-control" ng-model="noCourse.startTime" ng-options="key as ui.optionLists.timesHalfHours.values[key] for key in ui.optionLists.timesHalfHours.keys"><option value="">Start</option></select>
130130
</div>
131-
<div class="form-group">to</div>
132-
<div class="form-group">
131+
<div class="form-group inline-sm">to</div>
132+
<div class="form-group inline-sm">
133133
<select id="options-endTime" class="form-control" ng-model="noCourse.endTime" ng-options="key as ui.optionLists.timesHalfHours.values[key] for key in ui.optionLists.timesHalfHours.keys | startFrom: ui.optionLists.timesHalfHours.keys.indexOf(noCourse.startTime) + 1"><option value="">End</option></select>
134134
</div>
135135
</div>
@@ -164,15 +164,19 @@
164164
</div>
165165
</div>
166166
</div>
167-
<input name="action" value="getMatchingSchedules" type="hidden"> <input type="hidden" value="true" name="verbose" id="verbose">
168-
<div class="center" role="toolbar">
167+
<div class="hidden-xs hidden-sm center" role="toolbar">
169168
<div class="btn-group">
170169
<button type="button" class="btn-lg btn btn-primary btn-default" ng-click="generateSchedules()">Show Matching Schedules</button>
171170
</div>
172171
<div class="btn-group">
173-
<button type="button" class="btn-lg btn btn-default btn-danger" ng-click="resetState()">Reset</button>
172+
<button type="button" class="btn-lg btn btn-default btn-danger" ng-click="resetState()">Reset Everything</button>
174173
</div>
175174
</div>
175+
<div class="visible-xs visible-sm center">
176+
<button type="button" class="btn-lg btn btn-primary btn-default btn-block" ng-click="generateSchedules()">Show Matching Schedules</button>
177+
<div class="vert-spacer-static-sm"></div>
178+
<button type="button" class="btn-lg btn btn-default btn-danger btn-block" ng-click="resetState()">Reset Everything</button>
179+
</div>
176180
<div class="vert-spacer-static-md"></div>
177181
<div ng-show="!!resultError">
178182
<div class="alert alert-danger">

img/browse.png

-4.6 KB
Binary file not shown.

img/calendar.png

-1.99 KB
Binary file not shown.

img/grid.png

-6.62 KB
Binary file not shown.

0 commit comments

Comments
 (0)