Skip to content

Commit

Permalink
SAK-30671 Roster - Select components too far one from the other and too
Browse files Browse the repository at this point in the history 
close to the top

This also resolves SAK-30672,SAK-30673 and SAK-30680
  • Loading branch information
@alejandrogj
alejandrogj committed Apr 7, 2016
1 parent 1778e48 commit 45f2988
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 37 deletions.
67 changes: 33 additions & 34 deletions roster2/src/handlebars/overview.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<span class="instruction rosterTitleMessage">{{translate 'title_msg'}}</span>
{{/if}}

<div class="roster-table">
<div class="roster-table-row">
<div class="roster-table-cell">{{translate 'groups'}}</div>
<div class="roster-table-cell">
<div class="row">
<div class="form-group col-sm-6">
<label for="roster-groups-selector-top" class="form-control-label col-sm-3">{{translate 'groups'}}</label>
<div class="col-sm-4">
<select id="roster-groups-selector-top">
<option value="all">{{translate 'roster_sections_all'}}</option>
{{#each siteGroups}}
Expand All @@ -14,39 +14,38 @@
</select>
</div>
</div>
<div class="roster-table-row">
<div class="roster-table-cell">{{translate 'roles_label'}}</div>
<div class="roster-table-cell">
<select id="roster-roles-selector">
<option value="all">{{translate 'roster_sections_all'}}</option>
{{#each roles}}
<option id="roster-role-option-{{this}}" value="{{this}}">{{this}}</option>
{{/each}}
</select>
</div>
<div class="form-group col-sm-6">
<label for="roster-roles-selector" class="form-control-label col-sm-2">{{translate 'roles_label'}}</label>
<div class="col-sm-4">
<select id="roster-roles-selector">
<option value="all">{{translate 'roster_sections_all'}}</option>
{{#each roles}}
<option id="roster-role-option-{{this}}" value="{{this}}">{{this}}</option>
{{/each}}
</select>
</div>
</div>
</div>

<table id="roster_form:search_group" class="searchFilter">
<tbody>
<tr>
<td>
<div id="roster_form:search_filter" class="act">
<input id="roster-search-field" type="text" value="{{#if searchQuery}}{{searchQuery}}{{/if}}" name="roster_form_search" />
<input id="roster-search-button" class="active" type="button" value="{{translate 'roster_search_button'}}" name="roster_form:search_button" />
<input id="roster_form_clear_button" type="button" value="{{translate 'roster_clear_button'}}" name="roster_form:clear_button" />
</div>
</td>
<td>
<span class="instruction">
<div id="roster-members-total" class="rosterRoleTopLine">{{membersTotal}}</div>
<div id="roster-role-totals" class="rosterRoleBottomLine">({{roleFragments}})</div>
</span>
</td>
</tr>
</tbody>
</table>
<div id="roster_type_selector">
<div id="roster_form:search_group" class="row">
<div class="form-group col-sm-6">
<label for="roster-search-field" class="form-control-label col-sm-3">{{translate 'roster_search_text'}}</label>
<div class="col-sm-9">
<input id="roster-search-field" type="text" value="{{#if searchQuery}}{{searchQuery}}{{/if}}" name="roster_form_search" />
<input id="roster-search-button" class="active" type="button" value="{{translate 'roster_search_button'}}" name="roster_form:search_button" />
<input id="roster_form_clear_button" type="button" value="{{translate 'roster_clear_button'}}" name="roster_form:clear_button" />
</div>
</div>
</div>

<div id="summary" class="row">
<span>
<div id="roster-members-total" class="rosterRoleTopLine">{{membersTotal}}</div>
<div id="roster-role-totals" class="rosterRoleBottomLine">({{roleFragments}})</div>
</span>
</div>

<div id="roster_type_selector" class="row">
{{#if viewOfficialPhoto}}
<input type="radio" name="roster_picture_type" value="official" id="roster_official_picture_button" {{#if checkOfficialPicturesButton}}checked{{/if}}/><span>{{translate 'roster_show_official_pictures'}}</span>
<input type="radio" name="roster_picture_type" value="profile" id="roster_profile_picture_button" {{#unless checkOfficialPicturesButton}}checked{{/unless}}/><span>{{translate 'roster_show_profile_pictures'}}</span>
Expand Down
3 changes: 1 addition & 2 deletions roster2/src/webapp/WEB-INF/bootstrap.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<link rel="stylesheet" type="text/css" href="/profile2-tool/css/profile2-profile-entity.css" media="all" />
<link rel="stylesheet" type="text/css" href="/sakai-roster2-tool/css/roster.css" />
<link rel="stylesheet" type="text/css" href="/library/js/jquery/cluetip/1.2.10/css/jquery.cluetip.css" />
<link rel="stylesheet" type="text/css" href="/library/js/jquery/ui/1.11.3/themes/smoothness/jquery-ui.min.css" />

<script type="text/javascript">
Expand Down Expand Up @@ -54,7 +53,7 @@
<body>

<!-- wrap tool in portletBody div for PDA portal compatibility -->
<div class="portletBody">
<div class="portletBody container-fluid">

<ul id="roster_navbar" class="navIntraTool actionToolBar" role="menu"></ul>

Expand Down
13 changes: 12 additions & 1 deletion roster2/src/webapp/css/roster.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
@media print { .noprint { display: none; } }

#roster_type_selector {
margin-left: 10px;
margin-top: 1em;
margin-bottom: 15px;
}

Expand Down Expand Up @@ -172,13 +174,21 @@
font-size: 0.8em;
}

#roster_content{
margin-top: 1em;
}

#summary{
margin-left: 2px;
}

/* Table display for large screen sizes */
@media only screen and (min-width: 800px) and (max-width: 1100px) {
.roster-member {
font-size: 0.75em;
}
.roster-groups-selector {
max-width: 100px !important;
max-width: 100px !important;
}
}
@media only screen and (min-width: 800px) {
Expand Down Expand Up @@ -274,6 +284,7 @@
.roster-groups-selector {
padding: 0px;
max-width: 200px;
width: 175%;
}
.roster-last-visit-time {
width: 12%;
Expand Down

0 comments on commit 45f2988

Please sign in to comment.