Skip to content
Snippets Groups Projects
Commit fcbd70a2 authored by Hangzhi Yu's avatar Hangzhi Yu
Browse files

Rename form fields & css classes

parent 5abd7a32
No related branches found
No related tags found
1 merge request!21Bugfix/fix templates
Hide whitespace changes
Inline Side-by-side
aleksis/apps/hjelp/forms.py
+ 1
− 1
View file @ fcbd70a2
......@@ -48,7 +48,7 @@ class IssueForm(forms.Form):
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
),
)
bug_category_free_text = forms.CharField(
free_text = forms.CharField(
label=_("Please specify the issue according to the chosen category."), required=False,
)
short_description = forms.CharField(
......
aleksis/apps/hjelp/static/css/hjelp/hjelp.css
+ 3
− 3
View file @ fcbd70a2
......@@ -59,17 +59,17 @@
line-height: 1rem;
}
.bug-category-icon {
.issue-category-icon {
flex-basis: 45px;
}
.bug-category-field {
.issue-category-field {
flex-grow: 1;
margin: 0;
max-height: 40px;
}
.bug-category-field * {
.issue-category-field * {
margin: inherit;
max-height: inherit;
}
aleksis/apps/hjelp/templates/hjelp/issue_report.html
+ 27
− 27
View file @ fcbd70a2
......@@ -16,41 +16,41 @@
<p class="red-text">{{ form.non_field_errors }}</p>
<div class="row">
<div id="{{ form.bug_category_1.auto_id }}" class="input-field col s12 m4 browser-default">
<div id="{{ form.category_1.auto_id }}" class="input-field col s12 m4 browser-default">
<div class="flex-row">
<div id="bug_category_1_icon" class="bug-category-icon">
<div id="bug_category_1_icon" class="issue-category-icon">
<i class="material-icons prefix small">bug_report</i>
</div>
<div class="support-input-mobile bug-category-field">
{{ form.bug_category_1 }}
<div class="support-input-mobile issue-category-field">
{{ form.category_1 }}
</div>
</div>
</div>
<div id="{{ form.bug_category_2.auto_id }}" class="input-field col s12 m4 browser-default" style="display: none" disabled>
<div id="{{ form.category_2.auto_id }}" class="input-field col s12 m4 browser-default" style="display: none" disabled>
<div class="flex-row">
<div id="bug_category_2_icon" class="bug-category-icon">
<div id="bug_category_2_icon" class="issue-category-icon">
</div>
<div class="support-input-mobile bug-category-field">
{{ form.bug_category_2 }}
<div class="support-input-mobile issue-category-field">
{{ form.category_2 }}
</div>
</div>
</div>
<div id="{{ form.bug_category_3.auto_id }}" class="input-field col s12 m4 browser-default" style="display: none" disabled>
<div id="{{ form.category_3.auto_id }}" class="input-field col s12 m4 browser-default" style="display: none" disabled>
<div class="flex-row">
<div id="bug_category_3_icon" class="bug-category-icon">
<div id="bug_category_3_icon" class="issue-category-icon">
</div>
<div class="support-input-mobile bug-category-field">
{{ form.bug_category_3 }}
<div class="support-input-mobile issue-category-field">
{{ form.category_3 }}
</div>
</div>
</div>
<div id="{{ form.bug_category_free_text.auto_id }}" class="input-field col s12 m4" style="display: none" disabled>
<div id="{{ form.free_text.auto_id }}" class="input-field col s12 m4" style="display: none" disabled>
<div class="flex-row">
<div id="bug_category_free_text_icon" class="bug-category-icon">
<div id="bug_category_free_text_icon" class="issue-category-icon">
</div>
<div class="input-field support-input-mobile bug-category-field">
{{ form.bug_category_free_text }}
<label for="{{ form.bug_category_free_text.id_for_label }}"></label>
<div class="input-field support-input-mobile issue-category-field">
{{ form.free_text }}
<label for="{{ form.free_text.id_for_label }}"></label>
</div>
</div>
</div>
......@@ -106,13 +106,13 @@
success: function (data) {
if (data.free_text) {
$.fn.hideAndDisable(next_field_id)
next_field_id = "#{{ form.bug_category_free_text.auto_id }}"
$(next_field_id).children().children('.bug-category-field').children('label').html(data.placeholder)
next_field_id = "#{{ form.free_text.auto_id }}"
$(next_field_id).children().children('.issue-category-field').children('label').html(data.placeholder)
} else {
$.fn.hideAndDisable("#{{ form.bug_category_free_text.auto_id }}")
$.fn.hideAndDisable("#{{ form.free_text.auto_id }}")
$("[name=" + next_field_name + "]").next("span.select2:first").find("span.select2-selection__placeholder").html(data.placeholder);
}
$(next_field_id).children().children('.bug-category-icon').html("<i class=\"material-icons prefix small\">" + data.icon + "</i>");
$(next_field_id).children().children('.issue-category-icon').html("<i class=\"material-icons prefix small\">" + data.icon + "</i>");
if (($(next_field_id).is(':hidden')) && ((data.has_children)) || (data.free_text)){
$(next_field_id).disabled = false;
$(next_field_id).show();
......@@ -120,14 +120,14 @@
}
});
}
$("#{{ form.bug_category_1.auto_id }}").on('input', function() {
$.fn.setNextProperties(this.id, "#{{ form.bug_category_2.auto_id }}", "bug_category_2")
if ($("#{{ form.bug_category_3.auto_id }}").is(':visible')) {
$.fn.hideAndDisable("#{{ form.bug_category_3.auto_id }}")
$("#{{ form.category_1.auto_id }}").on('input', function() {
$.fn.setNextProperties(this.id, "#{{ form.category_2.auto_id }}", "bug_category_2")
if ($("#{{ form.category_3.auto_id }}").is(':visible')) {
$.fn.hideAndDisable("#{{ form.category_3.auto_id }}")
}
});
$("#{{ form.bug_category_2.auto_id }}").on('input', function() {
$.fn.setNextProperties(this.id, "#{{ form.bug_category_3.auto_id }}", "bug_category_3")
$("#{{ form.category_2.auto_id }}").on('input', function() {
$.fn.setNextProperties(this.id, "#{{ form.category_3.auto_id }}", "bug_category_3")
});
</script>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment