nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Hide relay options when upstream bridges are used

Browse Source 
Move upstream bridge options above relay options.
This commit is contained in:
James Valleroy 2016-09-12 08:26:22 -04:00 committed by Sunil Mohan Adapa
parent 5483d30151
commit 4eaff44b49
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plinth/modules/tor/forms.py
View File

@ -80,6 +80,22 @@ class TorForm(forms.Form): # pylint: disable=W0232
enabled = forms.BooleanField( enabled = forms.BooleanField(
label=_('Enable Tor'), label=_('Enable Tor'),
required=False) required=False)
use_upstream_bridges = forms.BooleanField(
label=_('Use upstream bridges to connect to Tor network'),
required=False,
help_text=_('When enabled, the bridges configured below will be used '
'to connect to the Tor network. This will disable relay '
'modes. Only use this option if you cannot connect to '
'the Tor network directly.'))
upstream_bridges = TrimmedCharField(
widget=widgets.Textarea,
label=_('Upstream bridges'),
required=False,
help_text=_('If you need to use a bridge to connect to Tor network, '
'you can get some bridges from '
'https://bridges.torproject.org/ and paste the bridge '
'information here.'),
validators=[bridges_validator])
relay_enabled = forms.BooleanField( relay_enabled = forms.BooleanField(
label=_('Enable Tor relay'), label=_('Enable Tor relay'),
required=False, required=False,
@ -111,19 +127,3 @@ class TorForm(forms.Form): # pylint: disable=W0232
'network for installations and upgrades. This adds a ' 'network for installations and upgrades. This adds a '
'degree of privacy and security during software ' 'degree of privacy and security during software '
'downloads.')) 'downloads.'))
use_upstream_bridges = forms.BooleanField(
label=_('Use upstream bridges to connect to Tor network'),
required=False,
help_text=_('When enabled, the bridges configured below will be used '
'to connect to the Tor network. This will disable relay '
'modes. Use this option only if you cannot connect to '
'the Tor network directly.'))
upstream_bridges = TrimmedCharField(
widget=widgets.Textarea,
label=_('Upstream bridges'),
required=False,
help_text=_('If you need to use a bridge to connect to Tor network, '
'you can get some bridges from '
'https://bridges.torproject.org/ and paste the bridge '
'information here.'),
validators=[bridges_validator])

4
plinth/modules/tor/templates/tor.html
View File

@ -159,10 +159,14 @@
$('label[for="id_tor-upstream_bridges"]').parent().show('slow'); $('label[for="id_tor-upstream_bridges"]').parent().show('slow');
$('#id_tor-relay_enabled').prop('checked', false); $('#id_tor-relay_enabled').prop('checked', false);
$('#id_tor-bridge_relay_enabled').prop('checked', false); $('#id_tor-bridge_relay_enabled').prop('checked', false);
$('#id_tor-relay_enabled').parent().parent().parent().parent().hide('slow');
$('#id_tor-bridge_relay_enabled').parent().parent().parent().parent().hide('slow');
} else { } else {
$('#id_tor-upstream_bridges').hide('slow'); $('#id_tor-upstream_bridges').hide('slow');
$('label[for="id_tor-upstream_bridges"]').hide('slow'); $('label[for="id_tor-upstream_bridges"]').hide('slow');
$('label[for="id_tor-upstream_bridges"]').parent().hide('slow'); $('label[for="id_tor-upstream_bridges"]').parent().hide('slow');
$('#id_tor-relay_enabled').parent().parent().parent().parent().show('slow');
$('#id_tor-bridge_relay_enabled').parent().parent().parent().parent().show('slow');
} }
}).change(); }).change();
})(jQuery); })(jQuery);