Merge pull request #7608 from colemanw/CRM-16353

CRM-16353 - Warn not to use deprecated function

diff --git a/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl
deleted file mode 100644 (file)
index 6cc7c4d..0000000
--- a/CRM/Upgrade/Incremental/sql/4.7.0.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 4.7.0 during upgrade *}

diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
new file mode 100644 (file)
index 0000000..3e96b2d
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.7.beta8.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 4.7.beta8 during upgrade *}

diff --git a/i/EnvelopeIn.gif b/i/EnvelopeIn.gif
deleted file mode 100644 (file)
index 36d47c0..0000000
Binary files a/i/EnvelopeIn.gif and /dev/null differ

diff --git a/i/applications-internet.png b/i/applications-internet.png
deleted file mode 100644 (file)
index d4bfb82..0000000
Binary files a/i/applications-internet.png and /dev/null differ

diff --git a/i/arrow.gif b/i/arrow.gif
deleted file mode 100644 (file)
index 82433b8..0000000
Binary files a/i/arrow.gif and /dev/null differ

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 9918c6e71c8181f0619cfd2875a3b2bdf6b48a56..4021e7bb0bc0f77f0291745ae28460d660dc7744 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.0',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.beta8',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/templates/CRM/Campaign/Form/ResultOptions.tpl b/templates/CRM/Campaign/Form/ResultOptions.tpl
index 2451609654eb401bbcb1280d72b59070cd8e8a7f..404ab0de30e853eb7445d12d6eae12c6df49716b 100644 (file)
--- a/templates/CRM/Campaign/Form/ResultOptions.tpl
+++ b/templates/CRM/Campaign/Form/ResultOptions.tpl
@@ -59,7 +59,7 @@
   <tr id="optionField_{$index}" class="form-item {cycle values="odd-row,even-row"}">
         <td>
         {if $index GT 1}
-            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}hide field or section{/ts}"/></a>
+            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><i class="crm-i fa-trash" title="{ts}hide field or section{/ts}"></i></a>
         {/if}
         </td>
       <td>
@@ -76,7 +76,7 @@
     {/section}
     </table>
   <div id="optionFieldLink" class="add-remove-link">
-        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}show field or section{/ts}"/>{ts}another choice{/ts}</a>
+        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><i class="crm-i fa-plus-circle"></i> {ts}add another choice{/ts}</a>
     </div>
   <span id="additionalOption" class="description">
     {ts}If you need additional options - you can add them after you Save your current entries.{/ts}

diff --git a/templates/CRM/Custom/Form/Optionfields.tpl b/templates/CRM/Custom/Form/Optionfields.tpl
index 4778499acfa24d824c8683f929923671c4b3ef2f..40d76d9603fee1939a84a51ceccad29c9c79e169 100644 (file)
--- a/templates/CRM/Custom/Form/Optionfields.tpl
+++ b/templates/CRM/Custom/Form/Optionfields.tpl
@@ -58,7 +58,7 @@
   <tr id="optionField_{$index}" class="form-item {cycle values="odd-row,even-row"}">
         <td>
         {if $index GT 1}
-            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}hide field or section{/ts}"/></a>
+            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><i class="crm-i fa-trash" title="{ts}hide field or section{/ts}"></i></a>
         {/if}
         </td>
       <td>
@@ -77,7 +77,7 @@
     {/section}
     </table>
   <div id="optionFieldLink" class="add-remove-link">
-        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}show field or section{/ts}"/>{ts}another choice{/ts}</a>
+        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><i class="crm-i fa-plus-circle"></i> {ts}add another choice{/ts}</a>
     </div>
   <span id="additionalOption" class="description">
     {ts}If you need additional options - you can add them after you Save your current entries.{/ts}

diff --git a/templates/CRM/Price/Form/OptionFields.tpl b/templates/CRM/Price/Form/OptionFields.tpl
index e0db489595b0fcecd65add69e6e9508c9091ad40..118b4ed0f9d2ab3b95f7c4397638cf706c06372b 100644 (file)
--- a/templates/CRM/Price/Form/OptionFields.tpl
+++ b/templates/CRM/Price/Form/OptionFields.tpl
@@ -56,7 +56,7 @@
   <tr id="optionField_{$index}" class="form-item {cycle values="odd-row,even-row"}">
         <td>
         {if $index GT 1}
-            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><img src="{$config->resourceBase}i/TreeMinus.gif" class="action-icon" alt="{ts}hide field or section{/ts}"/></a>
+            <a onclick="showHideRow({$index}); return false;" name="optionField_{$index}" href="#" class="form-link"><i class="crm-i fa-trash" title="{ts}hide field or section{/ts}"></i></a>
         {/if}
         </td>
       <td>
@@ -85,7 +85,7 @@
     {/section}
     </table>
   <div id="optionFieldLink" class="add-remove-link">
-        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><img src="{$config->resourceBase}i/TreePlus.gif" class="action-icon" alt="{ts}show field or section{/ts}"/>{ts}another choice{/ts}</a>
+        <a onclick="showHideRow(); return false;" name="optionFieldLink" href="#" class="form-link"><i class="crm-i fa-plus-circle"></i> {ts}add another choice{/ts}</a>
     </div>
   <div id="additionalOption" class="description">
     {ts}If you need additional options - you can add them after you Save your current entries.{/ts}

diff --git a/xml/version.xml b/xml/version.xml
index 7cc895fe154b8988bcb1e368c9f53a6b803dc682..712000627a69efde463d3927772236d714b356a2 100644 (file)
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>4.7.0</version_no>
+  <version_no>4.7.beta8</version_no>
 </version>