Merge 9207e2f into 36c5b7f

SamStudio8 · Jun 25, 2014 · 7c35701 · 7c35701
2 parents 36c5b7f + 9207e2f
commit 7c35701
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/templates/task/changetask.html b/templates/task/changetask.html
@@ -19,18 +19,7 @@ <h1>Add or Edit Task</h1>
 {% endblock %}
 
 {% block content %}
-<script type="text/javascript">
-    {% if user.triageuser.default_due_time %}
-        $(document).ready(function() {
-            $('.dateinput').change(function(){
-                if($(".timeinput").prop("value") == ""){
-                    // Set the time if no already set to a value
-                    $('.timeinput').val("{{ user.triageuser.default_due_time|date:"H:i" }}");
-                }
-            });
-        });
-    {% endif %}
-</script>
+{% include 'task/default_due_time_js.html' %}
 <form method="post">
     {% csrf_token %}
     <input type="hidden" name="next" value="{{next}}" />

diff --git a/templates/task/dashboard.html b/templates/task/dashboard.html
@@ -13,6 +13,7 @@
 {% endblock %}
 
 {% block content %}
+{% include 'task/default_due_time_js.html' %}
 <script type="text/javascript">
     function humanize(timestamp){
         return moment(timestamp).fromNow();

diff --git a/templates/task/default_due_time_js.html b/templates/task/default_due_time_js.html
@@ -0,0 +1,12 @@
+<script type="text/javascript">
+    {% if user.triageuser.default_due_time %}
+        $(document).ready(function() {
+            $('.timeinput').focus(function(){
+                if($(".timeinput").prop("value") == ""){
+                    // Set the time if no already set to a value
+                    $('.timeinput').val("{{ user.triageuser.default_due_time|date:"H:i" }}");
+                }
+            });
+        });
+    {% endif %}
+</script>
diff --git a/templates/task/housekeeping.html b/templates/task/housekeeping.html
@@ -60,6 +60,7 @@ <h1>Housekeeping</h1>
         });
     });
 </script>
+{% include 'task/default_due_time_js.html' %}
 
 <div class="row">
     <div id="housekeeper" class="col-md-6">
@@ -127,7 +128,7 @@ <h3>{{ task.name }}</h3>
                                         {% csrf_token %}
                                         <input type="hidden" name="form_type" value="quick-duedate" />
                                         <div class="input-group">
-                                            <input class="dateinput form-control" data_input="YYYY-MM-DD" id="id_due_date_0" name="due_date_0" type="date">
+                                            <input class="dateinput form-control" data_input="YYYY-MM-DD" id="id_due_date_0" name="due_date_0" type="date" value="{% now "Y-m-d" %}">
                                             <input class="timeinput form-control" id="id_due_date_1" name="due_date_1" type="time"><span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
                                         </div>
                                         <button type="submit" class="btn btn-warning btn-block">Reschedule</button>