added images for jQuery UI in web interface

some error handling when retrieving the status via AJAX

16 files changed, 120 insertions, 5 deletions

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 95606b2..1ca09c4 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -34,7 +34,7 @@ master.o: master.c master.h port.h
 coordinator.o: coordinator.c coordinator.h port.h system.h
 worker.o: worker.c worker.h port.h
 system.o: system.c system.h
-webserver.o: webserver.c webserver.h index.h jquery-ui-css.h jquery-js.h jquery-ui-js.h
+webserver.o: webserver.c webserver.h index.h jquery-ui-css.h jquery-js.h jquery-ui-js.h ui-bg_flat_0_aaaaaa_40x100-png.h ui-bg_flat_75_ffffff_40x100-png.h ui-bg_glass_55_fbf9ee_1x400-png.h ui-bg_glass_65_ffffff_1x400-png.h ui-bg_glass_75_dadada_1x400-png.h ui-bg_glass_75_e6e6e6_1x400-png.h ui-bg_glass_95_fef1ec_1x400-png.h ui-bg_highlight-soft_75_cccccc_1x100-png.h ui-icons_222222_256x240-png.h ui-icons_2e83ff_256x240-png.h ui-icons_454545_256x240-png.h ui-icons_888888_256x240-png.h ui-icons_cd0a0a_256x240-png.h
 3rdParty/linenoise/linenoise.o: 3rdParty/linenoise/linenoise.c 3rdParty/linenoise/linenoise.h
 3rdParty/http_tiny/http_lib.o: 3rdParty/http_tiny/http_lib.c 3rdParty/http_tiny/http_lib.h 
 cli.o: cli.c cli.h
@@ -65,7 +65,46 @@ jquery-js.h: jquery.js 3rdParty/xxd/xxd
 
 jquery-ui-js.h: jquery-ui.js 3rdParty/xxd/xxd
 	3rdParty/xxd/xxd -i jquery-ui.js > jquery-ui-js.h
+	
+ui-bg_flat_0_aaaaaa_40x100-png.h: images/ui-bg_flat_0_aaaaaa_40x100.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_flat_0_aaaaaa_40x100.png > ui-bg_flat_0_aaaaaa_40x100-png.h
+
+ui-bg_flat_75_ffffff_40x100-png.h: images/ui-bg_flat_75_ffffff_40x100.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_flat_75_ffffff_40x100.png > ui-bg_flat_75_ffffff_40x100-png.h
+
+ui-bg_glass_55_fbf9ee_1x400-png.h: images/ui-bg_glass_55_fbf9ee_1x400.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_glass_55_fbf9ee_1x400.png > ui-bg_glass_55_fbf9ee_1x400-png.h
+
+ui-bg_glass_65_ffffff_1x400-png.h: images/ui-bg_glass_65_ffffff_1x400.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_glass_65_ffffff_1x400.png > ui-bg_glass_65_ffffff_1x400-png.h
+
+ui-bg_glass_75_dadada_1x400-png.h: images/ui-bg_glass_75_dadada_1x400.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_glass_75_dadada_1x400.png > ui-bg_glass_75_dadada_1x400-png.h
+
+ui-bg_glass_75_e6e6e6_1x400-png.h: images/ui-bg_glass_75_e6e6e6_1x400.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_glass_75_e6e6e6_1x400.png > ui-bg_glass_75_e6e6e6_1x400-png.h
+
+ui-bg_glass_95_fef1ec_1x400-png.h: images/ui-bg_glass_95_fef1ec_1x400.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_glass_95_fef1ec_1x400.png > ui-bg_glass_95_fef1ec_1x400-png.h
+
+ui-bg_highlight-soft_75_cccccc_1x100-png.h: images/ui-bg_highlight-soft_75_cccccc_1x100.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-bg_highlight-soft_75_cccccc_1x100.png > ui-bg_highlight-soft_75_cccccc_1x100-png.h
 
+ui-icons_222222_256x240-png.h: images/ui-icons_222222_256x240.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-icons_222222_256x240.png > ui-icons_222222_256x240-png.h
+
+ui-icons_2e83ff_256x240-png.h: images/ui-icons_2e83ff_256x240.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-icons_2e83ff_256x240.png > ui-icons_2e83ff_256x240-png.h
+
+ui-icons_454545_256x240-png.h: images/ui-icons_454545_256x240.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-icons_454545_256x240.png > ui-icons_454545_256x240-png.h
+
+ui-icons_888888_256x240-png.h: images/ui-icons_888888_256x240.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-icons_888888_256x240.png > ui-icons_888888_256x240-png.h
+
+ui-icons_cd0a0a_256x240-png.h: images/ui-icons_cd0a0a_256x240.png 3rdParty/xxd/xxd
+	3rdParty/xxd/xxd -i images/ui-icons_cd0a0a_256x240.png > ui-icons_cd0a0a_256x240-png.h
+	
 clean:
 	@-rm *.o
 	@-rm biruda birudaenv
