[templates/resource-form][s]: minor tweaks to content and layout.

okfn · Sep 6, 2011 · 91cd53e · 91cd53e
1 parent f1e75e8
commit 91cd53e
Showing 1 changed file with 16 additions and 28 deletions.
diff --git a/lib/template/resource-form.js b/lib/template/resource-form.js
@@ -9,11 +9,24 @@ CKAN.Templates.resourceForm = ' \
       <dd> \
         <input id="Resource--url" name="Resource--url" type="text" value="${url}" placeholder="http://mydataset.com/file.csv" /> \
       </dd> \
+      <dt> \
+        <label class="field_opt" for="Resource--type"> \
+          Kind \
+        </label> \
+      </dt> \
+      <dd> \
+        <select id="Resource--type" name="Resource--type"> \
+          <option selected="selected" value="file">File</option> \
+          <option value="api">API</option> \
+          <option value="listing">Listing</option> \
+          <option value="example">Example</option> \
+        </select> \
+      </dd> \
     </dl> \
  \
   <fieldset> \
     <legend> \
-      <h3>A Bit More Info</h3> \
+      <h3>Optional Info</h3> \
     </legend> \
     <dl> \
       <dt> \
@@ -25,19 +38,6 @@ CKAN.Templates.resourceForm = ' \
         <input id="Resource--description" name="Resource--description" type="text" value="${description}" placeholder="A short description ..."/> \
       </dd> \
  \
-      <dt> \
-        <label class="field_opt" for="Resource--kind"> \
-          Kind \
-        </label> \
-      </dt> \
-      <dd> \
-        <select id="Resource--license_id" name="Resource--license_id"> \
-          <option selected="selected" value="file">File</option> \
-          <option value="api">API</option> \
-          <option value="index">Index</option> \
-          <option value="example">Example</option> \
-        </select> \
-      </dd> \
  \
       <dt> \
         <label class="field_opt" for="Resource--format"> \
@@ -47,19 +47,7 @@ CKAN.Templates.resourceForm = ' \
       <dd> \
         <input id="Resource--format" name="Resource--format" type="text" value="${format}" placeholder="e.g. csv, zip:csv (zipped csv), sparql"/> \
       </dd> \
- \
-      <dt> \
-        <label class="field_opt" for="Resource--license_id"> \
-          Licence \
-        </label> \
-      </dt> \
-      <dd> \
-        <select id="Resource--license_id" name="Resource--license_id"> \
-          <option selected="selected" value=""></option> \
-          <option value="notspecified">Other::License Not Specified</option> \
-        </select> \
-      </dd> \
-  </fieldset> \
+    </fieldset> \
  \
     <div class="submit"> \
       <input id="save" name="save" type="submit" value="Save" /> \
@@ -72,7 +60,7 @@ CKAN.Templates.resourceCreate = ' \
     <table> \
       <tr class="heading"> \
         <td> \
-          <h3>Link to data online (File, API etc)</h3> \
+          <h3>Link to data already online</h3> \
         </td> \
         <td><h3>or</h3></td> \
         <td><h3>Upload data</h3></td> \