Merge pull request #207 from Martii/fixMissingDefLic

Fix missing default script `@license`

**NOTE** Need this merged now since working on one of these files for a pr. Auto-merging

Author: Marti Martz

controllers/script.js

@@ -89,7 +89,7 @@ var getScriptPageTasks = function (options) {
       });
     }
   } else if (!script.isLib) {
-    options.script.meta.licenses = [{ name: 'MIT License (Expat)' }];
+    options.script.licenses = [{ name: 'MIT License (Expat)' }];
   }
 
   // Show homepages of the script

views/pages/newScriptPage.html

@@ -26,28 +26,36 @@ <h3>OpenUserJS.org Specific</h3>
           <div class="list-group script-metadata-definitions">
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@author {{#authedUser}}{{authedUser.name}}{{/authedUser}}{{^authedUser}}username{{/authedUser}}</code></h4>
-              <p class="list-group-item-text">The author of the script. Required for <a href="#collaboration">Collaboration</a>. Only the author may edit.</p>
+              <p class="list-group-item-text">The author of the script. Required for <a href="#collaboration">Collaboration</a>. Only the author may edit. Last value shown.</p>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@collaborator username</code></h4>
-              <p class="list-group-item-text">Can be defined multiple times. Required for <a href="#collaboration">Collaboration</a>.</p>
+              <p class="list-group-item-text">Can be defined multiple times. Required for <a href="#collaboration">Collaboration</a>. All values shown</p>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@description This script even does the laundry!</code></h4>
-              <p class="list-group-item-text">Specially formatted on the script page.</p>
+              <p class="list-group-item-text">Specially formatted on the script page. Last value shown.</p>
             </div>
 
             <div class="list-group-item active">
-              <h4 class="list-group-item-heading"><code>@copyright Year, Author (Author Homepage)</code></h4>
-              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40copyright">Wiki Link</a>] Specially formatted on the script page.</p>
+              <h4 class="list-group-item-heading"><code>@copyright Year, Author (Author Website)</code></h4>
+              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40copyright">Wiki Link</a>] Specially formatted on the script page. All values shown.</p>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@icon url</code></h4>
-              <p class="list-group-item-text">A url or data url. Used in the script list page at 16px and on the script page at ~45px.</p>
+              <p class="list-group-item-text">A url or data url. Resolution should be near 48px by 48px, Used in the script list page at 16px and on the script page at ~45px. Last value is shown.</p>
             </div>
             <div class="list-group-item active">
               <h4 class="list-group-item-heading"><code>@license License Type; License Homepage</code></h4>
-              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40license">Wiki Link</a>] Specially formatted on the script page.</p>
+              <p class="list-group-item-text">[<a href="https://sf.net/apps/mediawiki/greasemonkey/index.php?title=Metadata_Block#.40license">Wiki Link</a>] Specially formatted on the script page. All values shown. If absent MIT License (Expat) is implied.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@homepageURL url</code></h4>
+              <p class="list-group-item-text">A url of http, https or mailto protocol. Specially formatted on the script page. All values shown.</p>
+            </div>
+            <div class="list-group-item active">
+              <h4 class="list-group-item-heading"><code>@supportURL url</code></h4>
+              <p class="list-group-item-text">A url of http, https or mailto protocol. Specially formatted on the script page. Last value shown.</p>
             </div>
           </div>