Merge pull request #1142 from Tealk/secure-mail

[securemail] template adapted to standard
This commit is contained in:
Hypolite Petovan 2021-06-30 21:22:20 -04:00 committed by GitHub
commit bcda4f3c15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 24 deletions

View file

@ -77,7 +77,7 @@ function securemail_settings_post(App &$a, array &$b)
$enable = (!empty($_POST['securemail-enable']) ? 1 : 0); $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) { if ($_POST['securemail-submit'] == 'test' {
$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl())); $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));

View file

@ -1,26 +1,16 @@
{{* We organize the settings in collapsable panel-groups *}} <span id="settings_securemail_inflated" class="settings-block fakelink" style="display: block" onclick="openClose('settings_securemail_expanded'); openClose('settings_securemail_inflated');">
{{* this div should be in frio theme *}} <h3>{{$title}}</h3>
<div class="panel-group panel-group-settings" id="securemail" role="tablist" aria-multiselectable="true"> </span>
{{* The password setting section *}} <div id="settings_securemail_expanded" class="settings-block" style="display: none">
<div class="panel"> <span class="fakelink" onclick="openClose('settings_securemail_expanded'); openClose('settings_securemail_inflated');"><h3>{{$title}}</h3></span>
<div class="section-subtitle-wrapper" role="tab" id="securemail-settings"> <div id="securemail-wrapper">
<h4> {{include file="field_checkbox.tpl" field=$enable}}
<a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#securemail-settings-collapse" aria-expanded="true" aria-controls="securemail-settings-collapse"> {{include file="field_textarea.tpl" field=$publickey}}
{{$title}}
</a>
</h4>
</div>
<div id="securemail-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="securemail-settings">
<div class="section-content-tools-wrapper">
{{include file="field_checkbox.tpl" field=$enable}}
{{include file="field_textarea.tpl" field=$publickey}}
<div class="form-group pull-right settings-submit-wrapper" > <div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button> <button type="submit" name="securemail-submit" class="btn btn-primary" value="submit">{{$submit}}</button>
<button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button> <button type="submit" name="securemail-submit" class="btn btn-default" value="test">{{$test}}</button>
</div>
<div class="clear"></div>
</div>
</div>
</div> </div>
<div class="clear"></div>
</div>
</div> </div>