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.

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

Library: refactor breadcrumbs #698

Merged
merged 1 commit into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions modules/Library/library_browse.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,15 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs->add(__('Browse The Library'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_browse.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Browse The Library').'</div>';
echo '</div>';

//Get display settings
$browseBGColorStyle = null;
$browseBGColor = getSettingByScope($connection2, 'Library', 'browseBGColor');
Expand Down
7 changes: 2 additions & 5 deletions modules/Library/library_import.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,15 @@

use Gibbon\Forms\Form;

$page->breadcrumbs->add(__('Import Records'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_import.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Import Records').'</div>';
echo '</div>';

$step = null;
if (isset($_GET['step'])) {
$step = $_GET['step'];
Expand Down Expand Up @@ -565,4 +563,3 @@
}
}
}
?>
7 changes: 2 additions & 5 deletions modules/Library/library_lending.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$page->breadcrumbs->add(__('Lending & Activity Log'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Lending & Activity Log').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, array('success0' => 'Your request was completed successfully.'));
}
Expand Down Expand Up @@ -312,4 +310,3 @@
}
}
}
?>
8 changes: 4 additions & 4 deletions modules/Library/library_lending_item.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs
->add(__('Lending & Activity Log'), 'library_lending.php')
->add(__('View Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending_item.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending.php'>".__($guid, 'Lending & Activity Log')."</a> > </div><div class='trailEnd'>".__($guid, 'View Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, array('success0' => 'Your request was completed successfully.'));
}
Expand Down
19 changes: 10 additions & 9 deletions modules/Library/library_lending_item_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$gibbonLibraryItemEventID = trim($_GET['gibbonLibraryItemEventID']) ?? '';
$gibbonLibraryItemID = trim($_GET['gibbonLibraryItemID']) ?? '';

$page->breadcrumbs
->add(__('Lending & Activity Log'), 'library_lending.php')
->add(__('View Item'), 'library_lending_item.php', ['gibbonLibraryItemID' => $gibbonLibraryItemID])
->add(__('Edit Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending_item_edit.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Check if school year specified
$gibbonLibraryItemEventID = $_GET['gibbonLibraryItemEventID'];
$gibbonLibraryItemID = $_GET['gibbonLibraryItemID'];
if ($gibbonLibraryItemEventID == '' or $gibbonLibraryItemID == '') {
// check if school year specified
if (empty($gibbonLibraryItemEventID) or empty($gibbonLibraryItemID)) {
echo "<div class='error'>";
echo __($guid, 'You have not specified one or more required parameters.');
echo '</div>';
Expand All @@ -56,10 +62,6 @@
//Let's go!
$values = $result->fetch();

echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending.php'>".__($guid, 'Lending & Activity Log')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending_item.php&gibbonLibraryItemID=$gibbonLibraryItemID'>".__($guid, 'View Item')."</a> > </div><div class='trailEnd'>".__($guid, 'Edit Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, array('success0' => 'Your request was completed successfully.'));
}
Expand Down Expand Up @@ -170,4 +172,3 @@
}
}
}
?>
20 changes: 11 additions & 9 deletions modules/Library/library_lending_item_renew.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,23 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$gibbonLibraryItemEventID = trim($_GET['gibbonLibraryItemEventID']) ?? '';
$gibbonLibraryItemID = trim($_GET['gibbonLibraryItemID']) ?? '';

$page->breadcrumbs
->add(__('Lending & Activity Log'), 'library_lending.php')
->add(__('View Item'), 'library_lending_item.php', ['gibbonLibraryItemID' => $gibbonLibraryItemID])
->add(__('Renew Item'));


if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending_item_renew.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Check if school year specified
$gibbonLibraryItemEventID = $_GET['gibbonLibraryItemEventID'];
$gibbonLibraryItemID = $_GET['gibbonLibraryItemID'];
if ($gibbonLibraryItemEventID == '' or $gibbonLibraryItemID == '') {
// check if school year specified
if (empty($gibbonLibraryItemEventID) or empty($gibbonLibraryItemID)) {
echo "<div class='error'>";
echo __($guid, 'You have not specified one or more required parameters.');
echo '</div>';
Expand All @@ -56,10 +63,6 @@
//Let's go!
$values = $result->fetch();

echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending.php'>".__($guid, 'Lending & Activity Log')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending_item.php&gibbonLibraryItemID=$gibbonLibraryItemID'>".__($guid, 'View Item')."</a> > </div><div class='trailEnd'>".__($guid, 'Renew Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, array('success0' => 'Your request was completed successfully.'));
}
Expand Down Expand Up @@ -113,4 +116,3 @@
}
}
}
?>
17 changes: 9 additions & 8 deletions modules/Library/library_lending_item_return.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,22 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$gibbonLibraryItemEventID = trim($_GET['gibbonLibraryItemEventID']) ?? '';
$gibbonLibraryItemID = trim($_GET['gibbonLibraryItemID']) ?? '';

$page->breadcrumbs
->add(__('Lending & Activity Log'), 'library_lending.php')
->add(__('View Item'), 'library_lending_item.php', ['gibbonLibraryItemID' => $gibbonLibraryItemID])
->add(__('Return Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending_item_return.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Check if school year specified
$gibbonLibraryItemEventID = $_GET['gibbonLibraryItemEventID'];
$gibbonLibraryItemID = $_GET['gibbonLibraryItemID'];
if ($gibbonLibraryItemEventID == '' or $gibbonLibraryItemID == '') {
if (empty($gibbonLibraryItemEventID) or empty($gibbonLibraryItemID)) {
echo "<div class='error'>";
echo __($guid, 'You have not specified one or more required parameters.');
echo '</div>';
Expand All @@ -51,10 +57,6 @@
//Let's go!
$values = $result->fetch();

echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending.php'>".__($guid, 'Lending & Activity Log')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending_item.php&gibbonLibraryItemID=$gibbonLibraryItemID'>".__($guid, 'View Item')."</a> > </div><div class='trailEnd'>".__($guid, 'Return Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, null);
}
Expand Down Expand Up @@ -144,4 +146,3 @@
}
}
}
?>
16 changes: 8 additions & 8 deletions modules/Library/library_lending_item_signout.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,21 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$gibbonLibraryItemID = trim($_GET['gibbonLibraryItemID']) ?? '';

$page->breadcrumbs
->add(__('Lending & Activity Log'), 'library_lending.php')
->add(__('View Item'), 'library_lending_item.php', ['gibbonLibraryItemID' => $gibbonLibraryItemID])
->add(__('Sign Out'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_lending_item_signOut.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
$gibbonLibraryItemID = $_GET['gibbonLibraryItemID'];

if ($gibbonLibraryItemID == '') {
if (empty($gibbonLibraryItemID)) {
echo "<div class='error'>";
echo __($guid, 'You have not specified one or more required parameters.');
echo '</div>';
Expand All @@ -50,10 +55,6 @@
} else {
$values = $result->fetch();

echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending.php'>".__($guid, 'Lending & Activity Log')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_lending_item.php&gibbonLibraryItemID=$gibbonLibraryItemID'>".__($guid, 'View Item')."</a> > </div><div class='trailEnd'>".__($guid, 'Sign Out').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, null);
}
Expand Down Expand Up @@ -199,4 +200,3 @@
}
}
}
?>
6 changes: 2 additions & 4 deletions modules/Library/library_manage_catalog.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@
use Gibbon\Forms\Form;
use Gibbon\Forms\DatabaseFormFactory;

$page->breadcrumbs->add(__('Manage Catalog'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_manage_catalog.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Manage Catalog').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, array('success0' => 'Your request was completed successfully.'));
}
Expand Down
8 changes: 4 additions & 4 deletions modules/Library/library_manage_catalog_add.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs
->add(__('Manage Catalog'), 'library_manage_catalog.php')
->add(__('Add Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_manage_catalog_add.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_manage_catalog.php'>".__($guid, 'Manage Catalog')."</a> > </div><div class='trailEnd'>".__($guid, 'Add Item').'</div>';
echo '</div>';

$urlParamKeys = array('name' => '', 'gibbonLibraryTypeID' => '', 'gibbonSpaceID' => '', 'status' => '', 'gibbonPersonIDOwnership' => '', 'typeSpecificFields' => '');

$urlParams = array_intersect_key($_GET, $urlParamKeys);
Expand Down
8 changes: 4 additions & 4 deletions modules/Library/library_manage_catalog_delete.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs
->add(__('Manage Catalog'), 'library_manage_catalog.php')
->add(__('Delete Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_manage_catalog_delete.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Delete Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, null);
}
Expand Down
8 changes: 4 additions & 4 deletions modules/Library/library_manage_catalog_duplicate.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs
->add(__('Manage Catalog'), 'library_manage_catalog.php')
->add(__('Duplicate Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_manage_catalog_duplicate.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_manage_catalog.php'>".__($guid, 'Manage Catalog')."</a> > </div><div class='trailEnd'>".__($guid, 'Duplicate Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, null);
}
Expand Down
8 changes: 4 additions & 4 deletions modules/Library/library_manage_catalog_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs
->add(__('Manage Catalog'), 'library_manage_catalog.php')
->add(__('Edit Item'));

if (isActionAccessible($guid, $connection2, '/modules/Library/library_manage_catalog_edit.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q'])."/library_manage_catalog.php'>".__($guid, 'Manage Catalog')."</a> > </div><div class='trailEnd'>".__($guid, 'Edit Item').'</div>';
echo '</div>';

if (isset($_GET['return'])) {
returnProcess($guid, $_GET['return'], null, null);
}
Expand Down
6 changes: 2 additions & 4 deletions modules/Library/report_catalogSummary.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,15 @@
//Module includes
require_once __DIR__ . '/moduleFunctions.php';

$page->breadcrumbs->add(__('Catalog Summary'));

if (isActionAccessible($guid, $connection2, '/modules/Library/report_catalogSummary.php') == false) {
//Acess denied
echo "<div class='error'>";
echo __($guid, 'You do not have access to this action.');
echo '</div>';
} else {
//Proceed!
echo "<div class='trail'>";
echo "<div class='trailHead'><a href='".$_SESSION[$guid]['absoluteURL']."'>".__($guid, 'Home')."</a> > <a href='".$_SESSION[$guid]['absoluteURL'].'/index.php?q=/modules/'.getModuleName($_GET['q']).'/'.getModuleEntry($_GET['q'], $connection2, $guid)."'>".__($guid, getModuleName($_GET['q']))."</a> > </div><div class='trailEnd'>".__($guid, 'Catalog Summary').'</div>';
echo '</div>';

echo '<h3>';
echo __($guid, 'Search & Filter');
echo '</h3>';
Expand Down
Loading