scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update sidebar [fixes SCI-303]

Browse source
This commit is contained in:
zmagod 2016-08-03 16:09:45 +02:00
parent c7e1dea1bc
commit 45dac782ca
5 changed files with 64 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/partials/_sidebar.scss
View file

@ -37,6 +37,10 @@ $toggle-btn-size: 50px;
#slide-panel { #slide-panel {
height: 100%; height: 100%;
.my-module-group-element{
border-left: 1px dotted $color-emperor;
}
.sidebar-header { .sidebar-header {
height: $toggle-btn-size; height: $toggle-btn-size;
background: $color-theme-primary; background: $color-theme-primary;
@ -53,7 +57,10 @@ $toggle-btn-size: 50px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
opacity: 1; opacity: 1;
h5>a{
color: $color-white;
text-decoration: none;
}
// Animations // Animations
@include transition(opacity 0.5s ease); @include transition(opacity 0.5s ease);
} }

2
app/assets/stylesheets/partials/_tree_view.scss
View file

@ -30,7 +30,7 @@
} }
&.leaf { &.leaf {
padding-left: 30px; padding-left: 10px;
.tree-link::before { .tree-link::before {
content: "\25B8"; content: "\25B8";
} }

18
app/views/shared/_sidebar.html.erb
View file

@ -13,19 +13,23 @@
</div> </div>
<div class="tree"> <div class="tree">
<% if !project_page? %>
<ul> <ul>
<li class="<%= "active" if project_page? %>"> <li class="active">
<span class="tree-link line-wrap"> <span class="tree-link line-wrap">
<i></i> <i></i>
<% if !project_page? %> <%= link_to @project.name,
<%= link_to @project.name, project_action_to_link_to(@project), title: @project.name %> project_action_to_link_to(@project),
<% else %> title: @project.name %>
<span title="<%= @project.name %>"><%= @project.name %></span>
<% end %>
</span> </span>
<%= render partial: 'shared/sidebar/experiments', locals: { project: @project } %> <%= render partial: 'shared/sidebar/experiments',
locals: { project: @project } %>
</li> </li>
</ul> </ul>
<% else %>
<%= render partial: 'shared/sidebar/experiments',
locals: { project: @project } %>
<% end %>
</div> </div>
</div> </div>
<% end %> <% end %>

37
app/views/shared/sidebar/_experiments.html.erb
View file

@ -1,22 +1,31 @@
<ul> <ul>
<% if project.active_experiments.present? then %> <% if project.active_experiments.present? then %>
<% project.active_experiments.each do |experiment| %> <% if experiment_page? %>
<li class="<%= "active" if experiment_page? %>"> <li>
<span class="tree-link line-wrap"> <span class="tree-link line-wrap">
<i></i> <i></i>
<% if !experiment_page? %> <span title="<%= @experiment.name %>"><%= @experiment.name %></span>
<%= link_to experiment.name, experiment_action_to_link_to(experiment), title: experiment.name %>
<% else %>
<span title="<%= experiment.name %>"><%= experiment.name %></span>
<% end %>
</span> </span>
<%= render partial: 'shared/sidebar/my_modules', locals: { experiment: experiment } %> <%= render partial: 'shared/sidebar/my_modules', locals: { experiment: @experiment } %>
</li> </li>
<% else %>
<% project.active_experiments.each do |experiment| %>
<li>
<span class="tree-link line-wrap">
<i></i>
<% if can_view_experiment(experiment) %>
<%= link_to experiment.name,
experiment_action_to_link_to(experiment),
title: experiment.name,
class: 'overview_exp_label'
%>
<% else %>
<%= experiment.name %>
<% end %>
</span>
<%= render partial: 'shared/sidebar/my_modules', locals: { experiment: experiment } %>
</li>
<% end %>
<% end %> <% end %>
<% end %> <% end %>
<li> </ul>
<%= link_to new_project_experiment_path(project), id: 'new-experiment', remote: true do %>
<span class="glyphicon glyphicon-plus"></span> <i><%= t('experiments.new.create') %></i>
<% end %>
</li>
</ul>

52
app/views/shared/sidebar/_my_modules.html.erb
View file

@ -2,35 +2,28 @@
<ul> <ul>
<% experiment.active_module_groups.each do |my_module_group| %> <% experiment.active_module_groups.each do |my_module_group| %>
<li data-module-group="<%= my_module_group.id %>"> <li data-module-group="<%= my_module_group.id %>">
<span>
<i></i>
<span class="line-wrap short" title="<%= my_module_group.name %>">
<%= my_module_group.name %>
</span>
<% if is_canvas? %>
<a href="" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a>
<% end %>
</span>
<% if my_module_group.my_modules.present? then %> <% if my_module_group.my_modules.present? then %>
<ul> <ul>
<% my_module_group.my_modules.sort_by{|m| m.workflow_order}.each do |my_module| %> <span class="my-module-group-element">
<li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>"> <% my_module_group.my_modules.sort_by{|m| m.workflow_order}.each do |my_module| %>
<span class="tree-link"> <li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>">
<% if currently_active? my_module %> <span class="tree-link">
<%= my_module.name %> <% if currently_active? my_module %>
<% else %>
<% if can_view_module(my_module) then %>
<%= link_to my_module.name, module_action_to_link_to(my_module), class: "module-link" %>
<% else %>
<%= my_module.name %> <%= my_module.name %>
<% else %>
<% if can_view_module(my_module) then %>
<%= link_to my_module.name, module_action_to_link_to(my_module), class: "module-link" %>
<% else %>
<%= my_module.name %>
<% end %>
<% end %> <% end %>
<% end %> <% if is_canvas? %>
<% if is_canvas? %> <a href="#" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a>
<a href="#" class="canvas-center-on"><span class="glyphicon glyphicon-map-marker"></span></a> <% end %>
<% end %> </span>
</span> </li>
</li> <% end %>
<% end %> </span>
</ul> </ul>
<% end %> <% end %>
</li> </li>
@ -38,13 +31,10 @@
<% modules_without_group = experiment.modules_without_group %> <% modules_without_group = experiment.modules_without_group %>
<% if modules_without_group.present? then %> <% if modules_without_group.present? then %>
<li> <li>
<span>
<i></i>
<span class='sidebar-no-module-group'><%= t("sidebar.no_module_group") %></span>
</span>
<ul> <ul>
<% modules_without_group.each do |my_module| %> <% modules_without_group.each do |my_module| %>
<li class="leaf <%= "active" if currently_active? my_module %>" data-module-id="<%= my_module.id %>"> <li class="leaf <%= "active" if currently_active? my_module %>"
data-module-id="<%= my_module.id %>">
<span class="tree-link"> <span class="tree-link">
<% if currently_active? my_module %> <% if currently_active? my_module %>
<%= my_module.name %> <%= my_module.name %>
@ -61,4 +51,4 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>