-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove spin.js and convert spinner to css animation; make spinner act… (
#13, CO-2133) * Remove spin.js and convert spinner to css animation; make spinner active on all links and buttons except those marked with the .nospin class; create page for matchgrid configuration; update breadcrumbs for configuration page; fix user profile dropdown (CO-2133) * Remove the deprecated spin.js library (CO-2133) * Color table heading links appropriately; remove extra print statement from filter buttons (NOJIRA / CO-2133) * Link ID column of Matchgrid Records to edit/view for the record. Update the "link" column type to include the matchgrid_id when present. (CO-2133) * Display matchgrid description (if present) on Manage matchgrid view. (CO-2133) * Revert change to index.ctp for "link" column type. (CO-2133) Co-authored-by: benno <benno@sphericalcowgroup.com>
- Loading branch information
Showing
20 changed files
with
297 additions
and
184 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| <?php | ||
| /** | ||
| * COmanage Match Matchgrid Configure Template | ||
| * | ||
| * Portions licensed to the University Corporation for Advanced Internet | ||
| * Development, Inc. ("UCAID") under one or more contributor license agreements. | ||
| * See the NOTICE file distributed with this work for additional information | ||
| * regarding copyright ownership. | ||
| * | ||
| * UCAID licenses this file to you under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with the | ||
| * License. You may obtain a copy of the License at: | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * @link http://www.internet2.edu/comanage COmanage Project | ||
| * @package match | ||
| * @since COmanage Match v1.0.0 | ||
| * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) | ||
| */ | ||
|
|
||
| declare(strict_types = 1); | ||
| ?> | ||
| <div class="titleNavContainer"> | ||
| <div class="pageTitle"> | ||
| <h1><?= $vv_title; ?></h1> | ||
| </div> | ||
| </div> | ||
|
|
||
| <section class="inner-content"> | ||
| <!-- Matchgrid Configuration --> | ||
| <?php | ||
| // Determining whether to render the configuration block is a bit tricky, | ||
| // basically we have to see if the user has any appropriate permission. | ||
| // This will generally be all-or-nothing, but that could change over time. | ||
|
|
||
| $renderConfig = false; | ||
|
|
||
| if(!empty($vv_cur_mg)) { | ||
| // Matchgrid specific models | ||
|
|
||
| $models = [ | ||
| 'matchgrid_settings' => 'settings', | ||
| 'api_users' => 'vpn_key', | ||
| 'attributes' => 'edit', | ||
| 'attribute_groups' => 'storage', | ||
| 'attribute_maps' => 'swap_horiz', | ||
| 'rules' => 'assignment', | ||
| 'systems_of_record' => 'gavel', | ||
| ]; | ||
|
|
||
| // We'll get most users simply by checking for build permission | ||
| $renderConfig = $vv_permissions['build']; | ||
|
|
||
| if(!$renderConfig) { | ||
| foreach(array_keys($models) as $m) { | ||
| if(isset($vv_menu_permissions[$m]) && $vv_menu_permissions[$m]===true) { | ||
| $renderConfig = true; | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ?> | ||
| <?php if($renderConfig): ?> | ||
| <ul id="matchgrid-config-menu"> | ||
| <?php | ||
| foreach($models as $model => $icon) { | ||
| if($vv_menu_permissions[$model]) { | ||
| print '<li>'; | ||
|
|
||
| $linkContent = '<em class="material-icons" aria-hidden="true">' . $icon . '</em><span class="menu-title">' | ||
| . __('match.ct.'.\Cake\Utility\Inflector::camelize($model), [99]) | ||
| . '</span>'; | ||
|
|
||
| print $this->Html->link( | ||
| $linkContent, | ||
| ['plugin' => null, | ||
| 'controller' => $model, | ||
| 'action' => 'index', | ||
| '?' => ['matchgrid_id' => $vv_cur_mg->id]], | ||
| ['escape' => false] | ||
| ); | ||
|
|
||
| print '</li>'; | ||
| } | ||
| } | ||
|
|
||
| if($vv_permissions['build']) { | ||
| print '<li>'; | ||
|
|
||
| $linkContent = '<em class="material-icons" aria-hidden="true">build</em><span class="menu-title">' | ||
| . __('match.op.build') | ||
| . '</span>'; | ||
|
|
||
| print $this->Html->link( | ||
| $linkContent, | ||
| ['controller' => 'Matchgrids', | ||
| 'action' => 'build', | ||
| $vv_cur_mg->id], | ||
| ['escape' => false, | ||
| 'class' => 'nospin', | ||
| 'confirm' => __('match.op.build.confirm')] | ||
| ); | ||
| print '</li>'; | ||
| } | ||
| ?> | ||
| </ul> | ||
| <?php endif; // $renderConfig ?> | ||
| </section> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.