scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-27 18:21:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes hound

Browse source
This commit is contained in:
zmagod 2018-04-04 16:40:07 +02:00
parent 0c05c60ebf
commit 525a1c15ca
6 changed files with 18 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,26 +5,26 @@
}
.repository-columns-body {
margin-top: 50px
}
margin-top: 50px;
.repository-columns-body .list-group-item {
padding: 28px;
.list-group-item {
padding: 28px;
.controlls {
margin-top: -18px;
}
.controlls {
margin-top: -18px;
}
span {
margin-top: -10px;
}
span {
margin-top: -10px;
}
.glyphicon-trash {
margin-right: 10px;
color: $color-milano-red;
.glyphicon-trash {
color: $brand-danger;
margin-right: 10px;
&:hover {
cursor: pointer;
&:hover {
cursor: pointer;
}
}
}
}

2
app/helpers/repository_columns_helper.rb
View file

@ -6,7 +6,7 @@ module RepositoryColumnsHelper
def disabled?(column, type)
return false if column.new_record?
column.data_type == type ? false : true
column.data_type != type
end
def checked?(column, type)

16
app/views/repositories/_delete_column_modal.html.erb
View file

@ -1,16 +0,0 @@
<div class="modal fade" id="deleteRepositoryColumn" tabindex="-1" role="dialog" aria-labelledby="deleteRepositoryColumnLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title"><%= t("repositories.modal_delete_column.title") %></h4>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-action="delete"><%= t("repositories.modal_delete_column.delete") %></button>
<button type="button" class="btn btn-default" data-dismiss="modal"><%= t("general.cancel")%></button>
</div>
</div>
</div>
</div>

20
app/views/repositories/_delete_column_modal_body.html.erb
View file

@ -1,20 +0,0 @@
<%= bootstrap_form_for @repository_column,
url: repository_repository_column_path(@repository,
@repository_column,
format: :json),
remote: :true,
method: :delete,
data: { role: "destroy-repository-column-form",
id: @repository_column.id } do |f| %>
<%= f.hidden_field :column_index, value: column_index %>
<p><%= t("repositories.modal_delete_column.message", column: @repository_column.name) %></p>
<div class="alert alert-danger" role="alert">
<span class="glyphicon glyphicon-exclamation-sign"></span>
&nbsp;
<%= t("repositories.modal_delete_column.alert_heading") %>
<ul>
<li><%= t("repositories.modal_delete_column.alert_line_1", nr: @repository_column.repository_cells.count) %></li>
<li><%= t("repositories.modal_delete_column.alert_line_2") %></li>
</ul>
</div>
<% end %>

2
app/views/repositories/show.html.erb
View file

@ -49,7 +49,7 @@
</li>
<li>
<%= link_to t('repositories.index.options_dropdown.manage_columns'),
repository_repository_columns_path(repository) %>
repository_repository_columns_path(@repository) %>
</li>
<% end %>
<% if can_create_repositories?(@repository.team) %>

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

@ -10,7 +10,7 @@
<h2><strong><%=t 'libraries.repository_columns.index.manage_column' %></strong></h2>
</div>
<div class="col-md-6 text-right">
<button class="btn btn-primary btn-lg"
<button class="btn btn-primary"
data-modal-url="<%= repository_columns_create_html_path(@repository) %>"
data-action="new-column-modal">
<span class="glyphicon glyphicon-plus"></span>&nbsp;<%=t 'libraries.repository_columns.index.new_column' %>