Merge branch 'columns'

mpds-io · Jan 29, 2025 · 58caf27 · 58caf27
2 parents 4c9a1d1 + 22e6a4a
commit 58caf27
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src_js/main_logic.js b/src_js/main_logic.js
@@ -818,7 +818,7 @@ function open_context(el, launch_ext){
         } else if (rank == 12){
             $('#pd3d_data, #visualize').show();
         }
-        $('#ctx_col > ul > li.d_icon:visible > a').each(function(){
+        $('#ctx_col > ul > li.d_icon > a').each(function(){
             var fmt = $(this).attr('rel'),
                 link_add = (entype == 'S') ? '&export=1' : '',
                 link_sid = (fmt == 'raw') ? 'null' : wmgui.sid,

diff --git a/src_js/markup.js b/src_js/markup.js
@@ -680,6 +680,7 @@ function register_html(){
         <li rev="usr_tab_account" class="working">account</li>
         <li rev="usr_tab_perms">data access</li>
         <li rev="usr_tab_api_key" class="only_regular">API key</li>
+        <li rev="usr_tab_columns">tables</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>
@@ -738,6 +739,24 @@ function register_html(){
         </div>
     </div>
 
+    <div id="usr_tab_columns" class="menu_tabs" style="display:none;">
+        <div class="cross close_user_dialogue" style="margin-top:25px;"></div>
+        <div style="clear:both;"></div>
+        <div class="divider"></div>
+
+        <div class="columns"><input type="checkbox" checked />&nbsp;<label>Formula</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Anonymous formula</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Prototype</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Distinct phase</label></div>
+        <div class="columns"><input type="checkbox" checked />&nbsp;<label>Property</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Temperature</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Space group</label></div>
+        <div class="columns"><input type="checkbox" />&nbsp;<label>Conditions</label></div>
+        <div class="columns"><input type="checkbox" checked />&nbsp;<label>J. code</label></div>
+        <div class="columns"><input type="checkbox" checked />&nbsp;<label>Year</label></div>
+        <div class="columns"><input type="checkbox" checked />&nbsp;<label>Ref.</label></div>
+    </div>
+
     <div id="usr_tab_absolidix" class="menu_tabs" style="display:none;">
         <br /><br /><br /><br />Redirecting...<br /><br /><br /><br />
     </div>

diff --git a/webassets/ermac.css b/webassets/ermac.css
@@ -227,6 +227,9 @@ div.opened div.gallery_img:after{content:"";position:absolute;top:0;right:0;bott
 
 div.col_title{width:100%;height:40px;font-size:0.9em;letter-spacing:1.5px;text-align:center;line-height:40px;margin-bottom:6px;color:#333;background:#fafafa;overflow:hidden;text-transform:uppercase;}
 div.col_title a{text-decoration:none;color:#000;border-bottom:1px solid #000;}
+div.columns{height:46px;text-align:left;}
+div.columns > input{display:inline-block;width:40px !important;vertical-align:top;}
+div.columns > label{display:inline-block;vertical-align:top;margin-top:4px;}
 
 #ctx_col{display:none;position:fixed;top:62px;left:0;width:13.5%;height:90%;z-index:56;background:#fff;border-top:1px solid #888;}
 #ctx_col > ul{margin:0;padding:0;}