scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-03 19:24:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1206 from ZmagoD/zd_SCI_2442

Browse source 
make manage columns page more responsive [fixes SCI-2442]
This commit is contained in:
Zmago Devetak 2018-06-13 11:14:35 +02:00 committed by GitHub
commit 2eb6613c6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/repository_columns/index.js.erb
View file

@ -112,18 +112,18 @@
function _insertNewListItem(column) {
// remove element if already persent
$('[data-id="' + column.id + '"]').remove();
var html = '<li class="list-group-item" data-id="' + column.id + '" ';
var html = '<li class="list-group-item row" data-id="' + column.id + '" ';
html += 'data-destroy-url="' + column.destroy_html_url + '"';
html += 'data-edit-url="' + column.edit_url + '">';
html += '<span class="pull-left">' + column.name + '</span>';
html += '<span class="controlls pull-right">';
html += 'data-edit-url="' + column.edit_url + '"><div class="col-xs-8">';
html += '<span class="pull-left column-name">' + column.name + '</span>';
html += '</div><div class="col-xs-4"><span class="controlls pull-right">';
html += '<button class="btn btn-default" data-action="edit">';
html += '<span class="fas fa-pencil-alt"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.edit_column" %></button>&nbsp;';
html += '<button class="btn btn-default" data-action="destroy">';
html += '<button class="btn btn-default delete-column" data-action="destroy">';
html += '<span class="glyphicon glyphicon-trash"></span>&nbsp;';
html += '<%= I18n.t "libraries.repository_columns.index.delete_column" %>';
html += '</button></span></li>';
html += '</button></span></div></li>';
$(html).insertBefore('.repository-columns-body ul li:first')
.promise()
.done(function() {

14
app/assets/stylesheets/themes/repositories.scss
View file

@ -5,13 +5,17 @@
.list-group-item {
padding: 28px;
}
.controlls {
margin-top: -18px;
}
.column-name {
margin-top: 10px;
}
}
span {
margin-top: -10px;
@media only screen and (max-width: 768px) {
.repository-columns-body {
.delete-column {
margin-top: 5px;
}
}
}

28
app/views/repository_columns/index.html.erb
View file

@ -32,21 +32,25 @@
<% else %>
<% @repository_columns.each do |column| %>
<% cache column do %>
<li class="list-group-item"
<li class="list-group-item row"
data-id="<%= column.id %>"
data-destroy-url="<%= repository_columns_destroy_html_path(@repository, column) %>"
data-edit-url="<%= edit_repository_repository_column_path(@repository, column) %>">
<span class="pull-left"><%= column.name %></span>
<span class="controlls pull-right">
<button class="btn btn-default" data-action="edit">
<span class="fas fa-pencil-alt"></span>
<%=t 'libraries.repository_columns.index.edit_column'%>
</button>
<button class="btn btn-default" data-action="destroy">
<span class="glyphicon glyphicon-trash"></span>
<%=t 'libraries.repository_columns.index.delete_column'%>
</button>
</span>
<div class="col-xs-8">
<span class="pull-left column-name"><%= column.name %></span>
</div>
<div class="col-xs-4">
<span class="controlls pull-right">
<button class="btn btn-default" data-action="edit">
<span class="fas fa-pencil-alt"></span>
<%=t 'libraries.repository_columns.index.edit_column'%>
</button>&nbsp;
<button class="btn btn-default delete-column" data-action="destroy">
<span class="glyphicon glyphicon-trash"></span>
<%=t 'libraries.repository_columns.index.delete_column'%>
</button>
</span>
</div>
</li>
<% end %>
<% end %>