Form in Bootstrap style.

diff --git a/src/formelement.c b/src/formelement.c
index aea8afa075e8193cd9db2bb30290d515e8846a3f..d517c58c740d18dfd2b46895589adc30cbd533da 100644 (file)
--- 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 ("<div class=\"form-group\">\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</div>\n");
+
        ret = g_strdup (str->str);
        g_string_free (str, TRUE);
 

diff --git a/src/formelementsubmit.c b/src/formelementsubmit.c
index 4888c54381a4b09cddc8818b6bd4bda66eecbc89..1bcbcdf4166ac0dac1a048a365ef28a95777438f 100644 (file)
--- 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 2fb132512bad8024909bb6b5bfff7e1a3ebb23da..7ed037efb2160fcd37452af81a9aebbfbf460617 100644 (file)
--- 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 a0cbac9c08498fcc65ecfd9740651a886a246453..3bb4a361bb2fb06a5e0a4459f1a30af9c146ba65 100644 (file)
--- 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 ("<html>\n"
-                                               "<head><title>Form test</title></head>\n"
-                                               "<body>\n");
+       str = g_string_new ("<!DOCTYPE html>\n"
+                                               "<html lang=\"it\">\n"
+                                               "<head>\n"
+                                               "<meta charset=\"utf-8\">\n"
+                                               "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\">\n"
+                                               "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n"
+                                               "<title>Form test</title>\n"
+                                               "<!-- Bootstrap -->\n"
+                                               "<!-- Latest compiled and minified CSS -->\n"
+                                               "<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css\">\n"
+                                               "</head>\n"
+                                               "<body>\n"
+                                               "<div class=\"container\">\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</body>");
+       g_string_append (str,
+                                        "\n</div>\n"
+                                        "<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->\n"
+                                        "<script src=\"http://code.jquery.com/jquery-1.11.3.min.js\"></script>\n"
+                                        "<!-- Include all compiled plugins (below), or include individual files as needed -->\n"
+                                        "<!-- Latest compiled and minified JavaScript -->\n"
+                                        "<script src=\"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js\"></script>\n"
+                                        "</body>\n"
+                                        "</html>");
 
        zak_cgi_main_out (NULL, str->str);