Displayed data "active" or not about the user.

Daniel-KM · Apr 29, 2018 · 6ce9283 · 6ce9283
1 parent c82142a
commit 6ce9283
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 5 deletions.
diff --git a/application/asset/css/iconfonts.css b/application/asset/css/iconfonts.css
diff --git a/application/asset/css/style.css b/application/asset/css/style.css
diff --git a/application/asset/sass/_screen.scss b/application/asset/sass/_screen.scss
@@ -1390,7 +1390,8 @@ div[role="main"] {
  }
 }
 
-td .o-icon-private {
+td .o-icon-private,
+td .o-icon-user-inactive {
  display: inline-block;
  vertical-align: bottom;
  margin-left: .5em;

diff --git a/application/asset/sass/_tablet.scss b/application/asset/sass/_tablet.scss
@@ -132,7 +132,8 @@ footer {
  width: 100%;
 }
 
-td .o-icon-private {
+td .o-icon-private,
+td .o-icon-user-inactive {
  vertical-align: top;
  margin: 0;
 }

diff --git a/application/asset/sass/iconfonts.scss b/application/asset/sass/iconfonts.scss
@@ -120,6 +120,10 @@
  @extend .fa-eye-slash;
 }
 
+.o-icon-user-inactive {
+ @extend .fa-user-times;
+}
+
 .o-icon-activate {
  @extend .fa-toggle-off;
 }

diff --git a/application/src/Api/Representation/UserRepresentation.php b/application/src/Api/Representation/UserRepresentation.php
@@ -46,6 +46,11 @@ public function role()
  return $this->resource->getRole();
  }
 
+ public function isActive()
+ {
+ return $this->resource->isActive();
+ }
+
  public function created()
  {
  return $this->resource->getCreated();

diff --git a/application/view/omeka/admin/user/browse.phtml b/application/view/omeka/admin/user/browse.phtml
@@ -44,6 +44,9 @@ $sortHeadings = [
  <tr>
  <td>
  <?php echo $user->link($user->email() . ' (' . $user->name() . ')'); ?>
+ <?php if (!$user->isActive()): ?>
+ <span class="o-icon-user-inactive"></span>
+ <?php endif; ?>
  <ul class="actions">
  <?php if ($user->userIsAllowed('update')): ?>
  <li><?php echo $user->link('', 'edit', [

diff --git a/application/view/omeka/admin/user/show-details.phtml b/application/view/omeka/admin/user/show-details.phtml
@@ -1,4 +1,9 @@
-<h3><a href="<?php echo $this->escapeHtml($resource->url()); ?>"><?php echo $this->escapeHtml($resource->name()); ?></a></h3>
+<h3>
+ <a href="<?php echo $this->escapeHtml($resource->url()); ?>"><?php echo $this->escapeHtml($resource->name()); ?></a>
+ <?php if (!$resource->isActive()): ?>
+ <span class="user-inactive"><?php echo $this->translate('(inactive)'); ?></span>
+ <?php endif; ?>
+</h3>
 
 <div class="meta-group">
  <h4><?php echo $this->translate('Items'); ?></h4>

diff --git a/application/view/omeka/admin/user/show.phtml b/application/view/omeka/admin/user/show.phtml
@@ -30,4 +30,10 @@
  <?php echo $escape($this->translate($user->displayRole())); ?>
  </div>
 </div>
+<div class="property">
+ <h4><?php echo $this->translate('Is active'); ?></h4>
+ <div class="value">
+ <?php echo $escape($user->isActive() ? $this->translate('yes') : $this->translate('no')); ?>
+ </div>
+</div>
 <?php $this->trigger('view.show.after'); ?>