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

Jump to bottom

wizard UI. improvements and ui glitches #187

Merged
merged 6 commits into from
Dec 14, 2023
Merged

wizard UI. improvements and ui glitches #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23ca0b3
wizard ui. hide import & export button on users
edospadoni Dec 14, 2023
3bb9d55
wizard ui. hide permissions not used
edospadoni Dec 14, 2023
6643f6a
wizard ui. avoid forced password input
edospadoni Dec 14, 2023
704d6bc
wizard ui. fix bad logout
edospadoni Dec 14, 2023
3d2de04
wizard ui. remove limit on inventory phones
edospadoni Dec 14, 2023
cca16ea
wizard ui. hide also privacy permission
edospadoni Dec 14, 2023
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: 1 addition & 1 deletion wizard/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
<div ng-click="goTo('admin/settings')" class="list-group-item-value menu-item-left no-opacity full-width">{{'Settings' | translate | ellipsis:'1200'}}</div>
</div>
<div ng-if="!wizard.isWizard" class="panel-body adjust-panel-body list-group-item collapse-menu">
<a target="_blank" href="/freepbx/admin" class="list-group-item-value menu-item-left no-opacity a-menu full-width">{{'Advanceds' | translate | ellipsis:'1200'}}</a>
<a target="_blank" href="/freepbx/admin/" class="list-group-item-value menu-item-left no-opacity a-menu full-width">{{'Advanceds' | translate | ellipsis:'1200'}}</a>
</div>
<div ng-if="!wizard.isWizard" class="panel-body adjust-panel-body list-group-item collapse-menu {{resolveActiveTab('report',2) ? 'active' : ''}}">
<div ng-click="goTo('admin/report')" class="list-group-item-value menu-item-left no-opacity full-width">{{'Report' | translate | ellipsis:'1200'}}</div>
Expand Down
2 changes: 1 addition & 1 deletion wizard/app/scripts/controllers/admin/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/
angular.module('nethvoiceWizardUiApp')
.controller('AdminSettingsCtrl', function ($scope, UserService, RestService, RestServiceCTI, ConfigService, ModelService) {
$scope.wizard.isEnd = false
$scope.wizard.isEnd = true
$scope.view.changeRoute = false

$scope.create = function () {
Expand Down
6 changes: 6 additions & 0 deletions wizard/app/scripts/controllers/configurations/profiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ angular.module('nethvoiceWizardUiApp')

$scope.initGraphics = function () {};

$scope.tempBlacklist = ["conference", "chat", "phone_buttons", "screen_sharing", "video_conference", "trunks", "privacy"];

$scope.isInBlacklist = function(perm) {
return $scope.tempBlacklist.includes(perm);
}

$scope.isGroupPermission = function(p) {
return p.indexOf("grp_") !== -1;
};
Expand Down
2 changes: 1 addition & 1 deletion wizard/app/scripts/services/loginservice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ angular.module('nethvoiceWizardUiApp')

this.removeCredentials = function() {
return $q(function (resolve, reject) {
LocalStorageService.remove('secretkey');
RestService.get('/logout').then(function (res) {
LocalStorageService.remove('secretkey');
resolve(res);
}, function (err) {
reject(err);
Expand Down
8 changes: 4 additions & 4 deletions wizard/app/views/configurations/profiles.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ <h1 data-toggle="collapse" data-parent="#accordion-markup-{{$index}}" href="#col
</div>
<div class="row {{obj_permissions.permissions.length > 0 ? 'profile-permission-container' : ''}}" ng-if="obj_permissions.value">
<div
ng-hide="permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi'"
ng-hide="(permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi') || isInBlacklist(permission.name)"
class="col-lg-12 col-md-12 col-sm-12 col-xs-12 profile-permission"
ng-repeat="permission in obj_permissions.permissions"
>
Expand Down Expand Up @@ -167,7 +167,7 @@ <h1 data-toggle="collapse" data-parent="#accordion-markup-{{$index}}" href="#col
</div>
<div class="row {{obj_permissions.permissions.length > 0 ? 'profile-permission-container' : ''}}" ng-if="obj_permissions.value">
<div
ng-hide="permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi'"
ng-hide="(permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi') || isInBlacklist(permission.name)"
class="col-lg-12 col-md-12 col-sm-12 col-xs-12 profile-permission"
ng-repeat="permission in obj_permissions.permissions"
>
Expand Down Expand Up @@ -211,7 +211,7 @@ <h1 data-toggle="collapse" data-parent="#accordion-markup-{{$index}}" href="#col
ng-if="macro !== 'settings' && macro !== 'remote_sites' && macro !== 'nethvoice_cti'"
>
<div
ng-if="macro !== 'remote_sites'"
ng-if="macro !== 'remote_sites' && macro !== 'streaming' && macro != 'operator_panel'"
class="row profile-macro-title {{!obj_permissions.value ? 'disabled' : ''}}"
>
<div
Expand All @@ -230,7 +230,7 @@ <h1 data-toggle="collapse" data-parent="#accordion-markup-{{$index}}" href="#col
</div>
<div class="row {{obj_permissions.permissions.length > 0 ? 'profile-permission-container-child' : ''}}" ng-if="obj_permissions.value">
<div
ng-hide="permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi'"
ng-hide="(permission.name == 'phone_buttons' && wizard.provisioning != 'tancredi') || isInBlacklist(permission.name)"
class="col-lg-12 col-md-12 col-sm-12 col-xs-12 profile-permission child-permission"
ng-repeat="permission in obj_permissions.permissions"
>
Expand Down
4 changes: 2 additions & 2 deletions wizard/app/views/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1 class="control-label centered" for="textInput-markup">{{'Dashboard' | transl
type="text" class="form-control input-lg ng-pristine ng-valid ng-touched" placeholder="{{'Search users' | translate}}...">
</div>
</div>
<div class="form-group"> <button class="btn btn-default btn-lg" type="submit"> <span class="fa fa-search"></span>
<div class="form-group"> <button class="btn btn-default btn-lg adjust-search-button" type="submit"> <span class="fa fa-search"></span>
</button> </div>
</form>
<div class="col-xs-12 dashboard-cards-margin-top resizeDashboard" when-scrolled="scrollingUsersContainer()">
Expand Down Expand Up @@ -93,7 +93,7 @@ <h2 class="card-pf-title ng-binding dashboard-cards-h2">
type="text" class="form-control input-lg ng-pristine ng-valid ng-touched" placeholder="{{'Search trunks' | translate}}...">
</div>
</div>
<div class="form-group"> <button class="btn btn-default btn-lg" type="submit"> <span class="fa fa-search"></span>
<div class="form-group"> <button class="btn btn-default btn-lg adjust-search-button" type="submit"> <span class="fa fa-search"></span>
</button> </div>
</form>
<div class="col-xs-12 dashboard-cards-margin-top resizeDashboard" when-scrolled="scrollingTrunksContainer()">
Expand Down
2 changes: 1 addition & 1 deletion wizard/app/views/devices/inventory.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ <h4 class="modal-title" id="addPhonesLabel">{{'Add phones' | translate}}</h4>
<label class="col-sm-4 control-label" for="manual-model">{{ 'Model' | translate }}</label>
<div class="col-sm-8">
<select class="form-control" pf-select="{ noneSelectedText: '-' }" data-live-search="true" data-size="5"
ng-model="manualModel" ng-options="model.display_name for model in manualFilteredModels | orderBy:orderByValue | limitTo: phonesLimit"
ng-model="manualModel" ng-options="model.display_name for model in manualFilteredModels | orderBy:orderByValue"
ng-disabled="getManualFilteredModelsCount()" id="manual-model">
<option value="" ng-disabled="true" ng-hide="true">-</option>
</select>
Expand Down
12 changes: 6 additions & 6 deletions wizard/app/views/extensions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ <h1 class="control-label centered" for="textInput-markup">{{'Extensions Configur
</div>

</form>
<div class="form-group config-row-button">
<button ng-if="providerLocal" ng-click="fileSelectImport()" class="btn btn-primary btn-lg no-margin">{{'Import' | translate}}</button>
<button ng-click="csvExport()" class="btn btn-primary btn-lg no-margin">{{'Export' | translate}}</button>
<input ng-model="temp.importFile" type="file" accept=".csv" id="importInput">
<a id="dlLink" download="users.csv" href="" class="hidden"></a>
</div>
<!-- <div class="form-group config-row-button">
<button ng-if="providerLocal" ng-click="fileSelectImport()" class="btn btn-primary btn-lg no-margin">{{'Import' | translate}}</button>
<button ng-click="csvExport()" class="btn btn-primary btn-lg no-margin">{{'Export' | translate}}</button>
<input ng-model="temp.importFile" type="file" accept=".csv" id="importInput">
<a id="dlLink" download="users.csv" href="" class="hidden"></a>
</div> -->
<div class="list-group list-view-pf list-view-pf-view adjust-margin-extensions margin-bottom-lg">
<div ng-show="selectedUsersFilter == 'configured' ? user.default_extension !== 'none' : (selectedUsersFilter == 'unconfigured' ? user.default_extension == 'none' : true)"
class="list-group-item" ng-repeat="user in users | customFilterMultiple:'displayname,username,default_extension':searchUsersString | limitTo: usersLimit | orderBy:usersFilterNumbers:usersFilterNumbersOrd">
Expand Down