[js][s]: Merge pulled files out of sync. Restoring url slug editor.

ckan/public/scripts/application.js

@@ -125,9 +125,15 @@ CKAN.Utils = function($, my) {
     var titleInput = $('.js-title');
     var urlText = $('.js-url-text');
     var urlSuffix = $('.js-url-suffix');
-    var urlInput = $('.js-url-slug-editor');
+    var urlInput = $('.js-url-input');
     var validMsg = $('.js-url-is-valid');
 
+    if (titleInput.length==0) throw "No titleInput found.";
+    if (urlText.length==0) throw "No urlText found.";
+    if (urlSuffix.length==0) throw "No urlSuffix found.";
+    if (urlInput.length==0) throw "No urlInput found.";
+    if (validMsg.length==0) throw "No validMsg found.";
+
     var api_url = '/api/2/util/is_slug_valid';
     // (make length less than max, in case we need a few for '_' chars to de-clash slugs.)
     var MAX_SLUG_LENGTH = 90;

ckan/templates/group/new_group_form.html

@@ -20,7 +20,7 @@ <h2>Errors in form</h2>
     <dt><label class="field_opt" for="title">Url</label></dt>
     <dd class="name-field">
       <span class="js-url-text url-text">${g.site_url+h.url_for(controller='group',id=None)+'/'}<span class="js-url-viewmode js-url-suffix">&nbsp;</span><a style="display: none;" href="#" class="url-edit js-url-editlink js-url-viewmode">(edit)</a></span>
-      <input style="display: none;" id="name" maxlength="100" name="name" type="text" class="url-slug-editor js-url-editmode js-url-slug-editor" value="${data.get('name', '')}" />
+      <input style="display: none;" id="name" maxlength="100" name="name" type="text" class="url-slug-editor js-url-editmode js-url-input" value="${data.get('name', '')}" />
       <p class="js-url-is-valid">&nbsp;</p>
     </dd>
     <dd style="display: none;" class="js-url-editmode instructions basic">2+ chars, lowercase, using only 'a-z0-9' and '-_'</dd>