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.

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

wizard ui. added link to external user portal #188

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions wizard/app/scripts/controllers/extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ angular.module('nethvoiceWizardUiApp')
$scope.usersFilterNumbersOrd = false;
$scope.view.changeRoute = true;
$scope.usersLimit = 20
$scope.localDomain = "";

$scope.error = {
file: {
Expand Down Expand Up @@ -55,6 +56,7 @@ angular.module('nethvoiceWizardUiApp')
$scope.checkUserProviderStatus = function () {
ConfigService.getConfig().then(function (res) {
$scope.view.changeRoute = false;
$scope.localDomain = res.data.domain;
if (res.data.configured === 0) {
$scope.showConfigSwitch = true;
$location.path('/users');
Expand Down
4 changes: 3 additions & 1 deletion wizard/app/scripts/i18n/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,5 +151,7 @@
"expkey_label": "Exp key",
"progkey_label": "Label",
"upload_invalid_filename": "The file name is not valid. It can only contain letters, numbers and the symbols _ - . ( ) ",
"Spy":"Listen"
"Spy":"Listen",
"Link to portal text": "For user management (creation, update and deletion), use the dedicated portal",
"Link to portal": "Link to the Portal"
}
4 changes: 3 additions & 1 deletion wizard/app/scripts/i18n/locale-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -1067,5 +1067,7 @@
"Click on the button below to add you first gateway": "Clicca sul pulsante qui sotto per aggiungere il tuo primo gateway",
"Download config": "Scarica config",
"Push config": "Carica config",
"Enables access to NethVoice CTI application": "Consenti l'accesso all'applicazione NethVoice CTI"
"Enables access to NethVoice CTI application": "Consenti l'accesso all'applicazione NethVoice CTI",
"Link to portal text": "Per la gestione degli utenti (creazione, modifica e eliminazione), utilizzare il portale dedicato",
"Link to portal": "Link al Portale"
}
13 changes: 13 additions & 0 deletions wizard/app/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,19 @@ a {
margin-top: 28px;
}

.adjust-filter-label {
margin-top: 10px;
}

.adjust-creation-info {
margin-bottom: -25px;
}

.adjust-portal-link {
float: inline-end;
margin-top: -3px;
}

.check-results {
margin-top: 8px;
padding-left: 1px;
Expand Down
8 changes: 7 additions & 1 deletion wizard/app/views/extensions.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
</div>
<div class="wizard-pf-contents adjust-size no-margin-bottom">
<h1 class="control-label centered" for="textInput-markup">{{'Extensions Configuration' | translate}}</h1>

<div class="alert alert-info adjust-creation-info">
<span class="pficon pficon-info"></span>
{{'Link to portal text' | translate}}: <a class="btn btn-primary adjust-portal-link" ng-href="/users-admin/{{localDomain}}/#/login" target="_blank">{{'Link to portal' | translate}}</a>
</div>

<div ng-if="!(users | isEmpty)" class="container-fluid margin-top-lg">
<div ng-if="error.file.status" class="alert alert-danger alert-dismissable">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">
Expand All @@ -20,7 +26,7 @@ <h1 class="control-label centered" for="textInput-markup">{{'Extensions Configur
<strong>{{error.file.title | translate}}.</strong> {{error.file.content | translate}}
</div>
<div>
<div class="filter-label-user adjust-filter-user">{{'Filter' | translate}}:</div>
<div class="filter-label-user adjust-filter-label">{{'Filter' | translate}}:</div>
<select title="-" pf-select="{ width: '180px' }" ng-model="selectedUsersFilter" ng-options="uf as uf | translate for uf in availableUsersFilters">
</select>
<div class="filter-label-user-order">
Expand Down