Responding to usnistgov#1066: metaschema edits; CSS enhancement (#56)

* Responding to usnistgov#1066: metaschema edits; CSS enhancement * Whitespace cleanup in metadata metaschema * Apply suggestions from code review Co-authored-by: David Waltermire <[email protected]>
david-waltermire · Sep 9, 2022 · 6882d51 · 6882d51
1 parent 58e09d6
commit 6882d51
Show file tree

Hide file tree

Showing 5 changed files with 234 additions and 120 deletions.
diff --git a/src/metaschema/metaschema-author.css b/src/metaschema/metaschema-author.css
@@ -1,4 +1,4 @@
-METASCHEMA { font-family: Georgia, serif }
+METASCHEMA { font-family: Calibri, Verdana, sans-serif }
 
 * { display: block }
 
@@ -10,6 +10,11 @@ METASCHEMA { }
 
 title { }
 
+import:before      
+ { content: 'import module ' oxy_urlChooser(edit, '@href', columns 60) }
+
+
+
 define-assembly,
 define-field,
 define-flag      { margin-top: 1ex; margin-bottom: 1ex; border: thin inset black; padding: 0.5em }
@@ -23,6 +28,15 @@ define-flag:before
  oxy_textfield(edit, '@name', columns, 12) 
     }
 
+root-name:before { content: "Root name: "  }
+
+
+prop:before      
+ { content: 'property '
+ oxy_textfield(edit, '@name', columns, 25)
+ oxy_textfield(edit, '@value', columns, 30) 
+    }
+
 
 define-assembly[group-as]:before,
 define-field[group-as]:before,
@@ -36,12 +50,6 @@ define-flag     *  { margin: 0em }
 
 define-assembly > * { margin-top: 1em }
 
-allowed-values:before { content: "Allowed values" }
-allowed-values { border: thin solid black; padding: 1em }
-
-enum:before  { display: list-item }
-enum:before  { content: "enum" }
-
 pre { padding: 0.5em; background-color: gainsboro }
 
 define-assembly { }
@@ -79,6 +87,8 @@ example *:after { content: '</' oxy_name() '>'; font-family: monospace; font-siz
 
 model { padding-left: 0.5em; border-left: medium solid blue; font-size: 80%; padding-right: 2em }
 
+model model { font-size: 100%; }
+
 flag:before { content:
  oxy_name()
   ' ref: ' oxy_textfield(edit, '@ref', columns, 12) 
@@ -105,10 +115,45 @@ prose:before { font-weight: bold; content:
 
 choice > * { margin-left: 2em }
 
-enum { display: block; font-size: 90%; padding-left: 1em }
-enum:before { content:  oxy_textfield(edit, '@value', columns, 24); }
-
 a { display: inline; color: blue }
 a:before { content: oxy_urlChooser(        
         edit, "@href",
         columns 42); }
+
+
+/* CONSTRAINTS */
+
+constraint > * { border: thin solid black; padding: 0.6em }
+
+allowed-values:before { content: "Allowed values"
+  ' level: '  oxy_combobox(edit, '@level', editable, false, values, "ERROR, WARNING" ) }
+
+enum { margin-left: 2em; display: list-item;
+       font-size: 90%; padding-left: 1em }
+enum:before { content: oxy_textfield(edit, '@value', columns, 24); }
+
+index { }
+index:before {  content: "Index: "
+  ' name: ' oxy_textfield(edit, '@name', columns, 24)
+  ' target: ' oxy_textfield(edit, '@target', columns, 52)
+  ' level: '  oxy_combobox(edit, '@level', editable, false, values, "ERROR, WARNING" ); }
+
+key-field { margin-left: 2em }
+key-field:before {  content: "Key field "
+  ' target: ' oxy_textfield(edit, '@target', columns, 52)
+  ' level: '  oxy_combobox(edit, '@level', editable, false, values, "ERROR, WARNING" ); }
+
+expect { }
+expect:before  {  content: "Expect "
+  ' target: ' oxy_textfield(edit, '@target', columns, 52)
+  ' test: '   oxy_textfield(edit, '@test', columns, 36)
+  ' level: '  oxy_combobox(edit, '@level', editable, false, values, "ERROR, WARNING" ); }
+
+index-has-key { }
+
+index-has-key:before { content: "Index has key: "
+  ' name: ' oxy_textfield(edit, '@name', columns, 24)
+  ' target: ' oxy_textfield(edit, '@target', columns, 52)
+  ' level: '  oxy_combobox(edit, '@level', editable, false, values, "ERROR, WARNING" ); }
+
+