Skip to content

Commit

Permalink
introduction_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Tran Xuan Nam committed Jun 9, 2017
1 parent 10003d9 commit 9928072
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 26 deletions.
Binary file added app/assets/images/introduction/activities.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/agile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/certificate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/expert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/job.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/network.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/softskill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/introduction/teaching.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions app/assets/stylesheets/education/home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,27 @@
padding-left: 5px;
padding-right: 5px;
}

.feature {
align-items: center;
border-radius: 2px;
display: flex;
flex-direction: row;
margin-bottom: 25px;
min-height: 100px;
padding: 10px 5px;

.feature-description {
font-size: 20px;
font-weight: 600;
padding-left: 15px;
}

.feature-img {
min-width: 100px;

img {
width: 100px;
}
}
}
2 changes: 1 addition & 1 deletion app/views/education/home/_course_register_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
class: "sm-form-control" %>
</div>
<div class="col_half col_last">
<%= f.input :address, label: t("address"), error_class: :error,
<%= f.input :address, label: t(".address"), error_class: :error,
class: "sm-form-control" %>
</div>
<div class="clear"></div>
Expand Down
36 changes: 27 additions & 9 deletions app/views/education/home/_introduction_video.html.erb
Original file line number Diff line number Diff line change
@@ -1,15 +1,33 @@
<div class="section clearfix">
<div class="heading-block center nomargin">
<h3><%= t ".heading" %></h3>
</div>
</div>
<div class="container japan-market-video">
<div class="row clearfix common-height">
<div class="col-md-6 center col-padding introduction-video-bg">
<div>&nbsp;</div>
<div class="row clearfix">
<div class="col-md-6 ">
<% %w(agile certificate expert softskill).each do |feature| %>
<div class="feature">
<div class="feature-img">
<%= image_tag "introduction/#{feature}.png" %>
</div>
<div class="feature-description">
<%= t ".#{feature}" %>
</div>
</div>
<% end %>
</div>
<div class="col-md-6 center col-padding introduction-video-custom">
<div>
<div class="heading-block nobottomborder">
<h3><%= t ".heading" %></h3>
<div class="col-md-6 ">
<% %w(network teaching job activities).each do |feature| %>
<div class="feature">
<div class="feature-img">
<%= image_tag "introduction/#{feature}.png" %>
</div>
<div class="feature-description">
<%= t ".#{feature}" %>
</div>
</div>
<p class="lead nobottommargin"><%= simple_format t(".description") %></p>
</div>
<% end %>
</div>
</div>
</div>
16 changes: 8 additions & 8 deletions config/locales/education/education.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ en:
introduction_video:
before_heading: "Easily Understandable & Customizable."
heading: "What Framgia Awesome Academy will bring to you?"
description: "- Agile training program, built on the Agile model&#13;
- International standard training system certified by IC Agile and Ruby Association after completion of the course&#13;
- Teaching staff are experts with many years of experience in the field of information technology.&#13;
- Students are trained to develop soft skills in a holistic manner.&#13;
- Be directly involved in real projects, operating under the virtual company model&#13;
- A dynamic, young learning environment with modern facilities.&#13;
- Commitment to job support for trainees after the course.&#13;
- Participate in exciting and rewarding extracurricular activities."
agile: "Agile training program, built on the Agile model"
certificate: "International standard training system certified by IC Agile and Ruby Association after completion of the course"
expert: "Teaching staff are experts with many years of experience in the field of information technology"
softskill: "Students are trained to develop soft skills in a holistic manner."
network: "Be directly involved in real projects, operating under the virtual company model."
teaching: "A dynamic, young learning environment with modern facilities."
job: "Commitment to job support for trainees after the course."
activities: "Participate in exciting and rewarding extracurricular activities."
statistics:
course: "Courses"
trainee: "Trainees"
Expand Down
16 changes: 8 additions & 8 deletions config/locales/education/education.vi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ vi:
introduction_video:
before_heading: "Framgia Awesome Academy sẽ đem đến cho bạn những gì?"
heading: "Framgia Awesome Academy sẽ đem đến cho bạn những gì?"
description: "- Chương trình đào tạo bài bản, được xây dựng theo mô hình Agile &#13;
- Hệ thống đào tạo theo chuẩn quốc tế được chứng nhận bởi IC Agile và Ruby Association sau khi hoàn thành khóa học &#13;
- Đội ngũ giảng dạy là những chuyên gia có nhiều năm kinh nghiệm trong lĩnh vực công nghệ thông tin.&#13;
- Học viên được đào tạo để phát triển kỹ năng mềm một cách toàn diện.&#13;
- Được trực tiếp tham gia vào các dự án thực tế, hoạt động theo mô hình virtual company&#13;
- Môi trường học tập năng động, trẻ trung với cơ sở vật chất hiện đại.&#13;
- Cam kết hỗ trợ việc làm cho học viên sau khóa học.&#13;
- Tham gia các hoạt động ngoại khóa hấp dẫn và bổ ích."
agile: "Chương trình đào tạo bài bản, được xây dựng theo mô hình Agile "
certificate: "Hệ thống đào tạo theo chuẩn quốc tế được chứng nhận bởi IC Agile và Ruby Association sau khi hoàn thành khóa học "
expert: "Đội ngũ giảng dạy là những chuyên gia có nhiều năm kinh nghiệm trong lĩnh vực công nghệ thông tin."
softskill: "Học viên được đào tạo để phát triển kỹ năng mềm một cách toàn diện."
network: "Được trực tiếp tham gia vào các dự án thực tế, hoạt động theo mô hình virtual company"
teaching: "Môi trường học tập năng động, trẻ trung với cơ sở vật chất hiện đại."
job: "Cam kết hỗ trợ việc làm cho học viên sau khóa học."
activities: "Tham gia các hoạt động ngoại khóa hấp dẫn và bổ ích."
statistics:
course: "Khóa học"
trainee: "Người học"
Expand Down

0 comments on commit 9928072

Please sign in to comment.