Description:
wip
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r873:a7f456a02c5b - - 5 files changed: 26 inserted, 9 deleted
| @@ -35,7 +35,7 | |||||
|
|
35 |
|
35 | ||
|
|
36 | body { |
|
36 | body { |
|
|
37 | //font-size: 13px |
|
37 | //font-size: 13px |
|
|
38 |
- font-family: ' |
|
38 | + font-family: 'Noto Sans Thai', Tahoma, "sans-serif"; |
|
|
39 | margin: 10px; |
|
39 | margin: 10px; |
|
|
40 | padding: 10px; |
|
40 | padding: 10px; |
|
|
41 | padding-top: 60px; |
|
41 | padding-top: 60px; |
| @@ -16,7 +16,13 | |||||
|
|
16 |
|
16 | ||
|
|
17 | <link rel="preconnect" href="https://fonts.googleapis.com"> |
|
17 | <link rel="preconnect" href="https://fonts.googleapis.com"> |
|
|
18 | <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> |
|
18 | <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> |
|
|
19 | - <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"> |
|
19 | + -# |
|
|
|
20 | + <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"> | ||
|
|
|
21 | + <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"> | ||
|
|
|
22 | + <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"> | ||
|
|
|
23 | + <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"> | ||
|
|
|
24 | + <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"> | ||
|
|
|
25 | + <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"> | ||
|
|
20 |
|
26 | ||
|
|
21 | %body |
|
27 | %body |
|
|
22 | - unless local_assigns[:skip_header] |
|
28 | - unless local_assigns[:skip_header] |
| @@ -2,10 +2,11 | |||||
|
|
2 |
|
2 | ||
|
|
3 | .row |
|
3 | .row |
|
|
4 | .col-md-6 |
|
4 | .col-md-6 |
|
|
5 | - - if @announcements.length!=0 |
|
5 | + .card |
|
|
6 | - .announcementbox{:style => 'margin-top: 0px'} |
|
6 | + .card-header |
|
|
7 | - %span{:class => 'title'} |
|
7 | + Announcement |
|
|
8 | - Announcements |
|
8 | + = link_to 'Manage', announcements_path, class: 'btn btn-secondary btn-sm' |
|
|
|
9 | + %ul.list-group.list-group-flush | ||
|
|
9 | = render :partial => 'announcement', :collection => @announcements |
|
10 | = render :partial => 'announcement', :collection => @announcements |
|
|
10 | .col-md-4{style: "padding-left: 20px;"} |
|
11 | .col-md-4{style: "padding-left: 20px;"} |
|
|
11 | = render :partial => 'login_box' |
|
12 | = render :partial => 'login_box' |
| @@ -8,7 +8,17 | |||||
|
|
8 | - if @problem and @problem.errors |
|
8 | - if @problem and @problem.errors |
|
|
9 | =error_messages_for 'problem' |
|
9 | =error_messages_for 'problem' |
|
|
10 |
|
10 | ||
|
|
11 |
- = form_ |
|
11 | + = form_with url: do_import_problems_path, :multipart => true do |f| |
|
|
|
12 | + .row.mb-2 | ||
|
|
|
13 | + .col-md-1 | ||
|
|
|
14 | + = f.label :name, 'Name' | ||
|
|
|
15 | + .col-md-11 | ||
|
|
|
16 | + = f.text_field :name, class: 'form-control' | ||
|
|
|
17 | + .row.mb-2 | ||
|
|
|
18 | + .col-md-1 | ||
|
|
|
19 | + = f.label :full_name, 'Full Name' | ||
|
|
|
20 | + .col-md-11 | ||
|
|
|
21 | + = f.text_field :full_name, class: 'form-control' | ||
|
|
12 |
|
22 | ||
|
|
13 | .submitbox |
|
23 | .submitbox |
|
|
14 | %table |
|
24 | %table |
| @@ -5,8 +5,8 | |||||
|
|
5 | = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm' |
|
5 | = link_to 'Import problems', {:action => 'import'}, class: 'btn btn-success btn-sm' |
|
|
6 | = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm' |
|
6 | = link_to 'New problem', new_problem_path, class: 'btn btn-success btn-sm' |
|
|
7 | = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm' |
|
7 | = link_to 'Bulk Manage', { action: 'manage'}, class: 'btn btn-info btn-sm' |
|
|
8 |
- = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn- |
|
8 | + = link_to 'Turn off all problems', {:action => 'turn_all_off'}, class: 'btn btn-secondary btn-sm' |
|
|
9 |
- = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn- |
|
9 | + = link_to 'Turn on all problems', {:action => 'turn_all_on'}, class: 'btn btn-secondary btn-sm' |
|
|
10 | .submitbox |
|
10 | .submitbox |
|
|
11 | = form_tag action: 'quick_create', controller: 'problems' do |
|
11 | = form_tag action: 'quick_create', controller: 'problems' do |
|
|
12 | %b Quick New: |
|
12 | %b Quick New: |
You need to be logged in to leave comments.
Login now