settings page: removed "enable image cache"-checkbox

- also increased size of url field
This commit is contained in:
Niko Bochan 2015-02-13 13:44:21 +01:00
parent 1c6690351e
commit 2824cc3c18
2 changed files with 1 additions and 8 deletions

View File

@ -13,7 +13,6 @@ class CRM_Admin_Form_Setting_ProxySettings extends CRM_Admin_Form_Setting
// add all required elements // add all required elements
$this->addElement('checkbox','proxy_enabled'); $this->addElement('checkbox','proxy_enabled');
$this->addElement('checkbox','image_cache_enabled');
$this->addElement('text', 'proxy_url', ts('Proxy URL')); $this->addElement('text', 'proxy_url', ts('Proxy URL'));
$this->addButtons(array( $this->addButtons(array(
@ -30,7 +29,6 @@ class CRM_Admin_Form_Setting_ProxySettings extends CRM_Admin_Form_Setting
function preProcess() { function preProcess() {
$this->assign('proxy_enabled', CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'proxy_enabled')); $this->assign('proxy_enabled', CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'proxy_enabled'));
$this->assign('image_cache_enabled', CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'image_cache_enabled'));
$this->setDefaults(array( $this->setDefaults(array(
'proxy_url' => CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'proxy_url'), 'proxy_url' => CRM_Core_BAO_Setting::getItem('CiviProxy Settings', 'proxy_url'),
)); ));
@ -42,7 +40,6 @@ class CRM_Admin_Form_Setting_ProxySettings extends CRM_Admin_Form_Setting
// checkboxes // checkboxes
CRM_Core_BAO_Setting::setItem(!empty($values['proxy_enabled']),'CiviProxy Settings', 'proxy_enabled'); CRM_Core_BAO_Setting::setItem(!empty($values['proxy_enabled']),'CiviProxy Settings', 'proxy_enabled');
CRM_Core_BAO_Setting::setItem(!empty($values['image_cache_enabled']),'CiviProxy Settings', 'image_cache_enabled');
// text // text
if ($values['proxy_url']){ if ($values['proxy_url']){

View File

@ -8,10 +8,6 @@
<td class="label"><label for="proxy_enabled"> {ts}Enable proxy{/ts} <a onclick='CRM.help("{ts}Enable Proxy{/ts}", {literal}{"id":"id-proxy-enabled","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></label></td> <td class="label"><label for="proxy_enabled"> {ts}Enable proxy{/ts} <a onclick='CRM.help("{ts}Enable Proxy{/ts}", {literal}{"id":"id-proxy-enabled","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></label></td>
<td><input value="1" type="checkbox" id="proxy_enabled" name="proxy_enabled" {if $proxy_enabled}checked="checked"{/if} class="form-checkbox"/></td> <td><input value="1" type="checkbox" id="proxy_enabled" name="proxy_enabled" {if $proxy_enabled}checked="checked"{/if} class="form-checkbox"/></td>
</tr> </tr>
<tr>
<td class="label"><label for="image_cache_enabled"> {ts}Enable image cache{/ts} <a onclick='CRM.help("{ts}Enable Image Cache{/ts}", {literal}{"id":"id-image-cache-enabled","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></label></td>
<td><input value="1" type="checkbox" id="image_cache_enabled" name="image_cache_enabled" {if $image_cache_enabled}checked="checked"{/if} class="form-checkbox"/></td>
</tr>
<tr> <tr>
<td class="label">{$form.proxy_url.label} <a onclick='CRM.help("{ts}Proxy URL{/ts}", {literal}{"id":"id-proxy-url","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></td> <td class="label">{$form.proxy_url.label} <a onclick='CRM.help("{ts}Proxy URL{/ts}", {literal}{"id":"id-proxy-url","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></td>
<td>{$form.proxy_url.html}</td> <td>{$form.proxy_url.html}</td>
@ -32,7 +28,7 @@
<style type="text/css"> <style type="text/css">
#proxy_url { #proxy_url {
width: 220px; width: 300px;
} }
</style> </style>
{/literal} {/literal}