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

Removed all tutorial data from ERB, so that all tutorial code is in JS. [needed for fixing SCI-719]

Browse source
This commit is contained in:
Matej Zrimšek 2017-04-25 15:06:18 +02:00
parent b930af0033
commit a5cffd06f3
19 changed files with 83 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/my_modules/protocols.js.erb
View file

@ -123,21 +123,18 @@ function initTutorial() {
var nextPage = resultsTab.find('a').attr('href');
var steps = [{
intro: $("[data-role='tutorial-data']")
.attr('data-module-protocols-step-text')
intro: I18n.t('tutorial.module_protocols_html'),
}, {
element: $('#protocol-copy-to-repository')[0],
intro: $("[data-role='tutorial-data']")
.attr('data-module-protocols-save-step-text'),
intro: I18n.t('tutorial.module_protocols_save_html'),
position: 'right'
}, {
element: resultsTab[0],
intro: $("[data-role='tutorial-data']")
.attr('data-module-protocols-click-results-step-text'),
intro: I18n.t('tutorial.module_protocols_click_results_html'),
position: 'right'
}];
initPageTutorialSteps(12, 14, nextPage,
function() {}, function() {}, steps);
initPageTutorialSteps(12, 14, nextPage, function() {}, function() {},
steps);
}
}

9
app/assets/javascripts/my_modules/results.js.erb
View file

@ -133,15 +133,14 @@ function initTutorial() {
var nextPage = samplesTab.find('a').attr('href');
var steps = [{
element: $('#results-toolbar')[0],
intro: $('#results').attr('data-module-protocols-step-text')
intro: I18n.t('tutorial.module_results_html')
}, {
element: samplesTab[0],
intro: $('#results')
.attr('data-module-protocols-click-samples-step-text'),
intro: I18n.t('tutorial.module_results_click_samples_html'),
position: 'left'
}];
initPageTutorialSteps(15, 16, nextPage, function() {},
function() {}, steps);
initPageTutorialSteps(15, 16, nextPage, function() {}, function() {},
steps);
}
}

24
app/assets/javascripts/projects/canvas.js.erb
View file

