Download as
Browse Code »

Commit 8ded714e3c7453b302b712515d0296f8e79473f3

Authored by Zambom
1 parent 47ffc2aa
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Fixing date inputs (course & subject) [Issue: #226]

Showing 4 changed files with 28 additions and 5 deletions   Show diff stats
courses/templates/category/index.html
  Diff comments   View file @8ded714
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <div class="panel-body"> 33 <div class="panel-body">
34 <ul class="nav nav-pills nav-stacked"> 34 <ul class="nav nav-pills nav-stacked">
35 <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li> 35 <li><a href="javascript:void(0)">{% trans 'Replicate Course' %}</a></li>
36 - <li><a href="{% url 'course:create' %}">{% trans 'Create Course' %}</a></li> 36 + <li><a href="{% url 'course:creates' %}">{% trans 'Create Course' %}</a></li>
37 <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li> 37 <li><a href="{% url 'course:create_cat' %}">{% trans 'Create Category' %}</a></li>
38 </ul> 38 </ul>
39 </div> 39 </div>
courses/templates/course/create.html
  Diff comments   View file @8ded714
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput"> 19 <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
20 <label for="{{ field.auto_id }}">{{ field.label }}</label> 20 <label for="{{ field.auto_id }}">{{ field.label }}</label>
21 {% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%} 21 {% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
22 - <input type="date" class="form-control"name="{{field.name}}" value="{% if field.value.year %}{{field.value|date:'Y-m-d'}}{% else %}{{field.value}}{% endif %}" min="{{now|date:'Y-m-d'}}"> 22 + <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'Y-m-d'}}">
23 {% elif field.auto_id == 'id_image' %} 23 {% elif field.auto_id == 'id_image' %}
24 {% render_field field class='form-control' %} 24 {% render_field field class='form-control' %}
25 <div class="input-group"> 25 <div class="input-group">
courses/templates/subject/create.html
  Diff comments   View file @8ded714
@@ -11,8 +11,11 @@ @@ -11,8 +11,11 @@
11 {% for field in form %} 11 {% for field in form %}
12 <div class="form-group {% if field.errors %} has-error{% endif %}"> 12 <div class="form-group {% if field.errors %} has-error{% endif %}">
13 <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label> 13 <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
14 -  
15 - {% render_field field class='form-control' placeholder=field.label%} 14 + {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
  15 + <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  16 + {% else %}
  17 + {% render_field field class='form-control' placeholder=field.label%}
  18 + {% endif %}
16 <span class="help-block">{{ field.help_text }}</span> 19 <span class="help-block">{{ field.help_text }}</span>
17 </div> 20 </div>
18 {% endfor %} 21 {% endfor %}
@@ -22,4 +25,12 @@ @@ -22,4 +25,12 @@
22 </form> 25 </form>
23 </div> 26 </div>
24 </div> 27 </div>
  28 +
  29 + <script type="text/javascript">
  30 + var locale = navigator.language || navigator.userLanguage;
  31 +
  32 + $('.date-picker').datepicker({
  33 + language: locale,
  34 + });
  35 + </script>
25 {% endblock content %} 36 {% endblock content %}
courses/templates/subject/update.html
  Diff comments   View file @8ded714
@@ -12,7 +12,11 @@ @@ -12,7 +12,11 @@
12 <div class="form-group {% if field.errors %} has-error{% endif %}"> 12 <div class="form-group {% if field.errors %} has-error{% endif %}">
13 <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label> 13 <label for="{{ field.auto_id }}" class="control-label label-static"> {{ field.label }}</label>
14 14
15 - {% render_field field class='form-control' placeholder=field.label%} 15 + {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
  16 + <input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
  17 + {% else %}
  18 + {% render_field field class='form-control' placeholder=field.label%}
  19 + {% endif %}
16 <span class="help-block">{{ field.help_text }}</span> 20 <span class="help-block">{{ field.help_text }}</span>
17 </div> 21 </div>
18 {% endfor %} 22 {% endfor %}
@@ -22,4 +26,12 @@ @@ -22,4 +26,12 @@
22 </form> 26 </form>
23 </div> 27 </div>
24 </div> 28 </div>
  29 +
  30 + <script type="text/javascript">
  31 + var locale = navigator.language || navigator.userLanguage;
  32 +
  33 + $('.date-picker').datepicker({
  34 + language: locale,
  35 + });
  36 + </script>
25 {% endblock content %} 37 {% endblock content %}