Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Iliya Manolov
slapos
Commits
8376ee3c
Commit
8376ee3c
authored
Jun 20, 2017
by
Iliya Manolov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed all mentions of %erp5_url in custom.js and the notebook's output.
parent
ad71146a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
13 deletions
+8
-13
software/ipython_notebook/software.cfg
software/ipython_notebook/software.cfg
+2
-2
software/ipython_notebook/template/ERP5kernel.py.jinja
software/ipython_notebook/template/ERP5kernel.py.jinja
+2
-6
software/ipython_notebook/template/custom.js.jinja
software/ipython_notebook/template/custom.js.jinja
+4
-5
No files found.
software/ipython_notebook/software.cfg
View file @
8376ee3c
...
@@ -47,7 +47,7 @@ md5sum = d7d4a7e19d55bf14007819258bf42100
...
@@ -47,7 +47,7 @@ md5sum = d7d4a7e19d55bf14007819258bf42100
[erp5-kernel]
[erp5-kernel]
<= download-file-base
<= download-file-base
filename = ERP5kernel.py.jinja
filename = ERP5kernel.py.jinja
md5sum =
b5bb94181f7faee42ad18a909a648fe5
md5sum =
f7be6c3ef9cdfaaea3b8756895a22081
[kernel-json]
[kernel-json]
<= download-file-base
<= download-file-base
...
@@ -57,7 +57,7 @@ md5sum = ab6e78ea20855e07d388b5b86d1770fe
...
@@ -57,7 +57,7 @@ md5sum = ab6e78ea20855e07d388b5b86d1770fe
[custom-js]
[custom-js]
<= download-file-base
<= download-file-base
filename = custom.js.jinja
filename = custom.js.jinja
md5sum =
13561a9d86c488be752795e7bc23474a
md5sum =
584aa839aa20263ba885537b74c83abd
[instance-jupyter]
[instance-jupyter]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
...
software/ipython_notebook/template/ERP5kernel.py.jinja
View file @
8376ee3c
...
@@ -184,12 +184,8 @@ notebooks. \n' % magic_value
...
@@ -184,12 +184,8 @@ notebooks. \n' % magic_value
if check_attributes:
if check_attributes:
self.response = 'You have entered all required magics. You may now use your notebook.'
self.response = 'You have entered all required magics. You may now use your notebook.'
else:
else:
self.response = '''You have these required magics remaining: %s. \nYour current \
self.response = '''You have these required magics remaining: %s. \n''' % (
backend url is %s (you can change it with %serp5_url)''' % (
', '.join(map(str, missing_attributes)))
', '.join(map(str, missing_attributes)),
str(self.url),
'%'
)
# Display response to frontend before moving forward
# Display response to frontend before moving forward
self.display_response(response=(self.response + '\n'))
self.display_response(response=(self.response + '\n'))
...
...
software/ipython_notebook/template/custom.js.jinja
View file @
8376ee3c
...
@@ -85,12 +85,11 @@ $([IPython.events]).on('notebook_loaded.Notebook', function(){
...
@@ -85,12 +85,11 @@ $([IPython.events]).on('notebook_loaded.Notebook', function(){
var kernelname = IPython.notebook.kernel_selector.current_selection;
var kernelname = IPython.notebook.kernel_selector.current_selection;
var display_text="<div class='output_subarea output_text output_result'>\
var display_text="<div class='output_subarea output_text output_result'>\
<pre>Follow these steps to customize your notebook with ERP5 kernel :-</br>\
<pre>Follow these steps to customize your notebook with ERP5 kernel :-</br>\
1. Add <b>%erp5_url <your_erp5_url>/erp5/Base_executeJupyter</b>.</br>\
1. Make sure you have 'erp5_data_notebook' business template installed in your ERP5</br>\
Make sure you have 'erp5_data_notebook' business template installed in your ERP5</br>\
2. <b>%erp5_user <your_erp5_username></b></br>\
2. <b>%notebook_set_reference <your_notebook_refernce></b></br>\
3. <b>%erp5_password <your_erp5_password></b></br>\
4. <b>%notebook_set_reference <your_notebook_reference></b></br>\
It would be better to set the reference to match with erp5 reference pattern.</br>\
It would be better to set the reference to match with erp5 reference pattern.</br>\
3. <b>%erp5_user <your_erp5_username></b></br>\
4. <b>%erp5_password <your_erp5_password></b></br>\
5. As soon as you see 'Please Proceed' message you can now access your erp5 using notebook.</br>\
5. As soon as you see 'Please Proceed' message you can now access your erp5 using notebook.</br>\
<p><u>OTHER USEFUL MAGICS</u> -</br>\
<p><u>OTHER USEFUL MAGICS</u> -</br>\
<b>%my_notebooks</b> -This is used to display all the notebooks created by the specific user.</br>\
<b>%my_notebooks</b> -This is used to display all the notebooks created by the specific user.</br>\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment