Skip to content

Commit bd902e3

Browse files
authored
Merge pull request #3 from cploutarchou/fix-submenus
Fix submenus
2 parents 13743ab + b95ce42 commit bd902e3

12 files changed

+10346
-23
lines changed

application/controllers/Menu.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public function save()
160160
if (!empty($data['title'])) {
161161
$data['id'] = $this->input->post('menu_id');
162162
$data['url'] = $this->input->post('url');
163-
$data['class'] = $this->input->post('class');
163+
// $data['class'] = $this->input->post('class');
164164

165165
$item_moved = false;
166166
$group_id = $this->input->post('group_id');
@@ -189,7 +189,7 @@ public function save()
189189
$response['status'] = 1;
190190
$d['title'] = $data['title'];
191191
$d['url'] = $data['url'];
192-
$d['klass'] = $data['class']; //klass instead of class because of an error in js
192+
// $d['klass'] = $data['class']; //klass instead of class because of an error in js
193193
$response['menu'] = $d;
194194
}
195195
} else {

application/views/header.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/style.css">
88
<!-- Latest compiled and minified CSS -->
99
<link href="<?php echo base_url() ?>assets/css/bootstrap.min.css" rel="stylesheet">
10-
<link rel='icon' href='<?php echo base_url() ?>favicon.ico' type='image/x-icon'
11-
/ >
10+
<link rel='icon' href='<?php echo base_url() ?>favicon.ico' type='image/x-icon'>
1211
<!--[if lt IE 9]>
1312
<!-- <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>-->
1413
<![endif]-->
@@ -19,11 +18,11 @@
1918
echo $group_id;
2019
} ?>;
2120
</script>
22-
<script src="<?php echo base_url(); ?>assets/js/jquery-1.9.1.min.js"></script>
21+
<script src="<?php echo base_url(); ?>assets/js/jquery.min.js"></script>
2322
<script src="<?php echo base_url(); ?>assets/js/jquery-ui-1.10.3.custom.min.js"></script>
2423
<script src="<?php echo base_url(); ?>assets/js/jquery.mjs.nestedSortable.js"></script>
2524
<script src="<?php echo base_url(); ?>assets/js/menu.js"></script>
2625
<!-- Latest compiled JavaScript -->
27-
<script src="<?php echo base_url() ?>>/assets/js/bootstrap.min.js"></script>
26+
<script src="<?php echo base_url() ?>/assets/js/bootstrap.min.js"></script>
2827
</head>
2928

application/views/menus/vertical-menu-default.php

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<div class="container-fluid">
22
<div class="row">
33
<div class="col-sm-12">
4-
<?php $menu = get_main_menu($group_id);
5-
// var_dump($menu);?>
6-
4+
<?php $menu = get_main_menu($group_id); ?>
75
<nav class="navbar <?php if ($style == '' || $style == 'default') {
86
echo 'navbar-default';
97
} else if ($style == 'black') {
@@ -29,7 +27,6 @@
2927
href="<?php echo base_url() . $menu->main_menu[$i]->url ?>">
3028
<?php echo
3129
$menu->main_menu[$i]->title ?></a></li>
32-
3330
<?php else: ?>
3431
<li class="dropdown">
3532
<a href="<?php echo base_url() . $menu->main_menu[$i]->url ?>"
@@ -51,11 +48,20 @@ class="dropdown-toggle"
5148
class="dropdown-toggle"
5249
data-toggle="dropdown"><?php echo
5350
$menu->main_menu[$i]->parent_menu[$b]->title ?></a>
51+
<?php if (isset
52+
($menu->main_menu[$i]->parent_menu[$b]->parent_submenu)): ?>
53+
<ul class="dropdown-menu">
54+
<?php foreach
55+
($menu->main_menu[$i]->parent_menu[$b]->parent_submenu
56+
as $par_sub) : ?>
57+
<li><a href="<?php echo
58+
$par_sub->url ?>"><?php echo
59+
$par_sub->title ?>
60+
</a></li>
61+
<?php endforeach; ?>
62+
</ul>
63+
<?php endif; ?>
5464

55-
<ul class="dropdown-menu">
56-
<li><a href="#">Dropdown Submenu 4.1</a></li>
57-
58-
</ul>
5965
</li>
6066
<?php endif; ?>
6167
<?php endfor; ?>

application/views/vertical_menu_sample.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@
3434
border-radius: 6px 0 6px 6px;
3535
}
3636

37+
.dropdown-submenu > .dropdown-menu {
38+
top: 0;
39+
left: 100%;
40+
margin-top: -6px;
41+
margin-left: -1px;
42+
-webkit-border-radius: 0 6px 6px 6px;
43+
-moz-border-radius: 0 6px 6px 6px;
44+
border-radius: 0 6px 6px 6px;
45+
}
46+
3747
</style>
3848

3949
<body>
@@ -44,7 +54,7 @@
4454

4555
<div class="container">
4656
<div class="row">
47-
<?php get_menu('1', 'black'); ?>
57+
<?php get_menu('1', ''); ?>
4858
<!-- --><?php //get_menu('1', ''); ?>
4959
</div>
5060
</div>

assets/css/bootstrap.min.css

Lines changed: 7208 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
19.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)