]> saetta.ns0.it Git - zakjukebox/commitdiff
projects / zakjukebox / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8f01c97)
First page rendered (added template-glib).
authorAndrea Zagli <azagli@libero.it>
Sat, 23 Sep 2017 08:33:38 +0000 (10:33 +0200)
committerAndrea Zagli <azagli@libero.it>
Sat, 23 Sep 2017 08:34:06 +0000 (10:34 +0200)
configure.ac patch | blob | history
data/zakjukebox/ctpl/Makefile.am patch | blob | history
data/zakjukebox/ctpl/template.ctpl [new file with mode: 0644] patch | blob
src/commons.h patch | blob | history
src/index.c patch | blob | history
src/main.c patch | blob | history

diff --git a/configure.ac b/configure.ac
index 1eed7989dc49136a16bb49d2a2324bfcab4d58af..0b7f53d7bdf5eb8f9117b26aaf04ae0bca1abc86 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,8 @@ AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
 PKG_CHECK_MODULES(ZAKJUKEBOX, [libzakcgi
-                               libzakconfi])
+                               libzakconfi
+                               template-glib-1.0])
 
 AC_SUBST(ZAKJUKEBOX_CFLAGS)
 AC_SUBST(ZAKJUKEBOX_LIBS)
diff --git a/data/zakjukebox/ctpl/Makefile.am b/data/zakjukebox/ctpl/Makefile.am
index de858fcfd493c8f8fe72675b5dd4505d1ed8260d..d2ceb64e72933762be01979cfcdd282f0cb5203f 100644 (file)
--- a/data/zakjukebox/ctpl/Makefile.am
+++ b/data/zakjukebox/ctpl/Makefile.am
@@ -1,5 +1,6 @@
 ctpldir = $(datadir)/$(PACKAGE)/ctpl
 
-ctpl_DATA = 
+ctpl_DATA = \
+            template.ctpl
 
 EXTRA_DIST =
diff --git a/data/zakjukebox/ctpl/template.ctpl b/data/zakjukebox/ctpl/template.ctpl
new file mode 100644 (file)
index 0000000..d3343ac
--- /dev/null
+++ b/data/zakjukebox/ctpl/template.ctpl
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="it">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>ZakJukeBox</title>
+
+       <!-- Bootstrap -->
+       <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
+       <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
+
+       <!-- custom -->
+       <link rel="stylesheet" href="/concorsi/css/style.css">
+
+       <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+       <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+       <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+
+       {{head}}
+
+  </head>
+  <body{{body_tag}}>
+
+       <div class="container">
+      {{body}}
+       </div>
+
+  </body>
+</html>
diff --git a/src/commons.h b/src/commons.h
index fe20ba0cc13ecc7e8a3226d461b82cfae6c9c4bd..76e9e4d245ceb87fd4066f95b15e8b5517c4e284 100644 (file)
--- a/src/commons.h
+++ b/src/commons.h
@@ -25,7 +25,6 @@
 #endif
 
 #include <libzakcgi/libzakcgi.h>
-#include <libzakconfi/libzakconfi.h>
 
 typedef struct
        {
@@ -34,8 +33,6 @@ typedef struct
                gchar *formdir;
                gchar *imagesdir;
 
-               ZakConfi *confi;
-
                ZakCgiMain *zcgi_main;
                ZakCgiSession *zcgi_session;
 
diff --git a/src/index.c b/src/index.c
index b28df34ac1c1a9f2e781210b7781925c45f35abd..a69d944d833d1c7f6d51b5db14ad9aa188419ff0 100644 (file)
--- a/src/index.c
+++ b/src/index.c
@@ -20,33 +20,49 @@
        #include <config.h>
 #endif
 
+#include <tmpl-glib.h>
+
 #include "index.h"
 
 void
 index_index (GMatchInfo *minfo, gpointer user_data)
 {
-       /* CtplEnviron *env; */
+       g_autoptr(GFile) file = NULL;
+       g_autoptr(TmplScope) scope = NULL;
+       g_autoptr(TmplTemplate) tmpl = NULL;
+       g_autoptr(GError) error = NULL;
+       TmplSymbol *symbol = NULL;
+       gchar *str;
+       g_warning ("INDEX INDEX");
+       Commons *commons = (Commons *)user_data;
 
-       gchar *filename;
-       gchar *content;
+       file = g_file_new_for_path (CTPLDIR "/template.ctpl");
+       tmpl = tmpl_template_new (NULL);
 
-       Commons *commons = (Commons *)user_data;
+       if (!tmpl_template_parse_file (tmpl, file, NULL, &error))
+               {
+                       g_warning ("Unable to parse template file «%s»: %s", CTPLDIR "/template.ctpl", error->message);
+                       return;
+               }
+
+       scope = tmpl_scope_new ();
+
+       symbol = tmpl_scope_get (scope, "head");
+       tmpl_symbol_assign_string (symbol, "");
 
-       /* env = ctpl_environ_new (); */
+       symbol = tmpl_scope_get (scope, "body");
+       tmpl_symbol_assign_string (symbol, commons->root);
 
-       filename = g_build_filename (commons->ctpldir, "index_index.ctpl", NULL);
-       /* content = solipa_ctpl_get_filled (commons->solipa_ctpl, filename, env); */
-       g_free (filename);
+       symbol = tmpl_scope_get (scope, "body_tag");
+       tmpl_symbol_assign_string (symbol, "");
 
-       /* env = ctpl_environ_new (); */
-       /* ctpl_environ_push_string (env, "head", ""); */
-       /* ctpl_environ_push_string (env, "body_tag", ""); */
-       /* ctpl_environ_push_string (env, "body", content); */
+       if (!(str = tmpl_template_expand_string (tmpl, scope, &error)))
+               {
+                       g_warning ("Error on rendering page: %s", error->message);
+                       return;
+               }
 
-       filename = g_build_filename (commons->ctpldir, "template.ctpl", NULL);
-       /* g_string_printf (commons->out, "%s", */
-       /*                  solipa_ctpl_get_filled (commons->solipa_ctpl, filename, env)); */
-       g_free (filename);
+       g_string_printf (commons->out, "%s", str);
 
-       g_free (content);
+       g_free (str);
 }
diff --git a/src/main.c b/src/main.c
index 31b8ec39a886de3d59fee735234297f2c1dbde30..fc980024a0168a086dbc49d0302dd9703b807560 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -37,6 +37,8 @@ main (int argc, char *argv[])
 
        gchar *filename;
 
+       ZakConfi *confi;
+
        gchar *str;
 
        /* inizializzazione commons */
@@ -49,8 +51,8 @@ main (int argc, char *argv[])
 
        /* reading configuration file */
        filename = g_build_filename (commons->configdir, "zakjukebox.conf", NULL);
-       commons->confi = zak_confi_new (g_strdup_printf ("file://%s", filename));
-       if (commons->confi == NULL)
+       confi = zak_confi_new (g_strdup_printf ("file://%s", filename));
+       if (confi == NULL)
                {
                        g_error ("Unable to load the configuration file: %s", filename);
                        g_free (filename);
@@ -65,6 +67,8 @@ main (int argc, char *argv[])
 
        commons->zcgi_session = zak_cgi_session_new (commons->zcgi_main, "/zakjukebox", NULL);
 
+       commons->root = zak_confi_path_get_value (confi, "DIR/root");
+
        /* Routing */
        zcgi_url = zak_cgi_url_new (commons->zcgi_main);
 
Unnamed repository; edit this file 'description' to name the repository.