[sagenb] 01/01: Replace the 3D options in the UI with a notice about it not working

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagenb.

commit f761659153f85e8e67fe1fd65097ad4a16601c29
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Dec 5 01:55:58 2016 +0100

    Replace the 3D options in the UI with a notice about it not working
---
 debian/README.Debian                   |  2 ++
 debian/patches/debian-jmol-paths.patch | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index f2d205b..48b5394 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,6 +8,8 @@ Upstream claims to support using the old Jmol applet instead of JSmol, but it
 does not work and it would be hard for us Debian folks to patch it in, see
 https://github.com/sagemath/sagenb/issues/415
 
+3D plots do work from the SageMath command-line interface.
+
 Secure Notebook
 ===============
 
diff --git a/debian/patches/debian-jmol-paths.patch b/debian/patches/debian-jmol-paths.patch
index 05c634c..22d1631 100644
--- a/debian/patches/debian-jmol-paths.patch
+++ b/debian/patches/debian-jmol-paths.patch
@@ -1,6 +1,5 @@
-Description: Give the correct paths to jmol-applet
- This is just for documentation purposes; currently this is broken in upstream
- See README.Debian for more details.
+Description: Document the fact that 3D plots don't work
+ The extra path changes are just for documentation purposes, they don't work.
 Author: Ximin Luo <infinity0 at debian.org>
 Forwarded: not-needed
 --- a/sagenb/data/sage/js/jmol_lib.js
@@ -39,3 +38,20 @@ Forwarded: not-needed
          import mimetypes
          mimetypes.add_type('text/plain','.jmol')
  
+--- a/sagenb/data/sage/html/notebook/base.html
++++ b/sagenb/data/sage/html/notebook/base.html
+@@ -136,12 +136,8 @@
+         <input type="checkbox" title="{{ gettext('Enable/disable pretty_printing') }}"
+                onchange="pretty_print_check(this.checked);"
+                class="worksheet" value="pretty_print" {{ "checked" if worksheet.pretty_print() else "" }} /> {{ gettext('Typeset') }}
+-        <input id="3D_check", type="checkbox" title="{{ gettext('Load 3-D Live. Not recommended for worksheets with > 2 3-D Plots.') }}"
+-               onchange="live_3D_check(this.checked);"
+-               class="worksheet" value="live_3D" {{ "checked" if worksheet.live_3D() else "" }} /> {{ gettext('Load 3-D Live') }}
+-        <input id="3D_use_java", type="checkbox" title="{{ gettext('Use java for 3-D. Only applies to this running of worksheet.') }}"
+-               onchange="3D_use_java_check(this.checked);"
+-               class="worksheet" value="3D_use_java"/> {{ gettext('Use java for 3-D') }}
++          (<span title="3D plots do not work because JSmol cannot currently be packaged for Debian. See the README.source of the jmol package for more details on this situation. They do work in the SageMath CLI." >3D
++        plots are <strong>DISABLED</strong></span>)
+          {% endif %}
+     {% endif %} 
+     </div>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git