Skip to content

Commit

Permalink
Fixed issue from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rmathis committed Apr 1, 2021
1 parent d6c2e25 commit 29f352c
Showing 1 changed file with 21 additions and 23 deletions.
44 changes: 21 additions & 23 deletions View/Elements/Components/groupattributes.ctp
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
<?php if (count($attr) > 0) : ?>
<table class="table table-striped w-100">
<thead>
<table class="table table-striped w-100">
<thead>
<tr>
<th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
<th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
<th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
</tr>
</thead>
<tbody>
<?php foreach ($attributes as $attr) : ?>
<tr>
<th class="attr"><?php echo _txt('pl.grouperlite.table.attribute-name'); ?></th>
<th class="attr definition"><?php echo _txt('pl.grouperlite.table.attribute-description'); ?></th>
<th class="attr action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
<td><?php echo $attr['attributeDefNameName']; ?></td>
<td><?php echo $attr['attributeDefName'] ?></td>
<td>
<a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
<?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
</a>
</td>
</tr>
</thead>
<tbody>
<?php foreach ($attributes as $attr) : ?>
<tr>
<td><?php echo $attr['attributeDefNameName']; ?></td>
<td><?php echo $attr['attributeDefName'] ?></td>
<td>
<a href="<?php echo $baseUrl . $attr['attributeDefNameId']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
<?php echo _txt('pl.grouperlite.action.view'); ?> <i class="fa fa-external-link"></i>
</a>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
<?php endif; ?>
<?php endforeach; ?>
</tbody>
</table>
<?php if (count($attributes) < 1) : ?>
<div class="alert alert-info">
<p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.group.info.attributes-zero-state'); ?></p>
<p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.attributes.zero-state'); ?></p>
</div>
<?php endif; ?>

0 comments on commit 29f352c

Please sign in to comment.