Skip to content

merge to master #42

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

Open
aavram wants to merge 5 commits into
base: master
Choose a base branch
from
Open

merge to master #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
928fcda
test
hsc8-dev Apr 9, 2018
b65cc0c
Merge branch 'role' into develop
hsc8-dev Apr 9, 2018
a602b31
Merge branch 'develop' of https://github.com/AceComp4711/CustomVehicl…
hsc8-dev Apr 9, 2018
6be26a9
Fixed menu bar #2
hsc8-dev Apr 9, 2018
be6d762
Merge pull request #41 from hscong8/develop
aavram Apr 9, 2018
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
9 changes: 0 additions & 9 deletions application/views/_menubar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
/*
* Menu navbar, just an unordered list
*/

$plan = array('1' => 'Guest', '2' => 'User', '3' => 'Admin');
?>
<ul class="nav nav-pills">
{menudata}
Expand All @@ -16,12 +14,5 @@
<li><a href="/roles/actor/User">User</a></li>
<li><a href="/roles/actor/Admin">Admin</a></li>
</ul>
<!-- <select class="form-control" title="User Role"><b class="caret"></b>
<?php
foreach ($plan as $id => $value)
{?>
<option value="<?php echo $id; ?>" <?php echo ($id == '2') ? ' selected="selected"' : ''; ?>><?php echo $value; ?></option>
<?php }?>
</select> -->
</li>
</ul>
10 changes: 8 additions & 2 deletions application/views/homepage_template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
</head>
<body>
<div id="container">
<div class="navbar">
<div class="navbar-inner">{menubar}</div>
<div class="navbar navbar-default">
<div class="navbar-inner">
{menubar}
</div>
</div>
</div>
{content}
{top}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js">
</script>
<script src="/assets/js/bootstrap.min.js">
</script>
</body>
</html>