Added field class attribute.

diff --git a/src/fields.rs b/src/fields.rs
index b0c5e2ab2bdec93007a647a2f1899bb9ed033e70..8ead055ae6e6d47c2096278a0992c4f353f21814 100644 (file)
--- a/src/fields.rs
+++ b/src/fields.rs
@@ -22,6 +22,7 @@ struct Field {
        invisible: bool,
        help: String,
        value: String,
+       class: String,
        to_load: bool,
        to_save: bool,
        to_render: bool,
@@ -48,6 +49,9 @@ pub trait TField {
        fn get_value(&self) -> String;
        fn set_value(&mut self, value: &str);
 
+       fn get_class(&self) -> String;
+       fn set_class(&mut self, value: &str);
+
        fn get_to_load(&self) -> bool;
        fn set_to_load(&mut self, to_load: bool);
 
@@ -122,6 +126,14 @@ impl TField for FieldText {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -207,7 +219,7 @@ impl FieldText {
 
                match f.field.tmpl.add_raw_template("field", r#"{% if label %}<div class="mb-3">
  <label for="{{ name }}" class="form-label">{{ label }}</label>{% endif %}
- <input type="text" class="form-control{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}" {% if value %} value="{{ value | replace(from='"', to="&quot;") }}" {% endif %} {% if disabled %} readonly {% endif %} {% if maxlen > 0 %}maxlength="{{ maxlen }}"{% endif %} {% if invisible %}style="display: none;"{% endif %}/>
+ <input type="text" class="form-control{% if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" name="{{ name }}" id="{{ name }}" {% if value %} value="{{ value | replace(from='"', to="&quot;") }}" {% endif %} {% if disabled %} readonly {% endif %} {% if maxlen > 0 %}maxlength="{{ maxlen }}"{% endif %} {% if invisible %}style="display: none;"{% endif %}/>
  {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
  {% if label %}</div>{% endif %}"#) {
 Err(e) => { println!("{:?}", e) },
@@ -278,6 +290,14 @@ impl TField for FieldTextArea {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -366,7 +386,7 @@ impl FieldTextArea {
 
                match f.field.tmpl.add_raw_template("field", r#"{% if label %}<div class="mb-3">
  <label for="{{ name }}" class="form-label">{{ label }}</label>{% endif %}
- <textarea class="form-control{%if help %} is-invalid{% endif %}" {% if maxlen > 0 %}maxlength="{{ maxlen }}"{% endif %}
+ <textarea class="form-control{%if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" {% if maxlen > 0 %}maxlength="{{ maxlen }}"{% endif %}
  name="{{ name }}" id="{{ name }}" rows="{{ rows }}">{{ value | replace(from='"', to="&quot;") }}</textarea>
  {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
  {% if label %}</div>{% endif %}"#) {
@@ -451,6 +471,14 @@ impl TField for FieldRadio {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -538,7 +566,7 @@ impl FieldRadio {
  <label for="{{ name }}" class="form-label">{{ label }}</label><br/>{% endif %}
  {% for o in options %}
  <div class="form-check{% if help %} is-invalid{% endif %}">
- <input type="radio" class="form-check-input{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}_{{ loop.index }}" value="{{ o.value }}"{% if value == o.value %} checked{% endif %}/>
+ <input type="radio" class="form-check-input{% if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" name="{{ name }}" id="{{ name }}_{{ loop.index }}" value="{{ o.value }}"{% if value == o.value %} checked{% endif %}/>
  <label class="form-label" for="{{ name }}_{{ loop.index }}">{{ o.label }}</label>
  </div>
  {% endfor %}
@@ -549,7 +577,7 @@ _ => {},
 };
 
                match f.field.tmpl.add_raw_template("field_single", r#"<div class="form-check{% if help %} is-invalid{% endif %}">
- <input type="radio" class="form-check-input{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}_{{ idx }}" value="{{ value }}"{% if checked != "" %} checked{% endif %}/>
+ <input type="radio" class="form-check-input{% if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" name="{{ name }}" id="{{ name }}_{{ idx }}" value="{{ value }}"{% if checked != "" %} checked{% endif %}/>
  <label class="form-label" for="{{ name }}_{{ idx }}">{{ label }}</label>
  </div>"#) {
 Err(e) => { println!("{:?}", e) },
@@ -652,6 +680,14 @@ impl TField for FieldSelect {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -737,7 +773,7 @@ impl FieldSelect {
 
                match f.field.tmpl.add_raw_template("field", r#"{% if label %}<div class="mb-3">
  <label for="{{ name }}" class="form-label">{{ label }}</label><br/>{% endif %}
- <select class="form-select{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}">
+ <select class="form-select{% if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" name="{{ name }}" id="{{ name }}">
  {% for o in options %}
  <option value="{{ o.value }}"{% if value == o.value %} selected{% endif %}>{{ o.label }}</option>
  {% endfor %}
@@ -818,6 +854,14 @@ impl TField for FieldCheck {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -901,7 +945,7 @@ impl FieldCheck {
                f.field.to_render = true;
 
                match f.field.tmpl.add_raw_template("field", r#"<div class="form-check">
- <input type="checkbox" class="form-check-input{% if help %} is-invalid{% endif %}" name="{{ name }}" id="{{ name }}" {% if value == "1" or value == "on" %}checked{% endif %}/>
+ <input type="checkbox" class="form-check-input{% if help %} is-invalid{% endif %}{% if class %} {{class}}{% endif %}" name="{{ name }}" id="{{ name }}" {% if value == "1" or value == "on" %}checked{% endif %}/>
  {% if label %}<label for="{{ name }}" class="form-check-label">{{ label }}</label>{% endif %}
  {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
  </div>"#) {
@@ -964,6 +1008,14 @@ impl TField for FieldButton {
                self.field.value = String::from(value);
        }
 
+       fn get_class(&self) -> String {
+               String::from(&self.field.class)
+       }
+
+       fn set_class(&mut self, value: &str) {
+               self.field.value = String::from(value);
+       }
+
        fn get_to_load(&self) -> bool {
                self.field.to_load
        }
@@ -1045,7 +1097,7 @@ impl FieldButton {
                f.field.label = String::from(name);
                f.field.to_render = true;
 
-               match f.field.tmpl.add_raw_template("field", r#"<button class="btn btn-primary" type="submit" name="{{ name }}" id="{{ name }}"
+               match f.field.tmpl.add_raw_template("field", r#"<button class="btn{% if class %} {{class}}{% endif %}" type="submit" name="{{ name }}" id="{{ name }}"
 {% if form %}form="{{ form }}"{% endif %}>{{ label }}</button>"#) {
 Err(e) => { println!("{:?}", e) },
 _ => {},