From 6b42c689d422ecf8aebf9d8915ddbd6ef466fa44 Mon Sep 17 00:00:00 2001 From: Martii Date: Sun, 15 Jun 2014 22:39:11 -0600 Subject: [PATCH 1/4] Fix support for `@homepage` and upmix to `@homepageURL` for symmetry * Controller insertion for multiple values... this is useful since one homepage might be here on OUJS and another might be on GH... nice to know * Upmix `@homepage` to `@homepageURL` for future support of `@supportURL` from Scriptish * Rewrite affected views/pages/scriptPage.html to accomodate list... original source was missing `href` attribute value. Tested okay in dev environment [here](http://localhost:8080/scripts/marti/httplocalhost.localdomain/RFC_2606%C2%A73_-_license_and_licence_Unit_Test) --- controllers/script.js | 12 ++++++++++++ controllers/scriptStorage.js | 7 +++++-- views/pages/scriptPage.html | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/controllers/script.js b/controllers/script.js index 5d66b92b2..cb739a897 100644 --- a/controllers/script.js +++ b/controllers/script.js @@ -88,6 +88,18 @@ var getScriptPageTasks = function(options) { options.script.meta.licenses = [{ name: 'MIT License (Expat)' }]; } + // Show homepages of the script + if (script.meta.homepageURL) { + if (typeof script.meta.homepageURL === 'string') { + options.script.meta.homepages = [{ name: script.meta.homepageURL }]; + } else { + options.script.meta.homepages = []; + script.meta.homepageURL.forEach(function (homepage) { + options.script.meta.homepages.push({ name: homepage }); + }); + } + } + // Show the groups the script belongs to tasks.push(function (callback) { script.hasGroups = false; diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js index c9f2a3273..df305e7b5 100644 --- a/controllers/scriptStorage.js +++ b/controllers/scriptStorage.js @@ -120,8 +120,11 @@ function parseMeta(aString) { name = lineMatches[1]; value = lineMatches[2]; switch (name) { - case "licence": - name = "license"; + case 'licence': + name = 'license'; + break; + case 'homepage': + name = 'homepageURL'; break; } if (!headers[name] || unique[name]) { diff --git a/views/pages/scriptPage.html b/views/pages/scriptPage.html index c4ea529a5..b9ff9d017 100644 --- a/views/pages/scriptPage.html +++ b/views/pages/scriptPage.html @@ -35,7 +35,7 @@ {{/script.hasGroups}} - {{#script.meta.homepage}}

Homepage: {{script.meta.homepage}}

{{/script.meta.homepage}} + {{#script.meta.homepages}}

Homepage: {{name}}

{{/script.meta.homepages}} {{#script.meta.copyright}}

Copyright: {{script.meta.copyright}}

{{/script.meta.copyright}} {{#script.meta.licenses}}

License: {{name}}

{{/script.meta.licenses}} {{#script.meta.collaborators}}

Collaborator: {{name}}

{{/script.meta.collaborators}} From 7adbce2568c89e476817627352671edc9b90fd29 Mon Sep 17 00:00:00 2001 From: Martii Date: Sun, 15 Jun 2014 23:40:06 -0600 Subject: [PATCH 2/4] Condense collaborator list to styling from discussion pages Applies to #174 --- views/pages/scriptPage.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/pages/scriptPage.html b/views/pages/scriptPage.html index b9ff9d017..9167367d3 100644 --- a/views/pages/scriptPage.html +++ b/views/pages/scriptPage.html @@ -38,7 +38,9 @@ {{#script.meta.homepages}}

Homepage: {{name}}

{{/script.meta.homepages}} {{#script.meta.copyright}}

Copyright: {{script.meta.copyright}}

{{/script.meta.copyright}} {{#script.meta.licenses}}

License: {{name}}

{{/script.meta.licenses}} - {{#script.meta.collaborators}}

Collaborator: {{name}}

{{/script.meta.collaborators}} + {{#hasCollab}} +

Collaborator: {{#script.meta.collaborators}} {{name}} {{/script.meta.collaborators}}

+ {{/hasCollab}} {{#script.fork}}

Fork History: