marc
/
CiviProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor changes

This commit is contained in:
systopia 2015-02-18 14:24:49 +01:00
parent cdd44a1c30
commit ab4fad568f
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.hlp
View File

@ -1,7 +1,6 @@
{htxt id='id-proxy-enabled'} {htxt id='id-proxy-enabled'}
<p> <p>
{ts}Enable CiviProxy{/ts} {ts}Activating CiviProxy will cause all resource URLs (images, URL trackers, mail open tracers, etc.) to point to the proxy.{/ts}
{ts}This will cause all resource URLs (images, URL trackers, mail open tracers, etc.) to point to the proxy.{/ts}
</p> </p>
{/htxt} {/htxt}
@ -13,7 +12,7 @@
{htxt id='id-proxy-version'} {htxt id='id-proxy-version'}
<p> <p>
{ts}TODO #1{/ts} {ts}This is the CiviProxy version as reported by the installation at the given URL.{/ts}
</p> </p>
{/htxt} {/htxt}

12
de.systopia.civiproxy/templates/CRM/Admin/Form/Setting/ProxySettings.tpl
View File

@ -1,27 +1,28 @@
<div class="crm-block crm-form-block"> <div class="crm-block crm-form-block">
<div> <div>
<h3>{ts}Core Settings{/ts}</h3> <h3>{ts}Basic Settings{/ts}</h3>
<div> <div>
<div> <div>
<table id="core_settings" class="no-border"> <table id="core_settings" class="no-border">
<tr> <tr>
<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}CiviProxy enabled{/ts}&nbsp;<a onclick='CRM.help("{ts}CiviProxy enabled{/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> <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}&nbsp;<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>
</tr> </tr>
<tr> <tr>
<td class="label">{$form.proxy_version.label} <a onclick='CRM.help("{ts}Proxy Version{/ts}", {literal}{"id":"id-proxy-version","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></td> <td class="label">{$form.proxy_version.label}&nbsp;<a onclick='CRM.help("{ts}Proxy Version{/ts}", {literal}{"id":"id-proxy-version","file":"CRM\/Admin\/Form\/Setting\/ProxySettings"}{/literal}); return false;' href="#" title="{ts}Help{/ts}" class="helpicon">&nbsp;</a></td>
<td>{$form.proxy_version.html}</td> <td>{$form.proxy_version.html}</td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
{* ==== advanced settings disabled ========
<div> <div>
<h3>{ts}Component Settings{/ts}</h3> <h3>{ts}Advanced Settings{/ts}</h3>
<div> <div>
<div> <div>
<table id="component_settings" class="no-border"> <table id="component_settings" class="no-border">
@ -33,6 +34,7 @@
</div> </div>
</div> </div>
</div> </div>
==== advanced settings disabled ======== *}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div> <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div> </div>

5
proxy/config.php
View File

@ -11,8 +11,11 @@
/**************************************************************** /****************************************************************
** URLS ** ** URLS **
****************************************************************/ ****************************************************************/
$target_civicrm = 'https://crmtest.muslimehelfen.org'; // this should point to the base address of the CiviProxy installation
$proxy_base = 'https://ssl.webpack.de/wp11230065.server-he.de'; $proxy_base = 'https://ssl.webpack.de/wp11230065.server-he.de';
// this should point to the target CiviCRM system
$target_civicrm = 'https://crmtest.muslimehelfen.org';
//$proxy_base = 'http://localhost:8888/proxy'; //$proxy_base = 'http://localhost:8888/proxy';