Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-2515:Phone Home Metric:prevent parent window refreshing

Browse source 
- fixed.
This commit is contained in:
james 2011-07-06 11:32:57 -04:00
parent e69c0ea351
commit acf5dbd6df
6 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/forms/RegisterAirtime.php
View file

@ -139,7 +139,7 @@ class Application_Form_RegisterAirtime extends Zend_Form
// checkbox for privacy policy // checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"\">privacy policy</a>.") $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.")
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy); $this->addElement($checkboxPrivacy);
} }

2
airtime_mvc/application/forms/SupportPreferences.php
View file

@ -131,7 +131,7 @@ class Application_Form_SupportPreferences extends Zend_Form_SubForm
// checkbox for privacy policy // checkbox for privacy policy
$checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy"); $checkboxPrivacy = new Zend_Form_Element_Checkbox("Privacy");
$checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"\">privacy policy</a>.") $checkboxPrivacy->setLabel("By checking this box, I agree to Sourcefabric's <a id=\"link_to_privacy\" href=\"http://www.sourcefabric.org/en/about/policy/\" onclick=\"window.open(this.href); return false;\">privacy policy</a>.")
->setDecorators(array('ViewHelper')); ->setDecorators(array('ViewHelper'));
$this->addElement($checkboxPrivacy); $this->addElement($checkboxPrivacy);
} }

3
airtime_mvc/application/views/scripts/form/preferences_support.phtml
View file

@ -16,7 +16,8 @@
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dd id="publicize-element" style="width:90%;"> <dd id="publicize-element" style="width:90%;">
<div class="info-text">Click the box below to advertise your station on <a id="link_to_whos_using" href="">Sourcefabric.org</a>. <div class="info-text">Click the box below to advertise your station on
<a id="link_to_whos_using" href="http://sourcefabric.org/en/products/airtime_whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.</div> In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.</div>
<label class="optional" for="Publicise"> <label class="optional" for="Publicise">
<?php echo $this->element->getElement('Publicise') ?> <?php echo $this->element->getElement('Publicise') ?>

4
airtime_mvc/application/views/scripts/form/register-dialog.phtml
View file

@ -20,7 +20,9 @@
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt class="block-display info-text"> <dt class="block-display info-text">
Click the box below to advertise your station on <a id="link_to_whos_using" href="">Sourcefabric.org</a>. In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback. Click the box below to advertise your station on
<a id="link_to_whos_using" href="http://sourcefabric.org/en/products/airtime_whosusing" onclick="window.open(this.href); return false">Sourcefabric.org</a>.
In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback.
</dt> </dt>
<dd id="publicize-element" class="block-display"> <dd id="publicize-element" class="block-display">
<label class="optional" for="Publicise"> <label class="optional" for="Publicise">

8
airtime_mvc/public/js/airtime/nowplaying/register.js
View file

@ -91,14 +91,6 @@ $(document).ready(function(){
button.attr('disabled', 'disabled' ).addClass('ui-state-disabled'); button.attr('disabled', 'disabled' ).addClass('ui-state-disabled');
} }
$("#link_to_whos_using").live('click', function(){
window.open("http://sourcefabric.org/en/products/airtime_whosusing");
});
$("#link_to_privacy").live('click', function(){
window.open("http://www.sourcefabric.org/en/about/policy/");
});
$('.toggle legend').live('click',function() { $('.toggle legend').live('click',function() {
$('.toggle').toggleClass('closed'); $('.toggle').toggleClass('closed');
return false; return false;

4
airtime_mvc/public/js/airtime/preferences/preferences.js
View file

@ -72,10 +72,6 @@ $(document).ready(function() {
showErrorSections(); showErrorSections();
$("#link_to_privacy").live('click', function(){
window.open("http://www.sourcefabric.org/en/about/policy/");
});
$('.toggle legend').click(function() { $('.toggle legend').click(function() {
$('.toggle').toggleClass('closed'); $('.toggle').toggleClass('closed');
return false; return false;