Merge pull request #443 from rg663/438-datepicker-update

Datepicker updated
ubccr · Aug 5, 2022 · 5af1c12 · 5af1c12
2 parents 6f13af1 + 945d358
commit 5af1c12
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 29 deletions.
diff --git a/coldfront/core/allocation/templates/allocation/allocation_detail.html b/coldfront/core/allocation/templates/allocation/allocation_detail.html
@@ -409,7 +409,7 @@ <h3 class="d-inline"><i class="fas fa-users" aria-hidden="true"></i> Notificatio
       });
     }
   }
-  $(".datepicker").datepicker({ dateFormat: 'yy-mm-dd' });
+  $(".datepicker").flatpickr();
   $(document).on('click', '.confirm-activate', function(){
     var attributes_num = {{ attributes | length }};
     if (attributes_num == 0) {

diff --git a/coldfront/core/allocation/templates/allocation/allocation_list.html b/coldfront/core/allocation/templates/allocation/allocation_list.html
@@ -123,7 +123,7 @@ <h2>Allocations</h2>
     resetForm($('#filter_form'));
   });
 
-  $(".datepicker").datepicker();
+  $(".datepicker").flatpickr();
 
   function resetForm($form) {
     $form.find('input:text, input:password, input:file, select, textarea').val('');

diff --git a/coldfront/core/grant/templates/grant/grant_create.html b/coldfront/core/grant/templates/grant/grant_create.html
@@ -17,8 +17,8 @@
 </form>
 
 <script>
- $('#id_grant_start').datepicker();
- $('#id_grant_end').datepicker();
+ $('#id_grant_start').flatpickr();
+ $('#id_grant_end').flatpickr();
 </script>
 
 

diff --git a/coldfront/core/grant/templates/grant/grant_update_form.html b/coldfront/core/grant/templates/grant/grant_update_form.html
@@ -17,7 +17,7 @@
 </form>
 
 <script>
- $('#id_grant_start').datepicker();
- $('#id_grant_end').datepicker();
+ $('#id_grant_start').flatpickr();
+ $('#id_grant_end').flatpickr();
 </script>
 {% endblock %}
diff --git a/coldfront/core/resource/templates/resource_list.html b/coldfront/core/resource/templates/resource_list.html
@@ -109,7 +109,7 @@ <h2>Resources</h2>
     resetForm($('#filter_form'));
   });
 
-  $(".datepicker").datepicker();
+  $(".datepicker").flatpickr();
 
   function resetForm($form) {
     $form.find('input:text, input:password, input:file, select, textarea').val('');

diff --git a/coldfront/static/common/css/common.css b/coldfront/static/common/css/common.css
@@ -143,3 +143,5 @@ body > main > div > div.card.border-primary > div.card-body > form > div.alert.a
 	position:relative;
 	top:1px;
 }
+
+.form-control[readonly]{background-color:#ffffff;opacity:1}
diff --git a/coldfront/static/flatpickr/flatpickr.js b/coldfront/static/flatpickr/flatpickr.js
diff --git a/coldfront/static/flatpickr/flatpickr.min.css b/coldfront/static/flatpickr/flatpickr.min.css
diff --git a/coldfront/static/jquery/jquery-ui-1.12.1.min.css b/coldfront/static/jquery/jquery-ui-1.12.1.min.css
diff --git a/coldfront/static/jquery/jquery-ui-1.12.1.min.js b/coldfront/static/jquery/jquery-ui-1.12.1.min.js
diff --git a/coldfront/templates/common/base.html b/coldfront/templates/common/base.html
@@ -14,12 +14,12 @@
   <link rel="manifest" href="{% static 'common/site.webmanifest' %}">
 
   <!-- Load Bootstrap4 -->
-  <link rel="stylesheet" href="{% static 'jquery/jquery-ui-1.12.1.min.css' %}">
   <link rel="stylesheet" href="{% static 'bootstrap/bootstrap.min.css' %}">
+  <link rel="stylesheet" href="{% static 'flatpickr/flatpickr.min.css' %}">
 
   <script src="{% static 'jquery/jquery-3.6.0.min.js' %}"></script>
-  <script src="{% static 'jquery/jquery-ui-1.12.1.min.js' %}"></script>
   <script src="{% static 'bootstrap/bootstrap.bundle.min.js' %}"></script>
+  <script src="{% static 'flatpickr/flatpickr.js' %}"></script>
 
   <!-- Fontawesome CSS -->
   <link href="{% static 'fontawesome_free/css/all.min.css' %}" rel="stylesheet" type="text/css">