add html mark format correctly, output copyright only if not cc-0

Author: possumbilities

src/index.html

@@ -351,7 +351,7 @@ <h3>Mark Your Work</h3>
                 <p>If you are licensing or marking one work, paste the code next to it. If you are licensing or marking the whole page or blog, you can paste the code at the bottom of the page.</p>
 
                 <article>
-                    <details class="format">
+                    <details class="format" name="website" open>
                     <summary>Rich Text</summary>
 
                         <p class="rich-text mark">[contextually formatted mark here]</p>
@@ -367,7 +367,7 @@ <h3>Mark Your Work</h3>
                 </article>
 
                 <article>
-                    <details class="format">
+                    <details class="format" name="website">
                     <summary>HTML</summary>
 
                         <textarea class="html mark" readonly="true">[contextually formatted mark here]</textarea>
@@ -390,7 +390,7 @@ <h3>Mark Your Work</h3>
                 <p>Copy the text below and paste it on the title and/or copyright page of your print work or presentation, or in the credits of your media.</p>
 
                 <article>
-                <details class="format" open>
+                <details class="format" name="print" open>
                     <summary>Plain Text</summary>
 
                         <p class="plain-text mark">[contextually formatted mark here]</p>
@@ -804,7 +804,7 @@ <h4>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</
 </template>
 
 <template id="plain-text" class="mark">
-    <p>{{title}} © {{year}} by {{creator}} is {{typeAsVerb}} {{toolName}}. To view a copy of this {{type}}, visit {{toolURL}}</p>
+    <p>{{title}} {{copyright}} by {{creator}} is {{typeAsVerb}} {{toolName}}. To view a copy of this {{type}}, visit {{toolURL}}</p>
 </template>
 
 </body>

src/scripts.js

@@ -265,9 +265,11 @@ function renderMarkingFormats(state) {
 
     let type = "license";
     let typeAsVerb = "licensed under";
+    let copyright = ' © ' + attribution.workCreationYear;
     if (state.props.tool == 'cc-0') {
         type = "mark";
         typeAsVerb = "marked";
+        copyright = '';
     }
 
     // set contents of plain text mark
@@ -290,6 +292,7 @@ function renderMarkingFormats(state) {
     markProps.toolShort = state.props.toolShort;
     markProps.toolLong = state.props.toolLong;
     markProps.toolURL = state.props.toolURL;
+    markProps.copyright = copyright;
 
     // set contents of plain text mark
     plainTextFullName = document.querySelector('#plain-text-full-name').checked;
@@ -352,7 +355,7 @@ function renderMarkingFormats(state) {
         markProps.toolName = state.props.toolShort;
     }
 
-    let richTextMark = attribution.title + ' © ' + attribution.workCreationYear + ' by ' + attribution.creator + ' is ' + typeAsVerb  + ' ' + '<a href="' + state.props.toolURL + '">' + markProps.toolName + '</a>' + ccIconSet;
+    let richTextMark = '<a href="' + attribution.workLink + '">' + attribution.title + '</a>' + copyright + ' by ' + '<a href="' + attribution.creatorLink + '">' + attribution.creator + '</a>' + ' is ' + typeAsVerb  + ' ' + '<a href="' + state.props.toolURL + '">' + markProps.toolName + '</a>' + ccIconSet;
     document.querySelector('#mark-your-work .rich-text.mark').innerHTML = richTextMark;
 
 
@@ -365,8 +368,8 @@ function renderMarkingFormats(state) {
     } else {
         markProps.toolName = state.props.toolShort;
     }
-    defaultHTML = '<p xmlns:cc="http://creativecommons.org/ns#">This work is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="license noopener noreferrer">CC BY-SA 4.0<img src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt=""><img src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt=""><img src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt=""></a></p>';
-    let htmlMark = defaultHTML;
+    //defaultHTML = '<p xmlns:cc="http://creativecommons.org/ns#">This work is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/" target="_blank" rel="license noopener noreferrer">CC BY-SA 4.0<img src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt=""><img src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt=""><img src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt=""></a></p>';
+    let htmlMark = '<a href="' + attribution.workLink + '">' + attribution.title + '</a>' + copyright + ' by ' + '<a href="' + attribution.creatorLink + '">' + attribution.creator + '</a>' + ' is ' + typeAsVerb  + ' ' + '<a href="' + state.props.toolURL + '">' + markProps.toolName + '</a>' + ccIconSet;
     document.querySelector('#mark-your-work .html.mark').innerHTML = htmlMark;
 }