Add temporary fixes and minor updates

mpds-io · Aug 29, 2024 · 006fba6 · 006fba6
1 parent aca5720
commit 006fba6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 31 deletions.
diff --git a/src_js/events.js b/src_js/events.js
@@ -827,7 +827,7 @@ function register_events(){
             });
 
         } else if (desttab == 'usr_tab_ctrl'){ // redirect to an external app
-            window.location.href = (wmgui.edition === 0 ? '/ctrl/' : '/labs/custom-datasets/') + '?' + Math.floor(Math.random() * 1000);
+            window.location.href = '/ctrl/?' + Math.floor(Math.random() * 1000);
 
         } else if (desttab == 'usr_tab_absolidix'){ // redirect to an external app
             window.location.href = wmgui.mydata_addr;

diff --git a/src_js/markup.js b/src_js/markup.js
@@ -336,7 +336,7 @@ function register_html(){
         <p>In-house <i>ab initio</i> calculations</p><span class="extd href">Show more info...</span><span class="legend" style="display:none">This calculation is in progress. Upon completion it will be freely available under the CC BY 4.0 license. Support our work purchasing <a target="_blank" href="https://mpds.io/products" style="text-decoration:none;color:#000;border-bottom:1px solid #000;">our products</a>.<br /><br /></span>
     </div>
     <div id="pd3d_data" class="spinoff_pane">
-        <p>Automatically combined phase diagrams</p><span class="extd href">Show more info...</span><span class="legend" style="display:none">The 3d prisms and tetrahedra were automatically combined and rendered by the platform from the suitable binary and (or) ternary phase diagrams.<br /><br /></span>
+        <p>Automatically combined phase diagrams</p><span class="extd href">Show more info...</span><span class="legend" style="display:none">The 3d <a href="#search/phase%20diagram%20prism">prisms</a> and <a href="#search/phase%20diagram%20tetrahedron">tetrahedra</a> were automatically combined and rendered by the platform from the suitable <a href="#search/binary%20phase%20diagram">binary</a> and (or) <a href="#search/ternary%20phase%20diagram">ternary</a> phase diagrams.<br /><br /></span>
     </div>
 
     <ul>

diff --git a/src_js/wmsettings.js b/src_js/wmsettings.js
@@ -147,15 +147,15 @@ wmgui.path_s_xrpd = '#' + wmgui.api_host + '/download/s?fmt=xrpd&q=';
 wmgui.path_sd_plot = '#' + wmgui.api_host + '/download/p?fmt=json&q=';
 
 wmgui.engines_addrs = {
-    'cifplayer': '/ermac/webassets/iframe_cifplayer.html',
-    'visavis': '/ermac/webassets/iframe_visavis.html'
+    'cifplayer': '/ermac/webassets/iframe_cifplayer.html', // FIXME
+    'visavis': '/ermac/webassets/iframe_visavis.html' // FIXME
 }
 
 wmgui.v_pd_user_addr =    wmgui.static_host + '/pd_stub.html#';
-wmgui.v_ab_vis_addr =     wmgui.static_host + '/labs/view-phonons/#' + wmgui.api_host + '/download/p?fmt=json&q=';
-wmgui.v_pd_3d_addr =      'labs/pd3d/?';
+wmgui.v_ab_vis_addr =     '/ermac/labs/view-phonons/#' + wmgui.api_host + '/download/p?fmt=json&q='; // FIXME
+wmgui.v_pd_3d_addr =      '/ermac/labs/pd3d/?'; // FIXME
 
-// below are remote files commonly used
+// remote files commonly used
 wmgui.client_data_addr =  wmgui.static_host + '/wmdata.json?220923';
 wmgui.aetmap_addr =       wmgui.static_host + '/aets.jpg';
 
@@ -189,22 +189,6 @@ wmgui.editions = {
             document.getElementsByTagName('head')[0].appendChild(link);
         }
     },
-    6: {
-        'name': 'ASM International Materials Platform',
-        'prod_url': 'https://mpds.asminternational.org',
-        'dev_url': 'http://localhost:8075',
-        'css': wmgui.static_host + '/editions/asm/style.css?220923',
-        'actions': function(){
-            $('.only_mpds').hide();
-            $('.only_asm').css('display', 'inline-block');
-            // custom favicon
-            var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
-            link.type = 'image/x-icon';
-            link.rel = 'shortcut icon';
-            link.href = wmgui.static_host + '/editions/asm/asm.ico';
-            document.getElementsByTagName('head')[0].appendChild(link);
-        }
-    },
     10: {
         'name': 'Ermac on MPDS',
         'prod_url': 'https://ermac.mpds.io',
@@ -213,14 +197,6 @@ wmgui.editions = {
             $('.only_mpds').hide();
         }
     },
-    11: {
-        'name': 'Ermac on Tilde',
-        'prod_url': 'https://ermac.tilde.pro',
-        'dev_url': 'http://localhost:5556',
-        'actions': function(){
-            $('.only_mpds').hide();
-        }
-    },
     15: {
         'name': 'Ermac on Ab Solidix',
         'prod_url': 'https://ermac.absolidix.com',