Modified the menu

diff --git a/video/application/models/core.php b/video/application/models/core.php
index 9a610b3a569c2d08a760a96b32b4db136fbbf41b..07a874b20a577f22b35e019da084f3eebdff7706 100644 (file)
--- a/video/application/models/core.php
+++ b/video/application/models/core.php
@@ -2,9 +2,10 @@
 class Core extends CI_Model {
        public function get_menu() {
                $menu = array(
-                       '#1'    => 'Desktop',
-                       '#2'    => 'Apps',
-                       '#3'    => 'Test'
+                       'Desktop'       => '#',
+                       'App'           => '#',
+                       'Test'          => '#',
+                       'GitHub'        => 'https://github.com/mustis/WebOsProject'
                );
                print json_encode($menu);
        }

diff --git a/video/application/views/main_view.php b/video/application/views/main_view.php
index 37eac6e6bd06d6f45d560d08f2ff99db90f52875..fc96d26cfa512649797a49bb60ec3803da62898e 100644 (file)
--- a/video/application/views/main_view.php
+++ b/video/application/views/main_view.php
@@ -6,8 +6,8 @@
                <meta name="description" content="">\r
                <meta name="author" content="">\r
 \r
-               <!--<link href="/public/css/bootstrap.min.css" rel="stylesheet">-->\r
-               <link rel="stylesheet/less" type="text/css" href="/public/less/bootstrap.less">\r
+               <link href="/public/css/bootstrap.min.css" rel="stylesheet">\r
+               <!--<link rel="stylesheet/less" type="text/css" href="/public/less/bootstrap.less">-->\r
                <script src="/public/js/jquery.min.js"></script>\r
 \r
                <!--[if lt IE 9]>\r
@@ -19,7 +19,7 @@
                        $.getJSON("/backend/get_menu", function(data) {\r
                                var menuitems = []\r
                                $.each(data, function(key, val) {\r
-                                       menuitems.push('<li><a href="' + key + '">' + val + '</li>');\r
+                                       menuitems.push('<li><a href="' + val + '">' + key + '</li>');\r
                                });\r
                                $('<ul/>', {\r
                                        'class': 'nav',\r