# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2022-09-21 16:47:46
# Node ID a7f456a02c5bad047dbfbad22e7402921fb66f5e
# Parent  17032a7943cf0813c9c3fbd7ad23b28ce684769c

wip

diff --git a/app/assets/stylesheets/my_custom.css.scss b/app/assets/stylesheets/my_custom.css.scss
--- a/app/assets/stylesheets/my_custom.css.scss
+++ b/app/assets/stylesheets/my_custom.css.scss
@@ -35,7 +35,7 @@
 
 body {
   //font-size: 13px
-  font-family: 'Krub', Tahoma, "sans-serif";
+  font-family: 'Noto Sans Thai', Tahoma, "sans-serif";
   margin: 10px;
   padding: 10px;
   padding-top: 60px;
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -16,7 +16,13 @@
 
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital@0;1&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+  -#
+    <link href="https://fonts.googleapis.com/css2?family=Bai+Jamjuree:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Krub:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Sarabun:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Mitr:ital,wght@0,300;1,300&family=Kodchasan:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&family=Noto+Sans+Thai:ital,wght@0,200;0,400;0,600;1,200;1,400;1,600&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Noto+Serif+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Thai:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
+  <link href="https://fonts.googleapis.com/css2?family=Sarabun:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
 
 %body
   - unless local_assigns[:skip_header]
diff --git a/app/views/main/login.html.haml b/app/views/main/login.html.haml
--- a/app/views/main/login.html.haml
+++ b/app/views/main/login.html.haml
@@ -2,10 +2,11 @@
 
 .row
   .col-md-6
-    - if @announcements.length!=0
-      .announcementbox{:style => 'margin-top: 0px'}
-        %span{:class => 'title'}
-          Announcements
+    .card
+      .card-header
+        Announcement
+        = link_to 'Manage', announcements_path, class: 'btn btn-secondary btn-sm'
+      %ul.list-group.list-group-flush
         = render :partial => 'announcement', :collection => @announcements
   .col-md-4{style: "padding-left: 20px;"}
     = render :partial => 'login_box'
diff --git a/app/views/problems/import.html.haml b/app/views/problems/import.html.haml
--- a/app/views/problems/import.html.haml
+++ b/app/views/problems/import.html.haml
@@ -8,7 +8,17 @@
 - if @problem and @problem.errors
   =error_messages_for 'problem'
 
-= form_tag do_import_problems_path, :multipart => true  do |f|
+= form_with url: do_import_problems_path, :multipart => true  do |f|
+  .row.mb-2
+    .col-md-1
+      = f.label :name, 'Name'
+    .col-md-11
+      = f.text_field :name, class: 'form-control'
+  .row.mb-2
+    .col-md-1
+      = f.label :full_name, 'Full Name'
+    .col-md-11
+      = f.text_field :full_name, class: 'form-control'
 
   .submitbox
     %table
diff --git a/app/views/problems/index.html.haml b/app/views/problems/index.html.haml
--- a/app/views/problems/index.html.haml
+++ b/app/views/problems/index.html.haml
@@ -5,8 +5,8 @@
   = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm'
   = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm'
   = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm'
-  = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-default btn-sm'
-  = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-default btn-sm'
+  = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-secondary btn-sm'
+  = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-secondary btn-sm'
 .submitbox
   = form_tag action: 'quick_create', controller: 'problems' do
     %b Quick New: