From: Andrea Zagli <azagli@libero.it>
Date: Sun, 24 Sep 2023 10:38:58 +0000 (+0200)
Subject: Added field text placeholder attribute.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=30f3a081300cf69b370873723b8bf0c8e87505ff;p=rust%2Fzakform

Added field text placeholder attribute.
---

diff --git a/src/fields.rs b/src/fields.rs
index 8ead055..be1f9ca 100644
--- a/src/fields.rs
+++ b/src/fields.rs
@@ -79,6 +79,7 @@ pub trait TField {
 pub struct FieldText {
 	field: Field,
 	maxlen: i32,
+	placeholder: String,
 }
 
 impl TField for FieldText {
@@ -219,7 +220,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 %}{% 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 %}/>
+ <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 placeholder %}placeholder="{{ placeholder }}"{% endif %}/>
  {% if help %}<div id="helpBox_{{ name }}_" class="invalid-feedback">{{ help }}</div>{% endif %}
  {% if label %}</div>{% endif %}"#) {
 Err(e) => { println!("{:?}", e) },
@@ -236,6 +237,14 @@ _ => {},
 	pub fn get_maxlen(&self) -> i32 {
 		self.maxlen
 	}
+
+	pub fn set_placeholder(&mut self, placeholder: &String) {
+		self.placeholder = String::from(placeholder);
+	}
+
+	pub fn get_placeholder(&self) -> String {
+		String::from(&self.placeholder)
+	}
 }
 
 #[derive(Default)]
@@ -386,7 +395,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 class %} {{class}}{% 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 %}"#) {
@@ -566,7 +575,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 %}{% if class %} {{class}}{% 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 %}
@@ -577,7 +586,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 %}{% if class %} {{class}}{% 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) },
@@ -773,7 +782,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 %}{% if class %} {{class}}{% 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 %}
@@ -945,7 +954,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 %}{% if class %} {{class}}{% 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>"#) {
@@ -1097,7 +1106,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{% if class %} {{class}}{% endif %}" 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) },
 _ => {},