@@ -75,8 +114,8 @@ clean:
 	@-rm 3rdParty/linenoise/*.o
 	@-rm 3rdParty/xxd/xxd
 	@-rm biruda_conf.c
-	@-rm index.h jquery-ui-css.h jquery-js.h jquery-ui-js.h
-
+	@-rm index.h jquery-ui-css.h jquery-js.h jquery-ui-js.h ui-bg_flat_0_aaaaaa_40x100-png.h ui-bg_flat_75_ffffff_40x100-png.h ui-bg_glass_55_fbf9ee_1x400-png.h ui-bg_glass_65_ffffff_1x400-png.h ui-bg_glass_75_dadada_1x400-png.h ui-bg_glass_75_e6e6e6_1x400-png.h ui-bg_glass_95_fef1ec_1x400-png.h ui-bg_highlight-soft_75_cccccc_1x100-png.h ui-icons_222222_256x240-png.h ui-icons_2e83ff_256x240-png.h ui-icons_454545_256x240-png.h ui-icons_888888_256x240-png.h ui-icons_cd0a0a_256x240-png.h
+	
 # default values
 DESTDIR ?=
 prefix ?= /usr
diff --git a/src/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/images/ui-bg_flat_0_aaaaaa_40x100.png
new file mode 100644
index 0000000..127bc8f
--- /dev/null
+++ b/src/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/src/images/ui-bg_flat_75_ffffff_40x100.png b/src/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 0000000..56d9688
--- /dev/null
+++ b/src/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/src/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/images/ui-bg_glass_55_fbf9ee_1x400.png
new file mode 100644
index 0000000..f720048
--- /dev/null
+++ b/src/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/src/images/ui-bg_glass_65_ffffff_1x400.png b/src/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000..075d843
--- /dev/null
+++ b/src/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/src/images/ui-bg_glass_75_dadada_1x400.png b/src/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 0000000..addcc6b
--- /dev/null
+++ b/src/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/src/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/images/ui-bg_glass_75_e6e6e6_1x400.png
new file mode 100644
index 0000000..ecad24f
--- /dev/null
+++ b/src/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/src/images/ui-bg_glass_95_fef1ec_1x400.png b/src/images/ui-bg_glass_95_fef1ec_1x400.png
new file mode 100644
index 0000000..f6e3c36
--- /dev/null
+++ b/src/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/src/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/images/ui-bg_highlight-soft_75_cccccc_1x100.png
new file mode 100644
index 0000000..ae4f119
--- /dev/null
+++ b/src/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/src/images/ui-icons_222222_256x240.png b/src/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000..e9c8e16
--- /dev/null
+++ b/src/images/ui-icons_222222_256x240.png
diff --git a/src/images/ui-icons_2e83ff_256x240.png b/src/images/ui-icons_2e83ff_256x240.png
new file mode 100644
index 0000000..f2bf838
--- /dev/null
+++ b/src/images/ui-icons_2e83ff_256x240.png
diff --git a/src/images/ui-icons_454545_256x240.png b/src/images/ui-icons_454545_256x240.png
new file mode 100644
index 0000000..d6169e8
--- /dev/null
+++ b/src/images/ui-icons_454545_256x240.png
diff --git a/src/images/ui-icons_888888_256x240.png b/src/images/ui-icons_888888_256x240.png
new file mode 100644
index 0000000..d3e6e02
--- /dev/null
+++ b/src/images/ui-icons_888888_256x240.png
diff --git a/src/images/ui-icons_cd0a0a_256x240.png b/src/images/ui-icons_cd0a0a_256x240.png
new file mode 100644
index 0000000..4937018
--- /dev/null
+++ b/src/images/ui-icons_cd0a0a_256x240.png
diff --git a/src/index.html b/src/index.html
index c6ab63a..4372efa 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,14 +7,38 @@
 		<script src="/web/jquery-ui.js"></script>
 				
 		<script>
+			function sleep(milliseconds) {
+			  var start = new Date().getTime();
+			  for (var i = 0; i < 1e7; i++) {
+				if ((new Date().getTime() - start) > milliseconds){
+				  break;
+				}
+			  }
+			}
+
 			$( function( ) {
-				$( "#tabs" ).tabs( );
+				$( "#tabs" ).tabs({
+					cache: false,
+					beforeLoad: function( event, ui ) {
+						ui.panel.html( "Loading, please wait..." );
+						ui.jqXHR.fail( function( ) {
+							ui.panel.html(
+								"Couldn't load status of biruda. Check if biruda is running and the webserver is enabled." );
+							});
+					}
+				});
 			});
 			
 			$(document).ready( function( ) {
 				refresh_status( );
 			});
 
+			//~ $('#tabs').tabs({
+				//~ beforeLoad: function( event, ui ) {
+					//~ 
+				//~ }		
+			//~ });
+						
 			function refresh_status( ) {
 				$('#tabs').tabs( 'load', 0 );
 			}
diff --git a/src/webserver.c b/src/webserver.c
index 098334a..02353a5 100644
--- a/src/webserver.c
+++ b/src/webserver.c
@@ -17,7 +17,20 @@
 #include "jquery-ui-css.h"
 #include "jquery-js.h"
 #include "jquery-ui-js.h"
- 
+#include "ui-bg_flat_0_aaaaaa_40x100-png.h"
+#include "ui-bg_flat_75_ffffff_40x100-png.h"
+#include "ui-bg_glass_55_fbf9ee_1x400-png.h"
+#include "ui-bg_glass_65_ffffff_1x400-png.h"
+#include "ui-bg_glass_75_dadada_1x400-png.h"
+#include "ui-bg_glass_75_e6e6e6_1x400-png.h"
+#include "ui-bg_glass_95_fef1ec_1x400-png.h"
+#include "ui-bg_highlight-soft_75_cccccc_1x100-png.h"
+#include "ui-icons_222222_256x240-png.h"
+#include "ui-icons_2e83ff_256x240-png.h"
+#include "ui-icons_454545_256x240-png.h"
+#include "ui-icons_888888_256x240-png.h"
+#include "ui-icons_cd0a0a_256x240-png.h"
+
 static struct MHD_Daemon *d;
 
 #if MHD_VERSION < 0x00090500
@@ -117,6 +130,45 @@ static int handle_request( void *cls, struct MHD_Connection *connection,
 		} else if( strcmp( url, "/web/jquery-ui.js" ) == 0 ) {
 			strncpy( biruda_msg, (char *)jquery_ui_js, jquery_ui_js_len );
 			biruda_msg[jquery_ui_js_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_flat_0_aaaaaa_40x100.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_flat_0_aaaaaa_40x100_png, images_ui_bg_flat_0_aaaaaa_40x100_png_len );
+			images_ui_bg_flat_0_aaaaaa_40x100_png[images_ui_bg_flat_0_aaaaaa_40x100_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_flat_75_ffffff_40x100.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_flat_75_ffffff_40x100_png, images_ui_bg_flat_75_ffffff_40x100_png_len );
+			images_ui_bg_flat_75_ffffff_40x100_png[images_ui_bg_flat_75_ffffff_40x100_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_glass_55_fbf9ee_1x400.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_glass_55_fbf9ee_1x400_png, images_ui_bg_glass_55_fbf9ee_1x400_png_len );
+			images_ui_bg_glass_55_fbf9ee_1x400_png[images_ui_bg_glass_55_fbf9ee_1x400_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_glass_65_ffffff_1x400.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_glass_65_ffffff_1x400_png, images_ui_bg_glass_65_ffffff_1x400_png_len );
+			images_ui_bg_glass_65_ffffff_1x400_png[images_ui_bg_glass_65_ffffff_1x400_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_glass_75_dadada_1x400.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_glass_75_dadada_1x400_png, images_ui_bg_glass_75_dadada_1x400_png_len );
+			images_ui_bg_glass_75_dadada_1x400_png[images_ui_bg_glass_75_dadada_1x400_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_glass_75_e6e6e6_1x400.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_glass_75_e6e6e6_1x400_png, images_ui_bg_glass_75_e6e6e6_1x400_png_len );
+			images_ui_bg_glass_75_e6e6e6_1x400_png[images_ui_bg_glass_75_e6e6e6_1x400_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_glass_95_fef1ec_1x400.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_glass_95_fef1ec_1x400_png, images_ui_bg_glass_95_fef1ec_1x400_png_len );
+			images_ui_bg_glass_95_fef1ec_1x400_png[images_ui_bg_glass_95_fef1ec_1x400_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-bg_highlight-soft_75_cccccc_1x100.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_bg_highlight_soft_75_cccccc_1x100_png, images_ui_bg_highlight_soft_75_cccccc_1x100_png_len );
+			images_ui_bg_highlight_soft_75_cccccc_1x100_png[images_ui_bg_highlight_soft_75_cccccc_1x100_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-icons_222222_256x240.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_icons_222222_256x240_png, images_ui_icons_222222_256x240_png_len );
+			images_ui_icons_222222_256x240_png[images_ui_icons_222222_256x240_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-icons_2e83ff_256x240.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_icons_2e83ff_256x240_png, images_ui_icons_2e83ff_256x240_png_len );
+			images_ui_icons_2e83ff_256x240_png[images_ui_icons_2e83ff_256x240_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-icons_454545_256x240.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_icons_454545_256x240_png, images_ui_icons_454545_256x240_png_len );
+			images_ui_icons_454545_256x240_png[images_ui_icons_454545_256x240_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-icons_888888_256x240.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_icons_888888_256x240_png, images_ui_icons_888888_256x240_png_len );
+			images_ui_icons_888888_256x240_png[images_ui_icons_888888_256x240_png_len] = '\0';
+		} else if( strcmp( url, "/web/images/ui-icons_cd0a0a_256x240.png" ) == 0 ) {
+			strncpy( biruda_msg, (char *)images_ui_icons_cd0a0a_256x240_png, images_ui_icons_cd0a0a_256x240_png_len );
+			images_ui_icons_cd0a0a_256x240_png[images_ui_icons_cd0a0a_256x240_png_len] = '\0';
 		} else {
 			strcat( biruda_msg, "<html><body><p>This is biruda, the REST api. You can access the web interface <a href=\"/web\">here</a>.</p></body></html>" );
 		}