andre 5 сар өмнө
parent
commit
b69ee5bd97

+ 3 - 2
app/UI/Client/Setting/Forms/EditSettingForm.php

@@ -8,6 +8,7 @@ use ThurData\Servers\KerioEmail\App\UI\Client\Setting\Providers\EditSettingDataP
 use ThurData\Servers\KerioEmail\Core\UI\Interfaces\ClientArea;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Hidden;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Text;
+use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\Fields\Switcher;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\BaseForm;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Forms\FormConstants;
 use ThurData\Servers\KerioEmail\Core\UI\Widget\Buttons\ButtonCustomAction;
@@ -103,8 +104,8 @@ class EditSettingForm extends BaseForm implements ClientArea
         $field->setName('editdkim');
         $this->addField($field);
 
-        $button = new ButtonModal('setDefaults');
-        $this->addButton($button);
+        $defaults = new Switcher('setDefaults');
+        $this->addButton($defaults);
 //        $this->addButton($button);
         //  todo: additional section containing Kerio Domain settings like AD integration
 //        $this->addSection(new EditGeneralSection());

+ 0 - 63
templates/client/default/ui/core/default/widget/modals/editSettingModal.tpl

@@ -1,63 +0,0 @@
-{**********************************************************************
-* KerioEmail product developed. (2017-11-16)
-* *
-*
-*  CREATED BY THURDATA       ->       http://thurdata.com
-*  CONTACT                        ->       contact@thurdata.com
-*
-*
-* This software is furnished under a license and may be used and copied
-* only  in  accordance  with  the  terms  of such  license and with the
-* inclusion of the above copyright notice.  This software  or any other
-* copies thereof may not be provided or otherwise made available to any
-* other person.  No title to and  ownership of the  software is  hereby
-* transferred.
-*
-*
-**********************************************************************}
-
-{**
-* @autor ThurData <info@thurdata.ch>
-*}
-Blubb
-<div class="lu-modal show lu-modal--{$rawObject->getModalSize()}" id="confirmationModal" namespace="{$rawObject->getNamespace()}" index="{$rawObject->getId()}">
-    <div class="lu-modal__dialog">
-        <div class="lu-modal__content" id="mgModalContainer">
-            <div class="lu-modal__top lu-top">
-                <div class="lu-top__title lu-type-6">
-                    <span class="lu-text-faded lu-font-weight-normal">
-                        {if $rawObject->isRawTitle()}{$rawObject->getRawTitle()}{elseif $rawObject->getTitle()}{$MGLANG->T('modal', $rawObject->getTitle())}{/if}
-                    </span>
-                </div>
-                <div class="lu-top__toolbar">
-                    <button class="lu-btn lu-btn--xs lu-btn--default lu-btn--icon lu-btn--link lu-btn--plain closeModal" data-dismiss="lu-modal" aria-label="Close" @click='closeModal($event)'>
-                        <i class="lu-btn__icon lu-zmdi lu-zmdi-close"></i>
-                    </button>
-                </div>
-            </div>
-            <div class="lu-modal__body">
-                <div class="lu-row">
-                    <div class="lu-col-md-12">
-                        {foreach from=$rawObject->getForms() item=form }
-                            {$form->getHtml()}
-                        {/foreach}
-                    </div>
-                </div>
-            </div>
-            <div class="lu-modal__actions">
-                {foreach from=$rawObject->getActionButtons() item=actionButton}
-                    {$actionButton->getHtml()}
-                {/foreach} 
-            </div>
-            {if ($isDebug eq true AND (count($MGLANG->getMissingLangs()) != 0))}{literal}
-                <div class="lu-modal__actions">
-                    <div class="lu-row">
-                        {/literal}{foreach from=$MGLANG->getMissingLangs() key=varible item=value}{literal}
-                            <div class="lu-col-md-12"><b>{/literal}{$varible}{literal}</b> = '{/literal}{$value}{literal}';</div>
-                        {/literal}{/foreach}{literal}
-                    </div>
-                </div>
-            {/literal}{/if}
-        </div>
-    </div>
-</div>