Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41

[civicrm-core.git] / templates / CRM / Admin / Form / Setting / UpdateConfigBackend.tpl

diff --git a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
index 126b7ea904faf67ee5a4212e69d8f248c0a434da..25148c4164822e37b5c29a125114087b8aa8f352 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
+++ b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl
@@ -26,47 +26,24 @@
 <div class="crm-block crm-form-block crm-config-backend-form-block">
 <div id="help">
     <p>
-    {ts}Use this form if you need to reset the Base Directory Path and Base URL settings for your CiviCRM installation. These settings are stored in the database, and generally need adjusting after moving a CiviCRM installation to another location in the file system and/or to another URL.{/ts}</p>
+    {ts}When migrating a site to a new server, the paths and URLs of your CiviCRM installation may change. {/ts}
+    </p>
     <p>
-    {ts}CiviCRM will attempt to detect the new values that should be used. These are provided below as the default values for the <strong>New Base Directory</strong> and <strong>New Base URL</strong> fields.{/ts}</p>
+    {capture assign="pathsURL"}{crmURL p="civicrm/admin/setting/path" q="reset=1"}{/capture}
+    {capture assign="urlsURL"}{crmURL p="civicrm/admin/setting/url" q="reset=1"}{/capture}
+    {ts 1=$pathsURL 2=$urlsURL}The old paths and URLs may be retained in some database records. Use this form to clear caches or to reset paths to their defaults. If you need further customizations, then update the <a href="%1">Directories</a> and <a href="%2">Resource URLs</a>.{/ts}
+    </p>
 </div>
         <div>
           <span class="crm-button crm-icon-button">
             <span class="crm-button-icon ui-icon-trash"> </span>
             {$form._qf_UpdateConfigBackend_next_cleanup.html}
           </span>
+          <span class="crm-button crm-icon-button">
+            <span class="crm-button-icon ui-icon-trash"> </span>
+            {$form._qf_UpdateConfigBackend_next_resetpaths.html}
+          </span>
         </div>
-        <table>
-            <tr class="crm-config-backend-form-block-oldBaseDir">
-                <td class="label">{ts}Old Base Directory{/ts}</td>
-                <td>{$oldBaseDir}</td>
-            </tr>
-            <tr class="crm-config-backend-form-block-newBaseDir">
-                <td class="label">{$form.newBaseDir.label}</td>
-                <td>{$form.newBaseDir.html|crmAddClass:'huge'}<br />
-                <span class="description">{ts}For Drupal and WordPress installs, this is the absolute path to the location of the 'files' directory. For Joomla installs this is the absolute path to the location of the 'media' directory.{/ts}</span></td>
-            </tr>
-            <tr class="crm-config-backend-form-block-oldBaseURL">
-                <td class="label">{ts}Old Base URL{/ts}</td>
-                <td>{$oldBaseURL}</td>
-            </tr>
-            <tr class="crm-config-backend-form-block-newBaseURL">
-                <td class="label">{$form.newBaseURL.label}</td>
-                <td>{$form.newBaseURL.html|crmAddClass:'huge'}<br />
-                <span class="description">{ts}This is the URL for your Drupal, Joomla or WordPress site (e.g. http://www.mysite.com/drupal/).{/ts}</span></td>
-            </tr>
-{if $oldSiteName}
-            <tr class="crm-config-backend-form-block-oldSiteName">
-                <td class="label">{ts}Old Site Name{/ts}</td>
-                <td>{$oldSiteName}</td>
-            </tr>
-            <tr class="crm-config-backend-form-block-newSiteName">
-                <td class="label">{$form.newSiteName.label}</td>
-                <td>{$form.newSiteName.html|crmAddClass:'huge'}<br />
-                <span class="description">{ts}This is the your site name for a multisite install.{/ts}</span></td>
-            </tr>
-{/if}
-        </table>
         <div>{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 <div class="spacer"></div>
 </div>