Adjust ReSpec template and logic for OS stage (#51)

oasis-tcs · Jun 3, 2021 · 9727d3f · 9727d3f
1 parent a63533f
commit 9727d3f
Show file tree

Hide file tree

Showing 8 changed files with 9,628 additions and 24 deletions.
diff --git a/builds/respec-oasis-common-2.1.25.js b/builds/respec-oasis-common-2.1.25.js
diff --git a/builds/respec-oasis-common.js b/builds/respec-oasis-common.js
diff --git a/examples/template-spec.html b/examples/template-spec.html
@@ -14,7 +14,6 @@
         //        PSD     Project Specification Draft
         //        PSPRD   Project Specification Public Review Draft
         //        PS      Project Specification
-        //        COS     Candidate OASIS Standard
         //        OS      OASIS Standard
         //        Errata  Approved Errata
         //        PND     Project Note Draft

diff --git a/js/biblio.js b/js/biblio.js
@@ -42,7 +42,6 @@ define(
         ,   "WD":       "Working Draft"
         ,   "PSD":      "Project Specification Draft"
         ,   "PS":       "Project Specification"
-        ,   "COS":      "Candidate OASIS Standard"
         ,   "OS":       "OASIS Standard"
         ,   "Errata":   "Approved Errata"
         ,   "PND":      "Project Note Draft"

diff --git a/js/headers.js b/js/headers.js
@@ -131,7 +131,6 @@ define(
                 WD:             "WD"
             ,   PSD:            "PSD"
             ,   PS:             "PS"
-            ,   COS:            "COS"
             ,   OS:             "OS"
             ,   Errata:         "Errata"
             ,   PND:            "PND"
@@ -141,7 +140,6 @@ define(
                 WD:             "oasis:WD",
                 PSD:            "oasis:PSD",
                 PS:             "oasis:PS",
-                COS:            "oasis:COS",
                 OS:             "oasis:OS",
                 Errata:         "oasis:Errata",
                 PND:            "oasis:PND",
@@ -151,14 +149,13 @@ define(
                     WD:             "Working Draft"
                 ,   PSD:            "Project Specification Draft"
                 ,   PS:             "Project Specification"
-                ,   COS:            "Candidate OASIS Standard"
                 ,   OS:             "OASIS Standard"
                 ,   Errata:         "Approved Errata"
                 ,   PND:            "Project Note Draft"
                 ,   PN:             "Project Note"
                 ,   PRD:            "Public Review Draft"
             }
-        ,   stdTrackStatus: ["WD", "PSD", "PS", "COS", "OS", "Errata"]
+        ,   stdTrackStatus: ["WD", "PSD", "PS", "OS", "Errata"]
         ,   noTrackStatus:  ["PND", "PN"]
         ,   unPublished:    ["WD"]
 
@@ -231,7 +228,6 @@ define(
                 conf.isWD = (conf.specStatus === "WD");
                 conf.isPSD = (conf.specStatus === "PSD");
                 conf.isPS = (conf.specStatus === "PS");
-                conf.isCOS = (conf.specStatus === "COS");
                 conf.isOS = (conf.specStatus === "OS");
                 conf.isAE = (conf.specStatus === "Errata");
 
@@ -241,7 +237,7 @@ define(
                 conf.notYetStd = (conf.isStdTrack && conf.specStatus !== "OS");
                 conf.isStd = (conf.isStdTrack && conf.specStatus === "OS");
                 conf.notStd = (conf.specStatus !== "OS");
-                conf.prependOASIS = true;
+                conf.prependOASIS = true; //always show logo
 
                 // Derive specification URIs
                 if (!conf.thisVersion) {
@@ -326,8 +322,12 @@ define(
                         }
                     }
                 }
-                conf.docStatus = conf.textStatus + " " + conf.revision;
 
+                if (!conf.isStd) {
+                conf.docStatus = conf.textStatus + " " + conf.revision;
+                } else {
+                conf.docStatus = conf.textStatus;
+                }
                 if (conf.previousMaturity) {
                    conf.previousDocStatus = this.status2text[conf.previousMaturity];
                    if (conf.previousPublishDate) {

diff --git a/js/templates/headers.html b/js/templates/headers.html
@@ -180,7 +180,7 @@ <h2>
     <span class='citationTitle'>{{title}}</span>.
     Edited by {{editorsHTML}}.
     {{publishHumanDate}}.
-    {{#if prependOASIS}}OASIS {{/if}} {{textStatus}} {{revision}}.
+    {{#unless isStd}}OASIS {{/unless}} {{textStatus}}{{#unless isStd}} {{revision}}{{/unless}}.
     {{#if thisVersion}} <a class='u-url' href='{{thisVersion}}'>{{thisVersion}}</a>.{{/if}}
     {{#if latestVersion}} Latest stage: <a href='{{latestVersion}}'>{{latestVersion}}</a>.{{/if}}
     </p>

diff --git a/js/templates/sotd.html b/js/templates/sotd.html
@@ -15,7 +15,7 @@
     {{{sotdCustomParagraph}}}
   {{else}}
     <p>
-      This document was last revised or approved by the <a href='{{wgURI}}'>{{wg}}</a> on the above date.
+      This document was last revised or approved by the {{#if isStd}}membership of OASIS{{else}}<a href='{{wgURI}}'>{{wg}}</a>{{/if}} on the above date.
       The level of approval is also listed above.
       Check the “Latest stage” location noted above for possible later revisions of this document.
       Any other numbered Versions and other technical work produced by the Open Project are listed at

diff --git a/tools/package-oasis.json b/tools/package-oasis.json
@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "2.1.24",
+  "version": "2.1.25",
   "description": "Specification Edition Support Tool (OASIS Profile).",
   "main": "index.js",
   "directories": {