Fix several UX/design bugs and comment out Absolidix/XRPD buttons

Author: blokhin

src_js/main_logic.js

@@ -203,7 +203,7 @@ function re_view_request(search_type){
 
     wmgui.search_type = search_type;
     wmgui.search.search_type = search_type;
-    request_search(wmgui.search, pseudo_input.join(" "), true);
+    request_search(wmgui.search, pseudo_input.join(" ").replaceAll(",", " "), true);
 }
 
 function request_search(search, caption, without_history){
@@ -529,15 +529,24 @@ function switch_control_mode(mode, next_mode, active_abf, active_cde){ // NB (0,
 function build_cells(json, header, footer){
     var cls_map = {7: 'ml_data', 8: 'ab_data', 9: 'ab_data', 10: 'ab_data', 11: 'ab_data', 13: 'deactivated'},
         result_html = '';
+
     if (header) result_html += header;
 
     if (wmgui.search_type == 2){
         if (json[0].length != 6){ wmgui.notify('Rendering error, please try to <a href=javascript:location.reload()>reload</a>'); return ''; }
 
+        var act_link = '';
+
         $.each(json, function(k, row){
+
+            act_link = '<a class="launch_id" href="#article/' + row[0] + '">Show</a>';
+
             row[0] = parseInt(row[0]);
-            if (row[0] == 999999) row[4] = wmgui.mockyear; // special *ref_id*, only handled in GUI
-            result_html += '<tr id="e__B' + row[0] + '" class="tcell" data-type="B"><td class=c55>[<a class="resolve_ref' + ((wmgui.bid_history.indexOf(row[0]) > -1) ? ' visited' : '') + '" href="' + wmgui.refs_endpoint + '?ref_id=' + row[0] + '&sid=' + wmgui.sid + '&ed=' + wmgui.edition + '" rel="' + row[0] + '" target="_blank" rel="noopener noreferrer">' + row[0] + '</a>]</td><td class=a1>' + row[1] + '</td><td class=a2 title="' + row[2] + '">' + row[2] + '</td><td class=a5>' + row[5] + '</td><td class=c4>' + row[4] + '</td><td class=a6><a class="launch_id" href="#article/' + row[0] + '">Show</a></td></tr>';
+            if (row[0] == 999999){
+                row[4] = wmgui.mockyear; // special *ref_id*, only handled in GUI
+                act_link = '&nbsp;';
+            }
+            result_html += '<tr id="e__B' + row[0] + '" class="tcell" data-type="B"><td class=c55>[<a class="resolve_ref' + ((wmgui.bid_history.indexOf(row[0]) > -1) ? ' visited' : '') + '" href="' + wmgui.refs_endpoint + '?ref_id=' + row[0] + '&sid=' + wmgui.sid + '&ed=' + wmgui.edition + '" rel="' + row[0] + '" target="_blank" rel="noopener noreferrer">' + row[0] + '</a>]</td><td class=a1>' + row[1] + '</td><td class=a2 title="' + row[2] + '">' + row[2] + '</td><td class=a5>' + row[5] + '</td><td class=c4>' + row[4] + '</td><td class=a6>' + act_link + '</td></tr>';
         });
     } else if (wmgui.search_type == 1){
         if (json[0].length != 5){ wmgui.notify('Rendering error, please try to <a href=javascript:location.reload()>reload</a>'); return ''; }
@@ -572,14 +581,24 @@ function build_thumbs(json){
         json.sort(function(a, b){
             return a[4] > b[4] ? 1 : a[4] < b[4] ? -1 : 0; // pubyear
         });
+
         var title_html = '',
-            full_display = !!wmgui.sid;
+            full_display = !!wmgui.sid,
+            act_link = '';
+
         $.each(json, function(k, row){
+
+            act_link = '<a class="launch_id" href="#article/' + row[0] + '">Show entries</a>';
+
             row[0] = parseInt(row[0]);
-            if (row[0] == 999999) row[4] = wmgui.mockyear; // special *ref_id*, only handled in GUI
+            if (row[0] == 999999){
+                row[4] = wmgui.mockyear; // special *ref_id*, only handled in GUI
+                act_link = 'Too many to show...';
+            }
             if (full_display) title_html = (row[1].length > 60 ? row[1].substr(0, 60) + '&hellip;' : row[1]) + ', <span>' + (row[2].length > 80 ? row[2].substr(0, 80) + '&hellip;' : row[2]) + '</span>';
             else title_html = '<br /><br />&#x1f4d6;'; // book icon
-            result_html += '<div class="gallery_item" id="e__B' + row[0] + '" data-type="B"><div class="gallery_img"><div class="articled">' + title_html + '</div></div><div class="gallery_label"><a class="launch_id" href="#article/' + row[0] + '">Show entries</a><br />[<a class="resolve_ref' + ((wmgui.bid_history.indexOf(row[0]) > -1) ? ' visited' : '') + '" href="' + wmgui.refs_endpoint + '?ref_id=' + row[0] + '&sid=' + wmgui.sid + '&ed=' + wmgui.edition + '" rel="' + row[0] + '" target="_blank" rel="noopener noreferrer">' + row[3] + '&rsquo;' + row[4].toString().substr(2, 2) + '</a>]</div></div>';
+
+            result_html += '<div class="gallery_item" id="e__B' + row[0] + '" data-type="B"><div class="gallery_img"><div class="articled">' + title_html + '</div></div><div class="gallery_label">' + act_link + '<br />[<a class="resolve_ref' + ((wmgui.bid_history.indexOf(row[0]) > -1) ? ' visited' : '') + '" href="' + wmgui.refs_endpoint + '?ref_id=' + row[0] + '&sid=' + wmgui.sid + '&ed=' + wmgui.edition + '" rel="' + row[0] + '" target="_blank" rel="noopener noreferrer">' + row[3] + '&rsquo;' + row[4].toString().substr(2, 2) + '</a>]</div></div>';
         });
     } else if (wmgui.search_type == 1){
         if (json[0].length != 5){ wmgui.notify('Rendering error, please try to <a href=javascript:location.reload()>reload</a>'); return ''; }
@@ -1557,12 +1576,15 @@ function show_dunit_info(phid, bid, entry){
         }).done(function(data){
             if (data.error) return wmgui.notify(data.error);
 
-            var mp_data = '';
-            if (data.out.mpid) mp_data = '<h4 style="background:#ddd;margin-top:-7px;">Materials Project <a target="_blank" href="https://materialsproject.org/materials/mp-' + data.out.mpid + '">mp-' + data.out.mpid + '</a></h4>';
+            var html = '<h4>' + data.out.formula_html.split(' ')[0] + ' ' + (data.out.spg || '?') + ' ' + (data.out.pearson || '&mdash;') + '</h4>';
+
+            if (data.out.mpid) html += '<h4 style="background:#ddd;margin-top:-7px;">Materials Project <a target="_blank" href="https://materialsproject.org/materials/mp-' + data.out.mpid + '">mp-' + data.out.mpid + '</a></h4>';
 
-            var html = '<h4>' + data.out.formula_html.split(' ')[0] + ' ' + (data.out.spg || '?') + ' ' + (data.out.pearson || '&mdash;') + '</h4>' + mp_data + '<p>This phase was reported in ' + data.out.articles_count + ' article' + (data.out.articles_count > 1 ? 's' : '')  + '.';
+            html += '<p>';
+            if (data.out.articles_count) html += 'This phase was reported in ' + data.out.articles_count + ' article' + (data.out.articles_count > 1 ? 's' : '')  + '.';
             if (data.out.sim_count > 1) html += ' There are <a href="#interlinkage/' + phid + '">' + data.out.sim_count + ' structurally similar phases</a> from other articles.';
             html += '</p>';
+
             $('#phase_info').html(html);
 
         }).fail(function(xhr, textStatus, errorThrown){
@@ -1593,7 +1615,7 @@ function show_dunit_info(phid, bid, entry){
                 });
                 links_html = links_html.substr(0, links_html.length - 4); // " or "
                 if (citation[0].indexOf(',') !== -1) main_author += ' et al.';
-                citation_html += ' <a href="' + wmgui.refs_endpoint + '?fmt=bib&ref_id=' + bid + '&sid=' + wmgui.sid + '">' + main_author + ', ' + citation[1] + '. <i>' + citation[2] + '</i> <b>(' + citation[3] + ')</b></a>';
+                citation_html += ' <a href="' + wmgui.refs_endpoint + '?fmt=bib&ref_id=' + bid + '&sid=' + wmgui.sid + '">' + main_author + ', ' + citation[1] + '. ' + citation[2] + ' <i>(' + citation[3] + ')</i></a>';
             }
 
             if (bid == 999999){

src_js/markup.js

@@ -55,7 +55,7 @@ function register_html(){
             <thead><tr>
                 <th class="p1">Phase</th>
                 <th class="p2">Space group num.</th>
-                <th class="p3">Exp. entries</th>
+                <th class="p3">Entries</th>
                 <th class="p4">Publications</th>
                 <th class="p5"></th>
             </tr></thead>
@@ -310,7 +310,7 @@ function register_html(){
     <div id="phases_ctx">
         <div class="col_title">Distinct phases</div>
         <br />
-        &nbsp;<input type="checkbox" id="ctx_strict_phases_trigger" checked />&nbsp;<label for="ctx_strict_phases_trigger">other elements and impurities</label>
+        <div style="text-align:center;"><input type="checkbox" id="ctx_strict_phases_trigger" checked />&nbsp;<label for="ctx_strict_phases_trigger">include admixed phases</label></div>
         <!-- br />
         &nbsp;<input type="checkbox" id="ctx_subphases_trigger" />&nbsp;<label for="ctx_subphases_trigger">constituent phases</label -->
         <span>See the <a target="_blank" href="https://github.com/mpds-io/mpds-distinct-phases">public dumps</a> of the distinct phases appeared at least once in the literature.</span>
@@ -345,7 +345,7 @@ function register_html(){
     <ul>
         <li id="visualize" class="wmbutton">Visualize</li>
         <li id="xrpdize" class="wmbutton">Show XRPD</li>
-        <li id="absolidize" class="wmbutton"><span class="active">Simulate</span><span class="disabled">Added to <span class="href">my data</span>.</span></li>
+        <!-- li id="absolidize" class="wmbutton"><span class="active">Simulate</span><span class="disabled">Added to <span class="href">my data</span>.</span></li -->
         <li id="download_pdf" class="d_icon"><a rel="pdf" href="#" target="_blank" title="Get HTML / PDF document" rel="nofollow"></a></li>
         <li id="download_json" class="d_icon"><a rel="json" href="#" target="_blank" title="Get machine-readable JSON file" rel="nofollow"></a></li>
         <li id="download_png" class="d_icon"><a rel="png" href="#" target="_blank" title="Get PNG raster image" rel="nofollow"></a></li>
@@ -684,7 +684,7 @@ function register_html(){
         <li rev="usr_tab_perms">data access</li>
         <li rev="usr_tab_api_key" class="only_regular">API key</li>
         <!-- li rev="usr_tab_clmns">entries table</li -->
-        <li rev="usr_tab_absolidix" class="only_regular only_mpds">my data</li>
+        <!-- li rev="usr_tab_absolidix" class="only_regular only_mpds">my data</li -->
         <li rev="usr_tab_ctrl" style="display:none;" class="admin">management</li>
     </ul>
 

src_js/router.js

@@ -124,8 +124,8 @@ function url__entry(arg){
     request_search({'entry': arg}, 'entry ' + arg, true);
     wmgui.search = {}; // mockup to reset previous properties
     wmgui.passive_sim_col = true;
-    //$('#search_field-selectized').val('');
-    //wmgui.multiselects['main'].clear();
+    $('#search_field-selectized').val('');
+    wmgui.multiselects['main'].clear();
     show_interpretation();
 }
 
@@ -134,8 +134,10 @@ function url__entry(arg){
  */
 function url__phase_id(arg){
     wmgui.search_type = 0;
-    //$('#search_field-selectized').val('');
-    //wmgui.multiselects['main'].clear();
+    if (!wmgui.ptable.visible){
+        $('#search_field-selectized').val('');
+        wmgui.multiselects['main'].clear();
+    }
     show_interpretation();
     var phid = parseInt(arg);
     wmgui.search = {'phid': phid};
@@ -176,6 +178,8 @@ function url__phase(arg){
  */
 function url__article(arg){
     wmgui.search_type = 0;
+    $('#search_field-selectized').val('');
+    wmgui.multiselects['main'].clear();
     show_interpretation();
     var bentry = parseInt(arg);
     wmgui.search = {'bid': bentry};

src_js/wmsettings.js

@@ -201,7 +201,7 @@ wmgui.editions = {
         }
     },
     15: {
-        'name': 'Ermac on Ab Solidix',
+        'name': 'Ermac on Absolidix',
         'prod_url': 'https://ermac.absolidix.com',
         'dev_url': 'http://localhost:5560',
         'actions': function(){

webassets/ermac.css

@@ -182,7 +182,7 @@ th.a5.header, th.a5.headerSortUp, th.a5.headerSortDown{background-position:80% c
 td.a5{font-size:0.9em;letter-spacing:-1px;font-style:italic;}
 
 div.context_msg{display:none;width:70%;margin:0 auto;padding-top:10px;color:#555;font-size:1.25em;text-align:center;}
-#toomuch{margin-bottom:40px;}
+#toomuch{margin-bottom:50px;}
 #loadscroll{margin-bottom:100px;}
 #plthint{margin:0 auto 120px;}
 #plthint > span{display:block;width:100%;margin-bottom:45px;font-size:1.15em;}