mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 23:16:15 +08:00
Update repository index page
This commit is contained in:
Urban Rotnik
parent
3c1f28ec06
commit
466b05a5bc
|
|
@ -55,7 +55,7 @@ var RepositoryDatatable = (function(global) {
|
|||
originalHeader = $(TABLE_ID + ' thead').children().clone();
|
||||
viewAssigned = 'assigned';
|
||||
TABLE = $(TABLE_ID).DataTable({
|
||||
dom: "R<'row'<'col-sm-9-custom toolbar'l><'col-sm-3-custom'f>><'row'<'col-sm-12't>><'row'<'col-sm-7'i><'col-sm-5'p>>",
|
||||
dom: "R<'row'<'col-sm-6 toolbar'l><'col-sm-6'f>><'row'<'col-sm-12't>><'row'<'col-sm-7'i><'col-sm-5'p>>",
|
||||
stateSave: true,
|
||||
processing: true,
|
||||
serverSide: true,
|
||||
|
|
@ -252,8 +252,8 @@ var RepositoryDatatable = (function(global) {
|
|||
TABLE.columns.adjust();
|
||||
|
||||
// Append button to inner toolbar in table
|
||||
$('div.toolbarButtons').appendTo('div.toolbar');
|
||||
$('div.toolbarButtons').show();
|
||||
$('div.toolbarButtonsDatatable').appendTo('div.toolbar');
|
||||
$('div.toolbarButtonsDatatable').show();
|
||||
}, 10);
|
||||
|
||||
return TABLE;
|
||||
|
|
|
|||
6
app/assets/stylesheets/extend/bootstrap.scss
vendored
6
app/assets/stylesheets/extend/bootstrap.scss
vendored
|
|
@ -117,3 +117,9 @@
|
|||
float: none;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.btn {
|
||||
.fas {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,9 +10,18 @@
|
|||
.repository-table {
|
||||
margin-top: 20px;
|
||||
|
||||
.btn {
|
||||
border: 0;
|
||||
}
|
||||
// Datatables generated name
|
||||
.dataTables_length {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.dataTables_filter {
|
||||
float: right;
|
||||
}
|
||||
|
||||
// hack only for firefox
|
||||
|
|
@ -28,7 +37,6 @@
|
|||
.repository-cog {
|
||||
display: inline-block;
|
||||
float: right;
|
||||
padding-bottom: 15px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
|
|
@ -41,3 +49,53 @@
|
|||
background-color: $color-concrete;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#repository-toolbar {
|
||||
display: flex;
|
||||
|
||||
.repository-title {
|
||||
align-items: center;
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
margin-right: 20px;
|
||||
overflow: hidden;
|
||||
|
||||
span {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.repository-label {
|
||||
flex-shrink: 0;
|
||||
margin-right: 5px;
|
||||
opacity: .8;
|
||||
}
|
||||
|
||||
.repository-share-icon {
|
||||
flex-shrink: 0;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.repository-name {
|
||||
display: inline-block;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
.datatables-buttons {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.sidebar-button {
|
||||
span {
|
||||
display: inline-block !important;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.fas {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1200,7 +1200,7 @@ table.dataTable {
|
|||
|
||||
thead > tr > th,
|
||||
thead > tr > td {
|
||||
padding: 6px;
|
||||
padding: 8px;
|
||||
}
|
||||
|
||||
tbody > tr.selected,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
data-tooltipcontent="<%= I18n.t('tooltips.text.inventory.visibility') %>">
|
||||
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
|
||||
<span class="fas fa-eye"></span>
|
||||
<span class="hidden-xs"><%= t('repositories.index.visibility') %></span>
|
||||
<span class="hidden-xs"><%= t('repositories.index.columns') %></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right smart-dropdown" id="repository-columns-list">
|
||||
<li class="repository-columns-list-template hide">
|
||||
|
|
|
|||
|
|
@ -14,15 +14,26 @@
|
|||
<% end %>
|
||||
|
||||
<% if repository.shared_with?(current_team) %>
|
||||
<% if repository.team_repositories.where(team: current_team).take[:permission_level] == 'write' %>
|
||||
<% if repository.team_repositories.where(team: current_team).take.write? %>
|
||||
<%= draw_custom_icon('shared-edit') %>
|
||||
<% elsif repository.team_repositories.where(team: current_team).take[:permission_level] == 'read' %>
|
||||
<% else %>
|
||||
<%= draw_custom_icon('shared-read') %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</span>
|
||||
</li>
|
||||
<% end %>
|
||||
<% if can_create_repositories?(current_team) %>
|
||||
<li>
|
||||
<span class="tree-link link-wrap no-indent">
|
||||
<a class="sidebar-button" id="create-new-repository" data-remote="true"
|
||||
href="<%= create_modal_team_repositories_path(@repository.team) %>">
|
||||
<span class="fas fa-plus"></span>
|
||||
<%= t('libraries.index.no_libraries.create_new_button') %>
|
||||
</a>
|
||||
</span>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -11,16 +11,34 @@
|
|||
|
||||
<div class="content-pane">
|
||||
<div id="repository-toolbar">
|
||||
<div class="repository-title">
|
||||
<span class="repository-label"><%= t('repositories.index.title_label') %> </span>
|
||||
<span class="repository-name" title="<%= @repository.name %>"><%= @repository.name %></span>
|
||||
<span class="repository-share-icon">
|
||||
<% if @repository.shared_with?(current_team) %>
|
||||
<% if @repository.team_repositories.where(team: current_team).first.write? %>
|
||||
<%= draw_custom_icon('shared-edit') %>
|
||||
<% else %>
|
||||
<%= draw_custom_icon('shared-read') %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<% if can_create_repository_rows?(@repository) %>
|
||||
<button type="button" class="btn btn-primary editAdd help_tooltips"
|
||||
id="addRepositoryRecord" onclick="onClickAddRecord()"
|
||||
data-tooltiplink="<%= I18n.t('tooltips.link.inventory.new') %>"
|
||||
data-tooltipcontent="<%= I18n.t('tooltips.text.inventory.new') %>">
|
||||
<span class="fas fa-plus"></span>
|
||||
<span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
|
||||
</button>
|
||||
<% end %>
|
||||
<div id="datatables-buttons" class="datatables-buttons" style="display: inline;">
|
||||
<div class="new-repository-button">
|
||||
<% if can_manage_repository?(@repository) %>
|
||||
<a class="btn btn-default"
|
||||
id="share-repository"
|
||||
data-remote="true"
|
||||
href="#">
|
||||
<span class="fas fa-user-plus"></span>
|
||||
<span class="hidden-xs"><%= t('repositories.index.share_inventory') %></span>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= render partial: "columns_reorder_dropdown", formats: :html %>
|
||||
</div>
|
||||
|
||||
<div class="repository-cog dropdown">
|
||||
<button id="repository-acitons-dropdown"
|
||||
|
|
@ -30,8 +48,8 @@
|
|||
aria-haspopup="true"
|
||||
aria-expanded="true"
|
||||
<%= "disabled" unless can_perform_repository_actions(@repository) %>>
|
||||
<span class="fas fa-ellipsis-v"></span>
|
||||
<span class="hidden-xs"><%= t('repositories.index.advanced') %></span>
|
||||
<span class="fas fa-pencil-alt"></span>
|
||||
<span class="hidden-xs"><%= t('repositories.index.edit_inventory') %></span>
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
|
||||
|
|
@ -88,24 +106,10 @@
|
|||
</ul>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="datatables-buttons" style="display: inline;">
|
||||
<div class="new-repository-button">
|
||||
<% if can_create_repositories?(@repository.team) %>
|
||||
<a class="btn btn-default"
|
||||
id="create-new-repository"
|
||||
data-remote="true"
|
||||
href="<%= create_modal_team_repositories_path(@repository.team) %>">
|
||||
<span class="fas fa-plus"></span>
|
||||
<span class="hidden-xs"><%= t('libraries.index.no_libraries.create_new_button') %></span>
|
||||
</a>
|
||||
<% end %>
|
||||
</div>
|
||||
<%= render partial: "columns_reorder_dropdown", formats: :html %>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<hr/>
|
||||
|
||||
<div class="btn-group inline" id="saveCancel" data-toggle="buttons" style="display:none">
|
||||
<button type="button" class="btn btn-success" id="saveRecord" onclick="onClickSave()">
|
||||
<span class="fas fa-save"></span>
|
||||
|
|
@ -118,7 +122,18 @@
|
|||
</div>
|
||||
|
||||
<!-- These buttons are appended to table in javascript, after table initialization -->
|
||||
<div class="toolbarButtons" style="display:none">
|
||||
<div class="toolbarButtonsDatatable" style="display:none">
|
||||
|
||||
<% if can_create_repository_rows?(@repository) %>
|
||||
<button type="button" class="btn btn-primary editAdd help_tooltips"
|
||||
id="addRepositoryRecord" onclick="onClickAddRecord()"
|
||||
data-tooltiplink="<%= I18n.t('tooltips.link.inventory.new') %>"
|
||||
data-tooltipcontent="<%= I18n.t('tooltips.text.inventory.new') %>">
|
||||
<span class="fas fa-plus"></span>
|
||||
<span class="hidden-xs"><%= t("repositories.add_new_record") %></span>
|
||||
</button>
|
||||
<% end %>
|
||||
|
||||
<% if can_manage_repository_rows?(@repository) %>
|
||||
<button type="button" class="btn btn-default editAdd" id="editRepositoryRecord" onclick="onClickEdit()" disabled>
|
||||
<span class="fas fa-pencil-alt"></span>
|
||||
|
|
@ -126,7 +141,7 @@
|
|||
</button>
|
||||
<button type="button" class="btn btn-default"
|
||||
id="deleteRepositoryRecordsButton" onclick="onClickDelete()" disabled>
|
||||
<span class="fas fa-trash-alt"></span>
|
||||
<span class="fas fa-trash"></span>
|
||||
<span class="hidden-xs-custom"><%= t'repositories.delete_record' %></span>
|
||||
<%= submit_tag I18n.t('repositories.delete_record'), :class => "hidden
|
||||
delete_repository_records_submit" %>
|
||||
|
|
|
|||
|
|
@ -983,8 +983,10 @@ en:
|
|||
delete_flash: "\"%{name}\" inventory was successfully deleted!"
|
||||
rename_flash: "\"%{old_name}\" inventory was successfully renamed to \"%{new_name}\"!"
|
||||
copy_flash: "\"%{new}\" inventory was successfully copied from \"%{old}\"!"
|
||||
visibility: "Visibility"
|
||||
advanced: "Advanced"
|
||||
columns: "Columns"
|
||||
edit_inventory: "Edit Inventory"
|
||||
share_inventory: "Share"
|
||||
title_label: "Inventory:"
|
||||
options_dropdown:
|
||||
header: "Edit inventory"
|
||||
manage_columns: 'Manage columns'
|
||||
|
|
|
|||
Loading…
Reference in a new issue