Merge pull request #32 from YOzaz/master

Fixes for relative paths

.gitignore

@@ -1 +1,4 @@
 application/config/supervisor.php
+composer.phar
+composer.lock
+/vendor

application/views/welcome.php

@@ -4,11 +4,11 @@
 	<meta charset="utf-8">
 	<title>Supervisord Monitoring</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link type="text/css" rel="stylesheet" href="<?php echo site_url('/css/bootstrap.min.css');?>"/>
-	<link type="text/css" rel="stylesheet" href="<?php echo site_url('/css/bootstrap-responsive.min.css');?>"/>
-	<link type="text/css" rel="stylesheet" href="<?php echo site_url('/css/custom.css');?>"/>
-<script type="text/javascript" src="<?php echo site_url('/js/jquery-1.10.1.min.js');?>"></script>
-<script type="text/javascript" src="<?php echo site_url('/js/bootstrap.min.js');?>"></script>
+	<link type="text/css" rel="stylesheet" href="<?php echo base_url('/css/bootstrap.min.css');?>"/>
+	<link type="text/css" rel="stylesheet" href="<?php echo base_url('/css/bootstrap-responsive.min.css');?>"/>
+	<link type="text/css" rel="stylesheet" href="<?php echo base_url('/css/custom.css');?>"/>
+<script type="text/javascript" src="<?php echo base_url('/js/jquery-1.10.1.min.js');?>"></script>
+<script type="text/javascript" src="<?php echo base_url('/js/bootstrap.min.js');?>"></script>
 	<noscript>
 	<?php
 	if($this->config->item('refresh')){ ?>
@@ -121,7 +121,7 @@
 									$alert = true;
 									echo '<span class="pull-right"><a href="'.site_url('/control/clear/'.$name.'/'.$item_name).'" id="'.$name.'_'.$item_name.
 											'" onclick="return false" data-toggle="popover" data-message="'.htmlspecialchars($check).'" data-original-title="'.
-											$item_name.'@'.$name.'" class="pop btn btn-mini btn-danger"><img src="/img/alert_icon.png" /></a></span>';
+											$item_name.'@'.$name.'" class="pop btn btn-mini btn-danger"><img src="' . base_url('/img/alert_icon.png') . '" /></a></span>';
 								}
 								?>
 							</td>
@@ -157,7 +157,7 @@
 				<?php
 				}
 				if($alert && !$muted && $this->config->item('enable_alarm')){
-					echo '<embed height="0" width="0" src="'.site_url('/sounds/alert.mp3').'">';
+					echo '<embed height="0" width="0" src="'.base_url('/sounds/alert.mp3').'">';
 				}
 				if($alert){
 					echo '<title>!!! WARNING !!!</title>';

composer.json

@@ -0,0 +1,5 @@
+{
+	"name": "mlazarov/supervisord-monitor",
+	"description": "Supervisord Multi Server Monitoring Tool",
+	"license": "MIT"
+}

package.json

@@ -0,0 +1,14 @@
+{
+  "name": "supervisord-monitor",
+  "version": "1.0.0",
+  "description": "Supervisord Multi Server Monitoring Tool",
+  "author": "Martin Lazarov",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mlazarov/supervisord-monitor"
+  },
+  "bugs": {
+    "url": "https://github.com/mlazarov/supervisord-monitor/issues"
+  },
+  "license": "MIT"
+}

public_html/css/custom.css

@@ -37,23 +37,23 @@ body{
 }
 
 .icon-red {
-  background-image: url("/img/glyphicons-halflings-red.png") !important;
+  background-image: url("../img/glyphicons-halflings-red.png") !important;
 }
 .icon-purple {
-  background-image: url("/img/glyphicons-halflings-purple.png") !important;
+  background-image: url("../img/glyphicons-halflings-purple.png") !important;
 }
 .icon-blue {
-  background-image: url("/img/glyphicons-halflings-blue.png") !important;
+  background-image: url("../img/glyphicons-halflings-blue.png") !important;
 }
 .icon-lightblue {
-  background-image: url("/img/glyphicons-halflings-lightblue.png") !important;
+  background-image: url("../img/glyphicons-halflings-lightblue.png") !important;
 }
 .icon-green {
-  background-image: url("/img/glyphicons-halflings-green.png") !important;
+  background-image: url("../img/glyphicons-halflings-green.png") !important;
 }
 .icon-yellow {
-  background-image: url("/img/glyphicons-halflings-yellow.png") !important;
+  background-image: url("../img/glyphicons-halflings-yellow.png") !important;
 }
 .icon-orange {
-  background-image: url("/img/glyphicons-halflings-orange.png") !important;
+  background-image: url("../img/glyphicons-halflings-orange.png") !important;
 }