[#1019] Created a standard naming for all common manifest options. Fixed labeling on all.

plugins/attribution/popcorn.attribution.js

@@ -144,13 +144,13 @@
     options:{
       start: {
        elem: "input",
-       type: "text",
+       type: "number",
-       label: "In"
+       label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       nameofwork: {
         elem: "input",
@@ -160,7 +160,7 @@
       nameofworkurl: {
         elem: "input",
         type: "url",
-        label: "Url of Work",
+        label: "URL of Work",
         optional: true
       },
       copyrightholder: {
@@ -171,17 +171,17 @@
       copyrightholderurl: {
         elem: "input",
         type: "url",
-        label: "Copyright Holder Url",
+        label: "Copyright Holder URL",
         optional: true
       },
       license: {
         elem: "input",
         type: "text",
-        label: "License type"
+        label: "License Type"
        },
       licenseurl: {
         elem: "input",
-        type: "url",
+        type: "text",
         label: "License URL",
         optional: true
       },

plugins/code/popcorn.code.js

@@ -155,13 +155,13 @@
     options: {
       start: {
        elem: "input",
-       type: "text",
+       type: "number",
-       label: "In"
+       label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       onStart: {
         elem: "input",

plugins/documentcloud/popcorn.documentcloud.js

@@ -39,13 +39,13 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc
       options: {
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         target: "documentcloud-container",
         width: {
@@ -62,7 +62,7 @@ api - https://github.com/documentcloud/document-viewer/blob/master/public/javasc
         },
         src: {
           elem: "input",
-          type: "text",
+          type: "url",
           label: "PDF URL",
           "default": "http://www.documentcloud.org/documents/70050-urbina-day-1-in-progress.html"
         },

plugins/facebook/popcorn.facebook.js

@@ -60,24 +60,24 @@
         type: {
           elem: "select",
           options: [ "LIKE", "LIKE-BOX", "ACTIVITY", "FACEPILE", "LIVE-STREAM", "SEND", "COMMENTS" ],
-          label: "Type"
+          label: "Plugin Type"
         },
         target: "facebook-container",
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         // optional parameters:
         font: {
           elem: "input",
           type: "text",
-          label: "font",
+          label: "Font",
           optional: true
         },
         xid: {
@@ -89,7 +89,7 @@
         href: {
           elem: "input",
           type: "url",
-          label: "Href",
+          label: "href",
           optional: true
         },
         site: {
@@ -141,32 +141,32 @@
         max_rows: {
           elem: "input",
           type: "number",
-          label: "Max_rows",
+          label: "Max Rows",
           "default": 1,
           optional: true
         },
         border_color: {
           elem: "input",
           type: "text",
-          label: "Border_color",
+          label: "Border Color",
           optional: true
         },
         event_app_id: {
           elem: "input",
           type: "text",
-          label: "Event_app_id",
+          label: "Event App Id",
           optional: true
         },
         colorscheme: {
           elem: "select",
           options: [ "light", "dark" ],
-          label: "Colorscheme",
+          label: "Color Scheme",
           optional: true
         },
         show_faces: {
           elem: "input",
           type: "checkbox",
-          label: "Showfaces",
+          label: "Show Faces",
           "default": false,
           optional: true
         },
@@ -180,14 +180,14 @@
         always_post_to_friends: {
           elem: "input",
           type: "checkbox",
-          label: "Always_post_to_friends",
+          label: "Always post to Friends",
           "default": false,
           optional: true
         },
         num_posts: {
           elem: "input",
           type: "number",
-          label: "Number_of_Comments",
+          label: "Number of Comments",
           "default": 1,
           optional: true
         }

plugins/flickr/popcorn.flickr.js

@@ -176,13 +176,13 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       userid: {
         elem: "input",
@@ -204,7 +204,7 @@
       apikey: {
         elem: "input",
         type: "text",
-        label: "Api_key",
+        label: "API Key",
         optional: true
       },
       target: "flickr-container",

plugins/footnote/popcorn.footnote.js

@@ -36,13 +36,13 @@
       options: {
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         text: {
           elem: "input",

plugins/gml/popcorn.gml.js

@@ -153,13 +153,13 @@
       options: {
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         gmltag: {
           elem: "input",

plugins/googlefeed/popcorn.googlefeed.js

@@ -155,32 +155,32 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target: "feed-container",
       url: {
         elem: "input",
         type: "url",
-        label: "url",
+        label: "Feed URL",
         "default": "http://planet.mozilla.org/rss20.xml"
       },
       title: {
         elem: "input",
         type: "text",
-        label: "title",
+        label: "Title",
         "default": "Planet Mozilla",
         optional: true
       },
       orientation: {
         elem: "select",
         options: [ "Vertical", "Horizontal" ],
-        label: "orientation",
+        label: "Orientation",
         "default": "Vertical",
         optional: true
       }

plugins/googlemap/popcorn.googlemap.js

@@ -395,19 +395,19 @@ var googleCallback;
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "start",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "start",
-        label: "Out"
+        label: "End"
       },
       target: "map-container",
       type: {
         elem: "select",
         options: [ "ROADMAP", "SATELLITE", "STREETVIEW", "HYBRID", "TERRAIN", "STAMEN-WATERCOLOR", "STAMEN-TERRAIN", "STAMEN-TONER" ],
-        label: "Type",
+        label: "Map Type",
         optional: true
       },
       zoom: {

plugins/image/popcorn.image.js

@@ -92,31 +92,32 @@
           start: {
             elem: "input",
             type: "number",
-            label: "In"
+            label: "Start"
           },
           end: {
             elem: "input",
             type: "number",
-            label: "Out"
+            label: "End"
+          },
+          src: {
+            elem: "input",
+            type: "url",
+            label: "Image URL",
+            "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png"
           },
           href: {
             elem: "input",
             type: "url",
-            label: "anchor URL",
+            label: "Link",
             "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png",
             optional: true
           },
           target: "image-container",
-          src: {
-            elem: "input",
-            type: "url",
-            label: "Source URL",
-            "default": "http://mozillapopcorn.org/wp-content/themes/popcorn/images/for_developers.png"
-          },
           text: {
             elem: "input",
             type: "text",
-            label: "Text",
+            label: "Caption",
+            "default": "Popcorn.js",
             optional: true
           }
         }

plugins/lastfm/popcorn.lastfm.js

@@ -119,13 +119,13 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target: "lastfm-container",
       artist: {

plugins/linkedin/popcorn.linkedin.js

@@ -54,7 +54,7 @@
         },
         url: {
           elem: "input",
-          type: "text",
+          type: "url",
           label: "URL"
         },
         apikey: {
@@ -94,24 +94,24 @@
         productid: {
           elem: "input",
           type: "text",
-          label: "productid",
+          label: "Product Id",
           optional: true
         },
         related: {
           elem: "input",
           type: "text",
-          label: "related",
+          label: "Related",
           optional: true
         },
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
 
         target: "linkedin-container"

plugins/lowerthird/popcorn.lowerthird.js

@@ -41,32 +41,32 @@
         options:{
           start: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "In"
+            label: "Start"
           },
           end: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "Out"
+            label: "End"
           },
           target: "lowerthird-container",
           salutation : {
             elem: "input",
             type: "text",
-            label: "Text",
+            label: "Salutation",
             "default": "hello",
             optional: true
           },
           name: {
             elem: "input",
             type: "text",
-            label: "Text",
+            label: "Name",
             "default": "Popcorn.js"
           },
           role: {
             elem: "input",
             type: "text",
-            label: "Text",
+            label: "Role",
             "default": "JavaScript library",
             optional: true
           }

plugins/mediaspawner/popcorn.mediaspawner.js

@@ -64,12 +64,12 @@
         target: "mediaspawner-container",
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
           label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
           label: "End"
         },
         autoplay: {

plugins/mustache/popcorn.mustache.js

@@ -179,13 +179,13 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target: "mustache-container",
       template: {

plugins/openmap/popcorn.openmap.js

@@ -341,19 +341,19 @@
     options:{
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target: "map-container",
       type: {
         elem: "select",
         options: [ "ROADMAP", "SATELLITE", "TERRAIN" ],
-        label: "Type",
+        label: "Map Type",
         optional: true
       },
       zoom: {

plugins/processing/popcorn.processing.js

@@ -134,19 +134,15 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "Number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "Number",
-        label: "Out"
+        label: "End"
-      },
-      target: {
-        elem: "input",
-        type: "text",
-        label: "Target"
       },
+      target: "processing-container",
       sketch: {
         elem: "input",
         type: "url",

plugins/rdio/popcorn.rdio.js

@@ -131,15 +131,15 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
-      target: "rdio",
+      target: "rdio-container",
       artist: {
         elem: "input",
         type: "text",

plugins/subtitle/popcorn.subtitle.js

@@ -71,12 +71,12 @@
           start: {
             elem: "input",
             type: "text",
-            label: "In"
+            label: "Start"
           },
           end: {
             elem: "input",
             type: "text",
-            label: "Out"
+            label: "End"
           },
           target: "subtitle-container",
           text: {

plugins/tagthisperson/popcorn.tagthisperson.js

@@ -106,31 +106,31 @@
     options:{
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target : "tagthisperson-container",
       person: {
         elem: "input",
         type: "text",
-        label: "Name",
+        label: "Person's Name",
         "default": "Popcorn.js"
       },
       image: {
         elem: "input",
         type: "url",
-        label: "Image Src",
+        label: "Image URL",
         optional: true
       },
       href: {
         elem: "input",
         type: "url",
-        label: "URL",
+        label: "Link",
         optional: true
       }
     }

plugins/text/popcorn.text.js

@@ -129,13 +129,13 @@
       options: {
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         text: {
           elem: "input",

plugins/timeline/popcorn.timeline.js

@@ -109,35 +109,35 @@
     options: {
       start: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "In"
+        label: "Start"
       },
       end: {
         elem: "input",
-        type: "text",
+        type: "number",
-        label: "Out"
+        label: "End"
       },
       target: "feed-container",
       title: {
         elem: "input",
         type: "text",
-        label: "title"
+        label: "Title"
       },
       text: {
         elem: "input",
         type: "text",
-        label: "text"
+        label: "Text"
       },
       innerHTML: {
         elem: "input",
         type: "text",
-        label: "innerHTML",
+        label: "HTML Code",
         optional: true
       },
       direction: {
         elem: "select",
         options: [ "DOWN", "UP" ],
-        label: "direction",
+        label: "Direction",
         optional: true
       }
     }

plugins/tumblr/popcorn.tumblr.js

@@ -247,42 +247,42 @@
         requestType: {
           elem: "select",
           options:[ "INFO", "AVATAR", "BLOGPOST" ],
-          label: "Type_Of_Plugin"
+          label: "Request Type"
         },
         target: "tumblr-container",
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Start_Time"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "End_Time"
+          label: "End"
         },
         base_hostname: {
           elem: "input",
           type: "text",
-          label: "User_Name",
+          label: "User Name",
           "default": "https://citriccomics.tumblr.com"
         },
         // optional parameters:
         api_key: { // Required for Blog Info and Blog Post retrievals
           elem: "input",
           type: "text",
-          label: "Application_Key",
+          label: "API key",
           optional: true
         },
         size: {
           elem: "select",
           options: [ 16, 24, 30, 40, 48, 64, 96, 128, 512 ],
-          label: "avatarSize",
+          label: "Avatar Size",
           optional: true
         },
         blogId: { // Required for BLOGPOST requests
           elem: "input",
           type: "number",
-          label: "Blog_ID",
+          label: "Blog Id",
           optional: true
         },
         /* Optional for Photo and Video BlogPosts, defaulted to 250 pixels for photos and 400 for videos if not provided or provided width
@@ -291,8 +291,8 @@
         */
         width: {
           elem: "input",
-          type: "number",
+          type: "text",
-          label: "Photo_Width",
+          label: "Photo Width",
           optional: true
         }
       }

plugins/twitter/popcorn.twitter.js

@@ -43,18 +43,18 @@
         options:{
           start: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "In"
+            label: "Start"
           },
           end: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "Out"
+            label: "End"
           },
           src: {
             elem: "input",
             type: "text",
-            label: "Source",
+            label: "Tweet Source (# or @)",
             "default": "@popcornjs"
           },
           target: "twitter-container",

plugins/webpage/popcorn.webpage.js

@@ -43,18 +43,18 @@
         },
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         src: {
           elem: "input",
           type: "url",
-          label: "Src",
+          label: "Webpage URL",
           "default": "http://mozillapopcorn.org"
         },
         target: "iframe-container"

plugins/wikipedia/popcorn.wikipedia.js

@@ -43,13 +43,13 @@ var wikiCallback;
       options:{
         start: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "In"
+          label: "Start"
         },
         end: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Out"
+          label: "End"
         },
         lang: {
           elem: "input",
@@ -61,7 +61,7 @@ var wikiCallback;
         src: {
           elem: "input", 
           type: "url", 
-          label: "Src",
+          label: "Wikipedia URL",
           "default": "http://en.wikipedia.org/wiki/Cat"
         },
         title: {
@@ -73,8 +73,8 @@ var wikiCallback;
         },
         numberofwords: {
           elem: "input",
-          type: "text",
+          type: "number",
-          label: "Num Of Words",
+          label: "Number of Words",
           "default": "200",
           optional: true
         },

plugins/wordriver/popcorn.wordriver.js

@@ -71,13 +71,13 @@
         options: {
           start: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "In"
+            label: "Start"
           },
           end: {
             elem: "input",
-            type: "text",
+            type: "number",
-            label: "Out"
+            label: "End"
           },
           target: "wordriver-container",
           text: {