fixes responsiveness on mobile phone for sample view

This commit is contained in:
Mojca Lorber 2016-09-14 11:08:40 +02:00
parent b26bf7b183
commit a9029e0928
4 changed files with 34 additions and 9 deletions

View file

@ -9,13 +9,13 @@ var selectedSample;
table = $("#samples").DataTable({ table = $("#samples").DataTable({
order: [[2, "desc"]], order: [[2, "desc"]],
dom: "RB<'row'<'col-sm-9 toolbar'l><'col-sm-3'f>>tpi", dom: "RB<'row'<'col-sm-9-custom toolbar'l><'col-sm-3-custom'f>>tpi",
stateSave: true, stateSave: true,
buttons: [{ buttons: [{
extend: "colvis", extend: "colvis",
text: function () { text: function () {
return '<span class="glyphicon glyphicon-option-horizontal"></span> ' + return '<span class="glyphicon glyphicon-option-horizontal"></span> ' +
'<span class="hidden-xs">' + '<span class="hidden-xs-custom">' +
I18n.t('samples.column_visibility') + I18n.t('samples.column_visibility') +
'</span>'; '</span>';
}, },

View file

@ -23,3 +23,28 @@
display: none; display: none;
} }
} }
@media (min-width: 1075px) {
.col-sm-3-custom {
width: 25%;
float: left;
}
.col-sm-9-custom {
width: 75%;
float: left;
}
}
.col-sm-3-custom {
position: relative;
min-height: 1px;
padding-left: 15px;
padding-right: 15px;
}
.col-sm-9-custom {
position: relative;
min-height: 1px;
padding-left: 15px;
padding-right: 15px;
}

View file

@ -6,10 +6,10 @@
<div class="pull-right"> <div class="pull-right">
<button class="btn btn-greyed" id="results-collapse-btn"> <button class="btn btn-greyed" id="results-collapse-btn">
<span class="glyphicon glyphicon-collapse-up"></span> <span class="glyphicon glyphicon-collapse-up"></span>
<span class="hidden-xs"><%= t'my_modules.results.collapse_label' %></button></span> <span class="hidden-xs-custom"><%= t'my_modules.results.collapse_label' %></button></span>
<button class="btn btn-greyed" id="results-expand-btn"> <button class="btn btn-greyed" id="results-expand-btn">
<span class="glyphicon glyphicon-collapse-down"></span> <span class="glyphicon glyphicon-collapse-down"></span>
<span class="hidden-xs"><%= t'my_modules.results.expand_label' %></button></span> <span class="hidden-xs-custom"><%= t'my_modules.results.expand_label' %></button></span>
</div> </div>
<% if can_create_result_text_in_module(@my_module) or <% if can_create_result_text_in_module(@my_module) or

View file

@ -46,7 +46,7 @@
<div class="dropdown pull-right" style="display: inline;"> <div class="dropdown pull-right" style="display: inline;">
<button class="btn btn-default dropdown-toggle" type="button" id="addMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" <%= "disabled" unless can_add_sample_related_things_to_organization%>> <button class="btn btn-default dropdown-toggle" type="button" id="addMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" <%= "disabled" unless can_add_sample_related_things_to_organization%>>
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"> <span class="hidden-xs-custom">
<%= t'More' %> <%= t'More' %>
<span class="caret"></span> <span class="caret"></span>
</span> </span>
@ -92,14 +92,14 @@
<div class="toolbarButtons" style="display:none"> <div class="toolbarButtons" style="display:none">
<button type="button" class="btn btn-default editAdd" id="editSample" onclick="onClickEdit()" disabled> <button type="button" class="btn btn-default editAdd" id="editSample" onclick="onClickEdit()" disabled>
<span class="glyphicon glyphicon-pencil"></span> <span class="glyphicon glyphicon-pencil"></span>
<span class="hidden-xs"><%= t("samples.edit_sample") %></span> <span class="hidden-xs-custom"><%= t("samples.edit_sample") %></span>
</button> </button>
<% if can_delete_samples(@organization) %> <% if can_delete_samples(@organization) %>
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
id="deleteSamplesButton" data-target="#deleteSamples" data-toggle="modal" disabled> id="deleteSamplesButton" data-target="#deleteSamples" data-toggle="modal" disabled>
<span class="glyphicon glyphicon-trash"></span> <span class="glyphicon glyphicon-trash"></span>
<span class="hidden-xs"><%= t'samples.delete_samples' %></span> <span class="hidden-xs-custom"><%= t'samples.delete_samples' %></span>
<%= submit_tag MyModulesController::DELETE_SAMPLES, :class => "hidden delete_samples_submit" %> <%= submit_tag MyModulesController::DELETE_SAMPLES, :class => "hidden delete_samples_submit" %>
</button> </button>
<% end %> <% end %>
@ -108,7 +108,7 @@
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
id="assignSamples" onclick="$(this).next().click();" disabled> id="assignSamples" onclick="$(this).next().click();" disabled>
<span class="glyphicon glyphicon-ok-circle"></span> <span class="glyphicon glyphicon-ok-circle"></span>
<span class="hidden-xs"><%= t'samples.assign_samples_to_module' %></span> <span class="hidden-xs-custom"><%= t'samples.assign_samples_to_module' %></span>
</button> </button>
<%= submit_tag MyModulesController::ASSIGN_SAMPLES, :class => "hidden" %> <%= submit_tag MyModulesController::ASSIGN_SAMPLES, :class => "hidden" %>
<% end %> <% end %>
@ -116,7 +116,7 @@
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
id="unassignSamples" onclick="$(this).next().click();" disabled> id="unassignSamples" onclick="$(this).next().click();" disabled>
<span class="glyphicon glyphicon-ban-circle"></span> <span class="glyphicon glyphicon-ban-circle"></span>
<span class="hidden-xs"><%= t'samples.unassign_samples_to_module' %></span> <span class="hidden-xs-custom"><%= t'samples.unassign_samples_to_module' %></span>
</button> </button>
<%= submit_tag MyModulesController::UNASSIGN_SAMPLES, :class => "hidden" %> <%= submit_tag MyModulesController::UNASSIGN_SAMPLES, :class => "hidden" %>
<% end %> <% end %>