Skip to content

Commit

Permalink
Fixed misleading use of the note_add icon (#672)
Browse files Browse the repository at this point in the history
* Fixed misleading use of the note_add icon

* Update CHANGELOG.md
  • Loading branch information
hbugdoll authored Oct 5, 2021
1 parent 0dffd08 commit 93cef29
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE

## 4.2.0

+ [#660](https://github.com/luyadev/luya-module-admin/pull/660) Introduced `<luyaElements>` analogues for some `<zaaElements>`. This allows getting simple AngularJs form elements styled to match the rest of the interface elements.
+ [#668](https://github.com/luyadev/luya-module-admin/issues/668) Fixed misleading use of the `note_add` icon.
+ [#660](https://github.com/luyadev/luya-module-admin/pull/660) Introduced `<luyaElements>` analogues for some `<zaaElements>`. This allows getting simple AngularJs form elements styled to match the rest of the interface elements.
+ [#666](https://github.com/luyadev/luya-module-admin/pull/666) Fixed injection issue with zaaDecimal within zaaMultipleInputs.
+ [#665](https://github.com/luyadev/luya-module-admin/pull/665) Replaced `<span>` tags with `<a>` tags in main admin menu and submenus.
+ [#663](https://github.com/luyadev/luya-module-admin/issues/663) A new `TagRelation::cleanup(ActiveRecord $model)` method to remove all tag relations for a certain model.
Expand Down
2 changes: 1 addition & 1 deletion src/views/account/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</form>
</collapse-container>

<collapse-container title="<?= Module::t('settings_devices') ?>" icon="note_add" class="mb-3">
<collapse-container title="<?= Module::t('settings_devices') ?>" icon="devices" class="mb-3">
<p><?= Module::t('settings_devices_info'); ?></p>
<p ng-show="devices.length == 0" class="alert alert-info mb-0"><?= Module::t('settings_devices_empty'); ?></p>
<table ng-show="devices.length > 0" class="table table-bordered table-striped mb-0">
Expand Down
2 changes: 1 addition & 1 deletion src/views/aws/apioverview/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<thead>
<tr>
<th><?= Module::t('aw_apioverview_endpoint'); ?></th>
<th><i class="material-icons" tooltip tooltip-text="<?= Module::t('aw_apioverview_permadd'); ?>" tooltip-position="bottom">note_add</i></th>
<th><i class="material-icons" tooltip tooltip-text="<?= Module::t('aw_apioverview_permadd'); ?>" tooltip-position="bottom">add_box</i></th>
<th><i class="material-icons" tooltip tooltip-text="<?= Module::t('aw_apioverview_permedit'); ?>" tooltip-position="bottom">create</i></th>
<th><i class="material-icons" tooltip tooltip-text="<?= Module::t('aw_apioverview_permdelete'); ?>" tooltip-position="bottom">delete</i></th>
<th></th>
Expand Down
2 changes: 1 addition & 1 deletion src/views/aws/groupauth/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<span class="btn btn-icon btn-link" ng-click="toggleModule(items)"><i class="material-icons">done_all</i></span>
<span class="btn btn-icon btn-link" ng-click="clearModule(items)"><i class="material-icons">clear_all</i></span>
</th>
<th class="w-25"><i class="material-icons" tooltip tooltip-text="<?= Module::t('aws_groupauth_th_add'); ?>" tooltip-position="bottom">note_add</i></th>
<th class="w-25"><i class="material-icons" tooltip tooltip-text="<?= Module::t('aws_groupauth_th_add'); ?>" tooltip-position="bottom">add_box</i></th>
<th class="w-25"><i class="material-icons" tooltip tooltip-text="<?= Module::t('aws_groupauth_th_edit'); ?>" tooltip-position="bottom">create</i></th>
<th class="w-25"><i class="material-icons" tooltip tooltip-text="<?= Module::t('aws_groupauth_th_remove'); ?>" tooltip-position="bottom">delete</i></th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion src/views/aws/userhistorysummary/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<li class="list-group-item d-flex justify-content-between align-items-center p-2">
<span>
<?php if ($log->is_insert): ?>
<i class="material-icons" alt="Added">note_add</i>
<i class="material-icons" alt="Added">add_box</i>
<?php elseif ($log->is_update): ?>
<i class="material-icons" alt="Updated">create</i>
<?php elseif ($log->is_delete): ?>
Expand Down
2 changes: 1 addition & 1 deletion src/views/template/default.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div class="card-body" ng-show="item.isToggled">
<div class="timeline timeline-left timeline-compact">
<div class="timeline-item timeline-item-center-point" ng-repeat="(key, log) in item.items">
<i class="material-icons" ng-if="log.is_insert == 1">note_add</i>
<i class="material-icons" ng-if="log.is_insert == 1">add_box</i>
<i class="material-icons" ng-if="log.is_update == 1">create</i>
<i class="material-icons" ng-if="log.is_delete == 1">delete</i>
<small class="pr-4"><i>{{log.timestamp * 1000 | date:"HH:mm"}}</i></small>
Expand Down
2 changes: 1 addition & 1 deletion tests/admin/aws/UserHistorySummaryActiveWindowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function testRenderWithLogs()
$aws->ngRestModelClass = User::class;
$aws->setItemId(1);

$expect = '<script>zaa.bootstrap.register(\'UserHistorySummaryController\', [\'$scope\', function($scope) { $scope.pie = false; $scope.loadPieCharts = function() { $scope.$parent.sendActiveWindowCallback(\'pie\').then(function(response) { $scope.pie = response.data; }); }; $scope.loadPieCharts(); }]);</script><div class="row" ng-controller="UserHistorySummaryController"><div class="col-lg-3"><div class="card mb-4"><div class="card-header">Profile details</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"><tr><td>Title</td><td>1</td></tr><tr><td>Name</td><td>Foo Bar</td></tr><tr><td>Email</td><td><a href="mailto:foo@example.com">foo@example.com</a></td></tr><tr><td>Removed</td><td>No</td></tr><tr><td>Groups</td><td></td></tr><tr><td>Last API activity</td><td>05/23/70 21:21:18</td></tr></table></div></div><div class="card mb-4"><div class="card-header">Total contributions</div><div class="card-body" ng-if="pie"><echarts id="userEchart" data="pie"></echarts></div></div><div class="card"><div class="card-header">Custom settings</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"></table></div></div></div><div class="col-lg-3"><div class="card"><div class="card-header">Latest sessions</div><table class="table table-sm table-striped table-borderless table-hoverable small mb-0"></table></div></div><div class="col-lg-6"><div class="card"><div class="card-header">Change history</div><ul class="list-group list-group-flush"><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement1=!hiddenElement1">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement1"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement2=!hiddenElement2">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement2"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>bar</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Added">note_add</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement3=!hiddenElement3">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement3"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>-</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement4=!hiddenElement4">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement4"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li></ul></div></div></div>';
$expect = '<script>zaa.bootstrap.register(\'UserHistorySummaryController\', [\'$scope\', function($scope) { $scope.pie = false; $scope.loadPieCharts = function() { $scope.$parent.sendActiveWindowCallback(\'pie\').then(function(response) { $scope.pie = response.data; }); }; $scope.loadPieCharts(); }]);</script><div class="row" ng-controller="UserHistorySummaryController"><div class="col-lg-3"><div class="card mb-4"><div class="card-header">Profile details</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"><tr><td>Title</td><td>1</td></tr><tr><td>Name</td><td>Foo Bar</td></tr><tr><td>Email</td><td><a href="mailto:foo@example.com">foo@example.com</a></td></tr><tr><td>Removed</td><td>No</td></tr><tr><td>Groups</td><td></td></tr><tr><td>Last API activity</td><td>05/23/70 21:21:18</td></tr></table></div></div><div class="card mb-4"><div class="card-header">Total contributions</div><div class="card-body" ng-if="pie"><echarts id="userEchart" data="pie"></echarts></div></div><div class="card"><div class="card-header">Custom settings</div><div class="table-responsive"><table class="table table-sm table-borderless table-striped small"></table></div></div></div><div class="col-lg-3"><div class="card"><div class="card-header">Latest sessions</div><table class="table table-sm table-striped table-borderless table-hoverable small mb-0"></table></div></div><div class="col-lg-6"><div class="card"><div class="card-header">Change history</div><ul class="list-group list-group-flush"><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement1=!hiddenElement1">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement1"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement2=!hiddenElement2">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement2"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>bar</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Added">add_box</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement3=!hiddenElement3">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement3"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td>foo</td><td>-</td><td>baz</td></tr></table></div></li><li class="list-group-item d-flex justify-content-between align-items-center p-2"><span><i class="material-icons" alt="Updated">create</i><span class="badge badge-secondary"></span><span class="badge badge-info">ID #</span>51 years ago</span><span class="badge badge-primary badge-pill" ng-click="hiddenElement4=!hiddenElement4">Diff</span></li><li class="list-group-item p-0" ng-show="hiddenElement4"><div class="table-responsive"><table class="table table-sm table-striped table-borderless table-hoverable small"><thead><tr><th class="w-25">Attribute</th><th class="w-25">Old</th><th class="w-50">New</th></tr></thead><tr><td colspan="3">No changes</td></tr></table></div></li></ul></div></div></div>';

$this->assertContainsTrimmed($expect, $aws->index());

Expand Down

0 comments on commit 93cef29

Please sign in to comment.