]> jfr.im git - z_archive/KronOS.git/commitdiff
projects / z_archive / KronOS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: dc6f2c8)
Updating to work when not based at http://server/
authorJohn Runyon <redacted>
Fri, 1 Nov 2013 02:58:31 +0000 (02:58 +0000)
committerJohn Runyon <redacted>
Fri, 1 Nov 2013 02:58:31 +0000 (02:58 +0000)
application/config/routes.php patch | blob | blame | history
application/controllers/main.php patch | blob | blame | history
application/views/main_view.php patch | blob | blame | history
public/js/application.js patch | blob | blame | history

diff --git a/application/config/routes.php b/application/config/routes.php
index 75c30364c086186a35cde63ca0bf7deafe3bcb9b..0454bc26912c00025b02f04c769d4b439ac0dd55 100644 (file)
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -38,9 +38,9 @@
 |
 */
 
-$route['default_controller'] = "main";
+$route['default_controller'] = "Main";
 $route['404_override'] = '';
 
 
 /* End of file routes.php */
-/* Location: ./application/config/routes.php */
\ No newline at end of file
+/* Location: ./application/config/routes.php */
diff --git a/application/controllers/main.php b/application/controllers/main.php
index d3feb97c683e1638750871226e74d00e04ceb9f4..e5c286088ed6052f09738b0b7783b04ca914790e 100644 (file)
--- a/application/controllers/main.php
+++ b/application/controllers/main.php
@@ -7,7 +7,7 @@ class Main extends CI_Controller {
                parent::__construct();
        }
 
-       public function index(){
-               $this->load->view('main_view');
+       public function index() {
+               $this->load->view('main_view', array('base'=>base_url()));
        }
 }
diff --git a/application/views/main_view.php b/application/views/main_view.php
index 0e88d9a0fa1dd8f44c98e987dec3254332215c15..d6d3e1a7ea1f234bdc2ffce1f663dd0a5e6ec832 100644 (file)
--- a/application/views/main_view.php
+++ b/application/views/main_view.php
@@ -1,23 +1,24 @@
-<!DOCTYPE html>\r
-<html lang="en">\r
-       <head>\r
-               <meta charset="utf-8">\r
-               <title>KronOS</title>\r
-               <meta name="description" content="">\r
-               <meta name="author" content="">\r
-\r
-               <link href="/public/css/bootstrap.css" rel="stylesheet">\r
-               <!--<link rel="stylesheet/less" type="text/css" href="/public/less/bootstrap.less">-->\r
-\r
-               <!--[if lt IE 9]>\r
-                       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>\r
-               <![endif]-->\r
-       </head>\r
-       <body>\r
-               <script src="/public/js/jquery.min.js" type="text/javascript"></script>\r
-               <script src="/public/js/jquery.jclock.js" type="text/javascript"></script>\r
-               <script src="/public/js/bootstrap.min.js" type="text/javascript"></script>\r
-               <script src="/public/js/application.js" type="text/javascript"></script>\r
-               <script src="/public/js/less-1.3.0.min.js" type="text/javascript"></script>\r
-       </body>\r
-</html>\r
+<!DOCTYPE html>
+<html lang="en">
+       <head>
+               <meta charset="utf-8" />
+               <title>KronOS</title>
+               <meta name="description" content="" />
+               <meta name="author" content="" />
+               <base href="<?php echo $base; ?>" />
+
+               <link href="public/css/bootstrap.css" rel="stylesheet" />
+               <!--<link rel="stylesheet/less" type="text/css" href="/public/less/bootstrap.less" />-->
+
+               <!--[if lt IE 9]>
+                       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+               <![endif]-->
+       </head>
+       <body>
+               <script src="public/js/jquery.min.js" type="text/javascript"></script>
+               <script src="public/js/jquery.jclock.js" type="text/javascript"></script>
+               <script src="public/js/bootstrap.min.js" type="text/javascript"></script>
+               <script src="public/js/application.js" type="text/javascript"></script>
+               <script src="public/js/less-1.3.0.min.js" type="text/javascript"></script>
+       </body>
+</html>
diff --git a/public/js/application.js b/public/js/application.js
index fc4fd4cc476beb9f7b167422a4b91ce472791761..092fc6e8006dcb5912d4e8c006c8e1c7820ddc34 100644 (file)
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -9,7 +9,7 @@
 
                this.loadDefaults = function() {
                        var self = this;
-//                     $.getJSON("/backend/logged_in", function(resp) {
+//                     $.getJSON("backend/logged_in", function(resp) {
 //                             if (!resp.contents) {
                                        self.hideMenu();
                                        self.hideBackground();
@@ -48,7 +48,7 @@
                };
 
                this.loadMenuItems = function() {
-                       $.getJSON("/backend/get_menu", function(resp) {
+                       $.getJSON("backend/get_menu", function(resp) {
                                if (resp.success) {
                                        navStr = '<ul class="nav">';
                                        $.each(resp.contents, function(key, val) {
@@ -82,7 +82,7 @@
 
                this.loadLogin = function() {
                        $.ajax({
-                               url: "/backend/login_modal",
+                               url: "backend/login_modal",
                                success: function (data) {
                                        $('body').append(data);
                                        $('#loginModal').modal({
@@ -114,7 +114,7 @@
                                'password': $('#inputPassword').val()
                        };
                        self = this;
-                       $.post('/account/login', loginData, function(resp) {
+                       $.post('account/login', loginData, function(resp) {
                                if (resp.success) {
                                        document.cookie = "session_id="+resp.data.sid+";expires=0";
                                        self.setUsername(resp.data.name);
@@ -165,7 +165,7 @@
                }
 
                this.openApp = function(appid) {
-                       $.getJSON("/control/open/"+appid, function(resp) {
+                       $.getJSON("control/open/"+appid, function(resp) {
                                if (resp.success) {
                                        var repl = resp.contents
                                        var target = 'div#'+repl.name+repl.id;
Unnamed repository; edit this file 'description' to name the repository.