Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This works with Znuny 7.0.x, too. #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

This works with Znuny 7.0.x, too. #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30773ce
This works with Znuny 6.5.x, too.
Feb 28, 2024
5f8e6b5
Migrated to Znuny 7.0.x
Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 47 additions & 16 deletions Kernel/Output/HTML/Templates/Standard/AdminMultiSMTPForm.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
# --

<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
<h1>[% Translate("SMTP Management") | html %]</h1>
<div class="SidebarColumn">
<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst ActionsSideBar">
<div class="SidebarColumn ActionsSideBarComp">
<div class="WidgetSimple">
<div class="Header">
<h2>[% Translate("Actions") | html %]</h2>
Expand All @@ -24,6 +23,27 @@
</div>

<div class="ContentColumn">
<h1 class="InvisibleText">[% Translate("SMTP Management") | html %]</h1>

[% BreadcrumbPath = [
{
Name => Translate("SMTP Management"),
Link => Env("Action"),
},
]
%]

[% SWITCH Data.Action %]
[% CASE 'Add' %]
[% BreadcrumbPath.push({ Name => Translate('Add'),}) %]
[% CASE 'Change' %]
[% USE EditTitle = String(Translate("Edit")) %]
[% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %]
[% END %]

[% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]


<div class="WidgetSimple">
<div class="Header">
<h2>[% Translate("Add/Change SMTP") | html %]</h2>
Expand All @@ -43,6 +63,7 @@
<input type="checkbox" id="Anonymous" name="Anonymous" value="1" [% Data.AnonymousChecked %]/>
</div>

<div class="field-wrapper">
<label for="Host" class="Mandatory">
<span class="Marker">*</span>
[% Translate("Host") | html %]:
Expand All @@ -52,8 +73,9 @@
<div id="HostError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
<div id="HostServerError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="Port" class="Mandatory">
<span class="Marker">*</span>
[% Translate("Port") | html %]:
Expand All @@ -63,8 +85,9 @@
<div id="PortError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
<div id="PortServerError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="User" id="UserLabel" class="Mandatory">
<span id="UserMarker" class="Marker">*</span>
[% Translate("User") | html %]:
Expand All @@ -74,35 +97,39 @@
<div id="UserError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
<div id="UserServerError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="PasswordDecrypted" id="PasswordLabel">
[% Translate("Password") | html %]:
</label>
<div class="Field">
<input type="password" id="PasswordDecrypted" name="PasswordDecrypted" value="[% Data.PasswordDecrypted | html %]" class="W75pc [% Data.PasswordInvalid | html %]" maxlength="120"/>
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="AuthenticationType" id="AuthenticationTypeLabel" class="Mandatory">
<span id="UserMarker" class="Marker">*</span>
[% Translate("Authentication Type") | html %]:
</label>
<div class="Field">
[% Data.AuthenticationTypeSelect %]
</div>
<div class="Clear"></div>
</div>


<div class="field-wrapper">
<label for="OAuth2Name" id="OAuth2NameLabel">
[% Translate("OAuth2 Name") | html %]:
</label>
<div class="Field">
<input type="text" id="OAuth2Name" name="OAuth2Name" value="[% Data.OAuth2Name | html %]" class="W75pc" maxlength="120"/>
</div>
<div class="Clear"></div>
</div>


<div class="field-wrapper">
<label for="Emails" class="Mandatory">
<span class="Marker">*</span>
[% Translate("Emails") | html %]:
Expand All @@ -112,8 +139,9 @@
<div id="UserError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
<div id="UserServerError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="Type" class="Mandatory">
<span class="Marker">*</span>
[% Translate("Type") | html %]:
Expand All @@ -123,32 +151,35 @@
<div id="UserError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
<div id="UserServerError" class="TooltipErrorMessage"><p>[% Translate("This field is required.") | html %]</p></div>
</div>
<div class="Clear"></div>
</div>


<div class="field-wrapper">
<label for="ValidID" class="Mandatory">
<span class="Marker">*</span>
[% Translate("Validity") | html %]:
</label>
<div class="Field">
[% Data.ValidSelect %]
</div>
<div class="Clear"></div>
</div>

<div class="field-wrapper">
<label for="Comments">
[% Translate("Comment") | html %]:
</label>
<div class="Field">
<input type="text" id="Comments" name="Comments" value="[% Data.Comments | html %]" class="W75pc" maxlength="250"/>
</div>
<div class="Clear"></div>
</div>


<div class="Field">
<button class="Primary CallForAction" type="submit" value="[% Translate("Save") | html %]"><span>[% Translate("Save") | html %]</span></button>
<div class="field-wrapper form-button-actions">
<div class="Field buttons-field">
<button class="Primary CallForActionbtn-primary btn-main btn-width-md" type="submit" value="[% Translate("Save") | html %]"><span>[% Translate("Save") | html %]</span></button>
[% Translate("or") | html %]
<a href="[% Env("Baselink") %]Action=[% Env("Action") %]">[% Translate("Cancel") | html %]</a>
</div>
</div></div>
<div class="Clear"></div>
</fieldset>
</form>
Expand Down
26 changes: 23 additions & 3 deletions Kernel/Output/HTML/Templates/Standard/AdminMultiSMTPList.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
# did not receive this file, see http://www.gnu.org/licenses/agpl.txt.
# --

<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst">
<h1>[% Translate("SMTP Management") | html %]</h1>
<div class="SidebarColumn">
<div class="MainBox ARIARoleMain LayoutFixedSidebar SidebarFirst ActionsSideBar ActionsSideBar">
<div class="SidebarColumn ActionsSideBarComp ActionsSideBarComp">
<div class="WidgetSimple">
<div class="Header">
<h2>[% Translate("Actions") | html %]</h2>
Expand All @@ -27,6 +26,27 @@
</div>

<div class="ContentColumn">
<h1 class="InvisibleText">[% Translate("SMTP Management") | html %]</h1>

[% BreadcrumbPath = [
{
Name => Translate("SMTP Management"),
Link => Env("Action"),
},
]
%]

[% SWITCH Data.Action %]
[% CASE 'Add' %]
[% BreadcrumbPath.push({ Name => Translate('Add'),}) %]
[% CASE 'Change' %]
[% USE EditTitle = String(Translate("Edit")) %]
[% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %]
[% END %]

[% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]


<div class="WidgetSimple">
<div class="Header">
<h2>[% Translate("List") | html %]</h2>
Expand Down
4 changes: 3 additions & 1 deletion MultiSMTP.sopm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
<otrs_package version="1.0">
<!-- GENERATED WITH OPM::Maker::Command::sopm (1.1.0) -->
<Name>MultiSMTP</Name>
<Version>6.3.2</Version>
<Version>6.3.4</Version>
<Framework>6.3.x</Framework>
<Framework>6.4.x</Framework>
<Framework>6.5.x</Framework>
<Framework>7.0.x</Framework>
<Vendor>Perl-Services.de</Vendor>
<URL>https://www.perl-services.de</URL>
<Description Lang="de">Ein Modul, mit dem man mehrere SMTP-Server für Znuny nutzen kann.</Description>
Expand Down
6 changes: 4 additions & 2 deletions doc/MultiSMTP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"name": "MultiSMTP",
"version": "6.3.2",
"version": "6.3.4",
"framework": [
"6.3.x",
"6.4.x"
"6.4.x",
"6.5.x",
"7.0.x"
],
"vendor": {
"name": "Perl-Services.de",
Expand Down