Index: branches/release-35/tmpl/cms/edit_template.tmpl
===================================================================
--- branches/release-35/tmpl/cms/edit_template.tmpl (revision 1903)
+++ branches/release-35/tmpl/cms/edit_template.tmpl (revision 1925)
@@ -366,4 +366,6 @@
 }
 function savedArchiveMapChange(c) {
+    TC.removeClassName(TC.elementOrId("create-map"), "hidden");
+    TC.addClassName(TC.elementOrId("loading-styles"), "hidden");
     var res = c.responseText;
     if (res == '') 
@@ -407,4 +409,6 @@
 function addMap() {
     getByID('create-inline-mapping').style.display = 'none';
+    TC.addClassName(TC.elementOrId("create-map"), "hidden");
+    TC.removeClassName(TC.elementOrId("loading-styles"), "hidden");
     var f = document.forms['template-listing-form'];
     var frm = document.forms['archive_map_form'];
@@ -415,5 +419,10 @@
         + '&new_archive_type=' + f['new_archive_type'].value
         + '&magic_token=<mt:var name="magic_token">';
-    saveArchiveMapChange(param);
+    var client = TC.Client.call({
+        'load': savedArchiveMapChange,
+        'uri': '<mt:var name="script_url">',
+        'method': 'POST',
+        'arguments': param
+    });
 }
 
@@ -600,5 +609,8 @@
         hint=""
         show_hint="0">
-        <p><a href="javascript:void(0)" onclick="return setCreateMode()" class="icon-left icon-create"><__trans phrase="Create Archive Mapping"></a></p>
+        <span class="hidden" id="loading-styles">
+            <img src="/mt-static/images/indicator.white.gif" height="16" width="16" alt="" />
+        </span>
+        <div id="create-map"><p><a href="javascript:void(0)" onclick="return setCreateMode()" class="icon-left icon-create"><__trans phrase="Create Archive Mapping"></a></p></div>
         <div id="msg-block"></div>
         <div class="create-inline" id="create-inline-mapping">