Form test

From cef9b55b42735875c6d3586fefe2223dc81ae06c Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 14 Sep 2015 18:07:14 +0200 Subject: [PATCH] Form in Bootstrap style. --- src/formelement.c | 20 +++++++++++++++++++- src/formelementsubmit.c | 27 +++++++++++++++++++++++++++ src/tag.c | 6 +++--- tests/form.c | 28 +++++++++++++++++++++++----- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/src/formelement.c b/src/formelement.c index aea8afa..d517c58 100644 --- a/src/formelement.c +++ b/src/formelement.c @@ -228,7 +228,7 @@ gchar priv = ZAK_CGI_FORM_ELEMENT_GET_PRIVATE (element); - str = g_string_new (""); + str = g_string_new ("

\n"); if (priv->ht_label_attrs != NULL) { @@ -241,9 +241,27 @@ gchar if (ZAK_CGI_IS_FORM_ELEMENT (element) && ZAK_CGI_FORM_ELEMENT_GET_CLASS (element)->render != NULL) { + gchar *attr_class; + + attr_class = g_hash_table_lookup (priv->ht_attrs, "class"); + if (attr_class != NULL) + { + if (g_strstr_len (attr_class, -1, "form-control") == NULL) + { + g_hash_table_insert (priv->ht_attrs, "class", g_strdup_printf ("%s form-control", attr_class)); + } + g_free (attr_class); + } + else + { + g_hash_table_replace (priv->ht_attrs, g_strdup ("class"), g_strdup ("form-control")); + } + g_string_append (str, ZAK_CGI_FORM_ELEMENT_GET_CLASS (element)->render (element)); } + g_string_append (str, "\n

\n"); + ret = g_strdup (str->str); g_string_free (str, TRUE); diff --git a/src/formelementsubmit.c b/src/formelementsubmit.c index 4888c54..1bcbcdf 100644 --- a/src/formelementsubmit.c +++ b/src/formelementsubmit.c @@ -114,6 +114,9 @@ static gchar gchar *ret; GHashTable *ht_attrs; + gchar *attr_class; + GString *str_attr_class; + gchar *form_control; ZakCgiFormElementClass *klass; @@ -121,6 +124,30 @@ static gchar ht_attrs = klass->get_ht_attrs (element); + attr_class = g_hash_table_lookup (ht_attrs, "class"); + if (attr_class != NULL) + { + str_attr_class = g_string_new (attr_class); + form_control = g_strstr_len (str_attr_class->str, -1, "form-control"); + if (form_control != NULL) + { + /* no form-control for submit button */ + g_string_erase (str_attr_class, form_control - str_attr_class->str, 12); + } + g_string_free (str_attr_class, TRUE); + + if (g_strstr_len (attr_class, -1, "btn btn-default") == NULL) + { + g_hash_table_insert (ht_attrs, "class", g_strdup_printf ("%s btn btn-default", str_attr_class->str)); + } + + g_free (attr_class); + } + else + { + g_hash_table_replace (ht_attrs, g_strdup ("class"), g_strdup ("btn btn-default")); + } + ret = zak_cgi_tag_submit_ht (zak_cgi_form_element_get_id (element), ht_attrs); return ret; diff --git a/src/tag.c b/src/tag.c index 2fb1325..7ed037e 100644 --- a/src/tag.c +++ b/src/tag.c @@ -255,7 +255,7 @@ gchar */ gchar *zak_cgi_tag_file_ht (const gchar *id, - GHashTable *ht) + GHashTable *ht) { g_hash_table_insert (ht, "type", "file"); @@ -281,7 +281,7 @@ gchar ht = zak_cgi_commons_valist_to_ghashtable (ap); g_hash_table_insert (ht, "type", "submit"); - return zak_cgi_tag_tag_attrs ("input", id, ht); + return zak_cgi_tag_tag_attrs ("button", id, ht); } @@ -298,5 +298,5 @@ gchar { g_hash_table_insert (ht, "type", "submit"); - return zak_cgi_tag_tag_attrs ("input", id, ht); + return zak_cgi_tag_tag_attrs ("button", id, ht); } diff --git a/tests/form.c b/tests/form.c index a0cbac9..3bb4a36 100644 --- a/tests/form.c +++ b/tests/form.c @@ -38,9 +38,19 @@ main (int argc, char *argv[]) zakcgimain = zak_cgi_main_new (); - str = g_string_new ("\n" - "Form test\n" - "\n"); + str = g_string_new ("\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "Form test\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "

\n"); form = zak_cgi_form_new (zakcgimain, "method", "post", @@ -74,7 +84,7 @@ main (int argc, char *argv[]) element = zak_cgi_form_element_hidden_new ("hdn", "aaa", NULL); zak_cgi_form_add_element (form, element); - element = zak_cgi_form_element_submit_new ("submit", "aaa", NULL); + element = zak_cgi_form_element_submit_new ("submit", NULL, "zak-cgi-content", "Submit", NULL); zak_cgi_form_add_element (form, element); if (zak_cgi_main_is_post (zakcgimain)) @@ -96,7 +106,15 @@ main (int argc, char *argv[]) g_string_append (str, zak_cgi_form_render (form)); } - g_string_append (str, "\n"); + g_string_append (str, + "\n

\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + ""); zak_cgi_main_out (NULL, str->str); -- 2.49.0