Skip to content

Commit b434890

Browse files
Merge pull request #564 from creativecommons/structure-namespaces
alter namespaces, restructure code, amend plaint text markup to pull from `<template>` instead of raw JS
2 parents a7f41b8 + 7951478 commit b434890

File tree

3 files changed

+144
-90
lines changed

3 files changed

+144
-90
lines changed

src/index.html

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h1>Choose a License for Your Work</h1>
9999

100100

101101

102-
<form id="license-chooser">
102+
<form id="chooser">
103103

104104
<ol>
105105

@@ -136,8 +136,8 @@ <h1>Choose a License for Your Work</h1>
136136
<!-- <legend>Choose a License</legend> -->
137137
<legend>Which license do you need?</legend>
138138

139-
<label for="license">License</label>
140-
<select name="license" id="license">
139+
<label for="tool">License</label>
140+
<select name="tool" id="tool">
141141
<option value="noselect" selected>&mdash;choose a license&mdash;</option>
142142
<option value="cc-0">CC0 1.0</option>
143143
<option value="cc-by">CC-BY 4.0</option>
@@ -309,10 +309,10 @@ <h1>Choose a License for Your Work</h1>
309309
<!-- <button>submit</button> -->
310310

311311
<aside>
312-
<div id="license-recommendation">
313-
<h2>Recommended License</h2>
312+
<div id="tool-recommendation">
313+
<h2>Recommended</h2>
314314

315-
<article class="license">
315+
<article class="tool">
316316

317317
<!-- <header>
318318
<h3>CC-BY 4.0</h3>
@@ -476,10 +476,10 @@ <h2>Support Our Work</h2>
476476
<script src="scripts.js"></script>
477477

478478

479-
<template id="cc-0" class="license">
479+
<template id="cc-0" class="tool mark">
480480
<header>
481481
<h3>CC0 1.0</h3>
482-
<span class="license-icons">
482+
<span class="tool-icons">
483483
<svg>
484484
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
485485
</svg>
@@ -502,10 +502,10 @@ <h4>CC0 1.0 Universal</h4>
502502
<a href="https://creativecommons.org/publicdomain/zero/1.0/?ref=chooser-v2">See the License Deed</a>
503503
</template>
504504

505-
<template id="cc-by" class="license">
505+
<template id="cc-by" class="tool license">
506506
<header>
507507
<h3>CC-BY 4.0</h3>
508-
<span class="license-icons">
508+
<span class="tool-icons">
509509
<svg>
510510
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
511511
</svg>
@@ -528,10 +528,10 @@ <h4>Creative Commons Attribution 4.0 International</h4>
528528
<a href="https://creativecommons.org/licenses/by/4.0/?ref=chooser-v2">See the License Deed</a>
529529
</template>
530530

531-
<template id="cc-by-sa" class="license">
531+
<template id="cc-by-sa" class="tool license">
532532
<header>
533533
<h3>CC BY-SA 4.0</h3>
534-
<span class="license-icons">
534+
<span class="tool-icons">
535535
<svg>
536536
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
537537
</svg>
@@ -560,10 +560,10 @@ <h4>Creative Commons Attribution-ShareAlike 4.0 International</h4>
560560
<a href="https://creativecommons.org/licenses/by-sa/4.0/?ref=chooser-v2">See the License Deed</a>
561561
</template>
562562

563-
<template id="cc-by-nd" class="license">
563+
<template id="cc-by-nd" class="tool license">
564564
<header>
565565
<h3>CC BY-ND 4.0</h3>
566-
<span class="license-icons">
566+
<span class="tool-icons">
567567
<svg>
568568
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
569569
</svg>
@@ -592,10 +592,10 @@ <h4>Creative Commons Attribution-NoDerivatives 4.0 International</h4>
592592
<a href="https://creativecommons.org/licenses/by-nd/4.0/?ref=chooser-v2">See the License Deed</a>
593593
</template>
594594

595-
<template id="cc-by-nc" class="license">
595+
<template id="cc-by-nc" class="tool license">
596596
<header>
597597
<h3>CC BY-NC 4.0</h3>
598-
<span class="license-icons">
598+
<span class="tool-icons">
599599
<svg>
600600
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
601601
</svg>
@@ -629,10 +629,10 @@ <h4>Creative Commons Attribution-NonCommercial 4.0 International</h4>
629629
<a href="https://creativecommons.org/licenses/by-nc/4.0/?ref=chooser-v2">See the License Deed</a>
630630
</template>
631631

632-
<template id="cc-by-nc-sa" class="license">
632+
<template id="cc-by-nc-sa" class="tool license">
633633
<header>
634634
<h3>CC BY-NC-SA 4.0</h3>
635-
<span class="license-icons">
635+
<span class="tool-icons">
636636
<svg>
637637
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
638638
</svg>
@@ -670,10 +670,10 @@ <h4>Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International</h4>
670670
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/?ref=chooser-v2">See the License Deed</a>
671671
</template>
672672

673-
<template id="cc-by-nc-nd" class="license">
673+
<template id="cc-by-nc-nd" class="tool license">
674674
<header>
675675
<h3>CC BY-NC-ND 4.0</h3>
676-
<span class="license-icons">
676+
<span class="tool-icons">
677677
<svg>
678678
<use href="vocabulary/svg/cc/icons/cc-icons.svg#cc-logo"></use>
679679
</svg>
@@ -712,7 +712,7 @@ <h4>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</
712712
</template>
713713

714714
<template id="plain-text" class="mark">
715-
<p></p>
715+
<p>{{title}} © {{year}} by {{creator}} is {{typeAsVerb}} {{toolShort}}. To view a copy of this {{type}}, visit {{toolURL}}</p>
716716
</template>
717717

718718
</body>

0 commit comments

Comments
 (0)