mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-30 19:48:18 +08:00
Merge pull request #530 from biosistemika/ml_sci_1044
Add data-hook and yadcf-filter plug-in [SCI-1044]
This commit is contained in:
commit
317739af1e
6 changed files with 4435 additions and 17 deletions
|
@ -30,6 +30,7 @@
|
|||
//= require highlight.pack
|
||||
//= require tinymce-jquery
|
||||
//= require_directory ./sitewide
|
||||
//= require jquery.dataTables.yadcf
|
||||
//= require datatables
|
||||
//= require dataTables.noSearchHidden
|
||||
//= require bootstrap-select
|
||||
|
|
|
@ -26,12 +26,15 @@ $color-mine-shaft: #333;
|
|||
$color-nero: #262626;
|
||||
$color-black: #000;
|
||||
$color-cloud: rgba(0, 0, 0, .1);
|
||||
$color-gray-light-yadcf: '#cccccc';
|
||||
$color-gray-dark-yadcf: '#a9a9a9';
|
||||
|
||||
// Miscelaneous colors
|
||||
$color-mystic: #eaeff2;
|
||||
$color-candlelight: #ffda23;
|
||||
$color-orange: #ff900b;
|
||||
$color-saturated-green: #008600;
|
||||
$color-blue-yadcf: '#337ab7';
|
||||
|
||||
// Red colors
|
||||
$color-mojo: #cf4b48;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<ol class="breadcrumb breadcrumb-teams">
|
||||
<ol class="breadcrumb breadcrumb-teams" data-hook="breadcrumb-teams">
|
||||
<% if action_name == "index" %>
|
||||
<li class="active">
|
||||
<%= t("users.settings.teams.breadcrumbs.all") %>
|
||||
|
|
|
@ -54,22 +54,24 @@
|
|||
|
||||
<div data-hook="team-header-second-row"></div>
|
||||
|
||||
<div>
|
||||
<div class="badge-icon bg-primary">
|
||||
<%= link_to team_description_path(@team, format: :json),
|
||||
remote: true,
|
||||
class: 'description-link',
|
||||
style: 'color: inherit' do %>
|
||||
<span class="glyphicon glyphicon-info-sign"></span>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="well well-sm">
|
||||
<%= link_to team_description_path(@team, format: :json),
|
||||
remote: true,
|
||||
class: 'description-label description-link description-refresh',
|
||||
style: 'color: inherit' do %>
|
||||
<%= render partial: "users/settings/teams/description_label.html.erb", locals: { team: @team } %>
|
||||
<% end %>
|
||||
<div class="row">
|
||||
<div class="col-xs-24 col-sm-12" data-hook="team-header-description">
|
||||
<div class="badge-icon bg-primary">
|
||||
<%= link_to team_description_path(@team, format: :json),
|
||||
remote: true,
|
||||
class: 'description-link',
|
||||
style: 'color: inherit' do %>
|
||||
<span class="glyphicon glyphicon-info-sign"></span>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="well well-sm">
|
||||
<%= link_to team_description_path(@team, format: :json),
|
||||
remote: true,
|
||||
class: 'description-label description-link description-refresh',
|
||||
style: 'color: inherit' do %>
|
||||
<%= render partial: "users/settings/teams/description_label.html.erb", locals: { team: @team } %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- End of HEADER -->
|
||||
|
|
|
@ -161,10 +161,13 @@ class Constants
|
|||
COLOR_MINE_SHAFT = '#333333'.freeze # $color-mine-shaft
|
||||
COLOR_NERO = '#262626'.freeze # $color-nero
|
||||
COLOR_BLACK = '#000000'.freeze # $color-black
|
||||
COLOR_GRAY_LIGHT_YADCF = '#cccccc'.freeze # $color-gray-light-yadcf
|
||||
COLOR_GRAY_DARK_YADCF = '#a9a9a9'.freeze # $color-gray-dark-yadcf
|
||||
|
||||
# Miscelaneous colors
|
||||
COLOR_MYSTIC = '#eaeff2'.freeze # $color-mystic
|
||||
COLOR_CANDLELIGHT = '#ffda23'.freeze # $color-candlelight
|
||||
COLOR_BLUE_YADCF = '#337ab7'.freeze # $color-blue-yadcf
|
||||
|
||||
# Red colors
|
||||
COLOR_MOJO = '#cf4b48'.freeze # $color-mojo
|
||||
|
|
4409
vendor/assets/javascripts/jquery.dataTables.yadcf.js
vendored
Normal file
4409
vendor/assets/javascripts/jquery.dataTables.yadcf.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue