Skip to content

fixes the navbar for bootstrap 4 #11

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.

Sign up for GitHub

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

Merged
tylercraig9332 merged 1 commit into from
May 21, 2018
Merged

fixes the navbar for bootstrap 4 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/javascript/dev/
/javascript/build/
/node_modules/
package-lock.json
2 changes: 1 addition & 1 deletion Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ private function showNavBar(Request $request)

private function showList()
{
return '<a href="./slideshow/Show/list"><i class="fa fa-list"></i> Show list</a>';
return '<a class="nav-link" href="./slideshow/Show/list"><i class="fas fa-list"></i> Show list</a>';
}

public static function autoloader($class_name)
Expand Down
6 changes: 3 additions & 3 deletions class/Controller/Show/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ protected function listHtmlCommand(Request $request)
$this->createShowButton();
return $this->factory->scriptView('ShowList');
}

protected function listJsonCommand(Request $request)
{
return array('listing'=>$this->factory->listing(true));
Expand All @@ -63,7 +63,7 @@ protected function deleteCommand(Request $request)
{
$this->factory->delete($this->id);
}

protected function putCommand(Request $request)
{
$this->factory->put($this->id, $request);
Expand All @@ -74,7 +74,7 @@ private function createShowButton()
{
$nav = new NavBar();
$create = <<<EOF
<button class="btn btn-success navbar-btn" id="createShow"><i class="fa fa-plus"></i> Create new show</button>
<button class="btn btn-success navbar-btn" id="createShow"><i class="fa fa-plus"></i> Create New SlideShow</button>
EOF;
$nav->addItem($create);
}
Expand Down
2 changes: 2 additions & 0 deletions exports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ exports.APP_DIR = exports.path.resolve(__dirname, 'javascript')

exports.entry = {
vendor: ['react', 'react-dom'],
/*
ShowList: exports.APP_DIR + '/ShowList/index.jsx',
SlideList: exports.APP_DIR + '/SlideList/index.jsx',
SlideEdit: exports.APP_DIR + '/SlideEdit/index.jsx',
*/
}
116 changes: 53 additions & 63 deletions templates/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,54 @@
<div class="container-fluid" id="slideshow-navbar">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-sec">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse-sec">
<ul class="nav navbar-nav navbar-left">
<li>
<a href="<?=$home?>"><i class="fa fa-home"></i> Home</a>
</li>
<nav class="navbar navbar-expand-md navbar-light bg-light" role="navigation">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<a class="nav-link" href="<?=$home?>slideshow/Show"><i class="fa fa-home"></i> Home</a>
<ul class="navbar-nav ml-auto">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<?=$current_area?>
</a>
<div class="dropdown-menu">
<a class="dropdown-item" href="<?=$home?>properties/Property/list"><i class="fas fa-building"></i> Example - Does nothing</a>
</div>
</li>

<?php if ($items !== null):?>
<li class="navbar-text">|
</li>
<?php foreach($items as $item):
if ($item == '|'):?>
<li class="navbar-text">|
</li>
<?php else: ?>
<li>
<?=$item?>
</li>
<?php endif;?>
<?php endforeach;?>
<?php endif;?>
<?php if ($options !== null):?>
<li class="navbar-text">|
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<i class="fas fa-cog"></i>&nbsp;<?=$title?><span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li>
<?=$options?>
</li>
</ul>
</li>
<?php endif;?>
</ul>
<ul class="nav navbar-nav navbar-right">
<?php if ($logged):?>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><?=$username ?><span class="caret"></span></a>
<ul class="dropdown-menu">
<?php if ($admin): ?>
<li>
<a href="index.php?module=controlpanel"><i class="fas fa-cog"></i> Control panel</a>
</li>
<?php endif;?>
<li>
<a href="<?=$logout_uri?>"><i class="fas sign-out-alt"></i> Sign out</a>
</li>
</ul>
</li>
<?php endif; ?>
</ul>
</div><!-- /.navbar-collapse -->
</div>
<?php if ($items !== null):?>
<?php foreach($items as $item):?>
<li class="nav-item">
<?=$item?>
</li>
<?php endforeach;?>
<?php endif;?>
<?php if ($options !== null):?>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-toggle="dropdown">
<i class="fas fa-cog"></i>&nbsp;<?=$title?>
</a>
<div class="dropdown-menu">
<?=$options?>
</div>
</li>
<?php endif;?>
<?php if (isset($is_manager)):?>
<li class="nav-item">
<a class="nav-link" href="./properties/Manager/Properties"><i class="fa fa-list"></i> My properties</a>
</li>
<?php endif;?>
<?php if ($logged):?>
<li class="nav-item dropdown">
<a class="dropdown-toggle nav-link" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<?=$username ?></a>
<div class="dropdown-menu">
<?php if ($admin): ?>
<a class="dropdown-item" href="index.php?module=controlpanel"><i class="fas fa-cog"></i> Control panel</a>
<?php endif;?>
<a class="dropdown-item" href="<?=$logout_uri?>"><i class="fas fa-sign-out-alt"></i> Sign out</a>
<?php endif; ?>
</div>
</li>
</div>
</nav>