ghopp
/
taskrambler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

show taskrambler version in Frontend

release0.1.5
Georg Hopp 12 years ago
parent
cb5c42f7bc
commit
711dc28fc5
7 changed files with 27 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      assets/html/main.html
  2. 15
      assets/js/init.js
  3. 2
      include/application/application.h
  4. 1
      include/http/response.h
  5. 2
      src/application/Makefile.am
  6. 2
      src/application/application.c
  7. 3
      src/http/Makefile.am

6
assets/html/main.html
View File

@ -7,6 +7,10 @@
<title>Taskrambler</title> <title>Taskrambler</title>
<link rel="stylesheet" type="text/css" href="/style/taskrambler.css"> <link rel="stylesheet" type="text/css" href="/style/taskrambler.css">
<link rel="shortcut icon" href="/favicon.ico?v=2" /> <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> </head>
<body> <body>
@ -23,6 +27,8 @@
</a> </a>
</div> </div>
<span id="version"></span>
<div id="menu"> <div id="menu">
<ul> <ul>
<li class="menuedge"></li> <li class="menuedge"></li>

15
assets/js/init.js
View File

@ -5,9 +5,18 @@ $(document).ready(function() {
sess = new Session("#sessinfo"); 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() { $("div#menu ul li:eq(1)").click(function() {
sval.start(); sval.start();

2
include/application/application.h
View File

@ -50,6 +50,8 @@ CLASS(Application) {
Storage users; Storage users;
Storage passwords; Storage passwords;
const char * version;
}; };
int applicationLogin(Application, Credential, Session); int applicationLogin(Application, Credential, Session);

1
include/http/response.h
View File

@ -53,6 +53,7 @@ HttpResponse httpResponseLoginForm();
HttpResponse httpResponseRandval(time_t, int); HttpResponse httpResponseRandval(time_t, int);
HttpResponse httpResponseSession(Session); HttpResponse httpResponseSession(Session);
HttpResponse httpResponseUser(User); HttpResponse httpResponseUser(User);
HttpResponse httpResponseVersion(const char *);
HttpResponse httpResponseAsset(const char *, size_t); HttpResponse httpResponseAsset(const char *, size_t);
#endif // __HTTP_RESPONSE_H__ #endif // __HTTP_RESPONSE_H__

2
src/application/Makefile.am
View File

@ -14,4 +14,4 @@ ADAPTERHTTP = adapter/http/http.c \
noinst_LIBRARIES = libapplication.a noinst_LIBRARIES = libapplication.a
libapplication_a_SOURCES = $(APPLICATION) $(ADAPTERHTTP) libapplication_a_SOURCES = $(APPLICATION) $(ADAPTERHTTP)
libapplication_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/
libapplication_a_CFLAGS = $(CFLAGS) -Wall -I ../../ -I ../../include/

2
src/application/application.c
View File

@ -30,6 +30,7 @@
#include "storage/storage.h" #include "storage/storage.h"
#include "utils/memory.h" #include "utils/memory.h"
#include "config.h"
static static
int int
@ -58,6 +59,7 @@ applicationCtor(void * _this, va_list * params)
} }
this->active_sessions = new(Queue); this->active_sessions = new(Queue);
this->version = VERSION;
return 0; return 0;
} }

3
src/http/Makefile.am
View File

@ -18,6 +18,7 @@ RESP = response.c \
response/asset.c \ response/asset.c \
response/randval.c \ response/randval.c \
response/session.c \ response/session.c \
response/version.c \
response/user.c response/user.c
PARSER = parser.c \ PARSER = parser.c \
parser/parse.c \ parser/parse.c \
@ -41,4 +42,4 @@ noinst_LIBRARIES = libhttp.a
libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \ libhttp_a_SOURCES = $(MSG) $(REQ) $(RESP) $(PARSER) $(WRITER) \
$(WORKER) $(HEADER) interface/i_http_intro.c $(WORKER) $(HEADER) interface/i_http_intro.c
libhttp_a_CFLAGS = $(CFLAGS) -Wall -I ../../include/
libhttp_a_CFLAGS = $(CFLAGS) -Wall -I ../../ -I ../../include/
Write Preview
Loading…
Cancel
Save