@ -3137,9 +3137,19 @@ function initTutorial() {
if (stepNum >= 6 && stepNum <= 7) {
var nextPage = window.location.pathname;
initPageTutorialSteps(6, 7, nextPage, tutorialBeforeCb, tutorialAfterCb);
var steps = [{
element: $('#canvas-container')[0],
intro: I18n.t('tutorial.canvas_overview_html'),
position: 'left'
}, {
element: $('#edit-canvas-button')[0],
intro: I18n.t('tutorial.canvas_click_edit_workflow_html'),
position: 'left'
}];
initPageTutorialSteps(6, 7, nextPage, tutorialBeforeCb, tutorialAfterCb,
steps);
} else if (stepNum >= 8 && stepNum <= 9) {
// Go to edit canvas mode
// Go into edit canvas mode
$('.introjs-overlay').remove();
$('.introjs-helperLayer').remove();
$('.introjs-tooltipReferenceLayer').remove();
@ -3148,12 +3158,11 @@ function initTutorial() {
setTimeout(function() {
var nextPage = window.location.pathname;
var steps = [{
intro: $('#canvas-container').attr('data-edit-workflow-step-text'),
intro: I18n.t('tutorial.edit_workflow_html'),
element: $('#canvas-new-module')[0],
position: 'right'
}, {
intro: $('#canvas-container')
.attr('data-edit-workflow-click-save-step-text'),
intro: I18n.t('tutorial.edit_workflow_click_save_html'),
element: $('#canvas-save')[0],
position: 'right'
}];
@ -3171,12 +3180,11 @@ function initTutorial() {
var nextPage = qpcrModuleLeaf.find('a.module-link').attr('href');
var steps = [{
element: $('#slide-panel .tree')[0],
intro: $('#canvas-container').attr('data-sidebar-step-text'),
intro: I18n.t('tutorial.sidebar_html'),
position: 'right'
}, {
element: qpcrModuleLeaf[0],
intro: $('#canvas-container')
.attr('data-sidebar-click-module-step-text'),
intro: I18n.t('tutorial.sidebar_click_module_html'),
position: 'right'
}];
initPageTutorialSteps(10, 11, nextPage, tutorialBeforeCb,

12
app/assets/javascripts/projects/show.js
View file

@ -70,7 +70,17 @@
var stepNum = parseInt(Cookies.get('current_tutorial_step'), 10);
if (stepNum >= 4 && stepNum <= 5) {
var nextPage = $('[data-canvas-link]').data('canvasLink');
initPageTutorialSteps(4, 5, nextPage, tutorialBeforeCb, tutorialAfterCb);
var steps = [{
element: $('#new-experiment')[0],
intro: I18n.t('tutorial.tutorial_welcome_title_html'),
position: 'left'
}, {
element: $('.experiment-panel')[0],
intro: I18n.t('tutorial.edit_experiment_html'),
position: 'right'
}];
initPageTutorialSteps(4, 5, nextPage, tutorialBeforeCb, tutorialAfterCb,
steps);
}
}

12
app/assets/javascripts/protocols/index.js
View file

@ -777,7 +777,17 @@ function initTutorial() {
var stepNum = parseInt(Cookies.get('current_tutorial_step'), 10);
if (stepNum >= 23 && stepNum <= 24) {
var nextPage = $('.navbar-brand').attr('href');
initPageTutorialSteps(23, 24, nextPage, function() {}, function() {});
var steps = [{
element: $('.nav-settings')[0],
intro: I18n.t('tutorial.protocols_index_html'),
position: 'bottom'
}, {
element: $('#import-export-protocols')[0],
intro: I18n.t('tutorial.protocols_import_export_html'),
position: 'bottom'
}];
initPageTutorialSteps(23, 24, nextPage, function() {}, function() {},
steps);
}
}

8
app/assets/javascripts/reports/index.js
View file

@ -169,10 +169,12 @@
function initTutorial() {
var stepNum = parseInt(Cookies.get('current_tutorial_step'), 10);
if (stepNum === 19) {
var nextPage = $('#new-report-btn').attr('href');
var newReportBtn = $('#new-report-btn');
var nextPage = newReportBtn.attr('href');
var steps = [{
element: $('#new-report-btn')[0],
intro: $('#content').attr('data-reports-click-new-report-step-text'),
element: newReportBtn[0],
intro: I18n.t('tutorial.reports_index_click_new_report_html'),
position: 'right'
}];
initPageTutorialSteps(19, 19, nextPage, function() {}, function() {},

16
app/assets/javascripts/reports/new.js.erb
View file

@ -1150,10 +1150,22 @@ function initTutorial() {
var stepNum = parseInt(Cookies.get('current_tutorial_step'), 10);
if (stepNum >= 20 && stepNum <= 21) {
ignoreUnsavedWorkAlert = true;
var nextPage = $('.navbar-brand').attr('href');
var steps = [{
element: $('.new-element')[0],
intro: I18n.t('tutorial.new_report_html'),
position: 'left'
}, {
element: $('#team-link')[0],
intro: I18n.t('tutorial.new_report_click_team_html',
{ private_team: $('#team-link span').last().text() }),
position: 'left'
}];
initPageTutorialSteps(20, 21, nextPage, function() {}, function() {
ignoreUnsavedWorkAlert = false;
});
ignoreUnsavedWorkAlert = false;
},
steps);
}
}

8
app/assets/javascripts/samples/samples.js
View file

@ -62,14 +62,14 @@ function initTutorial() {
var nextPage = $('#reports-nav-tab a').attr('href');
var steps = [{
element: $('#importSamplesButton')[0],
intro: $('#samples-toolbar').attr('data-samples-step-text'),
intro: I18n.t('tutorial.samples_html'),
position: 'right'
}, {
element: $('#secondary-menu')[0],
intro: $('#samples-toolbar').attr('data-breadcrumbs-step-text')
intro: I18n.t('tutorial.breadcrumbs_html')
}];
initPageTutorialSteps(17, 18, nextPage,
function() {}, function() {}, steps);
initPageTutorialSteps(17, 18, nextPage, function() {}, function() {},
steps);
}
}

2
app/assets/javascripts/sitewide/utils.js
View file

@ -89,7 +89,7 @@ function initPageTutorialSteps(pageFirstStepN, pageLastStepN, nextPagePath,
var thisPagePath = window.location.pathname;
beforeCb();
// Initialize tutorial for the current page's steps
// Initialize tutorial for the current pages' steps
var doneLabel = (pageLastStepN === TUTORIAL_STEPS_CNT) ?
'Start using sciNote' : 'End tutorial';
if (_.isUndefined(steps)) {

16
app/views/experiments/canvas.html.erb
View file

@ -10,13 +10,7 @@
remote: true,
type: 'button',
id: 'edit-canvas-button',
class: 'ajax btn btn-default',
data: {
action: 'edit',
intro: t('tutorial.canvas_click_edit_workflow_html'),
step: '7',
position: 'left'
} do %>
class: 'ajax btn btn-default' do %>
<span class="glyphicon glyphicon-pencil"></span>
<span class="hidden-xs"><%=t 'experiments.canvas.canvas_edit' %></span>
<% end %>
@ -62,13 +56,7 @@
</div>
</div>
<div id="canvas-container" data-project-id="<%= @project.id %>"
data-step="6" data-position='left'
data-intro="<%=t 'tutorial.canvas_overview_html' %>"
data-sidebar-step-text="<%=t 'tutorial.sidebar_html' %>"
data-sidebar-click-module-step-text="<%=t 'tutorial.sidebar_click_module_html' %>"
data-edit-workflow-step-text="<%=t 'tutorial.edit_workflow_html' %>"
data-edit-workflow-click-save-step-text="<%=t 'tutorial.edit_workflow_click_save_html' %>">
<div id="canvas-container" data-project-id="<%= @project.id %>">
<%= render partial: 'canvas/full_zoom', locals: { experiment: @experiment, my_modules: @experiment.active_modules } %>
</div>

5
app/views/my_modules/protocols.html.erb
View file

@ -17,10 +17,7 @@
</div>
<!-- Tutorial data -->
<div class="hidden" data-role="tutorial-data" data-module-id="<%= @my_module.id %>"
data-module-protocols-step-text="<%=t 'tutorial.module_protocols_html' %>"
data-module-protocols-save-step-text="<%=t 'tutorial.module_protocols_save_html' %>"
data-module-protocols-click-results-step-text="<%=t 'tutorial.module_protocols_click_results_html' %>">
<div class="hidden" data-role="tutorial-data" data-module-id="<%= @my_module.id %>">
</div>
<!-- URL for status bar refreshing -->

4
app/views/my_modules/results.html.erb
View file

@ -41,9 +41,7 @@
<%= render partial: "shared/image_preview_modal.html.erb" %>
<div id="results" data-module-id="<%= @my_module.id %>"
data-module-protocols-step-text="<%=t 'tutorial.module_results_html' %>"
data-module-protocols-click-samples-step-text="<%=t 'tutorial.module_results_click_samples_html' %>">
<div id="results" data-module-id="<%= @my_module.id %>">
<% ordered_result_of(@my_module).each do |result| %>
<%= render partial: "result", locals: { result: result } %>
<% end %>

13
app/views/projects/show.html.erb
View file

@ -27,15 +27,10 @@
</div>
<% if can_create_experiment(@project) %>
<%= link_to new_project_experiment_url(@project),
remote: true,
type: "button",
id: 'new-experiment',
class: 'btn btn-primary pull-right',
data: {
intro: t('tutorial.create_experiment_html'),
step: '4',
position: 'left'
} do %>
remote: true,
type: "button",
id: 'new-experiment',
class: 'btn btn-primary pull-right' do %>
<span class="glyphicon glyphicon-plus"></span>
<span class="hidden-xs"><%=t 'experiments.new.create' %></span>
<% end %>

4
app/views/projects/show/_experiment.html.erb
View file

@ -1,11 +1,7 @@
<div class="col-md-6">
<div class="panel panel-default experiment-panel"
data-id="<%= experiment.id %>"
data-intro="<%= t('tutorial.edit_experiment_html') %>"
data-step="5"
data-position="right"
data-canvas-link="<%= canvas_experiment_url(experiment) %>"
disableInteraction="true"
>
<div class="panel-heading">
<% if can_view_experiment_actions experiment %>

4
app/views/protocols/index.html.erb
View file

@ -3,7 +3,7 @@
<% if current_team %>
<%= render partial: "protocols/breadcrumbs.html.erb", locals: { teams: @teams, current_team: @current_team, type: @type } %>
<ul class="nav nav-tabs nav-settings" data-intro="<%=t 'tutorial.protocols_index_html' %>" data-step="23" data-position="bottom">
<ul class="nav nav-tabs nav-settings">
<li role="presentation" class="<%= "active" if @type == :public %>">
<%= link_to t("protocols.index.navigation.public"), protocols_path(team: @current_team, type: :public) %>
</li>
@ -49,7 +49,7 @@
<% end %>
</div>
<div class="btn-group" role="group" data-intro="<%=t 'tutorial.protocols_import_export_html' %>" data-step="24">
<div id="import-export-protocols" class="btn-group" role="group">
<a class="btn btn-default btn-open-file" <%= can_import_protocols(@current_team) ? 'data-action="import"' : 'disabled="disabled"' %>>
<span class="glyphicon glyphicon-import"></span>
<span class="hidden-xs">&nbsp;<%= t("protocols.index.import") %></span>

5
app/views/reports/elements/_new_element.html.erb
View file

@ -1,11 +1,6 @@
<% if !defined? hide then hide = false end %>
<% if !defined? initial then initial = false end %>
<div class="new-element <%= "hidden" if hide %> <%= "initial" if initial %>" data-ts="ignore" data-type="new" title="<%=t "projects.reports.elements.new_element.title" %>"
<% if initial %>
data-step="20"
data-position="left"
data-intro="<%=t 'tutorial.new_report_html' %>"
<% end %>>
<a href="" class="new-element-href" data-action="add-new-elements">
<div class="line left-line">
<div class="filler-wrapper">

3
app/views/reports/index.html.erb
View file

@ -2,8 +2,7 @@
<%= render partial: "shared/sidebar" %>
<%= render partial: "shared/secondary_navigation" %>
<div id="content"
data-reports-click-new-report-step-text="<%=t 'tutorial.reports_index_click_new_report_html' %>">
<div id="content">
<div>
<% if can_create_new_report(@project) %>
<%= link_to new_project_reports_path(@project), class: 'btn btn-primary', id: 'new-report-btn', 'data-no-turbolink' => true do %>

4
app/views/reports/new/_report_navigation.html.erb
View file

@ -6,9 +6,7 @@
<li>
<% if can_view_projects(@project.team) %>
<a id="team-link"
href="<%= projects_path :team => @project.team.id %>"
data-intro="<%=t 'tutorial.new_report_click_team_html', private_team: @project.team.name %>"
data-step="21" data-position="left">
href="<%= projects_path :team => @project.team.id %>">
<% end %>
<span class="hidden-sm hidden-md hidden-lg">Org</span>
<span class="hidden-xs"><%= @project.team.name %></span>

2
app/views/shared/_samples.html.erb
View file

@ -18,8 +18,6 @@
<div id="samples-toolbar"
<% if @my_module %>
data-module-id="<%= @my_module.id %>"
data-samples-step-text="<%=t 'tutorial.samples_html' %>"
data-breadcrumbs-step-text="<%=t 'tutorial.breadcrumbs_html' %>"
<% end %>>
<% if can_create_samples(@team) %>