show taskrambler version in Frontend

12 years ago · 711dc28fc5
7 changed files with 27 additions and 6 deletions
--- a/assets/html/main.html
+++ b/assets/html/main.html
@ -7,6 +7,10 @@
 		<title>Taskrambler</title>
 		<link rel="stylesheet" type="text/css" href="/style/taskrambler.css">
 		<link rel="shortcut icon" href="/favicon.ico?v=2" />
+		<script type="text/javascript" src="/js/jquery.js"></script>
+		<script type="text/javascript" src="/js/serverval.js"></script>
+		<script type="text/javascript" src="/js/session.js"></script>
+		<script type="text/javascript" src="/js/init.js"></script>
 	</head>

 	<body> 
@ -23,6 +27,8 @@
 				</a>
 			</div>

+			<span id="version"></span>
+
 			<div id="menu">
 				<ul>
 					<li class="menuedge"></li>
--- a/assets/js/init.js
+++ b/assets/js/init.js
@ -1,13 +1,22 @@
 var sess = null;

 $(document).ready(function() {
-	var sval = new ServerVal("#randval");
+	var sval    = new ServerVal("#randval");

 	sess = new Session("#sessinfo");

-	$(window).focus(function() {
-		$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
-	});
+//	$(window).focus(function() {
+//		$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
+//	});
+
+	$.getJSON(
+		"/version/",
+		function(data) {
+			$.each(result, function(i, field){
+				$("#version").empty().append("version: " + field);
+			});
+		}
+	);

 	$("div#menu ul li:eq(1)").click(function() {
 		sval.start();
--- a/include/application/application.h
+++ b/include/application/application.h
@ -50,6 +50,8 @@ CLASS(Application) {

 	Storage           users;
 	Storage           passwords;
+
+	const char *      version;
 };

 int     applicationLogin(Application, Credential, Session);
--- a/include/http/response.h
+++ b/include/http/response.h
@ -53,6 +53,7 @@ HttpResponse httpResponseLoginForm();
 HttpResponse httpResponseRandval(time_t, int);
 HttpResponse httpResponseSession(Session);
 HttpResponse httpResponseUser(User);
+HttpResponse httpResponseVersion(const char *);
 HttpResponse httpResponseAsset(const char *, size_t);

 #endif // __HTTP_RESPONSE_H__
--- a/src/application/Makefile.am
+++ b/src/application/Makefile.am
@ -14,4 +14,4 @@ ADAPTERHTTP = adapter/http/http.c \
 noinst_LIBRARIES = libapplication.a

 libapplication_a_SOURCES = $(APPLICATION) $(ADAPTERHTTP)
-libapplication_a_CFLAGS  = $(CFLAGS) -Wall -I ../../include/
+libapplication_a_CFLAGS  = $(CFLAGS) -Wall -I ../../ -I ../../include/
--- a/src/application/application.c
+++ b/src/application/application.c
@ -30,6 +30,7 @@
 #include "storage/storage.h"

 #include "utils/memory.h"
+#include "config.h"

 static
 int
@ -58,6 +59,7 @@ applicationCtor(void * _this, va_list * params)
 	}

 	this->active_sessions = new(Queue);
+	this->version         = VERSION;

 	return 0;
 }
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@ -18,6 +18,7 @@ RESP   = response.c \
 	 response/asset.c \
 	 response/randval.c \
 	 response/session.c \
+	 response/version.c \
 	 response/user.c
 PARSER = parser.c \
 	 parser/parse.c \
@ -41,4 +42,4 @@ noinst_LIBRARIES = libhttp.a

 libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \
 		    $(WORKER) $(HEADER) interface/i_http_intro.c
-libhttp_a_CFLAGS  = $(CFLAGS) -Wall -I ../../include/
+libhttp_a_CFLAGS  = $(CFLAGS) -Wall -I ../../ -I ../../include/