From 59fed55ccc8357b97e197e62b4d008821bd1e50e Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Wed, 26 Sep 2018 14:59:25 +0300
Subject: [PATCH 01/33] =?UTF-8?q?Dersler=20i=C3=A7in=20aramalar=C4=B1=20te?=
 =?UTF-8?q?kille=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Akıllı arama ile detaylı arama birleştirilerek tek bir arama formundan aramaların yapılması sağlandı.
---
 app/models/concerns/dynamic_search.rb         |  5 +--
 .../courses/_search.html.erb                  | 31 ++++++++++---------
 config/locales/defaults/en.yml                |  1 +
 config/locales/defaults/tr.yml                |  1 +
 .../locales/models/course_management/en.yml   |  5 ++-
 .../locales/models/course_management/tr.yml   |  5 ++-
 6 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/app/models/concerns/dynamic_search.rb b/app/models/concerns/dynamic_search.rb
index 74ba73bc0..b6aa5087d 100644
--- a/app/models/concerns/dynamic_search.rb
+++ b/app/models/concerns/dynamic_search.rb
@@ -16,9 +16,10 @@ def dynamic_search_keys
 
     def dynamic_search(params = {})
       raise ArgumentError, 'parameter must be Hash' unless [ActionController::Parameters, Hash].include?(params.class)
-      return search(params[:term]) if params[:term].present?
 
-      dynamic_where(params)
+      results = dynamic_where(params)
+
+      params[:term].present? ? results.search(params[:term]) : results
     end
 
     private
diff --git a/app/views/course_management/courses/_search.html.erb b/app/views/course_management/courses/_search.html.erb
index 2909ab50b..507cf4d9d 100644
--- a/app/views/course_management/courses/_search.html.erb
+++ b/app/views/course_management/courses/_search.html.erb
@@ -1,38 +1,41 @@
 <div id="SearchForms" role="tablist">
-
-  <%= render 'layouts/shared/smart_search',
-             search_path: courses_path,
-             placeholder: t('.smart_search_placeholder') %>
-
   <div class="card">
-    <div class="card-header" role="tab" id="detailedSearch">
+    <div class="card-header" role="tab" id="Search">
       <h5 class="mb-0">
         <a class="collapsed"
            data-toggle="collapse"
-           href="#collapseDetailedSearch"
-           id="collapseDetailedSearchLink"
+           href="#collapseSearch"
+           id="collapseSearchLink"
            aria-expanded="false"
-           aria-controls="DetailedSearch">
-          <%= t('detailed_search') %>
+           aria-controls="Search">
+          <%= t('search') %>
         </a>
         <div class="float-right">
           <%= link_to t('reset'), courses_path, class: 'btn btn-warning btn-sm' %>
         </div>
       </h5>
     </div>
-    <div id="collapseDetailedSearch"
-         class="collapse"
+    <div id="collapseSearch"
+         class="collapse show"
          role="tabpanel"
-         aria-labelledby="detailedSearch"
+         aria-labelledby="Search"
          data-parent="#SearchForms">
       <div class="card-body">
         <%= form_tag courses_path, method: :get do %>
           <div class="row">
+            <div class="col-sm-12">
+              <div class="form-group">
+                <%= text_field_tag :term,
+                                    params[:term],
+                                    placeholder: t('.smart_search_placeholder'),
+                                    class: 'form-control' %>
+              </div>
+            </div>
             <div class="col-sm-4">
               <div class="form-group">
                 <%= label_tag(:unit_id, t('.unit')) %>
                 <%= select_tag(:unit_id,
-                              options_from_collection_for_select(Unit.all, :id, :name, params[:unit_id]),
+                              options_from_collection_for_select(Unit.coursable.active, :id, :name, params[:unit_id]),
                               include_blank: true,
                               class: 'form-control',
                               style: 'width: 100%') %>
diff --git a/config/locales/defaults/en.yml b/config/locales/defaults/en.yml
index 70e9dbad0..bba8f9db4 100644
--- a/config/locales/defaults/en.yml
+++ b/config/locales/defaults/en.yml
@@ -19,4 +19,5 @@ en:
   'no': 'No'
   detailed_search: Detailed Search
   reset: Reset
+  search: Search
   smart_search: Smart Search
diff --git a/config/locales/defaults/tr.yml b/config/locales/defaults/tr.yml
index 3ce049b4c..f6edbbecd 100644
--- a/config/locales/defaults/tr.yml
+++ b/config/locales/defaults/tr.yml
@@ -19,4 +19,5 @@ tr:
   'no': Hayır
   detailed_search: Detaylı Arama
   reset: Reset
+  search: Arama
   smart_search: Akıllı Arama
diff --git a/config/locales/models/course_management/en.yml b/config/locales/models/course_management/en.yml
index e416203db..f341c291d 100644
--- a/config/locales/models/course_management/en.yml
+++ b/config/locales/models/course_management/en.yml
@@ -62,7 +62,10 @@ en:
         success: Course successfully updated.
       search:
         smart_search_placeholder: Course name or code
-        <<: *course_attributes
+        program_type: All Program Types
+        language: All Languages
+        unit: All Units
+        status: All Statuses
       show:
         <<: *course_attributes
       index:
diff --git a/config/locales/models/course_management/tr.yml b/config/locales/models/course_management/tr.yml
index 717a47c94..7433c47f9 100644
--- a/config/locales/models/course_management/tr.yml
+++ b/config/locales/models/course_management/tr.yml
@@ -62,7 +62,10 @@ tr:
         success: Ders başarıyla güncellendi.
       search:
         smart_search_placeholder: Ders adı veya kodu
-        <<: *course_attributes
+        program_type: Tüm Program Türleri
+        language: Tüm Diller
+        unit: Tüm Birimler
+        status: Tüm Durumlar
       show:
         <<: *course_attributes
       index:

From 1754aa7579682e2e992f2d4838127ea35369f71b Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Wed, 26 Sep 2018 15:01:01 +0300
Subject: [PATCH 02/33] =?UTF-8?q?Browser=20validasyonlar=C4=B1=20aktifle?=
 =?UTF-8?q?=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/initializers/simple_form.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 83718ead9..108a7c387 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -130,7 +130,7 @@
   # in this configuration, which is recommended due to some quirks from different browsers.
   # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
   # change this configuration to true.
-  config.browser_validations = false
+  config.browser_validations = true
 
   # Collection of methods to detect if a file type was given.
   # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]

From 00751450fcdac22447b1a93707b276528bf40dfb Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Wed, 26 Sep 2018 15:01:50 +0300
Subject: [PATCH 03/33] =?UTF-8?q?Ders=20ekleme=20formuna=20client=20side?=
 =?UTF-8?q?=20validasyonlar=C4=B1=20ekle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/course_management/courses/_form.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/course_management/courses/_form.html.erb b/app/views/course_management/courses/_form.html.erb
index a22161f39..4f591dce1 100644
--- a/app/views/course_management/courses/_form.html.erb
+++ b/app/views/course_management/courses/_form.html.erb
@@ -19,7 +19,7 @@
           <% end %>
           <div class='row mt-3'>
             <div class='form-group col-sm-4'>
-              <%= f.association :unit %>
+              <%= f.association :unit, collection: Unit.coursable.active %>
             </div>
             <div class='form-group col-sm-4'>
               <%= f.input :name %>
@@ -28,13 +28,13 @@
               <%= f.input :code %>
             </div>
             <div class='form-group col-sm-4'>
-              <%= f.input :theoric %>
+              <%= f.input :theoric, input_html: { min: 0 } %>
             </div>
             <div class='form-group col-sm-4'>
-              <%= f.input :practice %>
+              <%= f.input :practice, input_html: { min: 0 } %>
             </div>
             <div class='form-group col-sm-4'>
-              <%= f.input :laboratory %>
+              <%= f.input :laboratory, input_html: { min: 0 } %>
             </div>
             <div class='form-group col-sm-4'>
               <%= f.input :program_type,

From d40af752c37a781908b22cf019c105a86de72286 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Wed, 26 Sep 2018 15:08:27 +0300
Subject: [PATCH 04/33] =?UTF-8?q?Controller=20ve=20testlerde=20ufak=20d?=
 =?UTF-8?q?=C3=BCzeltmeler=20yap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- N+1 problemini düzeltildi
---
 app/controllers/course_management/courses_controller.rb       | 2 +-
 test/controllers/course_management/courses_controller_test.rb | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/course_management/courses_controller.rb b/app/controllers/course_management/courses_controller.rb
index 27b27cbae..537bc8f61 100644
--- a/app/controllers/course_management/courses_controller.rb
+++ b/app/controllers/course_management/courses_controller.rb
@@ -7,7 +7,7 @@ class CoursesController < ApplicationController
     before_action :set_course, only: %i[show edit update destroy]
 
     def index
-      courses = Course.includes(:unit)
+      courses = Course.includes(:unit, :language)
                       .dynamic_search(search_params(Course))
       @pagy, @courses = pagy(courses)
     end
diff --git a/test/controllers/course_management/courses_controller_test.rb b/test/controllers/course_management/courses_controller_test.rb
index 88c3eca0f..6d4c64a0a 100644
--- a/test/controllers/course_management/courses_controller_test.rb
+++ b/test/controllers/course_management/courses_controller_test.rb
@@ -13,8 +13,7 @@ class CoursesControllerTest < ActionDispatch::IntegrationTest
       get courses_path
       assert_response :success
       assert_select '#add-button', translate('.index.add_new_course')
-      assert_select '#collapseSmartSearchLink', t('smart_search')
-      assert_select '#collapseDetailedSearchLink', t('detailed_search')
+      assert_select '#collapseSearchLink', t('search')
     end
 
     test 'should get show' do

From f7197ca0dd37baa7541901ef654d4199fb5b5e43 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Wed, 26 Sep 2018 17:50:02 +0300
Subject: [PATCH 05/33] =?UTF-8?q?Sidebar=20admin=20i=C3=A7in=20=C3=B6zelle?=
 =?UTF-8?q?=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/shared/_sidebar.html.erb    | 201 +-----------------
 .../layouts/shared/sidebar/_admin.html.erb    | 115 ++++++++++
 .../layouts/shared/sidebar/_general.html.erb  | 200 +++++++++++++++++
 config/locales/layouts/shared/sidebar_en.yml  |  77 +++----
 config/locales/layouts/shared/sidebar_tr.yml  |  77 +++----
 5 files changed, 396 insertions(+), 274 deletions(-)
 create mode 100644 app/views/layouts/shared/sidebar/_admin.html.erb
 create mode 100644 app/views/layouts/shared/sidebar/_general.html.erb

diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb
index c51835b4b..0beeb56f1 100644
--- a/app/views/layouts/shared/_sidebar.html.erb
+++ b/app/views/layouts/shared/_sidebar.html.erb
@@ -1,206 +1,7 @@
 <div class="sidebar">
   <nav class="sidebar-nav">
     <ul class="nav">
-      <li class="nav-item">
-        <%= link_to root_path, class: 'nav-link' do %>
-          <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
-        <% end %>
-      </li>
-      <li class="nav-item">
-        <%= link_to units_path, class: 'nav-link' do %>
-          <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item">
-        <%= link_to countries_path, class: 'nav-link' do %>
-          <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item nav-dropdown">
-        <a class="nav-link nav-dropdown-toggle" href="#">
-          <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
-        </a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <%= link_to calendar_titles_path, class: 'nav-link' do %>
-              <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to calendar_types_path, class: 'nav-link' do %>
-              <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to academic_terms_path, class: 'nav-link' do %>
-              <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to academic_calendars_path, class: 'nav-link' do %>
-              <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
-      <li class="nav-item nav-dropdown">
-        <a class="nav-link nav-dropdown-toggle" href="#">
-          <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
-        </a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <%= link_to courses_path, class: 'nav-link' do %>
-              <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to course_unit_groups_path, class: 'nav-link' do %>
-              <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to course_group_types_path, class: 'nav-link' do %>
-              <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to curriculums_path, class: 'nav-link' do %>
-              <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
-      <li class="nav-item">
-        <%= link_to users_path, class: 'nav-link' do %>
-          <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item nav-dropdown">
-        <a class="nav-link nav-dropdown-toggle" href="#">
-          <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
-        </a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <%= link_to prospective_students_path, class: 'nav-link' do %>
-              <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
-      <li class="nav-item">
-        <%= link_to languages_path, class: 'nav-link' do %>
-          <%= fa_icon('language', text: t('.languages'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item">
-        <%= link_to documents_path, class: 'nav-link' do %>
-          <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item nav-dropdown">
-        <a class="nav-link nav-dropdown-toggle" href="#">
-          <%= fa_icon('university', class: 'nav-icon') %><%= t('.references') %>
-        </a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <%= link_to high_school_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.high_school_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_disability_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_disability_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_drop_out_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_drop_out_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_education_levels_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_education_levels'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_entrance_point_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_entrance_point_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_entrance_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_entrance_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_grades_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_grades'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_grading_systems_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_grading_systems'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_punishment_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_punishment_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to student_studentship_statuses_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.student_studentship_statuses'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to unit_instruction_languages_path, class: 'nav-link' do %>
-              <%= fa_icon('language', text: t('.unit_instruction_languages'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to unit_instruction_types_path, class: 'nav-link' do %>
-              <%= fa_icon('graduation-cap', text: t('.unit_instruction_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to unit_statuses_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.unit_statuses'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to unit_types_path, class: 'nav-link' do %>
-              <%= fa_icon('sitemap', text: t('.unit_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to university_types_path, class: 'nav-link' do %>
-              <%= fa_icon('university', text: t('.university_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
-      <li class="nav-item">
-        <%= link_to studies_path, class: 'nav-link' do %>
-          <%= fa_icon('file-text-o', text: t('.studies'), class: 'nav-icon') %>
-        <% end %>
-      </li>
-      <li class="nav-item nav-dropdown">
-        <a class="nav-link nav-dropdown-toggle" href="#">
-          <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
-        </a>
-        <ul class="nav-dropdown-items">
-          <li class="nav-item">
-            <%= link_to agenda_types_path, class: 'nav-link' do %>
-              <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-          <li class="nav-item">
-            <%= link_to committees_path, class: 'nav-link' do %>
-              <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
-            <% end %>
-          </li>
-        </ul>
-      </li>
+      <%= render 'layouts/shared/sidebar/admin' %>
     </ul>
   </nav>
   <button class="sidebar-minimizer brand-minimizer" type="button"></button>
diff --git a/app/views/layouts/shared/sidebar/_admin.html.erb b/app/views/layouts/shared/sidebar/_admin.html.erb
new file mode 100644
index 000000000..fb2bd9e46
--- /dev/null
+++ b/app/views/layouts/shared/sidebar/_admin.html.erb
@@ -0,0 +1,115 @@
+<li class="nav-item">
+  <%= link_to root_path, class: 'nav-link' do %>
+    <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to curriculums_path, class: 'nav-link' do %>
+        <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to courses_path, class: 'nav-link' do %>
+        <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to course_unit_groups_path, class: 'nav-link' do %>
+        <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to prospective_students_path, class: 'nav-link' do %>
+        <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to documents_path, class: 'nav-link' do %>
+        <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to agenda_types_path, class: 'nav-link' do %>
+        <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to committees_path, class: 'nav-link' do %>
+        <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to calendar_titles_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to calendar_types_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to academic_terms_path, class: 'nav-link' do %>
+        <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to academic_calendars_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item">
+  <%= link_to users_path, class: 'nav-link' do %>
+    <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.definitions') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to units_path, class: 'nav-link' do %>
+        <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to countries_path, class: 'nav-link' do %>
+        <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to course_group_types_path, class: 'nav-link' do %>
+        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
\ No newline at end of file
diff --git a/app/views/layouts/shared/sidebar/_general.html.erb b/app/views/layouts/shared/sidebar/_general.html.erb
new file mode 100644
index 000000000..98b366431
--- /dev/null
+++ b/app/views/layouts/shared/sidebar/_general.html.erb
@@ -0,0 +1,200 @@
+<li class="nav-item">
+  <%= link_to root_path, class: 'nav-link' do %>
+    <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to units_path, class: 'nav-link' do %>
+    <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to countries_path, class: 'nav-link' do %>
+    <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to calendar_titles_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to calendar_types_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to academic_terms_path, class: 'nav-link' do %>
+        <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to academic_calendars_path, class: 'nav-link' do %>
+        <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to courses_path, class: 'nav-link' do %>
+        <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to course_unit_groups_path, class: 'nav-link' do %>
+        <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to course_group_types_path, class: 'nav-link' do %>
+        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to curriculums_path, class: 'nav-link' do %>
+        <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item">
+  <%= link_to users_path, class: 'nav-link' do %>
+    <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to prospective_students_path, class: 'nav-link' do %>
+        <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item">
+  <%= link_to languages_path, class: 'nav-link' do %>
+    <%= fa_icon('language', text: t('.languages'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to documents_path, class: 'nav-link' do %>
+    <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('university', class: 'nav-icon') %><%= t('.references') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to high_school_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.high_school_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_disability_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_disability_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_drop_out_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_drop_out_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_education_levels_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_education_levels'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_entrance_point_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_entrance_point_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_entrance_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_entrance_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_grades_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_grades'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_grading_systems_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_grading_systems'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_punishment_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_punishment_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to student_studentship_statuses_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.student_studentship_statuses'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to unit_instruction_languages_path, class: 'nav-link' do %>
+        <%= fa_icon('language', text: t('.unit_instruction_languages'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to unit_instruction_types_path, class: 'nav-link' do %>
+        <%= fa_icon('graduation-cap', text: t('.unit_instruction_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to unit_statuses_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.unit_statuses'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to unit_types_path, class: 'nav-link' do %>
+        <%= fa_icon('sitemap', text: t('.unit_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to university_types_path, class: 'nav-link' do %>
+        <%= fa_icon('university', text: t('.university_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
+<li class="nav-item">
+  <%= link_to studies_path, class: 'nav-link' do %>
+    <%= fa_icon('file-text-o', text: t('.studies'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item nav-dropdown">
+  <a class="nav-link nav-dropdown-toggle" href="#">
+    <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
+  </a>
+  <ul class="nav-dropdown-items">
+    <li class="nav-item">
+      <%= link_to agenda_types_path, class: 'nav-link' do %>
+        <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+    <li class="nav-item">
+      <%= link_to committees_path, class: 'nav-link' do %>
+        <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
+      <% end %>
+    </li>
+  </ul>
+</li>
\ No newline at end of file
diff --git a/config/locales/layouts/shared/sidebar_en.yml b/config/locales/layouts/shared/sidebar_en.yml
index bb3a232b7..243ca479b 100644
--- a/config/locales/layouts/shared/sidebar_en.yml
+++ b/config/locales/layouts/shared/sidebar_en.yml
@@ -2,40 +2,43 @@ en:
   layouts:
     shared:
       sidebar:
-        units: Units
-        locations: Locations
-        calendars: Calendars
-        calendar_titles: Calendar Titles
-        calendar_types: Calendar Types
-        academic_terms: Academic Terms
-        academic_calendars: Academic Calendars
-        courses: Courses
-        course_management: Course Management
-        course_unit_groups: Course Unit Group
-        course_group_types: Course Group Type
-        curriculums: Curriculums
-        languages: Languages
-        users: Users
-        references: References
-        documents: Documents
-        high_school_types: High School Types
-        student_disability_types: Disability Types
-        student_drop_out_types: Drop Out Types
-        student_education_levels: Education Levels
-        student_entrance_point_types: Entrance Point Types
-        student_entrance_types: Entrance Types
-        student_grades: Grades
-        student_grading_systems: Grading Systems
-        student_punishment_types: Punishment Types
-        student_management: Student Management
-        student_studentship_statuses: Studentship Statuses
-        unit_instruction_languages:  Instruction Languages
-        unit_instruction_types: Instruction Types
-        unit_statuses: Unit Statuses
-        unit_types: Unit Types
-        university_types: University Types
-        studies: Academic Studies
-        committees: Committees
-        committee_units: Committee Units
-        agenda_types: Agenda Types
-        first_registration: Prospective Students
+        admin:
+          units: Units
+          locations: Locations
+          calendars: Calendars
+          calendar_titles: Calendar Titles
+          calendar_types: Calendar Types
+          academic_terms: Academic Terms
+          academic_calendars: Academic Calendars
+          courses: Courses
+          course_management: Course Management
+          course_unit_groups: Course Unit Group
+          course_group_types: Course Group Type
+          curriculums: Curriculums
+          languages: Languages
+          users: Users
+          references: References
+          documents: Required Documents
+          high_school_types: High School Types
+          student_disability_types: Disability Types
+          student_drop_out_types: Drop Out Types
+          student_education_levels: Education Levels
+          student_entrance_point_types: Entrance Point Types
+          student_entrance_types: Entrance Types
+          student_grades: Grades
+          student_grading_systems: Grading Systems
+          student_punishment_types: Punishment Types
+          student_management: Student Management
+          student_studentship_statuses: Studentship Statuses
+          unit_instruction_languages:  Instruction Languages
+          unit_instruction_types: Instruction Types
+          unit_statuses: Unit Statuses
+          unit_types: Unit Types
+          university_types: University Types
+          studies: Academic Studies
+          committees: Committees
+          committee_units: Committee Units
+          agenda_types: Agenda Types
+          first_registration: Prospective Students
+          definitions: Definitions
+          units: Units
diff --git a/config/locales/layouts/shared/sidebar_tr.yml b/config/locales/layouts/shared/sidebar_tr.yml
index e01ed92cf..2d43a2173 100644
--- a/config/locales/layouts/shared/sidebar_tr.yml
+++ b/config/locales/layouts/shared/sidebar_tr.yml
@@ -2,40 +2,43 @@ tr:
   layouts:
     shared:
       sidebar:
-        units: Birimler
-        locations: Konumlar
-        calendars: Takvimler
-        calendar_titles: Takvim Başlıkları
-        calendar_types: Takvim Türleri
-        academic_terms: Akademik Dönemler
-        academic_calendars: Akademik Takvimler
-        courses: Dersler
-        course_management: Ders İşlemler
-        course_unit_groups: Ders Grupları
-        course_group_types: Ders Grup Türleri
-        curriculums: Müfredatlar
-        languages: Diller
-        users: Kullanıcılar
-        references: Referanslar
-        documents: Belgeler
-        high_school_types: Lise Türleri
-        student_disability_types: Engel Türleri
-        student_drop_out_types: Ayrılma Nedenleri
-        student_education_levels: Eğitim Düzeyleri
-        student_entrance_point_types: Giriş Puan Türleri
-        student_entrance_types: Giriş Türleri
-        student_grades: Sınıflar
-        student_grading_systems: Not Sistemleri
-        student_punishment_types: Ceza Türleri
-        student_management: Öğrenci Yönetimi
-        student_studentship_statuses: Öğrencilik Hakları
-        unit_instruction_languages: Öğrenim Dilleri
-        unit_instruction_types: Öğrenim Türleri
-        unit_statuses: Aktiflik Durumları
-        unit_types: Birim Türleri
-        university_types: Üniversite Türleri
-        studies: Akademik Çalışmalar
-        committees: Kurullar/Komisyonlar
-        committee_units: Kurul/Komisyon Birimleri
-        agenda_types: Gündem Türleri
-        first_registration: İlk Kayıt
+        admin:
+          units: Birimler
+          locations: Konumlar
+          calendars: Takvimler
+          calendar_titles: Takvim Başlıkları
+          calendar_types: Takvim Türleri
+          academic_terms: Akademik Dönemler
+          academic_calendars: Akademik Takvimler
+          courses: Dersler
+          course_management: Ders İşlemler
+          course_unit_groups: Ders Grupları
+          course_group_types: Ders Grup Türleri
+          curriculums: Müfredatlar
+          languages: Diller
+          users: Kullanıcılar
+          references: Referanslar
+          documents: Gerekli Belgeler
+          high_school_types: Lise Türleri
+          student_disability_types: Engel Türleri
+          student_drop_out_types: Ayrılma Nedenleri
+          student_education_levels: Eğitim Düzeyleri
+          student_entrance_point_types: Giriş Puan Türleri
+          student_entrance_types: Giriş Türleri
+          student_grades: Sınıflar
+          student_grading_systems: Not Sistemleri
+          student_punishment_types: Ceza Türleri
+          student_management: Öğrenci Yönetimi
+          student_studentship_statuses: Öğrencilik Hakları
+          unit_instruction_languages: Öğrenim Dilleri
+          unit_instruction_types: Öğrenim Türleri
+          unit_statuses: Aktiflik Durumları
+          unit_types: Birim Türleri
+          university_types: Üniversite Türleri
+          studies: Akademik Çalışmalar
+          committees: Kurullar/Komisyonlar
+          committee_units: Kurul/Komisyon Birimleri
+          agenda_types: Gündem Türleri
+          first_registration: İlk Kayıt
+          definitions: Tanımlar
+          units: Birimler

From 311da8f8a5704e70d59a8f833e3c1e9579f26114 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Wed, 26 Sep 2018 19:35:57 +0300
Subject: [PATCH 06/33] =?UTF-8?q?Referanslar=20i=C3=A7in=20dashboard=20olu?=
 =?UTF-8?q?=C5=9Ftur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/references/home_controller.rb |   7 +
 .../layouts/shared/sidebar/_admin.html.erb    |   5 +
 .../layouts/shared/sidebar/_general.html.erb  | 223 ++++--------------
 app/views/references/home/_card.html.erb      |  12 +
 app/views/references/home/index.html.erb      |  17 ++
 config/locales/models/references/en.yml       |  18 ++
 config/locales/models/references/tr.yml       |  20 +-
 config/routes/references.rb                   |   1 +
 .../references/home_controller_test.rb        |  16 ++
 9 files changed, 144 insertions(+), 175 deletions(-)
 create mode 100644 app/controllers/references/home_controller.rb
 create mode 100644 app/views/references/home/_card.html.erb
 create mode 100644 app/views/references/home/index.html.erb
 create mode 100644 test/controllers/references/home_controller_test.rb

diff --git a/app/controllers/references/home_controller.rb b/app/controllers/references/home_controller.rb
new file mode 100644
index 000000000..695b629a0
--- /dev/null
+++ b/app/controllers/references/home_controller.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module References
+  class HomeController < ApplicationController
+    def index; end
+  end
+end
diff --git a/app/views/layouts/shared/sidebar/_admin.html.erb b/app/views/layouts/shared/sidebar/_admin.html.erb
index fb2bd9e46..0c2f4d7b1 100644
--- a/app/views/layouts/shared/sidebar/_admin.html.erb
+++ b/app/views/layouts/shared/sidebar/_admin.html.erb
@@ -111,5 +111,10 @@
         <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
       <% end %>
     </li>
+    <li class="nav-item">
+      <%= link_to references_path, class: 'nav-link' do %>
+        <%= fa_icon('user-secret', text: t('.references'), class: 'nav-icon') %>
+      <% end %>
+    </li>
   </ul>
 </li>
\ No newline at end of file
diff --git a/app/views/layouts/shared/sidebar/_general.html.erb b/app/views/layouts/shared/sidebar/_general.html.erb
index 98b366431..497cfd84a 100644
--- a/app/views/layouts/shared/sidebar/_general.html.erb
+++ b/app/views/layouts/shared/sidebar/_general.html.erb
@@ -1,200 +1,75 @@
 <li class="nav-item">
-  <%= link_to root_path, class: 'nav-link' do %>
-    <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
+  <%= link_to high_school_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.high_school_types'), class: 'nav-icon') %>
   <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to units_path, class: 'nav-link' do %>
-    <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
+  <%= link_to student_disability_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_disability_types'), class: 'nav-icon') %>
   <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to countries_path, class: 'nav-link' do %>
-    <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
+  <%= link_to student_drop_out_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_drop_out_types'), class: 'nav-icon') %>
   <% end %>
 </li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to calendar_titles_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to calendar_types_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to academic_terms_path, class: 'nav-link' do %>
-        <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to academic_calendars_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
+<li class="nav-item">
+  <%= link_to student_education_levels_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_education_levels'), class: 'nav-icon') %>
+  <% end %>
 </li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to courses_path, class: 'nav-link' do %>
-        <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to course_unit_groups_path, class: 'nav-link' do %>
-        <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to course_group_types_path, class: 'nav-link' do %>
-        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to curriculums_path, class: 'nav-link' do %>
-        <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
+<li class="nav-item">
+  <%= link_to student_entrance_point_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_entrance_point_types'), class: 'nav-icon') %>
+  <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to users_path, class: 'nav-link' do %>
-    <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
+  <%= link_to student_entrance_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_entrance_types'), class: 'nav-icon') %>
   <% end %>
 </li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to prospective_students_path, class: 'nav-link' do %>
-        <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
+<li class="nav-item">
+  <%= link_to student_grades_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_grades'), class: 'nav-icon') %>
+  <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to languages_path, class: 'nav-link' do %>
-    <%= fa_icon('language', text: t('.languages'), class: 'nav-icon') %>
+  <%= link_to student_grading_systems_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_grading_systems'), class: 'nav-icon') %>
   <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to documents_path, class: 'nav-link' do %>
-    <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
+  <%= link_to student_punishment_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_punishment_types'), class: 'nav-icon') %>
   <% end %>
 </li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('university', class: 'nav-icon') %><%= t('.references') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to high_school_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.high_school_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_disability_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_disability_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_drop_out_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_drop_out_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_education_levels_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_education_levels'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_entrance_point_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_entrance_point_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_entrance_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_entrance_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_grades_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_grades'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_grading_systems_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_grading_systems'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_punishment_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_punishment_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to student_studentship_statuses_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.student_studentship_statuses'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to unit_instruction_languages_path, class: 'nav-link' do %>
-        <%= fa_icon('language', text: t('.unit_instruction_languages'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to unit_instruction_types_path, class: 'nav-link' do %>
-        <%= fa_icon('graduation-cap', text: t('.unit_instruction_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to unit_statuses_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.unit_statuses'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to unit_types_path, class: 'nav-link' do %>
-        <%= fa_icon('sitemap', text: t('.unit_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to university_types_path, class: 'nav-link' do %>
-        <%= fa_icon('university', text: t('.university_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
+<li class="nav-item">
+  <%= link_to student_studentship_statuses_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.student_studentship_statuses'), class: 'nav-icon') %>
+  <% end %>
 </li>
 <li class="nav-item">
-  <%= link_to studies_path, class: 'nav-link' do %>
-    <%= fa_icon('file-text-o', text: t('.studies'), class: 'nav-icon') %>
+  <%= link_to unit_instruction_languages_path, class: 'nav-link' do %>
+    <%= fa_icon('language', text: t('.unit_instruction_languages'), class: 'nav-icon') %>
   <% end %>
 </li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to agenda_types_path, class: 'nav-link' do %>
-        <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to committees_path, class: 'nav-link' do %>
-        <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
+<li class="nav-item">
+  <%= link_to unit_instruction_types_path, class: 'nav-link' do %>
+    <%= fa_icon('graduation-cap', text: t('.unit_instruction_types'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to unit_statuses_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.unit_statuses'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to unit_types_path, class: 'nav-link' do %>
+    <%= fa_icon('sitemap', text: t('.unit_types'), class: 'nav-icon') %>
+  <% end %>
+</li>
+<li class="nav-item">
+  <%= link_to university_types_path, class: 'nav-link' do %>
+    <%= fa_icon('university', text: t('.university_types'), class: 'nav-icon') %>
+  <% end %>
 </li>
\ No newline at end of file
diff --git a/app/views/references/home/_card.html.erb b/app/views/references/home/_card.html.erb
new file mode 100644
index 000000000..104f1d6d8
--- /dev/null
+++ b/app/views/references/home/_card.html.erb
@@ -0,0 +1,12 @@
+<div class="col-md-3 col-xs-4">
+  <div class="card">
+    <div class="card-body text-center">
+      <div class="text-muted text-uppercase font-weight-bold"><%= t(text) %></div>
+      <div class="text-value-lg py-3"><%= size %></div>
+      <%= link_to path, class: 'btn btn-block btn-secondary' do %>
+        <span class="small font-weight-bold"><%= t('action_group.show') %></span>
+        <i class="fa fa-angle-right"></i>
+      <% end %>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/views/references/home/index.html.erb b/app/views/references/home/index.html.erb
new file mode 100644
index 000000000..4a5226f2f
--- /dev/null
+++ b/app/views/references/home/index.html.erb
@@ -0,0 +1,17 @@
+<div class="row">
+  <%= render 'card', size: HighSchoolType.count, text: '.high_school_types', path: high_school_types_path %>
+  <%= render 'card', size: StudentDisabilityType.count, text: '.student_disability_types', path: student_disability_types_path %>
+  <%= render 'card', size: StudentDropOutType.count, text: '.student_drop_out_types', path: student_drop_out_types_path %>
+  <%= render 'card', size: StudentEducationLevel.count, text: '.student_education_levels', path: student_education_levels_path %>
+  <%= render 'card', size: StudentEntrancePointType.count, text: '.student_entrance_point_types', path: student_entrance_point_types_path %>
+  <%= render 'card', size: StudentEntranceType.count, text: '.student_entrance_types', path: student_entrance_types_path %>
+  <%= render 'card', size: StudentGrade.count, text: '.student_grades', path: student_grades_path %>
+  <%= render 'card', size: StudentGradingSystem.count, text: '.student_grading_systems', path: student_grading_systems_path %>
+  <%= render 'card', size: StudentPunishmentType.count, text: '.student_punishment_types', path: student_punishment_types_path %>
+  <%= render 'card', size: StudentStudentshipStatus.count, text: '.student_studentship_statuses', path: student_studentship_statuses_path %>
+  <%= render 'card', size: UnitInstructionLanguage.count, text: '.unit_instruction_languages', path: unit_instruction_languages_path %>
+  <%= render 'card', size: UnitInstructionType.count, text: '.unit_instruction_types', path: unit_instruction_types_path %>
+  <%= render 'card', size: UnitStatus.count, text: '.unit_statuses', path: unit_statuses_path %>
+  <%= render 'card', size: UnitType.count, text: '.unit_types', path: unit_types_path %>
+  <%= render 'card', size: UniversityType.count, text: '.university_types', path: university_types_path %>
+</div>
\ No newline at end of file
diff --git a/config/locales/models/references/en.yml b/config/locales/models/references/en.yml
index 14073b8ee..7bbd35ae5 100644
--- a/config/locales/models/references/en.yml
+++ b/config/locales/models/references/en.yml
@@ -103,3 +103,21 @@ en:
       destroy:
         success: Language successfully deleted!
         warning: Language can not be deleted.
+    home:
+      card:
+        high_school_types: High School Types
+        student_disability_types: Disability Types
+        student_drop_out_types: Drop Out Types
+        student_education_levels: Education Levels
+        student_entrance_point_types: Entrance Point Types
+        student_entrance_types: Entrance Types
+        student_grades: Grades
+        student_grading_systems: Grading Systems
+        student_punishment_types: Punishment Types
+        student_management: Student Management
+        student_studentship_statuses: Studentship Statuses
+        unit_instruction_languages:  Instruction Languages
+        unit_instruction_types: Instruction Types
+        unit_statuses: Unit Statuses
+        unit_types: Unit Types
+        university_types: University Types
\ No newline at end of file
diff --git a/config/locales/models/references/tr.yml b/config/locales/models/references/tr.yml
index b79094b3c..13871c99d 100644
--- a/config/locales/models/references/tr.yml
+++ b/config/locales/models/references/tr.yml
@@ -103,4 +103,22 @@ tr:
         success: Dil başarıyla oluşturuldu.
       destroy:
         success: Dil başarıyla silindi!
-        warning: Dil silinemedi.
\ No newline at end of file
+        warning: Dil silinemedi.
+    home:
+      card:
+        high_school_types: Lise Türleri
+        student_disability_types: Engel Türleri
+        student_drop_out_types: Ayrılma Nedenleri
+        student_education_levels: Eğitim Düzeyleri
+        student_entrance_point_types: Giriş Puan Türleri
+        student_entrance_types: Giriş Türleri
+        student_grades: Sınıflar
+        student_grading_systems: Not Sistemleri
+        student_punishment_types: Ceza Türleri
+        student_management: Öğrenci Yönetimi
+        student_studentship_statuses: Öğrencilik Hakları 
+        unit_instruction_languages: Öğrenim Dilleri
+        unit_instruction_types: Öğrenim Türleri
+        unit_statuses: Aktiflik Durumları
+        unit_types: Birim Türleri
+        university_types: Üniversite Türleri
\ No newline at end of file
diff --git a/config/routes/references.rb b/config/routes/references.rb
index 191730b53..8a2d06d5b 100644
--- a/config/routes/references.rb
+++ b/config/routes/references.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 scope module: :references do
+  get 'references', to: 'home#index'
   resources :countries do
     resources :cities, except: [:index] do
       resources :districts, except: %i[show index] do
diff --git a/test/controllers/references/home_controller_test.rb b/test/controllers/references/home_controller_test.rb
new file mode 100644
index 000000000..86738a0b7
--- /dev/null
+++ b/test/controllers/references/home_controller_test.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module References
+  class HomeControllerTest < ActionDispatch::IntegrationTest
+    setup do
+      sign_in users(:john)
+    end
+
+    test 'should get index' do
+      get references_path
+      assert_response :success
+    end
+  end
+end

From d9f6e3b306fd3fa521c8c8763fa7eaf718f3c8c2 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Wed, 26 Sep 2018 21:17:04 +0300
Subject: [PATCH 07/33] =?UTF-8?q?Sidebar=20s=C4=B1ralamay=C4=B1=20d=C3=BCz?=
 =?UTF-8?q?enle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/shared/sidebar/_admin.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/shared/sidebar/_admin.html.erb b/app/views/layouts/shared/sidebar/_admin.html.erb
index 0c2f4d7b1..cc6cdc1e7 100644
--- a/app/views/layouts/shared/sidebar/_admin.html.erb
+++ b/app/views/layouts/shared/sidebar/_admin.html.erb
@@ -106,15 +106,15 @@
         <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
       <% end %>
     </li>
-    <li class="nav-item">
-      <%= link_to course_group_types_path, class: 'nav-link' do %>
-        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
     <li class="nav-item">
       <%= link_to references_path, class: 'nav-link' do %>
         <%= fa_icon('user-secret', text: t('.references'), class: 'nav-icon') %>
       <% end %>
     </li>
+    <li class="nav-item">
+      <%= link_to course_group_types_path, class: 'nav-link' do %>
+        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
+      <% end %>
+    </li>    
   </ul>
 </li>
\ No newline at end of file

From 3f8b9c28a153695f4cb940a2238ecae5a5b1433c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Wed, 26 Sep 2018 23:07:21 +0300
Subject: [PATCH 08/33] Add student_entrance_type to prospective_students

---
 .../student_management/prospective_students_controller.rb | 3 ++-
 app/jobs/osym/import_prospective_students_job.rb          | 3 ++-
 app/models/prospective_student.rb                         | 1 +
 app/models/student_entrance_type.rb                       | 2 ++
 .../prospective_students/index.html.erb                   | 2 ++
 .../student_management/prospective_students/show.html.erb | 6 +++++-
 config/locales/models/student_management/en.yml           | 3 ++-
 config/locales/models/student_management/tr.yml           | 1 +
 ...0_add_student_entrance_type_to_prospective_students.rb | 7 +++++++
 db/schema.rb                                              | 4 +++-
 lib/tasks/import/all.rake                                 | 3 ++-
 ...ermalinks.rake => 1537989774_generate_permalinks.rake} | 0
 ...73_add_osys_entrance_type_to_prospective_students.rake | 8 ++++++++
 lib/tasks/post_deploy/create_unit_type_for_committee.rake | 7 -------
 public/500.html                                           | 2 +-
 .../models/yoksis_reference/student_entrance_type_test.rb | 5 +++++
 16 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb
 rename lib/tasks/post_deploy/{generate_permalinks.rake => 1537989774_generate_permalinks.rake} (100%)
 create mode 100644 lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake
 delete mode 100644 lib/tasks/post_deploy/create_unit_type_for_committee.rake

diff --git a/app/controllers/student_management/prospective_students_controller.rb b/app/controllers/student_management/prospective_students_controller.rb
index d5b654df3..ca74f2620 100644
--- a/app/controllers/student_management/prospective_students_controller.rb
+++ b/app/controllers/student_management/prospective_students_controller.rb
@@ -7,7 +7,8 @@ class ProspectiveStudentsController < ApplicationController
     before_action :set_prospective_student, only: %i[show]
 
     def index
-      prospective_students = ProspectiveStudent.includes(:unit).dynamic_search(search_params(ProspectiveStudent))
+      prospective_students = ProspectiveStudent.includes(:unit, :student_entrance_type)
+                                               .dynamic_search(search_params(ProspectiveStudent))
       @pagy, @prospective_students = pagy(prospective_students)
     end
 
diff --git a/app/jobs/osym/import_prospective_students_job.rb b/app/jobs/osym/import_prospective_students_job.rb
index 90e9de590..c699862ca 100644
--- a/app/jobs/osym/import_prospective_students_job.rb
+++ b/app/jobs/osym/import_prospective_students_job.rb
@@ -73,7 +73,8 @@ def perform
           military_status_date: parse_date(military_status_date),
           obs_status: obs_status.eql?('0') ? true : false,
           obs_status_date: parse_date(obs_status_date),
-          obs_registered_program: obs_registered_program
+          obs_registered_program: obs_registered_program,
+          student_entrance_type: StudentEntranceType.find_by(code: 1) # TODO: will be dynamic in the future
         )
         progress_bar.increment
       end
diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb
index 0c8473f96..3dd9ea2c1 100644
--- a/app/models/prospective_student.rb
+++ b/app/models/prospective_student.rb
@@ -18,6 +18,7 @@ class ProspectiveStudent < ApplicationRecord
   belongs_to :language, optional: true
   belongs_to :student_disability_type, optional: true
   belongs_to :high_school_type, optional: true
+  belongs_to :student_entrance_type, optional: true
 
   # validations
   validates :id_number, presence: true, uniqueness: { scope: %i[unit_id exam_score] }
diff --git a/app/models/student_entrance_type.rb b/app/models/student_entrance_type.rb
index d7a1364e7..af54c1d51 100644
--- a/app/models/student_entrance_type.rb
+++ b/app/models/student_entrance_type.rb
@@ -3,4 +3,6 @@
 class StudentEntranceType < ApplicationRecord
   include ReferenceValidations
   include ReferenceCallbacks
+
+  has_many :prospective_students, dependent: :destroy
 end
diff --git a/app/views/student_management/prospective_students/index.html.erb b/app/views/student_management/prospective_students/index.html.erb
index 9d96de7ed..1c9124038 100644
--- a/app/views/student_management/prospective_students/index.html.erb
+++ b/app/views/student_management/prospective_students/index.html.erb
@@ -16,6 +16,7 @@
               <th><%= t('.meb_status') %></th>
               <th><%= t('.military_status') %></th>
               <th><%= t('.obs_status') %></th>
+              <th><%= t('.student_entrance_type') %></th>
               <th><%= t('actions') %></th>
             </tr>
           </thead>
@@ -29,6 +30,7 @@
                 <td><%= prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %></td>
                 <td><%= prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %></td>
                 <td><%= prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %></td>
+                <td><%= prospective_student.student_entrance_type.name %></td>
                 <td>
                   <%= link_to_show(prospective_student_path(prospective_student)) %>
                 </td>
diff --git a/app/views/student_management/prospective_students/show.html.erb b/app/views/student_management/prospective_students/show.html.erb
index fa59cf473..ed56107a0 100644
--- a/app/views/student_management/prospective_students/show.html.erb
+++ b/app/views/student_management/prospective_students/show.html.erb
@@ -64,10 +64,14 @@
       <div class="card-body">
         <table class="table table-responsive-sm">
           <tbody>
+            <tr>
+              <td><%= t('.student_entrance_type') %></td>
+              <td><%= @prospective_student.student_entrance_type.name %></td>
+            </tr>
             <tr>
               <td><%= t('.unit') %></td>
               <% unit = @prospective_student.unit %>
-              <td><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).name %></td>
+              <td><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).try(:name) %></td>
             </tr>
             <tr>
               <td><%= t('.state_of_education') %></td>
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index 05cfde3e1..1238419da 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -39,7 +39,8 @@ en:
         military_status_date: Military Status Check Date
         obs_status: Studentship Status
         obs_status_date: Studentship Status Check Date
-        obs_registered_program: Registered to
+        obs_registered_program: Registered To
+        student_entrance_type: Entrance Type
         graduated: Graduated
         not_graduated_or_unknown: Not Graduated/Unknown
         unproblematic: Unproblematic
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index b58cd0aad..a4c319c35 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -40,6 +40,7 @@ tr:
         obs_status: Öğrencilik Durumu
         obs_status_date: Öğrencilik Durum Kontrol Tarihi
         obs_registered_program: Öğrenci Olarak Kayıtlı Olduğu Program
+        student_entrance_type: Giriş Türü
         graduated: Mezun
         not_graduated_or_unknown: Mezun Değil/Bilinmiyor
         unproblematic: Sorunsuz
diff --git a/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb b/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb
new file mode 100644
index 000000000..6692cd30c
--- /dev/null
+++ b/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStudentEntranceTypeToProspectiveStudents < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :prospective_students, :student_entrance_type, index: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 69fe8c6ae..58cf58d84 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_09_19_121858) do
+ActiveRecord::Schema.define(version: 2018_09_26_182120) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -400,9 +400,11 @@
     t.string "obs_registered_program", limit: 255
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.bigint "student_entrance_type_id"
     t.index ["high_school_type_id"], name: "index_prospective_students_on_high_school_type_id"
     t.index ["language_id"], name: "index_prospective_students_on_language_id"
     t.index ["student_disability_type_id"], name: "index_prospective_students_on_student_disability_type_id"
+    t.index ["student_entrance_type_id"], name: "index_prospective_students_on_student_entrance_type_id"
     t.index ["unit_id"], name: "index_prospective_students_on_unit_id"
   end
 
diff --git a/lib/tasks/import/all.rake b/lib/tasks/import/all.rake
index 1c235ec83..ff67ec855 100644
--- a/lib/tasks/import/all.rake
+++ b/lib/tasks/import/all.rake
@@ -5,7 +5,8 @@ namespace :import do
   task all: %w[
     countries
     yoksis_country_codes
-    cities districts
+    cities
+    districts
     languages
     titles
     high_school_types
diff --git a/lib/tasks/post_deploy/generate_permalinks.rake b/lib/tasks/post_deploy/1537989774_generate_permalinks.rake
similarity index 100%
rename from lib/tasks/post_deploy/generate_permalinks.rake
rename to lib/tasks/post_deploy/1537989774_generate_permalinks.rake
diff --git a/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake b/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake
new file mode 100644
index 000000000..3d9ff69fb
--- /dev/null
+++ b/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+namespace :post_deploy do
+  task add_osys_entrance_type_to_prospective_students: :environment do
+    entrance_type = StudentEntranceType.find_by(code: 1)
+    ProspectiveStudent.all.update(student_entrance_type_id: entrance_type.id)
+  end
+end
diff --git a/lib/tasks/post_deploy/create_unit_type_for_committee.rake b/lib/tasks/post_deploy/create_unit_type_for_committee.rake
deleted file mode 100644
index dc806e771..000000000
--- a/lib/tasks/post_deploy/create_unit_type_for_committee.rake
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-namespace :post_deploy do
-  task create_unit_type_for_committee: :environment do
-    UnitType.create(name: 'Kurul / Komisyon', code: 200)
-  end
-end
diff --git a/public/500.html b/public/500.html
index f0cb966b3..be30c53c8 100644
--- a/public/500.html
+++ b/public/500.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="tr">
   <head>
-    <title>We're sorry, but something went wrong (500)</title>
+    <title>Üzgünüz, sistem içsel bir hatayla karşılaştı. / We're sorry, but something went wrong (500)</title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta charset="utf-8">
     <style>
diff --git a/test/models/yoksis_reference/student_entrance_type_test.rb b/test/models/yoksis_reference/student_entrance_type_test.rb
index 91d61f283..39d4bcee8 100644
--- a/test/models/yoksis_reference/student_entrance_type_test.rb
+++ b/test/models/yoksis_reference/student_entrance_type_test.rb
@@ -9,4 +9,9 @@ class StudentEntranceTypeTest < ActiveSupport::TestCase
   setup do
     @object = student_entrance_types(:dgs)
   end
+
+  # relations
+  test 'student_entrance_types can communicate with prospective students' do
+    assert student_entrance_types(:dgs).prospective_students
+  end
 end

From 56b43ab6778e9d478529c5f8ac3516c8a1585a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Wed, 26 Sep 2018 23:24:56 +0300
Subject: [PATCH 09/33] Add student_entrance_type to search form of prospective
 students

---
 app/models/prospective_student.rb                    |  4 ++--
 .../prospective_students/_search.html.erb            | 12 +++++++++++-
 config/locales/models/student_management/en.yml      |  2 +-
 config/locales/models/student_management/tr.yml      |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb
index 3dd9ea2c1..2c96a97bb 100644
--- a/app/models/prospective_student.rb
+++ b/app/models/prospective_student.rb
@@ -11,14 +11,14 @@ class ProspectiveStudent < ApplicationRecord
     using: { tsearch: { prefix: true } }
   )
 
-  search_keys :meb_status, :military_status, :obs_status, :unit_id
+  search_keys :meb_status, :military_status, :obs_status, :unit_id, :student_entrance_type_id
 
   # relations
   belongs_to :unit
   belongs_to :language, optional: true
   belongs_to :student_disability_type, optional: true
   belongs_to :high_school_type, optional: true
-  belongs_to :student_entrance_type, optional: true
+  belongs_to :student_entrance_type
 
   # validations
   validates :id_number, presence: true, uniqueness: { scope: %i[unit_id exam_score] }
diff --git a/app/views/student_management/prospective_students/_search.html.erb b/app/views/student_management/prospective_students/_search.html.erb
index a40c8ccef..f3bad0bb6 100644
--- a/app/views/student_management/prospective_students/_search.html.erb
+++ b/app/views/student_management/prospective_students/_search.html.erb
@@ -64,7 +64,17 @@
               <div class="form-group">
                 <label for="unit_id"><%= t('.unit') %></label>
                 <%= select_tag(:unit_id,
-                               options_from_collection_for_select(Unit.all, :id, :name),
+                               options_from_collection_for_select(Unit.active.programs.order(:name), :id, :name),
+                               include_blank: true,
+                               class: 'form-control',
+                               style: 'width: 100%') %>
+              </div>
+            </div>
+            <div class="col-sm-3">
+              <div class="form-group">
+                <label for="student_entrance_type_id"><%= t('.student_entrance_type') %></label>
+                <%= select_tag(:student_entrance_type_id,
+                               options_from_collection_for_select(StudentEntranceType.order(:name), :id, :name),
                                include_blank: true,
                                class: 'form-control',
                                style: 'width: 100%') %>
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index 1238419da..1bc87ed58 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -29,7 +29,7 @@ en:
         top_student: Top Student
         placement_score: Placement Score
         placement_rank: Placement Rank
-        unit: Placement Unit
+        unit: Placement Program
         preference_order: Preference Order
         placement_score_type: Placement Score Type
         additional_score: Additional Score
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index a4c319c35..6b7a085d8 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -29,7 +29,7 @@ tr:
         top_student: Okul Birincisi
         placement_score: Yerleşme Puanı
         placement_rank: Yerleşme Sırası
-        unit: Yerleştiği Birim
+        unit: Yerleştiği Program
         preference_order: Tercih Sırası
         placement_score_type: Yerleşme Puan Türü
         additional_score: Ek Puan

From fc39f5c49dc17230f65aff60f7edd1037c525b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 00:39:14 +0300
Subject: [PATCH 10/33] Design registration page of prospective students

---
 .../prospective_students_controller.rb        |   6 +-
 app/models/prospective_student.rb             |   9 ++
 .../prospective_students/show.html.erb        | 117 ++++++++++--------
 .../locales/models/student_management/en.yml  |   4 +
 .../locales/models/student_management/tr.yml  |   4 +
 config/routes.rb                              |   4 +-
 6 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/app/controllers/student_management/prospective_students_controller.rb b/app/controllers/student_management/prospective_students_controller.rb
index ca74f2620..576465100 100644
--- a/app/controllers/student_management/prospective_students_controller.rb
+++ b/app/controllers/student_management/prospective_students_controller.rb
@@ -4,7 +4,7 @@ module StudentManagement
   class ProspectiveStudentsController < ApplicationController
     include PagyBackendWithHelpers
 
-    before_action :set_prospective_student, only: %i[show]
+    before_action :set_prospective_student, only: %i[show register]
 
     def index
       prospective_students = ProspectiveStudent.includes(:unit, :student_entrance_type)
@@ -14,6 +14,10 @@ def index
 
     def show; end
 
+    def register
+      
+    end
+
     private
 
     def redirect_with(message)
diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb
index 2c96a97bb..b3450ecdc 100644
--- a/app/models/prospective_student.rb
+++ b/app/models/prospective_student.rb
@@ -40,4 +40,13 @@ class ProspectiveStudent < ApplicationRecord
   enum nationality: { turkish: 1, kktc: 2, foreign: 3 }
   enum placement_type: { general: 1, additional_score: 2 }
   enum additional_score: { handicapped: 1 }
+
+  # custom methods
+  def can_permanently_register?
+    military_status && obs_status && meb_status
+  end
+
+  def can_temporarily_register?
+    military_status
+  end
 end
diff --git a/app/views/student_management/prospective_students/show.html.erb b/app/views/student_management/prospective_students/show.html.erb
index ed56107a0..bb38321e1 100644
--- a/app/views/student_management/prospective_students/show.html.erb
+++ b/app/views/student_management/prospective_students/show.html.erb
@@ -1,4 +1,70 @@
 <div class='row'>
+  <div class='col-lg-6'>
+    <div class="card">
+      <div class="card-header">
+        <%= fa_icon 'university' %><strong><%= t('.prospective_student') %></strong>
+      </div>
+      <div class="card-body">
+        <table class="table table-responsive-sm">
+          <tbody>
+            <tr>
+              <td><%= t('.student_entrance_type') %></td>
+              <td><%= @prospective_student.student_entrance_type.name %></td>
+            </tr>
+            <tr>
+              <td><%= t('.unit') %></td>
+              <% unit = @prospective_student.unit %>
+              <td><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).try(:name) %></td>
+            </tr>
+            <tr class="<%= @prospective_student.meb_status ? 'table-success' : 'table-danger' %>">
+              <td rowspan="2"><%= t('.meb_status') %></td>
+              <td><%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %></td>
+            </tr>
+            <tr class="<%= @prospective_student.meb_status ? 'table-success' : 'table-danger' %>">
+              <td><small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.meb_status_date) %></small></td>
+            </tr>
+
+            <tr class="<%= @prospective_student.military_status ? 'table-success' : 'table-danger' %>">
+              <td rowspan="2"><%= t('.military_status') %></td>
+              <td><%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %></td>
+            </tr>
+            <tr class="<%= @prospective_student.military_status ? 'table-success' : 'table-danger' %>">
+              <td><small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.military_status_date) %></small></td>
+            </tr>
+
+            <tr class="<%= @prospective_student.obs_status ? 'table-success' : 'table-danger' %>">
+              <td rowspan="2"><%= t('.obs_status') %></td>
+              <td><%= @prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %></td>
+            </tr>
+            <tr class="<%= @prospective_student.obs_status ? 'table-success' : 'table-danger' %>">
+              <td>
+                <small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.obs_status_date) %></small>
+                <% if @prospective_student.obs_registered_program %>
+                  <hr>
+                  <p><small><%= t('.registered_to', program: @prospective_student.obs_registered_program) %></small></p>
+                <% end %>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="card-footer">
+         <% if @prospective_student.can_permanently_register? %>
+          <%= link_to register_prospective_student_path, class: "btn btn-block btn-success" do %>
+            <%= t('.permanently_register') %>
+          <% end %>
+        <% elsif @prospective_student.can_temporarily_register? %>
+          <%= link_to register_prospective_student_path, class: "btn btn-block btn-warning" do %>
+            <%= t('.temporarily_register') %>
+          <% end %>
+        <% else %>
+          <%= link_to register_prospective_student_path, class: "btn btn-block btn-danger disabled" do %>
+            <%= t('.can_not_register') %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
   <div class='col-lg-6'>
     <div class="card">
       <div class="card-header">
@@ -51,61 +117,10 @@
               <td><%= t('.registration_district') %></td>
               <td><%= @prospective_student.registration_district %></td>
             </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-  <div class='col-lg-6'>
-    <div class="card">
-      <div class="card-header">
-        <%= fa_icon 'university' %><strong><%= t('.prospective_student') %></strong>
-      </div>
-      <div class="card-body">
-        <table class="table table-responsive-sm">
-          <tbody>
-            <tr>
-              <td><%= t('.student_entrance_type') %></td>
-              <td><%= @prospective_student.student_entrance_type.name %></td>
-            </tr>
-            <tr>
-              <td><%= t('.unit') %></td>
-              <% unit = @prospective_student.unit %>
-              <td><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).try(:name) %></td>
-            </tr>
             <tr>
               <td><%= t('.state_of_education') %></td>
               <td><%= @prospective_student.state_of_education %></td>
             </tr>
-            <tr class="<%= @prospective_student.meb_status ? 'table-success' : 'table-danger' %>">
-              <td><%= t('.meb_status') %></td>
-              <td>
-                <%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %></td>
-            </tr>
-            <tr>
-              <td><%= t('.meb_status_date') %></td>
-              <td><%= @prospective_student.meb_status_date %></td>
-            </tr>
-            <tr class="<%= @prospective_student.military_status ? 'table-success' : 'table-danger' %>">
-              <td><%= t('.military_status') %></td>
-              <td><%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %></td>
-            </tr>
-            <tr>
-              <td><%= t('.military_status_date') %></td>
-              <td><%= @prospective_student.military_status_date %></td>
-            </tr>
-            <tr class="<%= @prospective_student.obs_status ? 'table-success' : 'table-danger' %>">
-              <td><%= t('.obs_status') %></td>
-              <td><%= @prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %></td>
-            </tr>
-            <tr>
-              <td><%= t('.obs_status_date') %></td>
-              <td><%= @prospective_student.obs_status_date %></td>
-            </tr>
-            <tr>
-              <td><%= t('.obs_registered_program') %></td>
-              <td><%= @prospective_student.obs_registered_program %></td>
-            </tr>
           </tbody>
         </table>
       </div>
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index 1bc87ed58..a72bb64b8 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -70,6 +70,10 @@ en:
         prospective_student: Prospective Student
         identity_information: Identity Information
         other_information: Other Information
+        registered_to: 'Already registered to %{program}.'
+        permanently_register: Permanently Register
+        temporarily_register: Temporarily Register
+        can_not_register: Can Not Register
       index:
         <<: *prospective_student_attributes
         prospective_students: Prospective Students
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index 6b7a085d8..d61f35b0d 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -70,6 +70,10 @@ tr:
         prospective_student: Aday Öğrenci
         identity_information: Kimlik Bilgileri
         other_information: Diğer Bilgileri
+        registered_to: '%{program} isimli programda kayıtlı.'
+        permanently_register: Kesin Kayıt Yap
+        temporarily_register: Geçici Kayıt Yap
+        can_not_register: Kayıt Yapılamaz
       index:
         <<: *prospective_student_attributes
         prospective_students: Aday Öğrenciler
diff --git a/config/routes.rb b/config/routes.rb
index 3c547d8b4..ec32e5c48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,7 +33,9 @@
   end
 
   scope module: :student_management do
-    resources :prospective_students
+    resources :prospective_students do
+      get 'register', on: :member
+    end
   end
 
   draw :references

From ae59e91cb98863ff7ec9bf277152e5b58135fb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 04:17:53 +0300
Subject: [PATCH 11/33] Create controller actions for student registration

---
 .../prospective_students_controller.rb        | 27 +++++++++++++++----
 app/services/prospective_student_service.rb   | 25 +++++++++++++++++
 .../prospective_students/show.html.erb        | 14 +++++++---
 app/views/users/_identities.html.erb          |  2 +-
 config/application.rb                         |  1 +
 .../locales/models/student_management/en.yml  |  5 ++++
 .../locales/models/student_management/tr.yml  |  5 ++++
 ...938_add_registration_status_to_students.rb |  7 +++++
 db/schema.rb                                  |  3 ++-
 9 files changed, 79 insertions(+), 10 deletions(-)
 create mode 100644 app/services/prospective_student_service.rb
 create mode 100644 db/migrate/20180926213938_add_registration_status_to_students.rb

diff --git a/app/controllers/student_management/prospective_students_controller.rb b/app/controllers/student_management/prospective_students_controller.rb
index 576465100..5a66f1d0a 100644
--- a/app/controllers/student_management/prospective_students_controller.rb
+++ b/app/controllers/student_management/prospective_students_controller.rb
@@ -5,6 +5,7 @@ class ProspectiveStudentsController < ApplicationController
     include PagyBackendWithHelpers
 
     before_action :set_prospective_student, only: %i[show register]
+    before_action :can_register?, only: :register
 
     def index
       prospective_students = ProspectiveStudent.includes(:unit, :student_entrance_type)
@@ -15,17 +16,33 @@ def index
     def show; end
 
     def register
-      
+      prospective_student = ProspectiveStudentService.new(@prospective_student)
+      user = prospective_student.create_user
+
+      if user.save
+        student = prospective_student.create_student
+        student.save ? redirect_with_success : redirect_with_warning('.warning')
+      else
+        redirect_with_warning('.warning')
+      end
     end
 
     private
 
-    def redirect_with(message)
-      redirect_to prospective_students_path, flash: { info: t(".#{message}") }
-    end
-
     def set_prospective_student
       @prospective_student = ProspectiveStudent.find(params[:id])
     end
+
+    def can_register?
+      redirect_with_warning('.can_not_register') unless @prospective_student.can_temporarily_register?
+    end
+
+    def redirect_with_success
+      redirect_to(prospective_students_path, flash: { notice: t('.success') })
+    end
+
+    def redirect_with_warning(message)
+      redirect_to(prospective_students_path, flash: { alert: t(".#{message}") })
+    end
   end
 end
diff --git a/app/services/prospective_student_service.rb b/app/services/prospective_student_service.rb
new file mode 100644
index 000000000..ce1779545
--- /dev/null
+++ b/app/services/prospective_student_service.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class ProspectiveStudentService
+  def initialize(prospective_student)
+    @prospective_student = prospective_student
+  end
+
+  def create_user
+    User.new(
+      id_number: @prospective_student.id_number,
+      email: @prospective_student.email,
+      password: @prospective_student.id_number,
+      password_confirmation: @prospective_student.id_number
+    )
+  end
+
+  def create_student
+    Student.new(
+      user: User.find_by(id_number: @prospective_student.id_number),
+      unit: @prospective_student.unit,
+      permanently_registered: @prospective_student.can_permanently_register? ? true : false,
+      student_number: @prospective_student.id_number # must be generated
+    )
+  end
+end
diff --git a/app/views/student_management/prospective_students/show.html.erb b/app/views/student_management/prospective_students/show.html.erb
index bb38321e1..c018f96d8 100644
--- a/app/views/student_management/prospective_students/show.html.erb
+++ b/app/views/student_management/prospective_students/show.html.erb
@@ -21,7 +21,7 @@
               <td><%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %></td>
             </tr>
             <tr class="<%= @prospective_student.meb_status ? 'table-success' : 'table-danger' %>">
-              <td><small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.meb_status_date) %></small></td>
+              <td><small><%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.meb_status_date) %></small></td>
             </tr>
 
             <tr class="<%= @prospective_student.military_status ? 'table-success' : 'table-danger' %>">
@@ -29,7 +29,7 @@
               <td><%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %></td>
             </tr>
             <tr class="<%= @prospective_student.military_status ? 'table-success' : 'table-danger' %>">
-              <td><small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.military_status_date) %></small></td>
+              <td><small><%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.military_status_date) %></small></td>
             </tr>
 
             <tr class="<%= @prospective_student.obs_status ? 'table-success' : 'table-danger' %>">
@@ -38,13 +38,21 @@
             </tr>
             <tr class="<%= @prospective_student.obs_status ? 'table-success' : 'table-danger' %>">
               <td>
-                <small>Kontrol tarihi: <%= as_date_and_time(@prospective_student.obs_status_date) %></small>
+                <small><%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.obs_status_date) %></small>
                 <% if @prospective_student.obs_registered_program %>
                   <hr>
                   <p><small><%= t('.registered_to', program: @prospective_student.obs_registered_program) %></small></p>
                 <% end %>
               </td>
             </tr>
+
+            <% @prospective_student.unit.registration_documents.each do |registration_document| %>
+              <tr>
+                <td><%= registration_document.document.name %></td>
+                <td><%= check_box("post", "validated") %></td>
+                </td>
+              </tr>
+            <% end %>
           </tbody>
         </table>
       </div>
diff --git a/app/views/users/_identities.html.erb b/app/views/users/_identities.html.erb
index 950b2a197..d4916f629 100644
--- a/app/views/users/_identities.html.erb
+++ b/app/views/users/_identities.html.erb
@@ -19,7 +19,7 @@
         <div class="card-body">
           <table class='table table-responsive-sm'>
             <tr>
-              <td><%= t('activerecord.attributes.identity.name') %></td>
+              <td><%= t('activerecord.attributes.identity.type') %></td>
               <td>
                 <span class="badge badge-secondary">
                   <%= fa_icon('gavel', text: t('activerecord.enums.identity.types.formal')) if identity.formal? %>
diff --git a/config/application.rb b/config/application.rb
index 7b87213ec..3343f18ea 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -25,6 +25,7 @@ class Application < Rails::Application
     I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.yml').to_s]
 
     Dir[
+      Rails.root.join('app', 'services', '**', '*.rb'),
       Rails.root.join('lib', 'support', '**', '*.rb'),
       Rails.root.join('lib', 'api', '**', '*.rb')
     ].each { |file| require file }
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index a72bb64b8..0ba2a3723 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -74,9 +74,14 @@ en:
         permanently_register: Permanently Register
         temporarily_register: Temporarily Register
         can_not_register: Can Not Register
+        last_update: Last Update
       index:
         <<: *prospective_student_attributes
         prospective_students: Prospective Students
+      register:
+        success: Student successfully registered.
+        warning: Student could not be registered.
+        can_not_register: Can Not Register
   simple_form:
     labels:
       prospective_student:
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index d61f35b0d..a99c99e07 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -74,9 +74,14 @@ tr:
         permanently_register: Kesin Kayıt Yap
         temporarily_register: Geçici Kayıt Yap
         can_not_register: Kayıt Yapılamaz
+        last_update: Son Güncelleme
       index:
         <<: *prospective_student_attributes
         prospective_students: Aday Öğrenciler
+      register:
+        success: Öğrenci başarıyla kayıt edildi
+        warning: Öğrenci kayıt edilemedi
+        can_not_register: Kayıt Yapılamaz
   simple_form:
     labels:
       prospective_student:
diff --git a/db/migrate/20180926213938_add_registration_status_to_students.rb b/db/migrate/20180926213938_add_registration_status_to_students.rb
new file mode 100644
index 000000000..656a6859d
--- /dev/null
+++ b/db/migrate/20180926213938_add_registration_status_to_students.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRegistrationStatusToStudents < ActiveRecord::Migration[5.2]
+  def change
+    add_column :students, :permanently_registered, :boolean, null: false, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 58cf58d84..0156a1ef3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_09_26_182120) do
+ActiveRecord::Schema.define(version: 2018_09_26_213938) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -470,6 +470,7 @@
     t.bigint "unit_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "permanently_registered", default: false, null: false
     t.index ["unit_id"], name: "index_students_on_unit_id"
     t.index ["user_id"], name: "index_students_on_user_id"
   end

From c2e543e61269b0b47268c18342aa00821c7ba1ce Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:02:08 +0300
Subject: [PATCH 12/33] =?UTF-8?q?Ak=C4=B1ll=C4=B1=20ve=20dinamik=20arama?=
 =?UTF-8?q?=20formlar=C4=B1n=C4=B1=20birle=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/committee/agendas/_search.html.erb  | 46 +++++-----
 .../courses/_search.html.erb                  |  3 +-
 .../curriculums/_search.html.erb              | 76 ++++++----------
 .../prospective_students/_search.html.erb     | 85 +++++++++---------
 app/views/units/_search.html.erb              | 86 ++++++++++++-------
 5 files changed, 146 insertions(+), 150 deletions(-)

diff --git a/app/views/committee/agendas/_search.html.erb b/app/views/committee/agendas/_search.html.erb
index 77825a903..ba8183c7d 100644
--- a/app/views/committee/agendas/_search.html.erb
+++ b/app/views/committee/agendas/_search.html.erb
@@ -1,51 +1,53 @@
 <div id="SearchForms" role="tablist">
-
-  <%= render 'layouts/shared/smart_search',
-             search_path: committee_agendas_path,
-             placeholder: t('.smart_search_placeholder') %>
-
   <div class="card">
-    <div class="card-header" role="tab" id="detailedSearch">
+    <div class="card-header" role="tab" id="Search">
       <h5 class="mb-0">
         <a class="collapsed"
            data-toggle="collapse"
-           href="#collapseDetailedSearch"
-           id="collapseDetailedSearchLink"
+           href="#collapseSearch"
+           id="collapseSearchLink"
            aria-expanded="false"
-           aria-controls="DetailedSearch">
-          <%= t('detailed_search') %>
+           aria-controls="Search">
+          <%= t('search') %>
         </a>
         <div class="float-right">
           <%= link_to t('reset'), committee_agendas_path, class: 'btn btn-warning btn-sm' %>
         </div>
       </h5>
     </div>
-    <div id="collapseDetailedSearch"
-         class="collapse"
+    <div id="collapseSearch"
+         class="collapse show"
          role="tabpanel"
-         aria-labelledby="detailedSearch"
+         aria-labelledby="Search"
          data-parent="#SearchForms">
       <div class="card-body">
         <%= form_tag committee_agendas_path, method: :get do %>
           <div class="row">
-            <div class="col-sm-3">
+            <div class="col-sm-4">
+              <div class="form-group">
+                <%= label_tag :term, t('smart_search') %>
+                <%= text_field_tag :term,
+                                   params[:term],
+                                   placeholder: t('.smart_search_placeholder'),
+                                   class: 'form-control' %>
+              </div>
+            </div>
+            <div class="col-sm-4">
               <div class="form-group">
                 <%= label_tag(:status, t('.status')) %>
                 <%= select_tag(:status,
-                              options_for_select(enum_options_for_select(Agenda, :status), params[:status]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_for_select(enum_options_for_select(Agenda, :status), params[:status]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
-            <div class="col-sm-3">
+            <div class="col-sm-4">
               <div class="form-group">
                 <%= label_tag(:agenda_type_id, t('.agenda_type_id')) %>
                 <%= select_tag(:agenda_type_id,
                               options_from_collection_for_select(AgendaType.all, :id, :name, params[:agenda_type_id]),
                               include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                              class: 'form-control') %>
               </div>
             </div>
           </div>
@@ -64,4 +66,4 @@
   $(document).ready(function() {
     $('#agenda_type_id').select2();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/course_management/courses/_search.html.erb b/app/views/course_management/courses/_search.html.erb
index 507cf4d9d..cf19ed0a6 100644
--- a/app/views/course_management/courses/_search.html.erb
+++ b/app/views/course_management/courses/_search.html.erb
@@ -25,6 +25,7 @@
           <div class="row">
             <div class="col-sm-12">
               <div class="form-group">
+                <%= label_tag :term, t('smart_search') %>
                 <%= text_field_tag :term,
                                     params[:term],
                                     placeholder: t('.smart_search_placeholder'),
@@ -51,7 +52,6 @@
                               style: 'width: 100%') %>
               </div>
             </div>
-
             <div class="col-sm-3">
               <div class="form-group">
                 <%= label_tag(:language_id, t('.language')) %>
@@ -62,7 +62,6 @@
                               style: 'width: 100%') %>
               </div>
             </div>
-
             <div class="col-sm-2">
               <div class="form-group">
                 <%= label_tag(:status, t('.status')) %>
diff --git a/app/views/course_management/curriculums/_search.html.erb b/app/views/course_management/curriculums/_search.html.erb
index 418c4fe20..55b67daad 100644
--- a/app/views/course_management/curriculums/_search.html.erb
+++ b/app/views/course_management/curriculums/_search.html.erb
@@ -1,77 +1,53 @@
 <div id="SearchForms" role="tablist">
   <div class="card">
-    <div class="card-header" role="tab" id="smartSearch">
-      <h5 class="mb-0">
-        <a data-toggle="collapse"
-           href="#collapseSmartSearch"
-           id="collapseSmartSearchLink"
-           aria-expanded="true"
-           aria-controls="SmartSearch">
-          <%= t('smart_search') %>
-        </a>
-      </h5>
-    </div>
-    <div id="collapseSmartSearch"
-         class="collapse show"
-         role="tabpanel"
-         aria-labelledby="smartSearch"
-         data-parent="#SearchForms">
-      <div class="card-body">
-        <%= form_tag curriculums_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag :term,
-                               params[:term],
-                               placeholder: t('.smart_search_placeholder'),
-                               class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-  <div class="card">
-    <div class="card-header" role="tab" id="detailedSearch">
+    <div class="card-header" role="tab" id="Search">
       <h5 class="mb-0">
         <a class="collapsed"
            data-toggle="collapse"
-           href="#collapseDetailedSearch"
-           id="collapseDetailedSearchLink"
+           href="#collapseSearch"
+           id="collapseSearchLink"
            aria-expanded="false"
-           aria-controls="DetailedSearch">
-          <%= t('detailed_search') %>
+           aria-controls="Search">
+          <%= t('search') %>
         </a>
         <div class="float-right">
           <%= link_to t('reset'), curriculums_path, class: 'btn btn-warning btn-sm' %>
         </div>
       </h5>
     </div>
-    <div id="collapseDetailedSearch"
-         class="collapse"
+    <div id="collapseSearch"
+         class="collapse show"
          role="tabpanel"
-         aria-labelledby="detailedSearch"
+         aria-labelledby="Search"
          data-parent="#SearchForms">
       <div class="card-body">
         <%= form_tag curriculums_path, method: :get do %>
           <div class="row">
-            <div class="col-sm-8">
+            <div class="col-sm-4">
+              <div class="form-group">
+                <%= label_tag :term, t('smart_search') %>
+                <%= text_field_tag :term,
+                                   params[:term],
+                                   placeholder: t('.smart_search_placeholder'),
+                                   class: 'form-control' %>
+              </div>
+            </div>
+            <div class="col-sm-4">
               <div class="form-group">
                 <%= label_tag(:unit_id, t('.unit')) %>
                 <%= select_tag(:unit_id,
-                              options_from_collection_for_select(Unit.active.departments, :id, :name, params[:unit_id]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_from_collection_for_select(Unit.active.departments, :id, :name, params[:unit_id]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
-
             <div class="col-sm-4">
               <div class="form-group">
                 <%= label_tag(:status, t('.status')) %>
                 <%= select_tag(:status,
-                              options_for_select(enum_options_for_select(Curriculum, :status), params[:status]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_for_select(enum_options_for_select(Curriculum, :status), params[:status]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
           </div>
@@ -88,6 +64,6 @@
 
 <script type='text/javascript'>
   $(document).ready(function() {
-    $('#unit_id, #program_type, #language_id, #status').select2();
+    $('#unit_id, #status').select2();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/student_management/prospective_students/_search.html.erb b/app/views/student_management/prospective_students/_search.html.erb
index a40c8ccef..b92880665 100644
--- a/app/views/student_management/prospective_students/_search.html.erb
+++ b/app/views/student_management/prospective_students/_search.html.erb
@@ -1,73 +1,72 @@
-<div id="accordion" role="tablist">
-  <div class="card">
-    <div class="card-header" role="tab" id="headingOne">
-      <h5 class="mb-0">
-        <a data-toggle="collapse" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-          <%= t('smart_search') %>
-        </a>
-      </h5>
-    </div>
-    <div id="collapseOne" class="collapse show" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion" style="">
-      <div class="card-body">
-        <%= form_tag prospective_students_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.smart_search_placeholder'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-      </div>
-    </div>
-  </div>
+
+<div id="SearchForms" role="tablist">
   <div class="card">
-    <div class="card-header" role="tab" id="headingTwo">
+    <div class="card-header" role="tab" id="Search">
       <h5 class="mb-0">
-        <a class="collapsed" data-toggle="collapse" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-          <%= t('detailed_search') %>
+        <a class="collapsed"
+           data-toggle="collapse"
+           href="#collapseSearch"
+           id="collapseSearchLink"
+           aria-expanded="false"
+           aria-controls="Search">
+          <%= t('search') %>
         </a>
+        <div class="float-right">
+          <%= link_to t('reset'), prospective_students_path, class: 'btn btn-warning btn-sm' %>
+        </div>
       </h5>
     </div>
-    <div id="collapseTwo" class="collapse" role="tabpanel" aria-labelledby="headingTwo" data-parent="#accordion" style="">
+    <div id="collapseSearch"
+         class="collapse show"
+         role="tabpanel"
+         aria-labelledby="Search"
+         data-parent="#SearchForms">
       <div class="card-body">
         <%= form_tag prospective_students_path, method: :get do %>
           <div class="row">
+            <div class="col-sm-12">
+              <div class="form-group">
+                <%= label_tag :term, t('smart_search') %>
+                <%= text_field_tag :term,
+                                   params[:term],
+                                   placeholder: t('.smart_search_placeholder'),
+                                   class: 'form-control' %>
+              </div>
+            </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="name"><%= t('.meb_status') %></label>
+                <%= label_tag :meb_status, t('.meb_status') %>
                 <%= select_tag(:meb_status,
-                              options_for_select([[t('.graduated'), true], [t('.not_graduated_or_unknown'), false]]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_for_select([[t('.graduated'), true], [t('.not_graduated_or_unknown'), false]], params[:meb_status]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="name"><%= t('.military_status') %></label>
+                <%= label_tag :military_status, t('.military_status') %>
                 <%= select_tag(:military_status,
-                              options_for_select([[t('.unproblematic'), true], [t('.must_see_recruiting_office'), false]]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_for_select([[t('.unproblematic'), true], [t('.must_see_recruiting_office'), false]], params[:military_status]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="name"><%= t('.obs_status') %></label>
+                <%= label_tag :obs_status, t('.obs_status') %>
                 <%= select_tag(:obs_status,
-                              options_for_select([[t('.unproblematic'), true], [t('.student_in_a_different_unit'), false]]),
-                              include_blank: true,
-                              class: 'form-control',
-                              style: 'width: 100%') %>
+                               options_for_select([[t('.unproblematic'), true], [t('.student_in_a_different_unit'), false]], params[:obs_status]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="unit_id"><%= t('.unit') %></label>
+                <%= label_tag :unit_id, t('.unit') %>
                 <%= select_tag(:unit_id,
-                               options_from_collection_for_select(Unit.all, :id, :name),
+                               options_from_collection_for_select(Unit.all, :id, :name, params[:unit_id]),
                                include_blank: true,
-                               class: 'form-control',
-                               style: 'width: 100%') %>
+                               class: 'form-control') %>
               </div>
             </div>
           </div>
diff --git a/app/views/units/_search.html.erb b/app/views/units/_search.html.erb
index 5b3f2a144..29cabd55c 100644
--- a/app/views/units/_search.html.erb
+++ b/app/views/units/_search.html.erb
@@ -1,57 +1,71 @@
-<div id="accordion" role="tablist">
+<div id="SearchForms" role="tablist">
   <div class="card">
-    <div class="card-header" role="tab" id="headingOne">
+    <div class="card-header" role="tab" id="Search">
       <h5 class="mb-0">
-        <a data-toggle="collapse" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-          <%= t('smart_search') %>
+        <a class="collapsed"
+           data-toggle="collapse"
+           href="#collapseSearch"
+           id="collapseSearchLink"
+           aria-expanded="false"
+           aria-controls="Search">
+          <%= t('search') %>
         </a>
+        <div class="float-right">
+          <%= link_to t('reset'), units_path, class: 'btn btn-warning btn-sm' %>
+        </div>
       </h5>
     </div>
-    <div id="collapseOne" class="collapse show" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion" style="">
-      <div class="card-body">
-        <%= form_tag units_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.smart_search_placeholder'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-  <div class="card">
-    <div class="card-header" role="tab" id="headingTwo">
-      <h5 class="mb-0">
-        <a class="collapsed" data-toggle="collapse" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
-          <%= t('detailed_search') %>
-        </a>
-      </h5>
-    </div>
-    <div id="collapseTwo" class="collapse" role="tabpanel" aria-labelledby="headingTwo" data-parent="#accordion" style="">
+    <div id="collapseSearch"
+         class="collapse show"
+         role="tabpanel"
+         aria-labelledby="Search"
+         data-parent="#SearchForms">
       <div class="card-body">
         <%= form_tag units_path, method: :get do %>
           <div class="row">
+            <div class="col-sm-12">
+              <div class="form-group">
+                <%= label_tag :term, t('smart_search') %>
+                <%= text_field_tag :term, 
+                                   params[:term],
+                                   placeholder: t('.smart_search_placeholder'),
+                                   class: 'form-control' %>
+              </div>
+            </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="name"><%= t('.duration') %></label>
-                <%= text_field_tag 'duration', params[:duration], placeholder: "Öğretim Süresi (Yıl)", class: 'form-control' %>
+                <%= label_tag :duration, t('.duration') %>
+                <%= text_field_tag :duration, 
+                                   params[:duration],
+                                   placeholder: "Öğretim Süresi (Yıl)",
+                                   class: 'form-control' %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="ccnumber"><%= t('.unit_status') %></label>
-                <%= select_tag(:unit_status_id, options_from_collection_for_select(UnitStatus.all, :id, :name), include_blank: true, class: 'form-control') %>
+                <%= label_tag :unit_status_id, t('.unit_status') %>
+                <%= select_tag(:unit_status_id,
+                               options_from_collection_for_select(UnitStatus.all, :id, :name, params[:unit_status_id]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="ccnumber"><%= t('.unit_instruction_language') %></label>
-                <%= select_tag(:unit_instruction_language_id, options_from_collection_for_select(UnitInstructionLanguage.all, :id, :name), include_blank: true, class: 'form-control') %>
+                <%= label_tag :unit_instruction_language_id, t('.unit_instruction_language') %>
+                <%= select_tag(:unit_instruction_language_id,
+                               options_from_collection_for_select(UnitInstructionLanguage.all, :id, :name, params[:unit_instruction_language_id]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
             <div class="col-sm-3">
               <div class="form-group">
-                <label for="ccnumber"><%= t('.unit_instruction_type') %></label>
-                <%= select_tag(:unit_instruction_type_id, options_from_collection_for_select(UnitInstructionType.all, :id, :name), include_blank: true, class: 'form-control') %>
+                <%= label_tag :unit_instruction_type_id, t('.unit_instruction_type') %>
+                <%= select_tag(:unit_instruction_type_id,
+                               options_from_collection_for_select(UnitInstructionType.all, :id, :name,  params[:unit_instruction_type_id]),
+                               include_blank: true,
+                               class: 'form-control') %>
               </div>
             </div>
           </div>
@@ -64,4 +78,10 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+
+<script type='text/javascript'>
+  $(document).ready(function() {
+    $('#unit_status_id, #unit_instruction_language_id, #unit_instruction_type_id').select2();
+  });
+</script>

From b042302902c61d3a13a507b51667c33d2085a371 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:03:12 +0300
Subject: [PATCH 13/33] =?UTF-8?q?Select2'da=20olu=C5=9Fan=20responsive=20p?=
 =?UTF-8?q?roblemini=20d=C3=BCzelt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/application.scss   | 1 +
 app/assets/stylesheets/custom/select2.css | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 app/assets/stylesheets/custom/select2.css

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b555b4912..7d9c1e040 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,4 +4,5 @@
   *= require coreui
   *= require toastr/build/toastr.min
   *= require select2/dist/css/select2.min
+  *= require custom/select2
 */
diff --git a/app/assets/stylesheets/custom/select2.css b/app/assets/stylesheets/custom/select2.css
new file mode 100644
index 000000000..8ec178285
--- /dev/null
+++ b/app/assets/stylesheets/custom/select2.css
@@ -0,0 +1,3 @@
+.select2 {
+  width: 100% !important;
+}
\ No newline at end of file

From 0f5b22f527e1b8310a3ea0c8f1c80eded3527e66 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:04:36 +0300
Subject: [PATCH 14/33] =?UTF-8?q?M=C3=BCfredat=20i=C3=A7in=20rama=20formun?=
 =?UTF-8?q?u=20kontrol=20eden=20testi=20d=C3=BCzelt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course_management/curriculums_controller_test.rb           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/controllers/course_management/curriculums_controller_test.rb b/test/controllers/course_management/curriculums_controller_test.rb
index 7e07178d2..48bd074c4 100755
--- a/test/controllers/course_management/curriculums_controller_test.rb
+++ b/test/controllers/course_management/curriculums_controller_test.rb
@@ -14,8 +14,7 @@ class CurriculumsControllerTest < ActionDispatch::IntegrationTest
       get index_path
       assert_response :success
       assert_select '#add-button', translate('.index.add_new_curriculum')
-      assert_select '#collapseSmartSearchLink', t('smart_search')
-      assert_select '#collapseDetailedSearchLink', t('detailed_search')
+      assert_select '#collapseSearchLink', t('search')
     end
 
     test 'should get show' do

From a2634f8f271e4e2033fda8381b12b57b65e257c9 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:05:33 +0300
Subject: [PATCH 15/33] =?UTF-8?q?Language=20modelindeki=20arama=20hatas?=
 =?UTF-8?q?=C4=B1n=C4=B1=20d=C3=BCzelt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/language.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/language.rb b/app/models/language.rb
index b8e79baa1..0cc4f0a1d 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -5,7 +5,7 @@ class Language < ApplicationRecord
   include PgSearch
   pg_search_scope(
     :search,
-    against: %i[name iso yoksis_code],
+    against: %i[name iso],
     using: { tsearch: { prefix: true } }
   )
 

From d4c425ef6b288f2da0207c7fe93f42cce3a1e020 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:31:49 +0300
Subject: [PATCH 16/33] =?UTF-8?q?admin=20ve=20general=20sidebar=20kald?=
 =?UTF-8?q?=C4=B1r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/shared/_sidebar.html.erb    | 121 +++++++++++++++++-
 .../layouts/shared/sidebar/_admin.html.erb    | 120 -----------------
 .../layouts/shared/sidebar/_general.html.erb  |  75 -----------
 3 files changed, 120 insertions(+), 196 deletions(-)
 delete mode 100644 app/views/layouts/shared/sidebar/_admin.html.erb
 delete mode 100644 app/views/layouts/shared/sidebar/_general.html.erb

diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb
index 0beeb56f1..8f9234d66 100644
--- a/app/views/layouts/shared/_sidebar.html.erb
+++ b/app/views/layouts/shared/_sidebar.html.erb
@@ -1,7 +1,126 @@
 <div class="sidebar">
   <nav class="sidebar-nav">
     <ul class="nav">
-      <%= render 'layouts/shared/sidebar/admin' %>
+      <li class="nav-item">
+        <%= link_to root_path, class: 'nav-link' do %>
+          <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
+        <% end %>
+      </li>
+      <li class="nav-item nav-dropdown">
+        <a class="nav-link nav-dropdown-toggle" href="#">
+          <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
+        </a>
+        <ul class="nav-dropdown-items">
+          <li class="nav-item">
+            <%= link_to curriculums_path, class: 'nav-link' do %>
+              <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to courses_path, class: 'nav-link' do %>
+              <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to course_unit_groups_path, class: 'nav-link' do %>
+              <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+        </ul>
+      </li>
+      <li class="nav-item nav-dropdown">
+        <a class="nav-link nav-dropdown-toggle" href="#">
+          <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
+        </a>
+        <ul class="nav-dropdown-items">
+          <li class="nav-item">
+            <%= link_to prospective_students_path, class: 'nav-link' do %>
+              <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to documents_path, class: 'nav-link' do %>
+              <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+        </ul>
+      </li>
+      <li class="nav-item nav-dropdown">
+        <a class="nav-link nav-dropdown-toggle" href="#">
+          <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
+        </a>
+        <ul class="nav-dropdown-items">
+          <li class="nav-item">
+            <%= link_to agenda_types_path, class: 'nav-link' do %>
+              <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to committees_path, class: 'nav-link' do %>
+              <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+        </ul>
+      </li>
+      <li class="nav-item nav-dropdown">
+        <a class="nav-link nav-dropdown-toggle" href="#">
+          <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
+        </a>
+        <ul class="nav-dropdown-items">
+          <li class="nav-item">
+            <%= link_to calendar_titles_path, class: 'nav-link' do %>
+              <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to calendar_types_path, class: 'nav-link' do %>
+              <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to academic_terms_path, class: 'nav-link' do %>
+              <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to academic_calendars_path, class: 'nav-link' do %>
+              <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+        </ul>
+      </li>
+      <li class="nav-item">
+        <%= link_to users_path, class: 'nav-link' do %>
+          <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
+        <% end %>
+      </li>
+      <li class="nav-item nav-dropdown">
+        <a class="nav-link nav-dropdown-toggle" href="#">
+          <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.definitions') %>
+        </a>
+        <ul class="nav-dropdown-items">
+          <li class="nav-item">
+            <%= link_to units_path, class: 'nav-link' do %>
+              <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to countries_path, class: 'nav-link' do %>
+              <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to references_path, class: 'nav-link' do %>
+              <%= fa_icon('user-secret', text: t('.references'), class: 'nav-icon') %>
+            <% end %>
+          </li>
+          <li class="nav-item">
+            <%= link_to course_group_types_path, class: 'nav-link' do %>
+              <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
+            <% end %>
+          </li>    
+        </ul>
+      </li>
     </ul>
   </nav>
   <button class="sidebar-minimizer brand-minimizer" type="button"></button>
diff --git a/app/views/layouts/shared/sidebar/_admin.html.erb b/app/views/layouts/shared/sidebar/_admin.html.erb
deleted file mode 100644
index cc6cdc1e7..000000000
--- a/app/views/layouts/shared/sidebar/_admin.html.erb
+++ /dev/null
@@ -1,120 +0,0 @@
-<li class="nav-item">
-  <%= link_to root_path, class: 'nav-link' do %>
-    <%= fa_icon('home', class: 'nav-icon') %> <%= t('home_nav') %>
-  <% end %>
-</li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('list', class: 'nav-icon') %><%= t('.course_management') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to curriculums_path, class: 'nav-link' do %>
-        <%= fa_icon('book', text: t('.curriculums'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to courses_path, class: 'nav-link' do %>
-        <%= fa_icon('book', text: t('.courses'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to course_unit_groups_path, class: 'nav-link' do %>
-        <%= fa_icon('cubes', text: t('.course_unit_groups'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
-</li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('graduation-cap', class: 'nav-icon') %><%= t('.student_management') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to prospective_students_path, class: 'nav-link' do %>
-        <%= fa_icon('user-plus', text: t('.first_registration'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to documents_path, class: 'nav-link' do %>
-        <%= fa_icon('file-text-o', text: t('.documents'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
-</li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('tasks', class: 'nav-icon') %><%= t('.committees') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to agenda_types_path, class: 'nav-link' do %>
-        <%= fa_icon('tags', text: t('.agenda_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to committees_path, class: 'nav-link' do %>
-        <%= fa_icon('cubes', text: t('.committee_units'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
-</li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.calendars') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to calendar_titles_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar-plus-o', text: t('.calendar_titles'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to calendar_types_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar-check-o', text: t('.calendar_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to academic_terms_path, class: 'nav-link' do %>
-        <%= fa_icon('graduation-cap', text: t('.academic_terms'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to academic_calendars_path, class: 'nav-link' do %>
-        <%= fa_icon('calendar', text: t('.academic_calendars'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-  </ul>
-</li>
-<li class="nav-item">
-  <%= link_to users_path, class: 'nav-link' do %>
-    <%= fa_icon('user', text: t('.users'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item nav-dropdown">
-  <a class="nav-link nav-dropdown-toggle" href="#">
-    <%= fa_icon('calendar', class: 'nav-icon') %><%= t('.definitions') %>
-  </a>
-  <ul class="nav-dropdown-items">
-    <li class="nav-item">
-      <%= link_to units_path, class: 'nav-link' do %>
-        <%= fa_icon('sitemap', text: t('.units'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to countries_path, class: 'nav-link' do %>
-        <%= fa_icon('street-view', text: t('.locations'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to references_path, class: 'nav-link' do %>
-        <%= fa_icon('user-secret', text: t('.references'), class: 'nav-icon') %>
-      <% end %>
-    </li>
-    <li class="nav-item">
-      <%= link_to course_group_types_path, class: 'nav-link' do %>
-        <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
-      <% end %>
-    </li>    
-  </ul>
-</li>
\ No newline at end of file
diff --git a/app/views/layouts/shared/sidebar/_general.html.erb b/app/views/layouts/shared/sidebar/_general.html.erb
deleted file mode 100644
index 497cfd84a..000000000
--- a/app/views/layouts/shared/sidebar/_general.html.erb
+++ /dev/null
@@ -1,75 +0,0 @@
-<li class="nav-item">
-  <%= link_to high_school_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.high_school_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_disability_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_disability_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_drop_out_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_drop_out_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_education_levels_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_education_levels'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_entrance_point_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_entrance_point_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_entrance_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_entrance_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_grades_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_grades'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_grading_systems_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_grading_systems'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_punishment_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_punishment_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to student_studentship_statuses_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.student_studentship_statuses'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to unit_instruction_languages_path, class: 'nav-link' do %>
-    <%= fa_icon('language', text: t('.unit_instruction_languages'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to unit_instruction_types_path, class: 'nav-link' do %>
-    <%= fa_icon('graduation-cap', text: t('.unit_instruction_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to unit_statuses_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.unit_statuses'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to unit_types_path, class: 'nav-link' do %>
-    <%= fa_icon('sitemap', text: t('.unit_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
-<li class="nav-item">
-  <%= link_to university_types_path, class: 'nav-link' do %>
-    <%= fa_icon('university', text: t('.university_types'), class: 'nav-icon') %>
-  <% end %>
-</li>
\ No newline at end of file

From df9710c4d17bbf65f6d9b1041ac1e486512e22a7 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Thu, 27 Sep 2018 14:32:34 +0300
Subject: [PATCH 17/33] =?UTF-8?q?Sidebar=20=C3=A7evirileri=20ve=20referans?=
 =?UTF-8?q?=20isimlendirmelerini=20iyile=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/references/home/_card.html.erb     |  4 +-
 app/views/references/home/index.html.erb     | 30 ++++----
 config/locales/layouts/shared/sidebar_en.yml | 78 ++++++++++---------
 config/locales/layouts/shared/sidebar_tr.yml | 79 ++++++++++----------
 4 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/app/views/references/home/_card.html.erb b/app/views/references/home/_card.html.erb
index 104f1d6d8..d4920e385 100644
--- a/app/views/references/home/_card.html.erb
+++ b/app/views/references/home/_card.html.erb
@@ -1,8 +1,8 @@
 <div class="col-md-3 col-xs-4">
   <div class="card">
     <div class="card-body text-center">
-      <div class="text-muted text-uppercase font-weight-bold"><%= t(text) %></div>
-      <div class="text-value-lg py-3"><%= size %></div>
+      <div class="text-muted text-uppercase font-weight-bold"><%= t(title) %></div>
+      <div class="text-value-lg py-3"><%= content %></div>
       <%= link_to path, class: 'btn btn-block btn-secondary' do %>
         <span class="small font-weight-bold"><%= t('action_group.show') %></span>
         <i class="fa fa-angle-right"></i>
diff --git a/app/views/references/home/index.html.erb b/app/views/references/home/index.html.erb
index 4a5226f2f..6cd806d98 100644
--- a/app/views/references/home/index.html.erb
+++ b/app/views/references/home/index.html.erb
@@ -1,17 +1,17 @@
 <div class="row">
-  <%= render 'card', size: HighSchoolType.count, text: '.high_school_types', path: high_school_types_path %>
-  <%= render 'card', size: StudentDisabilityType.count, text: '.student_disability_types', path: student_disability_types_path %>
-  <%= render 'card', size: StudentDropOutType.count, text: '.student_drop_out_types', path: student_drop_out_types_path %>
-  <%= render 'card', size: StudentEducationLevel.count, text: '.student_education_levels', path: student_education_levels_path %>
-  <%= render 'card', size: StudentEntrancePointType.count, text: '.student_entrance_point_types', path: student_entrance_point_types_path %>
-  <%= render 'card', size: StudentEntranceType.count, text: '.student_entrance_types', path: student_entrance_types_path %>
-  <%= render 'card', size: StudentGrade.count, text: '.student_grades', path: student_grades_path %>
-  <%= render 'card', size: StudentGradingSystem.count, text: '.student_grading_systems', path: student_grading_systems_path %>
-  <%= render 'card', size: StudentPunishmentType.count, text: '.student_punishment_types', path: student_punishment_types_path %>
-  <%= render 'card', size: StudentStudentshipStatus.count, text: '.student_studentship_statuses', path: student_studentship_statuses_path %>
-  <%= render 'card', size: UnitInstructionLanguage.count, text: '.unit_instruction_languages', path: unit_instruction_languages_path %>
-  <%= render 'card', size: UnitInstructionType.count, text: '.unit_instruction_types', path: unit_instruction_types_path %>
-  <%= render 'card', size: UnitStatus.count, text: '.unit_statuses', path: unit_statuses_path %>
-  <%= render 'card', size: UnitType.count, text: '.unit_types', path: unit_types_path %>
-  <%= render 'card', size: UniversityType.count, text: '.university_types', path: university_types_path %>
+  <%= render 'card', content: HighSchoolType.count, title: '.high_school_types', path: high_school_types_path %>
+  <%= render 'card', content: StudentDisabilityType.count, title: '.student_disability_types', path: student_disability_types_path %>
+  <%= render 'card', content: StudentDropOutType.count, title: '.student_drop_out_types', path: student_drop_out_types_path %>
+  <%= render 'card', content: StudentEducationLevel.count, title: '.student_education_levels', path: student_education_levels_path %>
+  <%= render 'card', content: StudentEntrancePointType.count, title: '.student_entrance_point_types', path: student_entrance_point_types_path %>
+  <%= render 'card', content: StudentEntranceType.count, title: '.student_entrance_types', path: student_entrance_types_path %>
+  <%= render 'card', content: StudentGrade.count, title: '.student_grades', path: student_grades_path %>
+  <%= render 'card', content: StudentGradingSystem.count, title: '.student_grading_systems', path: student_grading_systems_path %>
+  <%= render 'card', content: StudentPunishmentType.count, title: '.student_punishment_types', path: student_punishment_types_path %>
+  <%= render 'card', content: StudentStudentshipStatus.count, title: '.student_studentship_statuses', path: student_studentship_statuses_path %>
+  <%= render 'card', content: UnitInstructionLanguage.count, title: '.unit_instruction_languages', path: unit_instruction_languages_path %>
+  <%= render 'card', content: UnitInstructionType.count, title: '.unit_instruction_types', path: unit_instruction_types_path %>
+  <%= render 'card', content: UnitStatus.count, title: '.unit_statuses', path: unit_statuses_path %>
+  <%= render 'card', content: UnitType.count, title: '.unit_types', path: unit_types_path %>
+  <%= render 'card', content: UniversityType.count, title: '.university_types', path: university_types_path %>
 </div>
\ No newline at end of file
diff --git a/config/locales/layouts/shared/sidebar_en.yml b/config/locales/layouts/shared/sidebar_en.yml
index 243ca479b..258b77da8 100644
--- a/config/locales/layouts/shared/sidebar_en.yml
+++ b/config/locales/layouts/shared/sidebar_en.yml
@@ -2,43 +2,41 @@ en:
   layouts:
     shared:
       sidebar:
-        admin:
-          units: Units
-          locations: Locations
-          calendars: Calendars
-          calendar_titles: Calendar Titles
-          calendar_types: Calendar Types
-          academic_terms: Academic Terms
-          academic_calendars: Academic Calendars
-          courses: Courses
-          course_management: Course Management
-          course_unit_groups: Course Unit Group
-          course_group_types: Course Group Type
-          curriculums: Curriculums
-          languages: Languages
-          users: Users
-          references: References
-          documents: Required Documents
-          high_school_types: High School Types
-          student_disability_types: Disability Types
-          student_drop_out_types: Drop Out Types
-          student_education_levels: Education Levels
-          student_entrance_point_types: Entrance Point Types
-          student_entrance_types: Entrance Types
-          student_grades: Grades
-          student_grading_systems: Grading Systems
-          student_punishment_types: Punishment Types
-          student_management: Student Management
-          student_studentship_statuses: Studentship Statuses
-          unit_instruction_languages:  Instruction Languages
-          unit_instruction_types: Instruction Types
-          unit_statuses: Unit Statuses
-          unit_types: Unit Types
-          university_types: University Types
-          studies: Academic Studies
-          committees: Committees
-          committee_units: Committee Units
-          agenda_types: Agenda Types
-          first_registration: Prospective Students
-          definitions: Definitions
-          units: Units
+        academic_calendars: Academic Calendars
+        academic_terms: Academic Terms
+        agenda_types: Agenda Types
+        calendar_titles: Calendar Titles
+        calendar_types: Calendar Types
+        calendars: Calendars
+        committee_units: Committee Units
+        committees: Committees
+        course_group_types: Course Group Type
+        course_management: Course Management
+        course_unit_groups: Course Unit Group
+        courses: Courses
+        curriculums: Curriculums
+        definitions: Definitions
+        documents: Required Documents
+        first_registration: Prospective Students
+        high_school_types: High School Types
+        languages: Languages
+        locations: Locations
+        references: References
+        student_disability_types: Disability Types
+        student_drop_out_types: Drop Out Types
+        student_education_levels: Education Levels
+        student_entrance_point_types: Entrance Point Types
+        student_entrance_types: Entrance Types
+        student_grades: Grades
+        student_grading_systems: Grading Systems
+        student_management: Student Management
+        student_punishment_types: Punishment Types
+        student_studentship_statuses: Studentship Statuses
+        studies: Academic Studies
+        unit_instruction_languages:  Instruction Languages
+        unit_instruction_types: Instruction Types
+        unit_statuses: Unit Statuses
+        unit_types: Unit Types
+        units: Units
+        university_types: University Types
+        users: Users
\ No newline at end of file
diff --git a/config/locales/layouts/shared/sidebar_tr.yml b/config/locales/layouts/shared/sidebar_tr.yml
index 2d43a2173..38c41f3b0 100644
--- a/config/locales/layouts/shared/sidebar_tr.yml
+++ b/config/locales/layouts/shared/sidebar_tr.yml
@@ -2,43 +2,42 @@ tr:
   layouts:
     shared:
       sidebar:
-        admin:
-          units: Birimler
-          locations: Konumlar
-          calendars: Takvimler
-          calendar_titles: Takvim Başlıkları
-          calendar_types: Takvim Türleri
-          academic_terms: Akademik Dönemler
-          academic_calendars: Akademik Takvimler
-          courses: Dersler
-          course_management: Ders İşlemler
-          course_unit_groups: Ders Grupları
-          course_group_types: Ders Grup Türleri
-          curriculums: Müfredatlar
-          languages: Diller
-          users: Kullanıcılar
-          references: Referanslar
-          documents: Gerekli Belgeler
-          high_school_types: Lise Türleri
-          student_disability_types: Engel Türleri
-          student_drop_out_types: Ayrılma Nedenleri
-          student_education_levels: Eğitim Düzeyleri
-          student_entrance_point_types: Giriş Puan Türleri
-          student_entrance_types: Giriş Türleri
-          student_grades: Sınıflar
-          student_grading_systems: Not Sistemleri
-          student_punishment_types: Ceza Türleri
-          student_management: Öğrenci Yönetimi
-          student_studentship_statuses: Öğrencilik Hakları
-          unit_instruction_languages: Öğrenim Dilleri
-          unit_instruction_types: Öğrenim Türleri
-          unit_statuses: Aktiflik Durumları
-          unit_types: Birim Türleri
-          university_types: Üniversite Türleri
-          studies: Akademik Çalışmalar
-          committees: Kurullar/Komisyonlar
-          committee_units: Kurul/Komisyon Birimleri
-          agenda_types: Gündem Türleri
-          first_registration: İlk Kayıt
-          definitions: Tanımlar
-          units: Birimler
+        academic_calendars: Akademik Takvimler
+        academic_terms: Akademik Dönemler
+        agenda_types: Gündem Türleri
+        calendar_titles: Takvim Başlıkları
+        calendar_types: Takvim Türleri
+        calendars: Takvimler
+        committee_units: Kurul/Komisyon Birimleri
+        committees: Kurullar/Komisyonlar
+        course_group_types: Ders Grup Türleri
+        course_management: Ders İşlemler
+        course_unit_groups: Ders Grupları
+        courses: Dersler
+        curriculums: Müfredatlar
+        definitions: Tanımlar
+        documents: Gerekli Belgeler
+        first_registration: İlk Kayıt
+        high_school_types: Lise Türleri
+        languages: Diller
+        locations: Konumlar
+        references: Referanslar
+        student_disability_types: Engel Türleri
+        student_drop_out_types: Ayrılma Nedenleri
+        student_education_levels: Eğitim Düzeyleri
+        student_entrance_point_types: Giriş Puan Türleri
+        student_entrance_types: Giriş Türleri
+        student_grades: Sınıflar
+        student_grading_systems: Not Sistemleri
+        student_management: Öğrenci Yönetimi
+        student_punishment_types: Ceza Türleri
+        student_studentship_statuses: Öğrencilik Hakları
+        studies: Akademik Çalışmalar
+        unit_instruction_languages: Öğrenim Dilleri
+        unit_instruction_types: Öğrenim Türleri
+        unit_statuses: Aktiflik Durumları
+        unit_types: Birim Türleri
+        units: Birimler
+        university_types: Üniversite Türleri
+        users: Kullanıcılar
+      
\ No newline at end of file

From 393d9a1065b046c67b14169148b7d0b3f572abb0 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 15:21:12 +0300
Subject: [PATCH 18/33] =?UTF-8?q?Ak=C4=B1ll=C4=B1=20arama=20formunu=20comp?=
 =?UTF-8?q?onents=20alt=C4=B1na=20ta=C5=9F=C4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/_smart_search_form.html.erb    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/views/components/_smart_search_form.html.erb

diff --git a/app/views/components/_smart_search_form.html.erb b/app/views/components/_smart_search_form.html.erb
new file mode 100644
index 000000000..223309b43
--- /dev/null
+++ b/app/views/components/_smart_search_form.html.erb
@@ -0,0 +1,30 @@
+<div class="card">
+  <div class="card-header" role="tab" id="smartSearch">
+    <h5 class="mb-0">
+      <a data-toggle="collapse"
+          href="#collapseSmartSearch"
+          id="collapseSmartSearchLink"
+          aria-expanded="true"
+          aria-controls="SmartSearch">
+        <%= t('smart_search') %>
+      </a>
+    </h5>
+  </div>
+  <div id="collapseSmartSearch"
+        class="collapse show"
+        role="tabpanel"
+        aria-labelledby="smartSearch"
+        data-parent="#SearchForms">
+    <div class="card-body">
+      <%= form_tag path, method: :get do %>
+        <div class="form-group">
+          <%= text_field_tag :term,
+                              params[:term],
+                              placeholder: placeholder,
+                              class: 'form-control' %>
+        </div>
+        <%= submit_tag t('search'), class: 'btn btn-primary' %>
+      <% end %>
+    </div>
+  </div>
+</div>
\ No newline at end of file

From 5852b0bc6cbe42e3dc4926d3ce7d22b4c9fbeaba Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 15:23:34 +0300
Subject: [PATCH 19/33] =?UTF-8?q?AcademicCalendar=20modeli=20i=C3=A7in=20p?=
 =?UTF-8?q?g=5Fsearch=20ekle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/academic_calendar.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/models/academic_calendar.rb b/app/models/academic_calendar.rb
index 6c7435ed9..3d451f891 100644
--- a/app/models/academic_calendar.rb
+++ b/app/models/academic_calendar.rb
@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
 class AcademicCalendar < ApplicationRecord
+  # search
+  include PgSearch
+  pg_search_scope(
+    :search,
+    against: %i[name],
+    using: { tsearch: { prefix: true } }
+  )
+
   # relations
   belongs_to :academic_term
   belongs_to :calendar_type

From 5079cf54a48e3b8a1cf393c549a0ee76f76cab1e Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Thu, 27 Sep 2018 15:29:14 +0300
Subject: [PATCH 20/33] =?UTF-8?q?Sistem=20genelinde=20arama=20formlar?=
 =?UTF-8?q?=C4=B1n=C4=B1=20tekille=C5=9Ftir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../academic_calendars/index.html.erb         | 10 ++-----
 .../calendar/calendar_titles/index.html.erb   | 10 ++-----
 .../committee/agenda_types/index.html.erb     | 10 ++-----
 app/views/committee/dashboard/index.html.erb  | 10 ++-----
 app/views/committee/dashboard/show.html.erb   | 10 ++-----
 .../course_group_types/index.html.erb         | 10 ++-----
 .../course_unit_groups/index.html.erb         | 10 ++-----
 .../layouts/shared/_smart_search.html.erb     | 30 -------------------
 app/views/references/cities/show.html.erb     | 10 ++-----
 app/views/references/countries/index.html.erb | 10 ++-----
 app/views/references/countries/show.html.erb  | 10 ++-----
 app/views/references/languages/index.html.erb | 10 ++-----
 app/views/users/_search.html.erb              | 21 -------------
 app/views/users/index.html.erb                |  4 ++-
 config/locales/models/user/en.yml             |  3 +-
 config/locales/models/user/tr.yml             |  3 +-
 16 files changed, 38 insertions(+), 133 deletions(-)
 delete mode 100644 app/views/layouts/shared/_smart_search.html.erb
 delete mode 100644 app/views/users/_search.html.erb

diff --git a/app/views/calendar/academic_calendars/index.html.erb b/app/views/calendar/academic_calendars/index.html.erb
index a7da93781..eb7d25e95 100644
--- a/app/views/calendar/academic_calendars/index.html.erb
+++ b/app/views/calendar/academic_calendars/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'align-justify', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag academic_calendars_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: academic_calendars_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/calendar/calendar_titles/index.html.erb b/app/views/calendar/calendar_titles/index.html.erb
index ac887aa0c..d014e5773 100644
--- a/app/views/calendar/calendar_titles/index.html.erb
+++ b/app/views/calendar/calendar_titles/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'align-justify', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag calendar_titles_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: calendar_titles_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/committee/agenda_types/index.html.erb b/app/views/committee/agenda_types/index.html.erb
index 81c8f04e3..5fe0bb3f0 100644
--- a/app/views/committee/agenda_types/index.html.erb
+++ b/app/views/committee/agenda_types/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'tags', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag agenda_types_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: agenda_types_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/committee/dashboard/index.html.erb b/app/views/committee/dashboard/index.html.erb
index 217eac11a..dca37fa77 100644
--- a/app/views/committee/dashboard/index.html.erb
+++ b/app/views/committee/dashboard/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'cubes', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag committees_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: committees_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/committee/dashboard/show.html.erb b/app/views/committee/dashboard/show.html.erb
index 0fb173f79..168c607ab 100644
--- a/app/views/committee/dashboard/show.html.erb
+++ b/app/views/committee/dashboard/show.html.erb
@@ -13,13 +13,9 @@
             </div>
           </div>
           <div class="card-body">
-            <%= form_tag committee_path(@committee.id), method: :get do %>
-              <div class="form-group">
-                <%= text_field_tag 'term', params[:term], placeholder: t('.description'), class: 'form-control' %>
-              </div>
-              <%= submit_tag t('search'), class: 'btn btn-primary' %>
-            <% end %>
-            <hr \>
+            <%= render 'components/smart_search_form',
+                       path: committee_path(@committee.id),
+                       placeholder: t('.description') %>
             <table class="table table-responsive-sm">
               <thead>
                 <tr>
diff --git a/app/views/course_management/course_group_types/index.html.erb b/app/views/course_management/course_group_types/index.html.erb
index b897889f5..77f159654 100644
--- a/app/views/course_management/course_group_types/index.html.erb
+++ b/app/views/course_management/course_group_types/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'tags', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag course_group_types_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: course_group_types_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/course_management/course_unit_groups/index.html.erb b/app/views/course_management/course_unit_groups/index.html.erb
index 7a9ff00ce..d7f572947 100644
--- a/app/views/course_management/course_unit_groups/index.html.erb
+++ b/app/views/course_management/course_unit_groups/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'tags', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag course_unit_groups_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.search_placeholder'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: course_unit_groups_path,
+                   placeholder: t('.search_placeholder') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/layouts/shared/_smart_search.html.erb b/app/views/layouts/shared/_smart_search.html.erb
deleted file mode 100644
index 3b249bef9..000000000
--- a/app/views/layouts/shared/_smart_search.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="card">
-  <div class="card-header" role="tab" id="smartSearch">
-    <h5 class="mb-0">
-      <a data-toggle="collapse"
-          href="#collapseSmartSearch"
-          id="collapseSmartSearchLink"
-          aria-expanded="true"
-          aria-controls="SmartSearch">
-        <%= t('smart_search') %>
-      </a>
-    </h5>
-  </div>
-  <div id="collapseSmartSearch"
-        class="collapse show"
-        role="tabpanel"
-        aria-labelledby="smartSearch"
-        data-parent="#SearchForms">
-    <div class="card-body">
-      <%= form_tag search_path, method: :get do %>
-        <div class="form-group">
-          <%= text_field_tag :term,
-                              params[:term],
-                              placeholder: placeholder,
-                              class: 'form-control' %>
-        </div>
-        <%= submit_tag t('search'), class: 'btn btn-primary' %>
-      <% end %>
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/references/cities/show.html.erb b/app/views/references/cities/show.html.erb
index d89ea5407..6bfc9934a 100644
--- a/app/views/references/cities/show.html.erb
+++ b/app/views/references/cities/show.html.erb
@@ -33,13 +33,9 @@
         </div>
       </div>
       <div class='card-body'>
-        <%= form_tag country_city_path(@country, @city), method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: country_city_path(@country, @city),
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/references/countries/index.html.erb b/app/views/references/countries/index.html.erb
index c215b6d86..14aee9dea 100644
--- a/app/views/references/countries/index.html.erb
+++ b/app/views/references/countries/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'street-view', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag countries_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: countries_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/references/countries/show.html.erb b/app/views/references/countries/show.html.erb
index 585a8b81e..7bfc8c138 100644
--- a/app/views/references/countries/show.html.erb
+++ b/app/views/references/countries/show.html.erb
@@ -49,13 +49,9 @@
         </div>
       </div>
       <div class='card-body'>
-        <%= form_tag country_path(@country), method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: country_path(@country),
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/references/languages/index.html.erb b/app/views/references/languages/index.html.erb
index ef4717065..caf6e52be 100644
--- a/app/views/references/languages/index.html.erb
+++ b/app/views/references/languages/index.html.erb
@@ -9,13 +9,9 @@
         <%= fa_icon 'language', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= form_tag languages_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-        <hr \>
+        <%= render 'components/smart_search_form',
+                   path: languages_path,
+                   placeholder: t('.name') %>
         <table class='table table-responsive-sm table-striped'>
           <thead>
             <tr>
diff --git a/app/views/users/_search.html.erb b/app/views/users/_search.html.erb
deleted file mode 100644
index f0b909f1a..000000000
--- a/app/views/users/_search.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="accordion" role="tablist">
-  <div class="card">
-    <div class="card-header" role="tab" id="headingOne">
-      <h5 class="mb-0">
-        <a data-toggle="collapse" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-          <%= t('smart_search') %>
-        </a>
-      </h5>
-    </div>
-    <div id="collapseOne" class="collapse show" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion" style="">
-      <div class="card-body">
-        <%= form_tag users_path, method: :get do %>
-          <div class="form-group">
-            <%= text_field_tag 'term', params[:term], placeholder: t('.smart_search_placeholder'), class: 'form-control' %>
-          </div>
-          <%= submit_tag t('search'), class: 'btn btn-primary' %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 0d0baeffa..4bc7426c0 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -9,7 +9,9 @@
         <%= fa_icon 'align-justify', text: t('.card_header') %>
       </div>
       <div class='card-body'>
-        <%= render 'search' %>
+        <%= render 'components/smart_search_form',
+                   path: users_path,
+                   placeholder: t('.smart_search_placeholder') %>
         <table class='table table-responsive-sm'>
           <thead>
             <tr>
diff --git a/config/locales/models/user/en.yml b/config/locales/models/user/en.yml
index acde8fd3e..161826da7 100644
--- a/config/locales/models/user/en.yml
+++ b/config/locales/models/user/en.yml
@@ -71,6 +71,7 @@ en:
       new_user_link: Create a New User
       addresses: Addresses
       identities: Identities
+      smart_search_placeholder: TC/YU number, e-mail address, first of last name
     account:
       <<: *user_attributes
     addresses:
@@ -93,8 +94,6 @@ en:
       identities: Identities
       addresses: Addresses
       employees: Employees
-    search:
-      smart_search_placeholder: TC/YU number, e-mail address, first of last name
     edit:
       form_title: Edit Account
     new:
diff --git a/config/locales/models/user/tr.yml b/config/locales/models/user/tr.yml
index 0a50c77bb..5efc2aa37 100644
--- a/config/locales/models/user/tr.yml
+++ b/config/locales/models/user/tr.yml
@@ -71,6 +71,7 @@ tr:
       new_user_link: Yeni Kullanıcı Oluştur
       addresses: Adres Bilgileri
       identities: Kimlik Bilgileri
+      smart_search_placeholder: TC/YU numarası, e-mail adresi, ad veya soyad
     account:
       <<: *user_attributes
     addresses:
@@ -93,8 +94,6 @@ tr:
       identities: Kimlik Bilgileri
       addresses: Adres Bilgileri
       employees: Personel İşlemleri
-    search:
-      smart_search_placeholder: TC/YU numarası, e-mail adresi, ad veya soyad
     edit:
       form_title: Hesabı Düzenle
     new:

From f40ecbe4f121801d60e866a209a9989121927e7d Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 15:31:02 +0300
Subject: [PATCH 21/33] Sort YAML files alphabetically

---
 config/locales/defaults/en.yml                |  15 +-
 config/locales/defaults/rails/en.yml          |  14 +-
 config/locales/defaults/rails/tr.yml          |  20 +-
 config/locales/defaults/tr.yml                |  17 +-
 config/locales/gems/devise/en.yml             |  43 ++-
 config/locales/gems/devise/tr.yml             |  43 ++-
 config/locales/gems/pagy/en.yml               |  28 +-
 config/locales/gems/pagy/tr.yml               |  28 +-
 config/locales/gems/simple_form/en.yml        |   8 +-
 config/locales/gems/simple_form/tr.yml        |   8 +-
 config/locales/layouts/application/en.yml     |  30 +-
 config/locales/layouts/application/tr.yml     |  30 +-
 config/locales/layouts/mailer/tr.yml          |   2 +-
 config/locales/layouts/shared/meta_en.yml     |   4 +-
 config/locales/layouts/shared/meta_tr.yml     |   4 +-
 config/locales/layouts/shared/sidebar_en.yml  |   2 +-
 config/locales/layouts/shared/sidebar_tr.yml  |   1 -
 config/locales/models/account/en.yml          | 114 +++----
 config/locales/models/account/tr.yml          | 114 +++----
 config/locales/models/addresses/en.yml        |  48 +--
 config/locales/models/addresses/tr.yml        |  48 +--
 config/locales/models/calendars/en.yml        | 170 +++++------
 config/locales/models/calendars/tr.yml        | 170 +++++------
 config/locales/models/committees/en.yml       |  90 +++---
 config/locales/models/committees/tr.yml       |  90 +++---
 .../locales/models/course_management/en.yml   | 124 ++++----
 .../locales/models/course_management/tr.yml   | 132 ++++----
 config/locales/models/documents/en.yml        |  30 +-
 config/locales/models/documents/tr.yml        |  30 +-
 config/locales/models/identities/en.yml       |  60 ++--
 config/locales/models/identities/tr.yml       |  60 ++--
 config/locales/models/references/en.yml       | 114 +++----
 config/locales/models/references/tr.yml       | 116 +++----
 .../models/registration_documents/en.yml      |  22 +-
 .../models/registration_documents/tr.yml      |  22 +-
 .../locales/models/student_management/en.yml  | 106 +++----
 .../locales/models/student_management/tr.yml  | 106 +++----
 config/locales/models/studies/en.yml          |  16 +-
 config/locales/models/studies/tr.yml          |  16 +-
 config/locales/models/units/en.yml            |  46 +--
 config/locales/models/units/tr.yml            |  46 +--
 config/locales/models/user/en.yml             | 126 ++++----
 config/locales/models/user/tr.yml             | 126 ++++----
 .../locales/models/yoksis_references/en.yml   | 282 +++++++++---------
 .../locales/models/yoksis_references/tr.yml   | 282 +++++++++---------
 config/locales/validators/en.yml              |  14 +-
 config/locales/validators/tr.yml              |  14 +-
 47 files changed, 1513 insertions(+), 1518 deletions(-)

diff --git a/config/locales/defaults/en.yml b/config/locales/defaults/en.yml
index bba8f9db4..2eb50a5b2 100644
--- a/config/locales/defaults/en.yml
+++ b/config/locales/defaults/en.yml
@@ -1,23 +1,22 @@
 en:
-  actions: Actions
   action_group:
     add: Add
     back: Back
     destroy: Destroy
     edit: Edit
+    file: Show File
     new: New
     show: Show
     update: Update
-    file: Show File
+  actions: Actions
   are_you_sure: Are you sure?
-  save: Save
-  search: Search
-  home_nav: Home
   created_at: Created At
-  updated_at: Updated At
-  'yes': 'Yes'
-  'no': 'No'
   detailed_search: Detailed Search
+  home_nav: Home
+  'no': 'No'
   reset: Reset
+  save: Save
   search: Search
   smart_search: Smart Search
+  updated_at: Updated At
+  'yes': 'Yes'
diff --git a/config/locales/defaults/rails/en.yml b/config/locales/defaults/rails/en.yml
index 22aefe302..d63d2dc90 100644
--- a/config/locales/defaults/rails/en.yml
+++ b/config/locales/defaults/rails/en.yml
@@ -4,8 +4,8 @@ en:
       messages:
         record_invalid: "Validation failed: %{errors}"
         restrict_dependent_destroy:
-          has_one: "Cannot delete record because a dependent %{record} exists"
           has_many: "Cannot delete record because dependent %{record} exist"
+          has_one: "Cannot delete record because a dependent %{record} exists"
   date:
     abbr_day_names:
     - Sun
@@ -92,12 +92,12 @@ en:
       x_months:
         one: 1 month
         other: "%{count} months"
-      x_years:
-        one: 1 year
-        other: "%{count} years"
       x_seconds:
         one: 1 second
         other: "%{count} seconds"
+      x_years:
+        one: 1 year
+        other: "%{count} years"
     prompts:
       day: Day
       hour: Hour
@@ -110,7 +110,6 @@ en:
     messages:
       accepted: must be accepted
       blank: can't be blank
-      present: must be blank
       confirmation: doesn't match %{attribute}
       empty: can't be empty
       equal_to: must be equal to %{count}
@@ -126,6 +125,8 @@ en:
       not_a_number: is not a number
       not_an_integer: must be an integer
       odd: must be odd
+      other_than: must be other than %{count}
+      present: must be blank
       required: must exist
       taken: has already been taken
       too_long:
@@ -137,7 +138,6 @@ en:
       wrong_length:
         one: is the wrong length (should be 1 character)
         other: is the wrong length (should be %{count} characters)
-      other_than: must be other than %{count}
     template:
       body: 'There were problems with the following fields:'
       header:
@@ -150,6 +150,7 @@ en:
       create: Create %{model}
       submit: Save %{model}
       update: Update %{model}
+  not_found: 'Not found!'
   number:
     currency:
       format:
@@ -210,4 +211,3 @@ en:
       long: "%B %d, %Y %I:%M %p"
       short: "%d %b %I:%M %p"
     pm: pm
-  not_found: 'Not found!'
diff --git a/config/locales/defaults/rails/tr.yml b/config/locales/defaults/rails/tr.yml
index fbc65c79d..2e182b1d6 100644
--- a/config/locales/defaults/rails/tr.yml
+++ b/config/locales/defaults/rails/tr.yml
@@ -1,15 +1,15 @@
 tr:
   activerecord:
+    attributes:
+      user:
+        id_number: 'Kimlik numarası'
+        password: 'Parola'
     errors:
       messages:
         record_invalid: 'Doğrulama başarısız oldu: %{errors}'
         restrict_dependent_destroy:
-          has_one: Bağlı bir kayıt %{record} bulunduğu için kayıt silinemedi
           has_many: Bağlı kayıtlar %{record} bulunduğu için kayıt silinemedi
-    attributes:
-      user:
-        password: 'Parola'
-        id_number: 'Kimlik numarası'
+          has_one: Bağlı bir kayıt %{record} bulunduğu için kayıt silinemedi
   date:
     abbr_day_names:
     - Pzr
@@ -114,7 +114,6 @@ tr:
     messages:
       accepted: kabul edilmeli
       blank: doldurulmalı
-      present: boş bırakılmalı
       confirmation: "%{attribute} teyidiyle uyuşmuyor"
       empty: doldurulmalı
       equal_to: tam olarak %{count} olmalı
@@ -126,9 +125,13 @@ tr:
       invalid: geçersiz
       less_than: "%{count} sayısından küçük olmalı"
       less_than_or_equal_to: "%{count} sayısına eşit veya küçük olmalı"
+      model_invalid: "Doğrulama başarısız oldu: %{errors}"
       not_a_number: geçerli bir sayı değil
       not_an_integer: tam sayı olmalı
       odd: tek olmalı
+      other_than: "%{count} karakterden oluşamaz"
+      present: boş bırakılmalı
+      required: doldurulmalı
       taken: hali hazırda kullanılmakta
       too_long:
         one: çok uzun (en fazla 1 karakter)
@@ -139,9 +142,6 @@ tr:
       wrong_length:
         one: hatalı uzunlukta (1 karakter olmalı)
         other: hatalı uzunlukta (%{count} karakter olmalı)
-      other_than: "%{count} karakterden oluşamaz"
-      model_invalid: "Doğrulama başarısız oldu: %{errors}"
-      required: doldurulmalı
     template:
       body: 'Lütfen aşağıdaki hataları düzeltiniz:'
       header:
@@ -154,6 +154,7 @@ tr:
       create: "%{model} Ekle"
       submit: "%{model} Kaydet"
       update: "%{model} Güncelle"
+  not_found: 'Erişmeye çalıştığınız sayfa bulunamadı!'
   number:
     currency:
       format:
@@ -214,4 +215,3 @@ tr:
       long: "%e %B %Y, %A, %H:%M"
       short: "%e %B, %H:%M"
     pm: öğleden sonra
-  not_found: 'Erişmeye çalıştığınız sayfa bulunamadı!'
diff --git a/config/locales/defaults/tr.yml b/config/locales/defaults/tr.yml
index f6edbbecd..f68a66def 100644
--- a/config/locales/defaults/tr.yml
+++ b/config/locales/defaults/tr.yml
@@ -1,23 +1,22 @@
 tr:
-  actions: İşlemler
   action_group:
     add: Ekle
     back: Geri
     destroy: Sil
     edit: Düzenle
+    file: Dosya Görüntüle
     new: Yeni
     show: Görüntüle
     update: Güncelle
-    file: Dosya Görüntüle
+  actions: İşlemler
   are_you_sure: Emin misiniz?
-  save: Kaydet
-  search: Arama Yap
-  home_nav: Anasayfa
   created_at: Oluşturulma Tarihi
-  updated_at: Güncellenme Tarihi
-  'yes': Evet
-  'no': Hayır
   detailed_search: Detaylı Arama
+  home_nav: Anasayfa
+  'no': Hayır
   reset: Reset
-  search: Arama
+  save: Kaydet
+  search: Arama Yap
   smart_search: Akıllı Arama
+  updated_at: Güncellenme Tarihi
+  'yes': Evet
diff --git a/config/locales/gems/devise/en.yml b/config/locales/gems/devise/en.yml
index 2ae9baadc..f41f38e92 100644
--- a/config/locales/gems/devise/en.yml
+++ b/config/locales/gems/devise/en.yml
@@ -1,25 +1,5 @@
 en:
   devise:
-    mailer:
-      common:
-        hello: 'Hello, %{mail}!'
-      email_changed:
-        subject: Email Changed
-        body: You have successfully updated your registered e-mail address. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake.
-        new_mail: 'Your new e-mail: %{mail}'
-      password_change:
-        subject: Password Changed
-        body: You have successfully updated your password. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake.
-      reset_password_instructions:
-        subject: Reset password instructions
-        body: You or someone else made a request to reset your password. Click the link below to reset your password.
-        reset_password: Reset Password
-        didnt_requested: You can ignore this e-mail if you didn't requested a password change. Your password will not change unless you click the link shown above and then set a new password.
-      confirmation_instructions:
-        subject: Confirmation instructions
-      unlock_instructions:
-        subject: Unlock instructions
-
     confirmations:
       confirmed: "Your email address has been successfully confirmed."
       send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
@@ -28,12 +8,31 @@ en:
       already_authenticated: "You are already signed in."
       inactive: "Your account is not activated yet."
       invalid: "Invalid %{authentication_keys} or password."
-      locked: "Your account is locked."
       last_attempt: "You have one more attempt before your account is locked."
+      locked: "Your account is locked."
       not_found_in_database: "Invalid %{authentication_keys} or password."
       timeout: "Your session expired. Please sign in again to continue."
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your email address before continuing."
+    mailer:
+      common:
+        hello: 'Hello, %{mail}!'
+      confirmation_instructions:
+        subject: Confirmation instructions
+      email_changed:
+        body: You have successfully updated your registered e-mail address. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake.
+        new_mail: 'Your new e-mail: %{mail}'
+        subject: Email Changed
+      password_change:
+        body: You have successfully updated your password. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake.
+        subject: Password Changed
+      reset_password_instructions:
+        body: You or someone else made a request to reset your password. Click the link below to reset your password.
+        didnt_requested: You can ignore this e-mail if you didn't requested a password change. Your password will not change unless you click the link shown above and then set a new password.
+        reset_password: Reset Password
+        subject: Reset password instructions
+      unlock_instructions:
+        subject: Unlock instructions
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
@@ -52,9 +51,9 @@ en:
       update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
       updated: "Your account has been updated successfully."
     sessions:
+      already_signed_out: "Signed out successfully."
       signed_in: "Signed in successfully."
       signed_out: "Signed out successfully."
-      already_signed_out: "Signed out successfully."
     unlocks:
       send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
       send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
diff --git a/config/locales/gems/devise/tr.yml b/config/locales/gems/devise/tr.yml
index bd91ca337..9d48fdd58 100644
--- a/config/locales/gems/devise/tr.yml
+++ b/config/locales/gems/devise/tr.yml
@@ -1,25 +1,5 @@
 tr:
   devise:
-    mailer:
-      common:
-        hello: 'Merhaba, %{mail}!'
-      email_changed:
-        subject: Email Adresiniz Değişti
-        body: Kayıtlı e-mail adresiniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz.
-        new_mail: 'Yeni e-mail adresiniz: %{mail}'
-      password_change:
-        subject: Şifreniz Değişti
-        body: Şifreniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz.
-      reset_password_instructions:
-        subject: Parola sıfırlama talimatları
-        body: Siz veya başka birisi şifrenizi sıfırlama talebinde bulundu. Şifrenizi sıfırlamak istiyorsanız aşağıdaki linke tıklayabilirsiniz.
-        reset_password: Şifremi Sıfırla
-        didnt_requested: Eğer böyle bir istekte bulunmadıysanız bu e-mail'i görmezden gelebilirsiniz. Yukarıdaki linke tıklayarak yeni bir şifre belirledikçe şifreniz değişmeyecektir.
-      confirmation_instructions:
-        subject: Onaylama talimatları
-      unlock_instructions:
-        subject: Kilit kaldırma talimalatları
-
     confirmations:
       confirmed: "Eposta adresiniz başırılı bir şekilde onaylandı."
       send_instructions: "Bir kaç dakika içerisinde eposta adresinizi nasıl onaylayacağınız hakkında bir eposta alacaksınız."
@@ -28,12 +8,31 @@ tr:
       already_authenticated: "Zaten giriş yaptınız."
       inactive: "Hesabınız henüz aktif edilmedi."
       invalid: "Geçersiz %{authentication_keys} veya parola."
-      locked: "Hesabınız kilitli."
       last_attempt: "Hesabınız kilitlenmeden önceki son şansınız."
+      locked: "Hesabınız kilitli."
       not_found_in_database: "Geçersiz %{authentication_keys} veya parola."
       timeout: "Oturum süreniz sonlandı. Lütfen devam etmek için tekrar giriş yapın."
       unauthenticated: "Devam etmeden önce giriş yapmalı veya kayıt olmalısınız."
       unconfirmed: "Devam etmeden önce eposta adresinizi onaylamalısınız."
+    mailer:
+      common:
+        hello: 'Merhaba, %{mail}!'
+      confirmation_instructions:
+        subject: Onaylama talimatları
+      email_changed:
+        body: Kayıtlı e-mail adresiniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz.
+        new_mail: 'Yeni e-mail adresiniz: %{mail}'
+        subject: Email Adresiniz Değişti
+      password_change:
+        body: Şifreniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz.
+        subject: Şifreniz Değişti
+      reset_password_instructions:
+        body: Siz veya başka birisi şifrenizi sıfırlama talebinde bulundu. Şifrenizi sıfırlamak istiyorsanız aşağıdaki linke tıklayabilirsiniz.
+        didnt_requested: Eğer böyle bir istekte bulunmadıysanız bu e-mail'i görmezden gelebilirsiniz. Yukarıdaki linke tıklayarak yeni bir şifre belirledikçe şifreniz değişmeyecektir.
+        reset_password: Şifremi Sıfırla
+        subject: Parola sıfırlama talimatları
+      unlock_instructions:
+        subject: Kilit kaldırma talimalatları
     omniauth_callbacks:
       failure: "\"%{reason}\" olduğu için %{kind}'den doğrulama yapılamıyor."
       success: "%{kind} hesabından başarılı bir şekilde doğrulandı."
@@ -52,9 +51,9 @@ tr:
       update_needs_confirmation: "Hesabınız başarılı bir şekilde güncellendi. Fakar eposta adresinizi onaylamanız gerekmekteir. Lütfen eposta kutunuzu kontrol ediniz ve yeni eposta adresinizi onaylama linkine tıklayınız."
       updated: "Hesabınız başarılı bir şekilde güncellendi."
     sessions:
+      already_signed_out: "Başarılı çıkış."
       signed_in: "Başarılı giriş."
       signed_out: "Başarılı çıkış."
-      already_signed_out: "Başarılı çıkış."
     unlocks:
       send_instructions: "Birkaç dakika içerisinde hesabınızın kilidini nasıl kaldıracağınız hakkında bir eposta alacaksınız."
       send_paranoid_instructions: "Eğer hesabınız varsa birkaç dakika içerisinde hesabınızın kilidini nasıl kaldırıcağınız hakkında bir eposta alacaksınız."
diff --git a/config/locales/gems/pagy/en.yml b/config/locales/gems/pagy/en.yml
index 96da8848c..bb23dce96 100644
--- a/config/locales/gems/pagy/en.yml
+++ b/config/locales/gems/pagy/en.yml
@@ -1,22 +1,22 @@
 en:
   pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Prev"
-      next: "Next&nbsp;&rsaquo;"
-      gap: "&hellip;"
+    compact:
+      of: "of"
+      page: "Page"
     info:
-      single_page:
-        zero: "No %{item_name} found"
-        one: "Displaying <b>1</b> %{item_name}"
-        other: "Displaying <b>all %{count}</b> %{item_name}"
-      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
       item_name:
-        zero: "items"
         one: "item"
         other: "items"
-    compact:
-      page: "Page"
-      of: "of"
+        zero: "items"
+      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
+      single_page:
+        one: "Displaying <b>1</b> %{item_name}"
+        other: "Displaying <b>all %{count}</b> %{item_name}"
+        zero: "No %{item_name} found"
     items:
+      items: "items per page"
       show: "Show"
-      items: "items per page"
\ No newline at end of file
+    nav:
+      gap: "&hellip;"
+      next: "Next&nbsp;&rsaquo;"
+      prev: "&lsaquo;&nbsp;Prev"
diff --git a/config/locales/gems/pagy/tr.yml b/config/locales/gems/pagy/tr.yml
index 6fdaa0549..6e4b6219f 100644
--- a/config/locales/gems/pagy/tr.yml
+++ b/config/locales/gems/pagy/tr.yml
@@ -1,22 +1,22 @@
 tr:
   pagy:
-    nav:
-      prev: "&lsaquo;&nbsp;Önceki"
-      next: "Sonraki&nbsp;&rsaquo;"
-      gap: "&hellip;"
+    compact:
+      of: "/"
+      page: "Sayfa"
     info:
-      single_page:
-        zero: "Hiç %{item_name} bulunamadı."
-        one: "<b>1</b> %{item_name} gösteriliyor."
-        other: "Toplam <b>%{count}</b> %{item_name} gösteriliyor."
-      multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor."
       item_name:
-        zero: "kayıt"
         one: "kayıt"
         other: "kayıt"
-    compact:
-      page: "Sayfa"
-      of: "/"
+        zero: "kayıt"
+      multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor."
+      single_page:
+        one: "<b>1</b> %{item_name} gösteriliyor."
+        other: "Toplam <b>%{count}</b> %{item_name} gösteriliyor."
+        zero: "Hiç %{item_name} bulunamadı."
     items:
-      show: "Göster"
       items: "sayfa başı"
+      show: "Göster"
+    nav:
+      gap: "&hellip;"
+      next: "Sonraki&nbsp;&rsaquo;"
+      prev: "&lsaquo;&nbsp;Önceki"
diff --git a/config/locales/gems/simple_form/en.yml b/config/locales/gems/simple_form/en.yml
index bc4f237cb..93ad81c9f 100644
--- a/config/locales/gems/simple_form/en.yml
+++ b/config/locales/gems/simple_form/en.yml
@@ -1,12 +1,12 @@
 en:
   simple_form:
-    "yes": 'Yes'
+    error_notification:
+      default_message: "Please review the problems below:"
     "no": 'No'
     required:
-      text: 'required'
       mark: '*'
       # You can uncomment the line below if you need to overwrite the whole required html.
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
-    error_notification:
-      default_message: "Please review the problems below:"
+      text: 'required'
+    "yes": 'Yes'
diff --git a/config/locales/gems/simple_form/tr.yml b/config/locales/gems/simple_form/tr.yml
index f58271854..e45d6c1ea 100644
--- a/config/locales/gems/simple_form/tr.yml
+++ b/config/locales/gems/simple_form/tr.yml
@@ -1,12 +1,12 @@
 tr:
   simple_form:
-    "yes": 'Evet'
+    error_notification:
+      default_message: "Lütfen aşağıdaki sorunları gözden geçirin:"
     "no": 'Hayır'
     required:
-      text: 'zorunlu alan'
       mark: '*'
       # You can uncomment the line below if you need to overwrite the whole required html.
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
-    error_notification:
-      default_message: "Lütfen aşağıdaki sorunları gözden geçirin:"
+      text: 'zorunlu alan'
+    "yes": 'Evet'
diff --git a/config/locales/layouts/application/en.yml b/config/locales/layouts/application/en.yml
index f67729624..d54b924c0 100644
--- a/config/locales/layouts/application/en.yml
+++ b/config/locales/layouts/application/en.yml
@@ -1,24 +1,24 @@
 en:
-  layouts:
-    application:
-      my_account: My Account
-      identities: Identities
-      addresses: Addresses
-      profile_settings: Profile Settings
-      settings: Settings
-      account_settings: Account Settings
-      logout: Logout
   home:
     components:
       membership_notifications:
-        upcoming_events: Upcoming academic calendar events
-        profile_completion_rate: Profile completion rate
         address_information: You address information
+        change_password: Change your password.
         identity_information: Your identity information
-        seems_missing: seems missing.
         last_password_change: Last password change
-        change_password: Change your password.
+        profile_completion_rate: Profile completion rate
+        seems_missing: seems missing.
+        upcoming_events: Upcoming academic calendar events
       user_and_account_statistics:
-        registered_users: Registered Users
-        identities: Identities
         addresses: Addresses
+        identities: Identities
+        registered_users: Registered Users
+  layouts:
+    application:
+      account_settings: Account Settings
+      addresses: Addresses
+      identities: Identities
+      logout: Logout
+      my_account: My Account
+      profile_settings: Profile Settings
+      settings: Settings
diff --git a/config/locales/layouts/application/tr.yml b/config/locales/layouts/application/tr.yml
index d78522e7c..8009276f3 100644
--- a/config/locales/layouts/application/tr.yml
+++ b/config/locales/layouts/application/tr.yml
@@ -1,24 +1,24 @@
 tr:
-  layouts:
-    application:
-      my_account: Hesabım
-      identities: Kimlik Bilgileri
-      addresses: Adres Bilgileri
-      profile_settings: Profil Ayarları
-      settings: Ayarlar
-      account_settings: Hesap Ayarları
-      logout: Çıkış Yap
   home:
     components:
       membership_notifications:
-        upcoming_events: Yaklaşan akademik takvim olayları
-        profile_completion_rate: Profil tamamlama oranı
         address_information: Adres bilgileriniz
+        change_password: Şifrenizi değiştirin.
         identity_information: Kimlik bilgileriniz
-        seems_missing: eksik görünüyor.
         last_password_change: Son şifre değişikliği
-        change_password: Şifrenizi değiştirin.
+        profile_completion_rate: Profil tamamlama oranı
+        seems_missing: eksik görünüyor.
+        upcoming_events: Yaklaşan akademik takvim olayları
       user_and_account_statistics:
-        registered_users: Kayıtlı Kullanıcılar
-        identities: Kimlik Bilgileri
         addresses: Adres Bilgileri
+        identities: Kimlik Bilgileri
+        registered_users: Kayıtlı Kullanıcılar
+  layouts:
+    application:
+      account_settings: Hesap Ayarları
+      addresses: Adres Bilgileri
+      identities: Kimlik Bilgileri
+      logout: Çıkış Yap
+      my_account: Hesabım
+      profile_settings: Profil Ayarları
+      settings: Ayarlar
diff --git a/config/locales/layouts/mailer/tr.yml b/config/locales/layouts/mailer/tr.yml
index dcb53182f..8980919d5 100644
--- a/config/locales/layouts/mailer/tr.yml
+++ b/config/locales/layouts/mailer/tr.yml
@@ -1,4 +1,4 @@
 tr:
   layouts:
     mailer:
-      title: Nokul - Üniversite Otomasyonu
\ No newline at end of file
+      title: Nokul - Üniversite Otomasyonu
diff --git a/config/locales/layouts/shared/meta_en.yml b/config/locales/layouts/shared/meta_en.yml
index 5ca54ffe8..8344be1cb 100644
--- a/config/locales/layouts/shared/meta_en.yml
+++ b/config/locales/layouts/shared/meta_en.yml
@@ -2,6 +2,6 @@ en:
   layouts:
     shared:
       meta:
-        title: Nokul - University Otomation
-        description: Nokul, is a complete web application and automation for universities and students.
         author: OMU - BAUM
+        description: Nokul, is a complete web application and automation for universities and students.
+        title: Nokul - University Otomation
diff --git a/config/locales/layouts/shared/meta_tr.yml b/config/locales/layouts/shared/meta_tr.yml
index 5bd0aafd8..dacb8c0a5 100644
--- a/config/locales/layouts/shared/meta_tr.yml
+++ b/config/locales/layouts/shared/meta_tr.yml
@@ -2,6 +2,6 @@ tr:
   layouts:
     shared:
       meta:
-        title: Nokul - Üniversite Otomasyonu
-        description: Nokul, nitelikli okul üniversiteler için öğrenci ve personel otomasyonudur.
         author: OMÜ - BAUM
+        description: Nokul, nitelikli okul üniversiteler için öğrenci ve personel otomasyonudur.
+        title: Nokul - Üniversite Otomasyonu
diff --git a/config/locales/layouts/shared/sidebar_en.yml b/config/locales/layouts/shared/sidebar_en.yml
index 258b77da8..046852249 100644
--- a/config/locales/layouts/shared/sidebar_en.yml
+++ b/config/locales/layouts/shared/sidebar_en.yml
@@ -39,4 +39,4 @@ en:
         unit_types: Unit Types
         units: Units
         university_types: University Types
-        users: Users
\ No newline at end of file
+        users: Users
diff --git a/config/locales/layouts/shared/sidebar_tr.yml b/config/locales/layouts/shared/sidebar_tr.yml
index 38c41f3b0..28418fbba 100644
--- a/config/locales/layouts/shared/sidebar_tr.yml
+++ b/config/locales/layouts/shared/sidebar_tr.yml
@@ -40,4 +40,3 @@ tr:
         units: Birimler
         university_types: Üniversite Türleri
         users: Kullanıcılar
-      
\ No newline at end of file
diff --git a/config/locales/models/account/en.yml b/config/locales/models/account/en.yml
index 496fecba3..ce836f69d 100644
--- a/config/locales/models/account/en.yml
+++ b/config/locales/models/account/en.yml
@@ -1,88 +1,88 @@
 en:
-  activerecord:
-    attributes:
-      employee: &employee_attributes
-        is_active: Is Active?
-        title_id: Title
-        user_id: User
-        id_number: ID Number
-      duty: &duty_attributes
-        tenure_status: Tenure Status
-        tenure: Tenure
-        temporary: Temporary Duty
-        start_date: Start Date
-        end_date: End Date
-        employee: Employee
-        unit_id: Unit
-      position: &position_attributes
-        administrative_function_id: Administrative Function
-        start_date: Start Date
-        end_date: End Date
-  helpers:
-    submit:
-      employee:
-        create: Create Employee
-        update: Update Employee
-      duty:
-        create: Create Duty
-        update: Update Duty
-      position:
-        create: Create Position
-        update: Update Position
   account:
-    employees:
-      new:
-        form_title: Create a Employee
-      edit:
-        form_title: Update the Employee
-      create:
-        success: Employee successfully created.
-      destroy:
-        success: Employee successfully deleted.
-        warning: Employee could not be deleted.
-      update:
-        success: Employee successfully updated.
     duties:
-      new:
-        form_title: Create a Duty
-      edit:
-        form_title: Update the Duty
       create:
         success: Duty successfully created.
       destroy:
         success: Duty successfully deleted.
         warning: Duty could not be deleted.
+      edit:
+        form_title: Update the Duty
+      new:
+        form_title: Create a Duty
       update:
         success: Duty successfully updated.
-    positions:
-      new:
-        form_title: Create a Position
+    employees:
+      create:
+        success: Employee successfully created.
+      destroy:
+        success: Employee successfully deleted.
+        warning: Employee could not be deleted.
       edit:
-        form_title: Update the Position
+        form_title: Update the Employee
+      new:
+        form_title: Create a Employee
+      update:
+        success: Employee successfully updated.
+    positions:
       create:
         success: Position successfully created.
       destroy:
         success: Position successfully deleted.
         warning: Position could not be deleted.
+      edit:
+        form_title: Update the Position
+      new:
+        form_title: Create a Position
       update:
         success: Position successfully updated.
     profile:
       edit:
-        profile_settings: Profile Settings
-        visiblity_settings: Visiblity Settings
-        phone_number: Phone Number
         extension_number: Extension Number
-        website: Website
-        twitter: Twitter Username
         linkedin: Linkedin Username
-        skype: Skype Username
         orcid: ORCID
+        phone_number: Phone Number
+        profile_settings: Profile Settings
         public_photo: Show picture on my profile
         public_studies: Show academic studies on my profile
+        skype: Skype Username
+        twitter: Twitter Username
+        visiblity_settings: Visiblity Settings
+        website: Website
       update:
         success: Profile successfully updated.
+  activerecord:
+    attributes:
+      duty: &duty_attributes
+        employee: Employee
+        end_date: End Date
+        start_date: Start Date
+        temporary: Temporary Duty
+        tenure: Tenure
+        tenure_status: Tenure Status
+        unit_id: Unit
+      employee: &employee_attributes
+        id_number: ID Number
+        is_active: Is Active?
+        title_id: Title
+        user_id: User
+      position: &position_attributes
+        administrative_function_id: Administrative Function
+        end_date: End Date
+        start_date: Start Date
+  helpers:
+    submit:
+      duty:
+        create: Create Duty
+        update: Update Duty
+      employee:
+        create: Create Employee
+        update: Update Employee
+      position:
+        create: Create Position
+        update: Update Position
   simple_form:
     placeholders:
       user:
-        twitter: twitter.com/
         linkedin: linkedin.com/
+        twitter: twitter.com/
diff --git a/config/locales/models/account/tr.yml b/config/locales/models/account/tr.yml
index 8f5fb65c7..baddc7f69 100644
--- a/config/locales/models/account/tr.yml
+++ b/config/locales/models/account/tr.yml
@@ -1,88 +1,88 @@
 tr:
-  activerecord:
-    attributes:
-      employee: &employee_attributes
-        is_active: Aktif mi?
-        title_id: Ünvan
-        user_id: Kullanıcı
-        id_number: Kimlik Numarası
-      duty: &duty_attributes
-        tenure_status: Kadro Durumu
-        tenure: Kadrolu
-        temporary: Geçici Görevlendirme
-        start_date: Başlangıç Tarihi
-        end_date: Bitiş Tarihi
-        employee_id: Personel
-        unit_id: Birim
-      position: &position_attributes
-        administrative_function_id: Görev
-        start_date: Başlangıç Tarihi
-        end_date: Bitiş Tarihi
-  helpers:
-    submit:
-      employee:
-        create: Personel Kaydı Oluştur
-        update: Personel Kaydını Güncelle
-      duty:
-        create: Görevlendirme Oluştur
-        update: Görevlendirmeyi Güncelle
-      position:
-        create: İdari Görev Oluştur
-        update: İdari Görevi Güncelle
   account:
-    employees:
-      new:
-        form_title: Personel Kaydı Oluştur
-      edit:
-        form_title: Personel Kaydını Güncelle
-      create:
-        success: Personel kaydı başarıyla oluşturuldu.
-      destroy:
-        success: Personel kaydı başarıyla silindi.
-        warning: Personel kaydı silinemedi!
-      update:
-        success: Personel kaydı başarıyla güncellendi.
     duties:
-      new:
-        form_title: Görevlendirme Oluştur
-      edit:
-        form_title: Görevlendirmeyi Güncelle
       create:
         success: Görevlendirme başarıyla oluşturuldu.
       destroy:
         success: Görevlendirme başarıyla silindi.
         warning: Görevlendirme silinemedi!
+      edit:
+        form_title: Görevlendirmeyi Güncelle
+      new:
+        form_title: Görevlendirme Oluştur
       update:
         success: Görevlendirme başarıyla güncellendi.
-    positions:
-      new:
-        form_title: İdari Görev Oluştur
+    employees:
+      create:
+        success: Personel kaydı başarıyla oluşturuldu.
+      destroy:
+        success: Personel kaydı başarıyla silindi.
+        warning: Personel kaydı silinemedi!
       edit:
-        form_title: İdari Görevi Güncelle
+        form_title: Personel Kaydını Güncelle
+      new:
+        form_title: Personel Kaydı Oluştur
+      update:
+        success: Personel kaydı başarıyla güncellendi.
+    positions:
       create:
         success: İdari görev başarıyla oluşturuldu.
       destroy:
         success: İdari görev başarıyla silindi.
         warning: İdari görev silinemedi!
+      edit:
+        form_title: İdari Görevi Güncelle
+      new:
+        form_title: İdari Görev Oluştur
       update:
         success: İdari görev başarıyla güncellendi.
     profile:
       edit:
-        profile_settings: Profil Ayarları
-        visiblity_settings: Görünürlük Ayarları
-        phone_number: Telefon numaranız
         extension_number: Dahili numaranız
-        website: Web Sayfanız
-        twitter: Twitter Kullanıcı Adı
         linkedin: Linkedin Kullanıcı Adı
-        skype: Skype Kullanıcı Adı
         orcid: ORCID
+        phone_number: Telefon numaranız
+        profile_settings: Profil Ayarları
         public_photo: Profilimde Fotoğrafımı Göster
         public_studies: Profilimde Akademik Çalışmalarımı Göster
+        skype: Skype Kullanıcı Adı
+        twitter: Twitter Kullanıcı Adı
+        visiblity_settings: Görünürlük Ayarları
+        website: Web Sayfanız
       update:
         success: Profiliniz başarıyla güncellendi
+  activerecord:
+    attributes:
+      duty: &duty_attributes
+        employee_id: Personel
+        end_date: Bitiş Tarihi
+        start_date: Başlangıç Tarihi
+        temporary: Geçici Görevlendirme
+        tenure: Kadrolu
+        tenure_status: Kadro Durumu
+        unit_id: Birim
+      employee: &employee_attributes
+        id_number: Kimlik Numarası
+        is_active: Aktif mi?
+        title_id: Ünvan
+        user_id: Kullanıcı
+      position: &position_attributes
+        administrative_function_id: Görev
+        end_date: Bitiş Tarihi
+        start_date: Başlangıç Tarihi
+  helpers:
+    submit:
+      duty:
+        create: Görevlendirme Oluştur
+        update: Görevlendirmeyi Güncelle
+      employee:
+        create: Personel Kaydı Oluştur
+        update: Personel Kaydını Güncelle
+      position:
+        create: İdari Görev Oluştur
+        update: İdari Görevi Güncelle
   simple_form:
     placeholders:
       user:
-        twitter: twitter.com/
         linkedin: linkedin.com/
+        twitter: twitter.com/
diff --git a/config/locales/models/addresses/en.yml b/config/locales/models/addresses/en.yml
index aa18d11a7..c69917e5f 100644
--- a/config/locales/models/addresses/en.yml
+++ b/config/locales/models/addresses/en.yml
@@ -2,45 +2,45 @@ en:
   activerecord:
     attributes:
       address: &address_attributes
-        type: Address Type
-        phone_number: Phone Number
-        full_address: Full Address
         district: District
+        full_address: Full Address
+        phone_number: Phone Number
+        type: Address Type
     enums:
       address:
         types:
           formal: Formal Address
           informal: Other Address
-  simple_form:
-    hints:
-      address:
-        full_address: Neighbourhood, street and door number
-  helpers:
-    submit:
-      address:
-        create: Save the Address
-        update: Update the Address
   account:
     addresses:
+      create:
+        success: Address successfully created!
+      destroy:
+        success: Address successfully deleted!
+        warning: Address can not be deleted!
+      edit:
+        form_title: Edit Address
+        warning: You can not edit your formal address!
       index:
         <<: *address_attributes
-        new_address: Add a New Address
         card_header: Address Information
+        create_from_mernis: Create from MERNIS
         district_and_city: District / City
+        new_address: Add a New Address
         update_from_mernis: Update from MERNİS
-        create_from_mernis: Create from MERNIS
       new:
         form_title: Create Address
-      edit:
-        warning: You can not edit your formal address!
-        form_title: Edit Address
-      create:
-        success: Address successfully created!
-      update:
-        success: Address successfully updated!
-      destroy:
-        success: Address successfully deleted!
-        warning: Address can not be deleted!
       save_from_mernis:
         wait: You recently created or updated your address. You can update your address once every week.
         will_update: We got your address create or update request. In a couple of seconds/minutes you will be able to see your new address.
+      update:
+        success: Address successfully updated!
+  helpers:
+    submit:
+      address:
+        create: Save the Address
+        update: Update the Address
+  simple_form:
+    hints:
+      address:
+        full_address: Neighbourhood, street and door number
diff --git a/config/locales/models/addresses/tr.yml b/config/locales/models/addresses/tr.yml
index 4bf122ea4..3b23fc62c 100644
--- a/config/locales/models/addresses/tr.yml
+++ b/config/locales/models/addresses/tr.yml
@@ -2,45 +2,45 @@ tr:
   activerecord:
     attributes:
       address: &address_attributes
-        type: Adres Türü
-        phone_number: Cep Telefonu Numarası
-        full_address: Açık Adres
         district: İlçe
+        full_address: Açık Adres
+        phone_number: Cep Telefonu Numarası
+        type: Adres Türü
     enums:
       address:
         types:
           formal: Resmi Adres
           informal: Diğer Adres
-  simple_form:
-    hints:
-      address:
-        full_address: Mahalle, cadde, sokak, apartman adı ve kapı numarası
-  helpers:
-    submit:
-      address:
-        create: Adresi Kaydet
-        update: Adresi Güncelle
   account:
     addresses:
+      create:
+        success: Adres başarıyla oluşturuldu!
+      destroy:
+        success: Adres başarıyla silindi!
+        warning: Adres silinemedi!
+      edit:
+        form_title: Adresi Düzenle
+        warning: Yasal ikamet adresinizi düzenleyemezsiniz!
       index:
         <<: *address_attributes
-        new_address: Yeni Adres Ekle
         card_header: Adres Bilgileri
+        create_from_mernis: MERNİS'ten Oluştur
         district_and_city: İlçe / İl
+        new_address: Yeni Adres Ekle
         update_from_mernis: MERNİS'ten Güncelle
-        create_from_mernis: MERNİS'ten Oluştur
       new:
         form_title: Adres Oluştur
-      edit:
-        warning: Yasal ikamet adresinizi düzenleyemezsiniz!
-        form_title: Adresi Düzenle
-      create:
-        success: Adres başarıyla oluşturuldu!
-      update:
-        success: Adres başarıyla güncellendi!
-      destroy:
-        success: Adres başarıyla silindi!
-        warning: Adres silinemedi!
       save_from_mernis:
         wait: Adresinizi yakın bir zamanda oluşturdunuz veya güncellediniz. Adresinizi haftada bir güncelleyebilirsiniz.
         will_update: Adres oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adresiniz güncellenecek.
+      update:
+        success: Adres başarıyla güncellendi!
+  helpers:
+    submit:
+      address:
+        create: Adresi Kaydet
+        update: Adresi Güncelle
+  simple_form:
+    hints:
+      address:
+        full_address: Mahalle, cadde, sokak, apartman adı ve kapı numarası
diff --git a/config/locales/models/calendars/en.yml b/config/locales/models/calendars/en.yml
index ce359f9ce..b005ceb9a 100644
--- a/config/locales/models/calendars/en.yml
+++ b/config/locales/models/calendars/en.yml
@@ -1,28 +1,28 @@
 en:
   activerecord:
     attributes:
-      calendar_title: &calendar_title_attributes
-        name: Calendar Title
-      academic_term: &academic_term_attributes
-        year: Year
-        term: Term
-      calendar_type: &calendar_type_attributes
-        name: Calendar Type
-      calendar_title_type:
-        type: Type
-        title: Title
-        status: Status
       academic_calendar: &academic_calendar_attributes
-        name: Calendar Name
         academic_term: Academic Term
         calendar_type: Calendar Type
+        description: Description
+        name: Calendar Name
         senate_decision_date: Senate Decision Date
         senate_decision_no: Senate Decision No
-        description: Description
+      academic_term: &academic_term_attributes
+        term: Term
+        year: Year
       calendar_event:
         calendar_title_id: Title
-        start_date: Date of Start
         end_date: Date of End
+        start_date: Date of Start
+      calendar_title: &calendar_title_attributes
+        name: Calendar Title
+      calendar_title_type:
+        status: Status
+        title: Title
+        type: Type
+      calendar_type: &calendar_type_attributes
+        name: Calendar Type
     enums:
       academic_term:
         terms:
@@ -31,100 +31,100 @@ en:
           summer: Summer
       calendar_title_type:
         statuses:
-          passive: Passive
           active: Active
-  helpers:
-    submit:
-      calendar_title:
-        create: Create Calendar Title
-        update: Update Calendar Title
-      academic_term:
-        create: Create Academic Term
-        update: Update Academic Term
-      calendar_type:
-        create: Create Calendar Type
-        update: Update Calendar Type
-      academic_calendar:
-        create: Create Academic Calendar
-        update: Update Academic Calendar
+          passive: Passive
   calendar:
-    calendar_titles:
-      index:
-        <<: *calendar_title_attributes
-        new_calender_title_link: New Calendar Title
-        card_header: Calendar Titles
-      new:
-        form_title: Create a Calendar Title
-      edit:
-        form_title: Edit the Calendar Title
+    academic_calendars:
+      calendar_event_fields:
+        delete_event: Delete the Event
       create:
-        success: Calendar title successfully created.
+        success: Academic calendar successfully created.
       destroy:
-        success: Calendar title successfully deleted.
-        warning: Calendar title could not be deleted.
+        success: Academic calendar successfully deleted
+        warning: Academic calendar could not be deleted.
+      edit:
+        form_title: Update the Academic Calendar
+      form:
+        events: Events
+        new_event_link: Add a New Event
+      index:
+        <<: *academic_calendar_attributes
+        card_header: Academic Calendars
+        new_academic_calendar_link: New Academic Calendar
+      new:
+        form_title: Create an Academic Calendar
+      show:
+        <<: *academic_calendar_attributes
+        alert: Record could not be found!
       update:
-        success: Calendar title successfully updated.
+        success: Academic calendar successfully updated.
     academic_terms:
+      create:
+        success: Academic term successfully created.
+      destroy:
+        success: Academic term successfully deleted.
+        warning: Academic term could not be deleted.
+      edit:
+        form_title: Update the Academic Term
       index:
         <<: *academic_term_attributes
-        new_academic_term_link: New Academic Term
         card_header: Academic Terms
+        new_academic_term_link: New Academic Term
       new:
         form_title: Create a New Academic Term
-      edit:
-        form_title: Update the Academic Term
+      update:
+        success: Academic term successfully updated.
+    calendar_titles:
       create:
-        success: Academic term successfully created.
+        success: Calendar title successfully created.
       destroy:
-        success: Academic term successfully deleted.
-        warning: Academic term could not be deleted.
+        success: Calendar title successfully deleted.
+        warning: Calendar title could not be deleted.
+      edit:
+        form_title: Edit the Calendar Title
+      index:
+        <<: *calendar_title_attributes
+        card_header: Calendar Titles
+        new_calender_title_link: New Calendar Title
+      new:
+        form_title: Create a Calendar Title
       update:
-        success: Academic term successfully updated.
+        success: Calendar title successfully updated.
     calendar_types:
-      index:
-        <<: *calendar_type_attributes
-        new_calendar_type_link: New Calendar Type
-        card_header: Calendar Types
-      form:
-        new_title_link: New Calendar Title
-        titles: Calendar Titles
       calendar_title_type_fields:
         delete_title_type: Delete Calendar Title
-      show:
-        <<: *calendar_type_attributes
-        card_header: '%{calendar_type} Calendar Type'
-      new:
-        form_title: Create a Calendar Type
-      edit:
-        form_title: Update the Calendar Type
       create:
         success: Calendar type successfully created.
       destroy:
         success: Calendar type successfully deleted.
         warning: Calendar type could not be deleted.
-      update:
-        success: Calendar type successfully updated.
-    academic_calendars:
-      index:
-        <<: *academic_calendar_attributes
-        new_academic_calendar_link: New Academic Calendar
-        card_header: Academic Calendars
+      edit:
+        form_title: Update the Calendar Type
       form:
-        new_event_link: Add a New Event
-        events: Events
-      calendar_event_fields:
-        delete_event: Delete the Event
+        new_title_link: New Calendar Title
+        titles: Calendar Titles
+      index:
+        <<: *calendar_type_attributes
+        card_header: Calendar Types
+        new_calendar_type_link: New Calendar Type
       new:
-        form_title: Create an Academic Calendar
-      edit:
-        form_title: Update the Academic Calendar
-      create:
-        success: Academic calendar successfully created.
-      destroy:
-        success: Academic calendar successfully deleted
-        warning: Academic calendar could not be deleted.
+        form_title: Create a Calendar Type
       show:
-        <<: *academic_calendar_attributes
-        alert: Record could not be found!
+        <<: *calendar_type_attributes
+        card_header: '%{calendar_type} Calendar Type'
       update:
-        success: Academic calendar successfully updated.
+        success: Calendar type successfully updated.
+  helpers:
+    submit:
+      academic_calendar:
+        create: Create Academic Calendar
+        update: Update Academic Calendar
+      academic_term:
+        create: Create Academic Term
+        update: Update Academic Term
+      calendar_title:
+        create: Create Calendar Title
+        update: Update Calendar Title
+      calendar_type:
+        create: Create Calendar Type
+        update: Update Calendar Type
diff --git a/config/locales/models/calendars/tr.yml b/config/locales/models/calendars/tr.yml
index eeaf7c3b3..6a36db72f 100644
--- a/config/locales/models/calendars/tr.yml
+++ b/config/locales/models/calendars/tr.yml
@@ -1,28 +1,28 @@
 tr:
   activerecord:
     attributes:
-      calendar_title: &calendar_title_attributes
-        name: Takvim Başlığı
-      academic_term: &academic_term_attributes
-        year: Akademik Yıl
-        term: Akademik Dönem
-      calendar_type: &calendar_type_attributes
-        name: Takvim Türü
-      calendar_title_type:
-        type: Tür
-        title: Başlık
-        status: Durum
       academic_calendar: &academic_calendar_attributes
-        name: Takvim Adı
         academic_term: Akademik Dönem
         calendar_type: Takvim Türü
+        description: Açıklama
+        name: Takvim Adı
         senate_decision_date: Senato Karar Tarihi
         senate_decision_no: Senato Karar No
-        description: Açıklama
+      academic_term: &academic_term_attributes
+        term: Akademik Dönem
+        year: Akademik Yıl
       calendar_event:
         calendar_title_id: Başlık
-        start_date: Başlama Tarihi
         end_date: Bitiş Tarihi
+        start_date: Başlama Tarihi
+      calendar_title: &calendar_title_attributes
+        name: Takvim Başlığı
+      calendar_title_type:
+        status: Durum
+        title: Başlık
+        type: Tür
+      calendar_type: &calendar_type_attributes
+        name: Takvim Türü
     enums:
       academic_term:
         terms:
@@ -31,100 +31,100 @@ tr:
           summer: Yaz
       calendar_title_type:
         statuses:
-          passive: Pasif
           active: Aktif
-  helpers:
-    submit:
-      calendar_title:
-        create: Takvim Başlığı Oluştur
-        update: Takvim Başlığını Güncelle
-      academic_term:
-        create: Akademik Dönem Oluştur
-        update: Akademik Dönemi Güncelle
-      calendar_type:
-        create: Takvim Türü Oluştur
-        update: Takvim Türünü Güncelle
-      academic_calendar:
-        create: Akademik Takvim Oluştur
-        update: Akademik Takvimi Güncelle
+          passive: Pasif
   calendar:
-    calendar_titles:
-      index:
-        <<: *calendar_title_attributes
-        new_calender_title_link: Yeni Takvim Başlığı
-        card_header: Takvim Başlıkları
-      new:
-        form_title: Takvim Başlığı Oluştur
-      edit:
-        form_title: Takvim Başlığını Güncelle
+    academic_calendars:
+      calendar_event_fields:
+        delete_event: Etkinliği Sil
       create:
-        success: Takvim başlığı başarıyla oluşturuldu.
+        success: Akademik takvim başarıyla oluşturuldu.
       destroy:
-        success: Takvim başlığı başarıyla silindi.
-        warning: Takvim başlığı silinemedi!
+        success: Akademik takvim başarıyla silindi.
+        warning: Akademik takvim silinemedi!
+      edit:
+        form_title: Akademik Takvimi Düzenle
+      form:
+        events: Etkinlikler
+        new_event_link: Etkinlik Ekle
+      index:
+        <<: *academic_calendar_attributes
+        card_header: Akademik Takvimler
+        new_academic_calendar_link: Yeni Akademik Takvim
+      new:
+        form_title: Akademik Takvim Oluştur
+      show:
+        <<: *academic_calendar_attributes
+        alert: Böyle bir kayıt bulunamadı!
       update:
-        success: Takvim başlığı başarıyla güncellendi.
+        success: Akademik takvim başarıyla güncellendi.
     academic_terms:
+      create:
+        success: Akademik dönem başarıyla oluşturuldu.
+      destroy:
+        success: Akademik dönem başarıyla silindi.
+        warning: Akademik dönem silinemedi!
+      edit:
+        form_title: Akademik Dönemi Güncelle
       index:
         <<: *academic_term_attributes
-        new_academic_term_link: Yeni Akademik Dönem
         card_header: Akademik Dönemler
+        new_academic_term_link: Yeni Akademik Dönem
       new:
         form_title: Akademik Dönem Oluştur
-      edit:
-        form_title: Akademik Dönemi Güncelle
+      update:
+        success: Akademik dönem başarıyla güncellendi.
+    calendar_titles:
       create:
-        success: Akademik dönem başarıyla oluşturuldu.
+        success: Takvim başlığı başarıyla oluşturuldu.
       destroy:
-        success: Akademik dönem başarıyla silindi.
-        warning: Akademik dönem silinemedi!
+        success: Takvim başlığı başarıyla silindi.
+        warning: Takvim başlığı silinemedi!
+      edit:
+        form_title: Takvim Başlığını Güncelle
+      index:
+        <<: *calendar_title_attributes
+        card_header: Takvim Başlıkları
+        new_calender_title_link: Yeni Takvim Başlığı
+      new:
+        form_title: Takvim Başlığı Oluştur
       update:
-        success: Akademik dönem başarıyla güncellendi.
+        success: Takvim başlığı başarıyla güncellendi.
     calendar_types:
-      index:
-        <<: *calendar_type_attributes
-        new_calendar_type_link: Yeni Takvim Türü
-        card_header: Takvim Türleri
-      form:
-        new_title_link: Yeni Başlık Ekle
-        titles: Takvim Başlıkları
       calendar_title_type_fields:
         delete_title_type: Başlığı Sil
-      show:
-        <<: *calendar_type_attributes
-        card_header: '%{calendar_type} Takvim Türü'
-      new:
-        form_title: Takvim Türü Oluştur
-      edit:
-        form_title: Takvim Türünü Güncelle
       create:
         success: Takvim türü başarıyla oluşturuldu.
       destroy:
         success: Takvim türü başarıyla silindi.
         warning: Takvim türü silinemedi!
-      update:
-        success: Takvim türü başarıyla güncellendi.
-    academic_calendars:
-      index:
-        <<: *academic_calendar_attributes
-        new_academic_calendar_link: Yeni Akademik Takvim
-        card_header: Akademik Takvimler
+      edit:
+        form_title: Takvim Türünü Güncelle
       form:
-        new_event_link: Etkinlik Ekle
-        events: Etkinlikler
-      calendar_event_fields:
-        delete_event: Etkinliği Sil
+        new_title_link: Yeni Başlık Ekle
+        titles: Takvim Başlıkları
+      index:
+        <<: *calendar_type_attributes
+        card_header: Takvim Türleri
+        new_calendar_type_link: Yeni Takvim Türü
       new:
-        form_title: Akademik Takvim Oluştur
-      edit:
-        form_title: Akademik Takvimi Düzenle
-      create:
-        success: Akademik takvim başarıyla oluşturuldu.
-      destroy:
-        success: Akademik takvim başarıyla silindi.
-        warning: Akademik takvim silinemedi!
+        form_title: Takvim Türü Oluştur
       show:
-        <<: *academic_calendar_attributes
-        alert: Böyle bir kayıt bulunamadı!
+        <<: *calendar_type_attributes
+        card_header: '%{calendar_type} Takvim Türü'
       update:
-        success: Akademik takvim başarıyla güncellendi.
+        success: Takvim türü başarıyla güncellendi.
+  helpers:
+    submit:
+      academic_calendar:
+        create: Akademik Takvim Oluştur
+        update: Akademik Takvimi Güncelle
+      academic_term:
+        create: Akademik Dönem Oluştur
+        update: Akademik Dönemi Güncelle
+      calendar_title:
+        create: Takvim Başlığı Oluştur
+        update: Takvim Başlığını Güncelle
+      calendar_type:
+        create: Takvim Türü Oluştur
+        update: Takvim Türünü Güncelle
diff --git a/config/locales/models/committees/en.yml b/config/locales/models/committees/en.yml
index 1ca458308..47bf37ee5 100644
--- a/config/locales/models/committees/en.yml
+++ b/config/locales/models/committees/en.yml
@@ -2,8 +2,8 @@ en:
   activerecord:
     attributes:
       agenda: &agenda_attributes
-        agenda_type_id: Agenda Type
         agenda_file: Agenda File
+        agenda_type_id: Agenda Type
         description: Agenda Description
         status: Agenda Status
       agenda_type: &agenda_type_attributes
@@ -13,71 +13,71 @@ en:
     enums:
       agenda:
         statuses:
-          recent: Recent
           decided: Decided
           delayed: Delayed
-  helpers:
-    submit:
-      agenda:
-        create: Create Agenda
-        update: Update Agenda
-      agenda_type:
-        create: Create Agenda Type
-        update: Update Agenda Type
+          recent: Recent
   committee:
-    agendas:
+    agenda_types:
+      create:
+        success: Agenda Type successfully created.
+      destroy:
+        success: Agenda Type successfully deleted.
+        warning: Agenda Type can not be deleted!
+      edit:
+        form_title: Update the Agenda Type
       index:
-        <<: *agenda_attributes
-        new_agenda_link: Create a New Agenda
-        card_header: Agendas
-        unit: Unit
-        agenda_type: Agenda Type
+        <<: *agenda_type_attributes
+        card_header: Agenda Types
+        new_agenda_type_link: Create a New Agenda Type
       new:
-        form_title: Create a Agenda
-      edit:
-        form_title: Update a Agenda
+        form_title: Create a Agenda Type
+      update:
+        success: Agenda Type successfully updated.
+    agendas:
       create:
         success: Agenda successfully created.
-      update:
-        success: Agenda successfully updated.
       destroy:
         success: Agenda successfully deleted.
         warning: Agenda can not be deleted!
+      edit:
+        form_title: Update a Agenda
+      index:
+        <<: *agenda_attributes
+        agenda_type: Agenda Type
+        card_header: Agendas
+        new_agenda_link: Create a New Agenda
+        unit: Unit
+      new:
+        form_title: Create a Agenda
       search:
         agenda_type_id: Agenda Type
         smart_search_placeholder: Agenda Description
         status: Agenda Status
-    agenda_types:
-      index:
-        <<: *agenda_type_attributes
-        new_agenda_type_link: Create a New Agenda Type
-        card_header: Agenda Types
-      new:
-        form_title: Create a Agenda Type
-      edit:
-        form_title: Update the Agenda Type
-      create:
-        success: Agenda Type successfully created.
       update:
-        success: Agenda Type successfully updated.
-      destroy:
-        success: Agenda Type successfully deleted.
-        warning: Agenda Type can not be deleted!
+        success: Agenda successfully updated.
     dashboard:
       index:
         agendas: Agendas
-        name: Committee / Commission Name
+        card_header: Committee / Commission
         detsis_id: DETSIS ID
-        yoksis_id: YOKSIS ID
-        unit_status: Unit Status
-        unit_type: Unit Type
         district: Location
-        card_header: Committee / Commission
+        name: Committee / Commission Name
         new_committee_link: Create a New Committee/Commission
+        unit_status: Unit Status
+        unit_type: Unit Type
+        yoksis_id: YOKSIS ID
       show:
-        description: Description
-        unit: Parent Unit
-        agenda_type: Agenda Type
-        status: Agenda Status
         actions: Actions
         agenda_card_header: Agendas
+        agenda_type: Agenda Type
+        description: Description
+        status: Agenda Status
+        unit: Parent Unit
+  helpers:
+    submit:
+      agenda:
+        create: Create Agenda
+        update: Update Agenda
+      agenda_type:
+        create: Create Agenda Type
+        update: Update Agenda Type
diff --git a/config/locales/models/committees/tr.yml b/config/locales/models/committees/tr.yml
index bba8ece57..24feb917b 100644
--- a/config/locales/models/committees/tr.yml
+++ b/config/locales/models/committees/tr.yml
@@ -2,8 +2,8 @@ tr:
   activerecord:
     attributes:
       agenda: &agenda_attributes
-        agenda_type_id: Gündem Türü
         agenda_file: Gündem Dosyası
+        agenda_type_id: Gündem Türü
         description: Gündem Açıklaması
         status: Gündem Durumu
       agenda_type: &agenda_type_attributes
@@ -13,71 +13,71 @@ tr:
     enums:
       agenda:
         statuses:
-          recent: Yeni
           decided: Karar Verildi
           delayed: Ertelendi
-  helpers:
-    submit:
-      agenda:
-        create: Gündem Oluştur
-        update: Gündem Güncelle
-      agenda_type:
-        create: Gündem Türü Oluştur
-        update: Gündem Türü Güncelle
+          recent: Yeni
   committee:
-    agendas:
+    agenda_types:
+      create:
+        success: Gündem Türü başarıyla oluşturuldu.
+      destroy:
+        success: Gündem Türü başarıyla silindi.
+        warning: Gündem Türü silinemedi!
+      edit:
+        form_title: Gündem Türü Güncelle
       index:
-        <<: *agenda_attributes
-        new_agenda_link: Yeni Bir Gündem Oluştur
-        card_header: Gündemler
-        unit: Birim
-        agenda_type: Gündem Türü
+        <<: *agenda_type_attributes
+        card_header: Gündem Türleri
+        new_agenda_type_link: Yeni Bir Gündem Türü Oluştur
       new:
-        form_title: Gündem Oluştur
-      edit:
-        form_title: Gündem Güncelle
+        form_title: Gündem Türü Oluştur
+      update:
+        success: Gündem Türü başarıyla güncellendi.
+    agendas:
       create:
         success: Gündem başarıyla oluşturuldu.
-      update:
-        success: Gündem başarıyla güncellendi.
       destroy:
         success: Gündem başarıyla silindi.
         warning: Gündem silinemedi!
+      edit:
+        form_title: Gündem Güncelle
+      index:
+        <<: *agenda_attributes
+        agenda_type: Gündem Türü
+        card_header: Gündemler
+        new_agenda_link: Yeni Bir Gündem Oluştur
+        unit: Birim
+      new:
+        form_title: Gündem Oluştur
       search:
         agenda_type_id: Gündem Türü
         smart_search_placeholder: Gündem Açıklaması
         status: Gündem Durumu
-    agenda_types:
-      index:
-        <<: *agenda_type_attributes
-        new_agenda_type_link: Yeni Bir Gündem Türü Oluştur
-        card_header: Gündem Türleri
-      new:
-        form_title: Gündem Türü Oluştur
-      edit:
-        form_title: Gündem Türü Güncelle
-      create:
-        success: Gündem Türü başarıyla oluşturuldu.
       update:
-        success: Gündem Türü başarıyla güncellendi.
-      destroy:
-        success: Gündem Türü başarıyla silindi.
-        warning: Gündem Türü silinemedi!
+        success: Gündem başarıyla güncellendi.
     dashboard:
       index:
         agendas: Gündemler
-        name: Kurul / Komisyon Adı
+        card_header: Kurul / Komisyon
         detsis_id: DETSIS ID
-        yoksis_id: YOKSIS ID
-        unit_status: Birim Durumu
-        unit_type: Birim Türü
         district: Bulunduğu İlçe
-        card_header: Kurul / Komisyon
+        name: Kurul / Komisyon Adı
         new_committee_link: Yeni Bir Kurul/Komisyon Oluştur
+        unit_status: Birim Durumu
+        unit_type: Birim Türü
+        yoksis_id: YOKSIS ID
       show:
-        description: Açıklama
-        unit: Üst Birim
+        actions: İşlemler
+        agenda_card_header: Gündemler
         agenda_type: Gündem Türü
+        description: Açıklama
         status: Gündem Durumu
-        actions: İşlemler
-        agenda_card_header: Gündemler
\ No newline at end of file
+        unit: Üst Birim
+  helpers:
+    submit:
+      agenda:
+        create: Gündem Oluştur
+        update: Gündem Güncelle
+      agenda_type:
+        create: Gündem Türü Oluştur
+        update: Gündem Türü Güncelle
diff --git a/config/locales/models/course_management/en.yml b/config/locales/models/course_management/en.yml
index f341c291d..d56e701b5 100644
--- a/config/locales/models/course_management/en.yml
+++ b/config/locales/models/course_management/en.yml
@@ -2,114 +2,114 @@ en:
   activerecord:
     attributes:
       course: &course_attributes
-        credit: Credit
         code: Code
-        program_type: Program Type
+        credit: Credit
         laboratory: Laboratory
         language: Language
         name: Name
         practice: Practice
+        program_type: Program Type
         status: Status
         theoric: Theoric
         unit: Unit
+      course_group_type: &course_group_type_attributes
+        name: Course Group Type Name
       course_unit_group: &course_unit_group_attributes
-        courses: Courses
         course_group_type: Course Group Type
         course_ids: Courses
+        courses: Courses
         name: Course Group Name
         search_placeholder: Course Group Name / Unit Name / Course Group Type Name
         total_ects_condition: Total ECTS Condition
         unit: Unit
-      course_group_type: &course_group_type_attributes
-        name: Course Group Type Name
       curriculum: &curriculum_attributes
         name: Curriculum Name
         number_of_semesters: Number of Semesters
-        unit: Unit
-        status: Status
         programs: Programs
-    models:
-      course: Course
-      course_unit_group: Course Group
-      course_group_type: Course Group Type
-      curriculum: Curriculum
+        status: Status
+        unit: Unit
     enums:
       course:
         program_types:
           associate: Associate
-          undergraduate: Undergraduate
-          master: Master
           doctoral: Doctoral
+          master: Master
+          undergraduate: Undergraduate
         statuses:
-          passive: Passive
           active: Active
+          passive: Passive
       curriculum:
         statuses:
           active: Active
           passive: Passive
+    models:
+      course: Course
+      course_group_type: Course Group Type
+      course_unit_group: Course Group
+      curriculum: Curriculum
   course_management:
-    courses:
-      new:
-        form_title: Create a Course
-      edit:
-        form_title: Update the Course
+    course_group_types:
       create:
-        success: Course successfully created.
+        success: Course group type created.
       destroy:
-        success: Course successfully destroyed.
-        error: An error occured when deleting the course.
-      update:
-        success: Course successfully updated.
-      search:
-        smart_search_placeholder: Course name or code
-        program_type: All Program Types
-        language: All Languages
-        unit: All Units
-        status: All Statuses
-      show:
-        <<: *course_attributes
+        error: An error occured when deleting the course group type.
+        success: Course group type successfully destroyed.
+      edit:
+        form_title: Course Group Type successfully updated.
       index:
-        <<: *course_attributes
-        add_new_course: Add a New Course
-        courses: Courses
-    course_unit_groups:
+        <<: *course_group_type_attributes
+        card_header: Course Group Types
+        new_course_group_type_link: Add a New Course Group Type
       new:
-        form_title: Course Group successfully created.
-      show:
-        name: Course Unit Group Name
-        total_ects_condition: Total ECTS Condition
-        unit: Unit
-        course_group_type: Course Group Type
-        courses: Courses
-      edit:
-        form_title: Course Group successfully updated.
+        form_title: Course Group Type successfully created.
+      update:
+        success: Course group type successfully updated.
+    course_unit_groups:
       create:
         success: Course group created.
       destroy:
-        success: Course group successfully destroyed.
         error: An error occured when deleting the course group.
-      update:
-        success: Course group successfully updated.
+        success: Course group successfully destroyed.
+      edit:
+        form_title: Course Group successfully updated.
       index:
         <<: *course_unit_group_attributes
-        new_course_unit_group_link: Add a New Course Group
         card_header: Course Groups
-    course_group_types:
+        new_course_unit_group_link: Add a New Course Group
       new:
-        form_title: Course Group Type successfully created.
-      edit:
-        form_title: Course Group Type successfully updated.
+        form_title: Course Group successfully created.
+      show:
+        course_group_type: Course Group Type
+        courses: Courses
+        name: Course Unit Group Name
+        total_ects_condition: Total ECTS Condition
+        unit: Unit
+      update:
+        success: Course group successfully updated.
+    courses:
       create:
-        success: Course group type created.
+        success: Course successfully created.
       destroy:
-        success: Course group type successfully destroyed.
-        error: An error occured when deleting the course group type.
-      update:
-        success: Course group type successfully updated.
+        error: An error occured when deleting the course.
+        success: Course successfully destroyed.
+      edit:
+        form_title: Update the Course
       index:
-        <<: *course_group_type_attributes
-        new_course_group_type_link: Add a New Course Group Type
-        card_header: Course Group Types
+        <<: *course_attributes
+        add_new_course: Add a New Course
+        courses: Courses
+      new:
+        form_title: Create a Course
+      search:
+        language: All Languages
+        program_type: All Program Types
+        smart_search_placeholder: Course name or code
+        status: All Statuses
+        unit: All Units
+      show:
+        <<: *course_attributes
+      update:
+        success: Course successfully updated.
     curriculums:
       create:
         success: Curriculum successfully created.
diff --git a/config/locales/models/course_management/tr.yml b/config/locales/models/course_management/tr.yml
index 7433c47f9..350522e37 100644
--- a/config/locales/models/course_management/tr.yml
+++ b/config/locales/models/course_management/tr.yml
@@ -2,114 +2,114 @@ tr:
   activerecord:
     attributes:
       course: &course_attributes
-        credit: Kredi
         code: Dersin Kodu
-        program_type: Program Türü
+        credit: Kredi
         laboratory: Laboratuvar
         language: Dil
         name: Dersin Adı
         practice: Uygulama
+        program_type: Program Türü
         status: Durumu
         theoric: Teorik
         unit: Birim
+      course_group_type: &course_group_type_attributes
+        name: Ders Grup Tür Adı
       course_unit_group: &course_unit_group_attributes
-        courses: Dersler
         course_group_type: Ders Grup Türü
         course_ids: Dersler
+        courses: Dersler
         name: Ders Grup Adı
         search_placeholder: Ders Grup Adı / Birim Adı / Ders Grup Türü Adı
         total_ects_condition: Toplam AKTS Koşulu
         unit: Birim
-      course_group_type: &course_group_type_attributes
-        name: Ders Grup Tür Adı
       curriculum: &curriculum_attributes
-          name: Müfredat Adı
-          unit: Birim
-          number_of_semesters: Dönem Sayısı
-          status: Durumu
-          programs: Programlar
-    models:
-      course: Ders
-      course_unit_group: Ders Grubu
-      course_group_type: Ders Grup Türü
-      curriculum: Müfreadat
+        name: Müfredat Adı
+        number_of_semesters: Dönem Sayısı
+        programs: Programlar
+        status: Durumu
+        unit: Birim
     enums:
       course:
         program_types:
           associate: Önlisans
-          undergraduate: Lisans
-          master: Yüksek Lisans
           doctoral: Doktora
+          master: Yüksek Lisans
+          undergraduate: Lisans
         statuses:
-          passive: Pasif
           active: Aktif
+          passive: Pasif
       curriculum:
         statuses:
-          passive: Pasif
           active: Aktif
+          passive: Pasif
+    models:
+      course: Ders
+      course_group_type: Ders Grup Türü
+      course_unit_group: Ders Grubu
+      curriculum: Müfreadat
   course_management:
-    courses:
-      new:
-        form_title: Ders Oluştur
-      edit:
-        form_title: Dersi Düzenle
+    course_group_types:
       create:
-        success: Ders başarıyla oluşturuldu.
+        success: Ders grup türü başarıyla oluşturuldu.
       destroy:
-        success: Ders başarıyla silindi.
-        error: Ders silinirken bir hata oluştu.
-      update:
-        success: Ders başarıyla güncellendi.
-      search:
-        smart_search_placeholder: Ders adı veya kodu
-        program_type: Tüm Program Türleri
-        language: Tüm Diller
-        unit: Tüm Birimler
-        status: Tüm Durumlar
-      show:
-        <<: *course_attributes
+        error: Ders grup türü silinirken bir hata oluştu.
+        success: Ders grup türü başarıyla silindi.
+      edit:
+        form_title: Ders Grup Türü Düzenle
       index:
-        <<: *course_attributes
-        add_new_course: Yeni Ders Ekle
-        courses: Dersler
-    course_unit_groups:
+        <<: *course_group_type_attributes
+        card_header: Ders Grup Türleri
+        new_course_group_type_link: Yeni Ders Grup Türü Ekle
       new:
-        form_title: Ders Grup Oluştur
-      show:
-        name: Ders Grup Adı
-        total_ects_condition: Toplam AKTS Koşulu
-        unit: Birim
-        course_group_type: Ders Grup Türü
-        courses: Dersler
-      edit:
-        form_title: Ders Grup Düzenle
+        form_title: Ders Grup Türü Oluştur
+      update:
+        success: Ders grup türü başarıyla güncellendi.
+    course_unit_groups:
       create:
         success: Ders grubu başarıyla oluşturuldu.
       destroy:
-        success: Ders grubu başarıyla silindi.
         error: Ders grubu silinirken bir hata oluştu.
-      update:
-        success: Ders grubu başarıyla güncellendi.
+        success: Ders grubu başarıyla silindi.
+      edit:
+        form_title: Ders Grup Düzenle
       index:
         <<: *course_unit_group_attributes
-        new_course_unit_group_link: Yeni Ders Grup Ekle
         card_header: Ders Grupları
-    course_group_types:
+        new_course_unit_group_link: Yeni Ders Grup Ekle
       new:
-        form_title: Ders Grup Türü Oluştur
-      edit:
-        form_title: Ders Grup Türü Düzenle
+        form_title: Ders Grup Oluştur
+      show:
+        course_group_type: Ders Grup Türü
+        courses: Dersler
+        name: Ders Grup Adı
+        total_ects_condition: Toplam AKTS Koşulu
+        unit: Birim
+      update:
+        success: Ders grubu başarıyla güncellendi.
+    courses:
       create:
-        success: Ders grup türü başarıyla oluşturuldu.
+        success: Ders başarıyla oluşturuldu.
       destroy:
-        success: Ders grup türü başarıyla silindi.
-        error: Ders grup türü silinirken bir hata oluştu.
-      update:
-        success: Ders grup türü başarıyla güncellendi.
+        error: Ders silinirken bir hata oluştu.
+        success: Ders başarıyla silindi.
+      edit:
+        form_title: Dersi Düzenle
       index:
-        <<: *course_group_type_attributes
-        new_course_group_type_link: Yeni Ders Grup Türü Ekle
-        card_header: Ders Grup Türleri
+        <<: *course_attributes
+        add_new_course: Yeni Ders Ekle
+        courses: Dersler
+      new:
+        form_title: Ders Oluştur
+      search:
+        language: Tüm Diller
+        program_type: Tüm Program Türleri
+        smart_search_placeholder: Ders adı veya kodu
+        status: Tüm Durumlar
+        unit: Tüm Birimler
+      show:
+        <<: *course_attributes
+      update:
+        success: Ders başarıyla güncellendi.
     curriculums:
       create:
         success: Müfredat başarıyla oluşturuldu.
diff --git a/config/locales/models/documents/en.yml b/config/locales/models/documents/en.yml
index 00ad75d24..bb43b381d 100644
--- a/config/locales/models/documents/en.yml
+++ b/config/locales/models/documents/en.yml
@@ -4,28 +4,28 @@ en:
       document: &document_attributes
         name: Document Name
         statement: Statement
-  helpers:
-    submit:
-      document:
-        create: Create Document
-        update: Update Document
   documents:
     common:
       documents: Documents
-    show:
-      <<: *document_attributes
+    create:
+      success: Document successfully created.
+    destroy:
+      success: Document successfully deleted!
+      warning: Document can not be deleted.
+    edit:
+      form_title: Update the Document
     index:
       <<: *document_attributes
-      new_document_link: Create a New Document
       card_header: Documents
+      new_document_link: Create a New Document
     new:
       form_title: Create a Document
-    edit:
-      form_title: Update the Document
+    show:
+      <<: *document_attributes
     update:
       success: Document successfully updated.
-    create:
-      success: Document successfully created.
-    destroy:
-      success: Document successfully deleted!
-      warning: Document can not be deleted.
+  helpers:
+    submit:
+      document:
+        create: Create Document
+        update: Update Document
diff --git a/config/locales/models/documents/tr.yml b/config/locales/models/documents/tr.yml
index acd15944d..6c46c598e 100644
--- a/config/locales/models/documents/tr.yml
+++ b/config/locales/models/documents/tr.yml
@@ -4,28 +4,28 @@ tr:
       document: &document_attributes
         name: Belge Adı
         statement: Açıklama
-  helpers:
-    submit:
-      document:
-        create: Belge Oluştur
-        update: Belge Güncelle
   documents:
     common:
       documents: Belgeler
-    show:
-      <<: *document_attributes
+    create:
+      success: Belge başarıyla oluşturuldu.
+    destroy:
+      success: Belge başarıyla silindi!
+      warning: Belge silinemedi!
+    edit:
+      form_title: Belge Güncelle
     index:
       <<: *document_attributes
-      new_document_link: Yeni Belge Oluştur
       card_header: Belgeler
+      new_document_link: Yeni Belge Oluştur
     new:
       form_title: Belge Oluştur
-    edit:
-      form_title: Belge Güncelle
+    show:
+      <<: *document_attributes
     update:
       success: Belge başarıyla güncellendi.
-    create:
-      success: Belge başarıyla oluşturuldu.
-    destroy:
-      success: Belge başarıyla silindi!
-      warning: Belge silinemedi!
+  helpers:
+    submit:
+      document:
+        create: Belge Oluştur
+        update: Belge Güncelle
diff --git a/config/locales/models/identities/en.yml b/config/locales/models/identities/en.yml
index 46bd8eeb2..58599c7a2 100644
--- a/config/locales/models/identities/en.yml
+++ b/config/locales/models/identities/en.yml
@@ -2,58 +2,58 @@ en:
   activerecord:
     attributes:
       identity: &identity_attributes
-        type: Identity Type
-        first_name: First Name
-        last_name: Last Name
-        mothers_name: Mothers Name
+        date_of_birth: Date of Birth
         fathers_name: Fathers Name
+        first_name: First Name
         gender: Gender
+        last_name: Last Name
         marital_status: Marital Status
+        mothers_name: Mothers Name
         place_of_birth: Place of Birth
-        date_of_birth: Date of Birth
         registered_to: Registration
+        type: Identity Type
     enums:
       identity:
-        types:
-          formal: Formal Identity
-          informal: Informal Identity
         genders:
-          male: Male
           female: Female
+          male: Male
           other: Other
         marital_statuses:
-          single: Single
-          married: Married
           divorced: Divorced
+          married: Married
+          single: Single
           unknown: Unknown
-  helpers:
-    submit:
-      identity:
-        create: Create Identity
-        update: Update Identity
+        types:
+          formal: Formal Identity
+          informal: Informal Identity
   account:
     identities:
+      create:
+        success: Identity successfully created!
+      destroy:
+        success: Identity successfully deleted!
+        warning: Identity can not be deleted!
+      edit:
+        form_title: Edit Identity
+        warning: You can not edit your formal identity!
       index:
         <<: *identity_attributes
+        create_from_mernis: Create from MERNIS
+        department: Department
+        informal_identity: Informal Identity
         new_identity: Add a New Identity
-        user_identity: User Identity
         student_identity: Student Identity
-        informal_identity: Informal Identity
         update_from_mernis: Update from MERNIS
-        create_from_mernis: Create from MERNIS
-        department: Department
-      edit:
-        warning: You can not edit your formal identity!
-        form_title: Edit Identity
+        user_identity: User Identity
       new:
         form_title: Create Identity
-      create:
-        success: Identity successfully created!
-      update:
-        success: Identity successfully updated!
-      destroy:
-        success: Identity successfully deleted!
-        warning: Identity can not be deleted!
       save_from_mernis:
         wait: You recently created or updated your identity. You can only update your identity once a week from MERNIS.
         will_update: We have received your identity create or update request. Your identity will be updated in a couple of seconds/minutes.
+      update:
+        success: Identity successfully updated!
+  helpers:
+    submit:
+      identity:
+        create: Create Identity
+        update: Update Identity
diff --git a/config/locales/models/identities/tr.yml b/config/locales/models/identities/tr.yml
index a6d24e9c5..0812e938b 100644
--- a/config/locales/models/identities/tr.yml
+++ b/config/locales/models/identities/tr.yml
@@ -2,58 +2,58 @@ tr:
   activerecord:
     attributes:
       identity: &identity_attributes
-        type: Kimlik Türü
-        first_name: Ad
-        last_name: Soyad
-        mothers_name: Anne Adı
+        date_of_birth: Doğum Tarihi
         fathers_name: Baba Adı
+        first_name: Ad
         gender: Cinsiyet
+        last_name: Soyad
         marital_status: Medeni Hal
+        mothers_name: Anne Adı
         place_of_birth: Doğum Yeri
-        date_of_birth: Doğum Tarihi
         registered_to: Kütük Bilgisi
+        type: Kimlik Türü
     enums:
       identity:
-        types:
-          formal: Resmi Kimlik
-          informal: Diğer Kimlik
         genders:
-          male: Erkek
           female: Kadın
+          male: Erkek
           other: Diğer
         marital_statuses:
-          single: Bekâr
-          married: Evli
           divorced: Boşanmış
+          married: Evli
+          single: Bekâr
           unknown: Bilinmiyor
-  helpers:
-    submit:
-      identity:
-        create: Kimliği Kaydet
-        update: Kimliği Güncelle
+        types:
+          formal: Resmi Kimlik
+          informal: Diğer Kimlik
   account:
     identities:
+      create:
+        success: Kimlik başarıyla oluşturuldu!
+      destroy:
+        success: Kimlik başarıyla silindi!
+        warning: Kimlik silinemedi!
+      edit:
+        form_title: Kimliği Düzenle
+        warning: Yasal kimlik bilgilerinizi düzenleyemezsiniz!
       index:
         <<: *identity_attributes
+        create_from_mernis: MERNİS'ten Oluştur
+        department: Öğrencilik Birimi
+        informal_identity: Diğer Kimliğiniz
         new_identity: Yeni Kimlik Ekle
-        user_identity: Kullancı Kimliğiniz
         student_identity: Öğrencilik Kimliğiniz
-        informal_identity: Diğer Kimliğiniz
         update_from_mernis: MERNİS'ten Güncelle
-        create_from_mernis: MERNİS'ten Oluştur
-        department: Öğrencilik Birimi
-      edit:
-        warning: Yasal kimlik bilgilerinizi düzenleyemezsiniz!
-        form_title: Kimliği Düzenle
+        user_identity: Kullanıcı Kimliğiniz
       new:
         form_title: Kimlik Oluştur
-      create:
-        success: Kimlik başarıyla oluşturuldu!
-      update:
-        success: Kimlik başarıyla güncellendi!
-      destroy:
-        success: Kimlik başarıyla silindi!
-        warning: Kimlik silinemedi!
       save_from_mernis:
         wait: Kimliğinizi yakın bir zamanda oluşturdunuz veya güncellediniz. Kimliğinizi haftada bir güncelleyebilirsiniz.
         will_update: Kimlik oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adresiniz güncellenecek.
+      update:
+        success: Kimlik başarıyla güncellendi!
+  helpers:
+    submit:
+      identity:
+        create: Kimliği Kaydet
+        update: Kimliği Güncelle
diff --git a/config/locales/models/references/en.yml b/config/locales/models/references/en.yml
index 7bbd35ae5..b22742dfe 100644
--- a/config/locales/models/references/en.yml
+++ b/config/locales/models/references/en.yml
@@ -1,31 +1,31 @@
 en:
   activerecord:
     attributes:
+      city: &city_attributes
+        alpha_2_code: Alpha 2 Code
+        name: Name of City
       country: &country_attributes
-        name: Name of Country
         alpha_2_code: Alpha 2 Code
         alpha_3_code: Alpha 3 Code
-        numeric_code: ISO3166 Numeric
         mernis_code: MERNIS Code
+        name: Name of Country
+        numeric_code: ISO3166 Numeric
         yoksis_code: YOKSIS Code
-      city: &city_attributes
-        name: Name of City
-        alpha_2_code: Alpha 2 Code
       district: &district_attributes
-        name: Name of District
-        mernis_code: MERNIS Code
         city_id: City
+        mernis_code: MERNIS Code
+        name: Name of District
       language: &language_attributes
-        name: Name
         iso: ISO Code
+        name: Name
   helpers:
     submit:
-      country:
-        create: Create Country
-        update: Update Country
       city:
         create: Create City
         update: Update City
+      country:
+        create: Create Country
+        update: Update Country
       district:
         create: Create District
         update: Update District
@@ -33,76 +33,58 @@ en:
         create: Create Language
         update: Update Language
   references:
-    common:
-      countries: Ülkeler
     cities:
+      create:
+        success: City successfully created.
+      destroy:
+        success: City successfully deleted!
+        warning: City can not be deleted.
+      edit:
+        form_title: Update the City
+      new:
+        form_title: Create a City
       show:
         <<: *district_attributes
+        active: Is Active?
         card_header: Districts
         new_district_link: Add a New District
-        active: Is Active?
-      new:
-        form_title: Create a City
-      edit:
-        form_title: Update the City
       update:
         success: City successfully updated.
+    common:
+      countries: Ülkeler
+    countries:
       create:
-        success: City successfully created.
+        success: Country successfully created.
       destroy:
-        success: City successfully deleted!
-        warning: City can not be deleted.
-    countries:
+        success: Country successfully deleted.
+        warning: Country can not be deleted.
+      edit:
+        form_title: Edit the Country
       index:
         <<: *country_attributes
-        new_country_link: Add a New Country
         card_header: Countries
+        new_country_link: Add a New Country
+      new:
+        form_title: Create Country
+        new_country: New Country
       show:
         <<: *city_attributes
         card_header: Cities
         new_city_link: Add a New City
-      new:
-        form_title: Create Country
-        new_country: New Country
-      edit:
-        form_title: Edit the Country
       update:
         success: Country successfully updated.
-      create:
-        success: Country successfully created.
-      destroy:
-        success: Country successfully deleted.
-        warning: Country can not be deleted.
     districts:
-      new:
-        form_title: Create a District
-      edit:
-        form_title: Update the District
-      update:
-        success: District successfully updated.
       create:
         success: District successfully created.
       destroy:
         success: District successfully deleted.
         warning: District can not be deleted.
-    languages:
-      common:
-        languages: Languages
-      index:
-        <<: *language_attributes
-        new_language_link: Create a New Language
-        card_header: Languages
-      new:
-        form_title: Create a Language
       edit:
-        form_title: Update the Language
+        form_title: Update the District
+      new:
+        form_title: Create a District
       update:
-        success: Language successfully updated.
-      create:
-        success: Language successfully created.
-      destroy:
-        success: Language successfully deleted!
-        warning: Language can not be deleted.
+        success: District successfully updated.
     home:
       card:
         high_school_types: High School Types
@@ -113,11 +95,29 @@ en:
         student_entrance_types: Entrance Types
         student_grades: Grades
         student_grading_systems: Grading Systems
-        student_punishment_types: Punishment Types
         student_management: Student Management
+        student_punishment_types: Punishment Types
         student_studentship_statuses: Studentship Statuses
         unit_instruction_languages:  Instruction Languages
         unit_instruction_types: Instruction Types
         unit_statuses: Unit Statuses
         unit_types: Unit Types
-        university_types: University Types
\ No newline at end of file
+        university_types: University Types
+    languages:
+      common:
+        languages: Languages
+      create:
+        success: Language successfully created.
+      destroy:
+        success: Language successfully deleted!
+        warning: Language can not be deleted.
+      edit:
+        form_title: Update the Language
+      index:
+        <<: *language_attributes
+        card_header: Languages
+        new_language_link: Create a New Language
+      new:
+        form_title: Create a Language
+      update:
+        success: Language successfully updated.
diff --git a/config/locales/models/references/tr.yml b/config/locales/models/references/tr.yml
index 13871c99d..6facaf67b 100644
--- a/config/locales/models/references/tr.yml
+++ b/config/locales/models/references/tr.yml
@@ -1,31 +1,31 @@
 tr:
   activerecord:
     attributes:
+      city: &city_attributes
+        alpha_2_code: Alpha 2 Kodu
+        name: Şehir Adı
       country: &country_attributes
-        name: Ülke Adı
         alpha_2_code: Alpha 2 Kodu
         alpha_3_code: Alpha 3 Kodu
-        numeric_code: ISO3166 Rakamsal
         mernis_code: MERNIS Kodu
+        name: Ülke Adı
+        numeric_code: ISO3166 Rakamsal
         yoksis_code: YOKSIS Kodu
-      city: &city_attributes
-        name: Şehir Adı
-        alpha_2_code: Alpha 2 Kodu
       district: &district_attributes
-        name: İlçe Adı
-        mernis_code: MERNIS Kodu
         city_id: Şehir
+        mernis_code: MERNIS Kodu
+        name: İlçe Adı
       language: &language_attributes
-        name: Ad
         iso: ISO Kodu
+        name: Ad
   helpers:
     submit:
-      country:
-        create: Ülke Oluştur
-        update: Ülkeyi Güncelle
       city:
         create: Şehir Oluştur
         update: Şehri Güncelle
+      country:
+        create: Ülke Oluştur
+        update: Ülkeyi Güncelle
       district:
         create: İlçe Oluştur
         update: İlçeyi Güncelle
@@ -33,77 +33,59 @@ tr:
         create: Dil Oluştur
         update: Dil Güncelle
   references:
-    common:
-      countries: Ülkeler
     cities:
+      create:
+        success: Şehir başarıyla oluşturuldu.
+      destroy:
+        success: Şehir başarıyla silindi!
+        warning: Şehir silinemedi!
+      edit:
+        form_title: Şehri Düzenle
+      new:
+        form_title: Şehir Oluştur
       show:
         <<: *district_attributes
+        active: Aktiflik Durumu
         card_header: İlçeler
         new_district_link: Yeni Bir İlçe Ekle
-        active: Aktiflik Durumu
-      new:
-        form_title: Şehir Oluştur
-      edit:
-        form_title: Şehri Düzenle
       update:
         success: Şehir başarıyla güncellendi.
+    common:
+      countries: Ülkeler
+    countries:
       create:
-        success: Şehir başarıyla oluşturuldu.
+        success: Ülke başarıyla oluşturuldu.
       destroy:
-        success: Şehir başarıyla silindi!
-        warning: Şehir silinemedi!
-    countries:
+        success: Ülke başarıyla silindi!
+        warning: Ülke silinemedi!
+      edit:
+        form_title: Ülkeyi Düzenle
       index:
         <<: *country_attributes
-        new_country_link: Yeni Ülke Ekle
         card_header: Ülkeler
+        new_country_link: Yeni Ülke Ekle
+      new:
+        form_title: Ülke Oluştur
+        new_country: Yeni Ülke
       show:
         <<: *country_attributes
         <<: *city_attributes
         card_header: Şehirler
         new_city_link: Yeni Şehir Ekle
-      new:
-        form_title: Ülke Oluştur
-        new_country: Yeni Ülke
-      edit:
-        form_title: Ülkeyi Düzenle
       update:
         success: Ülke başarıyla güncellendi.
-      create:
-        success: Ülke başarıyla oluşturuldu.
-      destroy:
-        success: Ülke başarıyla silindi!
-        warning: Ülke silinemedi!
     districts:
-      new:
-        form_title: İlçe Oluştur
-      edit:
-        form_title: İlçeyi Düzenle
-      update:
-        success: İlçe başarıyla güncellendi.
       create:
         success: İlçe başarıyla oluşturuldu.
       destroy:
         success: İlçe başarıyla silindi!
         warning: İlçe silinemedi!
-    languages:
-      common:
-        languages: Diller
-      index:
-        <<: *language_attributes
-        new_language_link: Yeni Dil Oluştur
-        card_header: Diller
-      new:
-        form_title: Dil Oluştur
       edit:
-        form_title: Dil Güncelle
+        form_title: İlçeyi Düzenle
+      new:
+        form_title: İlçe Oluştur
       update:
-        success: Dil başarıyla güncellendi.
-      create:
-        success: Dil başarıyla oluşturuldu.
-      destroy:
-        success: Dil başarıyla silindi!
-        warning: Dil silinemedi.
+        success: İlçe başarıyla güncellendi.
     home:
       card:
         high_school_types: Lise Türleri
@@ -114,11 +96,29 @@ tr:
         student_entrance_types: Giriş Türleri
         student_grades: Sınıflar
         student_grading_systems: Not Sistemleri
-        student_punishment_types: Ceza Türleri
         student_management: Öğrenci Yönetimi
-        student_studentship_statuses: Öğrencilik Hakları 
+        student_punishment_types: Ceza Türleri
+        student_studentship_statuses: Öğrencilik Hakları
         unit_instruction_languages: Öğrenim Dilleri
         unit_instruction_types: Öğrenim Türleri
         unit_statuses: Aktiflik Durumları
         unit_types: Birim Türleri
-        university_types: Üniversite Türleri
\ No newline at end of file
+        university_types: Üniversite Türleri
+    languages:
+      common:
+        languages: Diller
+      create:
+        success: Dil başarıyla oluşturuldu.
+      destroy:
+        success: Dil başarıyla silindi!
+        warning: Dil silinemedi.
+      edit:
+        form_title: Dil Güncelle
+      index:
+        <<: *language_attributes
+        card_header: Diller
+        new_language_link: Yeni Dil Oluştur
+      new:
+        form_title: Dil Oluştur
+      update:
+        success: Dil başarıyla güncellendi.
diff --git a/config/locales/models/registration_documents/en.yml b/config/locales/models/registration_documents/en.yml
index 732f05fac..e1985a1fc 100644
--- a/config/locales/models/registration_documents/en.yml
+++ b/config/locales/models/registration_documents/en.yml
@@ -2,10 +2,10 @@ en:
   activerecord:
     attributes:
       registration_document: &registration_document_attributes
-        unit: Unit
         academic_term: Academic Term
         document: Document
         statement: Statement
+        unit: Unit
   helpers:
     submit:
       registration_document:
@@ -14,20 +14,20 @@ en:
   registration_documents:
     common:
       registration_documents: Documents
-    show:
-      <<: *registration_document_attributes
+    create:
+      success: Document successfully created.
+    destroy:
+      success: Document successfully deleted!
+      warning: Document can not be deleted.
+    edit:
+      form_title: Update the Document
     index:
       <<: *registration_document_attributes
-      new_registration_document_link: Create a New Document
       card_header: '%{unit} Documents Required for Registration'
+      new_registration_document_link: Create a New Document
     new:
       form_title: Create a Document
-    edit:
-      form_title: Update the Document
+    show:
+      <<: *registration_document_attributes
     update:
       success: Document successfully updated.
-    create:
-      success: Document successfully created.
-    destroy:
-      success: Document successfully deleted!
-      warning: Document can not be deleted.
diff --git a/config/locales/models/registration_documents/tr.yml b/config/locales/models/registration_documents/tr.yml
index 9dc19fff3..78aa2c394 100644
--- a/config/locales/models/registration_documents/tr.yml
+++ b/config/locales/models/registration_documents/tr.yml
@@ -2,10 +2,10 @@ tr:
   activerecord:
     attributes:
       registration_document: &registration_document_attributes
-        unit: Birim
         academic_term: Akademik Dönem
         document: Belge
         statement: Açıklama
+        unit: Birim
   helpers:
     submit:
       registration_document:
@@ -14,20 +14,20 @@ tr:
   registration_documents:
     common:
       registration_documents: Belgeler
-    show:
-      <<: *registration_document_attributes
+    create:
+      success: Belge başarıyla oluşturuldu.
+    destroy:
+      success: Belge başarıyla silindi!
+      warning: Belge silinemedi!
+    edit:
+      form_title: Belge Güncelle
     index:
       <<: *registration_document_attributes
-      new_registration_document_link: Yeni Belge Oluştur
       card_header: '%{unit} Kayıt İçin Gerekli Belgeler'
+      new_registration_document_link: Yeni Belge Oluştur
     new:
       form_title: Belge Oluştur
-    edit:
-      form_title: Belge Güncelle
+    show:
+      <<: *registration_document_attributes
     update:
       success: Belge başarıyla güncellendi.
-    create:
-      success: Belge başarıyla oluşturuldu.
-    destroy:
-      success: Belge başarıyla silindi!
-      warning: Belge silinemedi!
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index 0ba2a3723..552a95805 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -2,87 +2,87 @@ en:
   activerecord:
     attributes:
       prospective_student: &prospective_student_attributes
-        id_number: ID Number
-        first_name: First Name
-        last_name: Last Name
-        fathers_name: Father's Name
-        mothers_name: Mother's Name
+        additional_score: Additional Score
+        address: Address
         date_of_birth: Date of Birth
+        email: Email
+        exam_score: Exam Score
+        fathers_name: Father's Name
+        first_name: First Name
         gender: Gender
-        nationality: Nationality
-        place_of_birth: Place of Birth
-        registration_city: Registration City
-        registration_district: Registration District
-        high_school_code: School Code
-        high_school_type: School Type
+        graduated: Graduated
         high_school_branch: School Branch
-        state_of_education: State of Education
+        high_school_code: School Code
         high_school_graduation_year: High Scholl Graduation Year
-        placement_type: Placement Type
-        exam_score: Exam Score
-        language_id: Language ID
-        address: Address
+        high_school_type: School Type
         home_phone: Home Phone
-        mobile_phone: Mobile phone
-        email: Email
-        student_disability_type_id: Student Disability Type ID
-        top_student: Top Student
-        placement_score: Placement Score
-        placement_rank: Placement Rank
-        unit: Placement Program
-        preference_order: Preference Order
-        placement_score_type: Placement Score Type
-        additional_score: Additional Score
+        id_number: ID Number
+        language_id: Language ID
+        last_name: Last Name
         meb_status: MEB Status
         meb_status_date: MEB Status Check Date
         military_status: Military Status
         military_status_date: Military Status Check Date
+        mobile_phone: Mobile phone
+        mothers_name: Mother's Name
+        must_see_recruiting_office: Must see recruiting unit
+        nationality: Nationality
+        not_graduated_or_unknown: Not Graduated/Unknown
+        obs_registered_program: Registered To
         obs_status: Studentship Status
         obs_status_date: Studentship Status Check Date
-        obs_registered_program: Registered To
+        place_of_birth: Place of Birth
+        placement_rank: Placement Rank
+        placement_score: Placement Score
+        placement_score_type: Placement Score Type
+        placement_type: Placement Type
+        preference_order: Preference Order
+        registration_city: Registration City
+        registration_district: Registration District
+        smart_search_placeholder: Prospective student id number, first name or last name.
+        state_of_education: State of Education
+        student_disability_type_id: Student Disability Type ID
         student_entrance_type: Entrance Type
-        graduated: Graduated
-        not_graduated_or_unknown: Not Graduated/Unknown
-        unproblematic: Unproblematic
-        must_see_recruiting_office: Must see recruiting unit
         student_in_a_different_unit: Student in a different university/unit
-        smart_search_placeholder: Prospective student id number, first name or last name.
+        top_student: Top Student
+        unit: Placement Program
+        unproblematic: Unproblematic
     enums:
       prospective_student:
+        additional_score:
+          handicapped: Handicapped Additional Score
         genders:
-          male: Male
           female: Female
+          male: Male
         nationality:
-          turkish: Turkish Citizen
-          kktc: Northern Cyprus Citizen
           foreign: Foreign Citizen
+          kktc: Northern Cyprus Citizen
+          turkish: Turkish Citizen
         placement_types:
-          general: General
           additional_score: Additional Scored
-        additional_score:
-          handicapped: Handicapped Additional Score
+          general: General
+  simple_form:
+    labels:
+      prospective_student:
+        <<: *prospective_student_attributes
   student_management:
     prospective_students:
+      index:
+        <<: *prospective_student_attributes
+        prospective_students: Prospective Students
+      register:
+        can_not_register: Can Not Register
+        success: Student successfully registered.
+        warning: Student could not be registered.
       search:
         <<: *prospective_student_attributes
       show:
         <<: *prospective_student_attributes
-        prospective_student: Prospective Student
+        can_not_register: Can Not Register
         identity_information: Identity Information
+        last_update: Last Update
         other_information: Other Information
-        registered_to: 'Already registered to %{program}.'
         permanently_register: Permanently Register
+        prospective_student: Prospective Student
+        registered_to: 'Already registered to %{program}.'
         temporarily_register: Temporarily Register
-        can_not_register: Can Not Register
-        last_update: Last Update
-      index:
-        <<: *prospective_student_attributes
-        prospective_students: Prospective Students
-      register:
-        success: Student successfully registered.
-        warning: Student could not be registered.
-        can_not_register: Can Not Register
-  simple_form:
-    labels:
-      prospective_student:
-        <<: *prospective_student_attributes
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index a99c99e07..096529d71 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -2,87 +2,87 @@ tr:
   activerecord:
     attributes:
       prospective_student: &prospective_student_attributes
-        id_number: Kimlik Numarası
-        first_name: Ad
-        last_name: Soyad
-        fathers_name: Baba Adı
-        mothers_name: Anne Adı
+        additional_score: Ek Puan
+        address: Adres
         date_of_birth: Doğum Tarihi
+        email: E-posta
+        exam_score: Sınav Puanı
+        fathers_name: Baba Adı
+        first_name: Ad
         gender: Cinsiyet
-        nationality: Uyruk
-        place_of_birth: Doğum Yeri
-        registration_city: Nüfusa Kayıtlı Olduğu İl
-        registration_district: Nüfusa Kayıtlı Olduğu İlçe
-        high_school_code: Lise Kodu
-        high_school_type: Lise Türü
+        graduated: Mezun
         high_school_branch: Lise Dalı
-        state_of_education: Öğrenim Durumu
+        high_school_code: Lise Kodu
         high_school_graduation_year: Lise Mezuniyet Yılı
-        placement_type: Yerleşme Türü
-        exam_score: Sınav Puanı
-        language_id: Dil ID
-        address: Adres
+        high_school_type: Lise Türü
         home_phone: Ev Telefonu
-        mobile_phone: Cep Telefonu
-        email: E-posta
-        student_disability_type_id: Öğrenci Engel Türü
-        top_student: Okul Birincisi
-        placement_score: Yerleşme Puanı
-        placement_rank: Yerleşme Sırası
-        unit: Yerleştiği Program
-        preference_order: Tercih Sırası
-        placement_score_type: Yerleşme Puan Türü
-        additional_score: Ek Puan
+        id_number: Kimlik Numarası
+        language_id: Dil ID
+        last_name: Soyad
         meb_status: Lise Mezuniyet Durumu
         meb_status_date: Lise Mezuniyet Kontrol Tarihi
         military_status: Askerlik Durumu
         military_status_date: Askerlik Durum Kontrol Tarihi
+        mobile_phone: Cep Telefonu
+        mothers_name: Anne Adı
+        must_see_recruiting_office: Askerlik Şubesiyle Görüşmeli
+        nationality: Uyruk
+        not_graduated_or_unknown: Mezun Değil/Bilinmiyor
+        obs_registered_program: Öğrenci Olarak Kayıtlı Olduğu Program
         obs_status: Öğrencilik Durumu
         obs_status_date: Öğrencilik Durum Kontrol Tarihi
-        obs_registered_program: Öğrenci Olarak Kayıtlı Olduğu Program
+        place_of_birth: Doğum Yeri
+        placement_rank: Yerleşme Sırası
+        placement_score: Yerleşme Puanı
+        placement_score_type: Yerleşme Puan Türü
+        placement_type: Yerleşme Türü
+        preference_order: Tercih Sırası
+        registration_city: Nüfusa Kayıtlı Olduğu İl
+        registration_district: Nüfusa Kayıtlı Olduğu İlçe
+        smart_search_placeholder: Aday öğrenci kimlik numarası, adı veya soyadı
+        state_of_education: Öğrenim Durumu
+        student_disability_type_id: Öğrenci Engel Türü
         student_entrance_type: Giriş Türü
-        graduated: Mezun
-        not_graduated_or_unknown: Mezun Değil/Bilinmiyor
-        unproblematic: Sorunsuz
-        must_see_recruiting_office: Askerlik Şubesiyle Görüşmeli
         student_in_a_different_unit: Başka Bir Üniversite/Birimde Öğrenci
-        smart_search_placeholder: Aday öğrenci kimlik numarası, adı veya soyadı
+        top_student: Okul Birincisi
+        unit: Yerleştiği Program
+        unproblematic: Sorunsuz
     enums:
       prospective_student:
+        additional_score:
+          handicapped: Engelli Ek Puanı
         genders:
-          male: Erkek
           female: Kadın
+          male: Erkek
         nationality:
-          turkish: Türk Vatandaşı
-          kktc: Kuzey Kıbrıs Türk Vatandaşı
           foreign: Yabancı Uyruklu
+          kktc: Kuzey Kıbrıs Türk Vatandaşı
+          turkish: Türk Vatandaşı
         placement_types:
-          general: Genel
           additional_score: Ek Puanlı
-        additional_score:
-          handicapped: Engelli Ek Puanı
+          general: Genel
+  simple_form:
+    labels:
+      prospective_student:
+        <<: *prospective_student_attributes
   student_management:
     prospective_students:
+      index:
+        <<: *prospective_student_attributes
+        prospective_students: Aday Öğrenciler
+      register:
+        can_not_register: Kayıt Yapılamaz
+        success: Öğrenci başarıyla kayıt edildi
+        warning: Öğrenci kayıt edilemedi
       search:
         <<: *prospective_student_attributes
       show:
         <<: *prospective_student_attributes
-        prospective_student: Aday Öğrenci
+        can_not_register: Kayıt Yapılamaz
         identity_information: Kimlik Bilgileri
+        last_update: Son Güncelleme
         other_information: Diğer Bilgileri
-        registered_to: '%{program} isimli programda kayıtlı.'
         permanently_register: Kesin Kayıt Yap
+        prospective_student: Aday Öğrenci
+        registered_to: '%{program} isimli programda kayıtlı.'
         temporarily_register: Geçici Kayıt Yap
-        can_not_register: Kayıt Yapılamaz
-        last_update: Son Güncelleme
-      index:
-        <<: *prospective_student_attributes
-        prospective_students: Aday Öğrenciler
-      register:
-        success: Öğrenci başarıyla kayıt edildi
-        warning: Öğrenci kayıt edilemedi
-        can_not_register: Kayıt Yapılamaz
-  simple_form:
-    labels:
-      prospective_student:
-        <<: *prospective_student_attributes
diff --git a/config/locales/models/studies/en.yml b/config/locales/models/studies/en.yml
index 53245dbef..8148c047c 100644
--- a/config/locales/models/studies/en.yml
+++ b/config/locales/models/studies/en.yml
@@ -1,17 +1,17 @@
 en:
   studies:
-    dashboard:
-      index:
-        articles: Articles
-        projects: Projects
-        certifications: Certifications
     articles:
       index:
         article: Article
-        top_publishers: Top Publishing Academics
-        recently_added: Recently Added Articles
         number_of_articles_by_years: Number of Articles by Years
         publications_by_index_types: Publications by Index Types
-        publications_by_publication_types: Publications by Publication Types
         publications_by_language: Publications by Publication Language
         publications_by_number_of_authors: Publications by Number of Authors
+        publications_by_publication_types: Publications by Publication Types
+        recently_added: Recently Added Articles
+        top_publishers: Top Publishing Academics
+    dashboard:
+      index:
+        articles: Articles
+        certifications: Certifications
+        projects: Projects
diff --git a/config/locales/models/studies/tr.yml b/config/locales/models/studies/tr.yml
index 8d64426e8..bed83b445 100644
--- a/config/locales/models/studies/tr.yml
+++ b/config/locales/models/studies/tr.yml
@@ -1,17 +1,17 @@
 tr:
   studies:
-    dashboard:
-      index:
-        articles: Makaleler
-        projects: Projeler
-        certifications: Sertifikalar
     articles:
       index:
         article: Makale
-        top_publishers: En Çok Makalesi Olanlar
-        recently_added: En Son Eklenen Makaleler
         number_of_articles_by_years: Yıllara Göre Makale Sayısı
         publications_by_index_types: Index Türüne Göre Makaleler
-        publications_by_publication_types: Yayın Türüne Göre Makaleler
         publications_by_language: Yayın Dili Göre Makaleler
         publications_by_number_of_authors: Yazar Sayısına Göre Makaleler
+        publications_by_publication_types: Yayın Türüne Göre Makaleler
+        recently_added: En Son Eklenen Makaleler
+        top_publishers: En Çok Makalesi Olanlar
+    dashboard:
+      index:
+        articles: Makaleler
+        certifications: Sertifikalar
+        projects: Projeler
diff --git a/config/locales/models/units/en.yml b/config/locales/models/units/en.yml
index baa5b9031..11309dc81 100644
--- a/config/locales/models/units/en.yml
+++ b/config/locales/models/units/en.yml
@@ -2,20 +2,20 @@ en:
   activerecord:
     attributes:
       unit: &unit_attributes
-        name: Unit Name
-        yoksis_id: YOKSIS ID
+        ancestry: Parent/Children Unit
         detsis_id: DETSIS ID
+        district: Location
+        duration: Duration of Instruction
         foet_code: FOET Code
         founded_at: Founded At
-        duration: Duration of Instruction
-        district: Location
-        ancestry: Parent/Children Unit
-        unit_type: Unit Type
-        unit_status: Unit Status
+        name: Unit Name
+        parent_id: Parent Unit
         unit_instruction_language: Instruction Language
         unit_instruction_type: Instruction Type
+        unit_status: Unit Status
+        unit_type: Unit Type
         university_type: University Type
-        parent_id: Parent Unit
+        yoksis_id: YOKSIS ID
   helpers:
     submit:
       unit:
@@ -24,28 +24,28 @@ en:
   units:
     common:
       units: Units
+    create:
+      success: Unit successfully created.
+    destroy:
+      success: Unit successfully deleted!
+      warning: Unit can not be deleted.
+    edit:
+      form_title: Update the Unit
+    index:
+      <<: *unit_attributes
+      card_header: Units
+      new_unit_link: Create a New Unit
+    new:
+      form_title: Create a Unit
     search:
-      smart_search_placeholder: Unit name or YOKSIS ID
       duration: Duration of Instruction
-      unit_status: Unit Status
+      smart_search_placeholder: Unit name or YOKSIS ID
       unit_instruction_language: Language of Instruction
       unit_instruction_type: Instruction Type
+      unit_status: Unit Status
     show:
       <<: *unit_attributes
       parent: Parent Unit
       registration_documents: Registration Documents
-    index:
-      <<: *unit_attributes
-      new_unit_link: Create a New Unit
-      card_header: Units
-    new:
-      form_title: Create a Unit
-    edit:
-      form_title: Update the Unit
     update:
       success: Unit successfully updated.
-    create:
-      success: Unit successfully created.
-    destroy:
-      success: Unit successfully deleted!
-      warning: Unit can not be deleted.
diff --git a/config/locales/models/units/tr.yml b/config/locales/models/units/tr.yml
index 85dd20f0e..73e55386b 100644
--- a/config/locales/models/units/tr.yml
+++ b/config/locales/models/units/tr.yml
@@ -2,20 +2,20 @@ tr:
   activerecord:
     attributes:
       unit: &unit_attributes
-        name: Birim Adı
-        yoksis_id: YOKSIS ID
+        ancestry: Üst/Alt Birim
         detsis_id: DETSIS ID
+        district: Bulunduğu İlçe
+        duration: Öğretim Süresi
         foet_code: FOET Kodu
         founded_at: Kuruluş Tarihi
-        duration: Öğretim Süresi
-        district: Bulunduğu İlçe
-        ancestry: Üst/Alt Birim
-        unit_type: Birim Türü
-        unit_status: Birim Durumu
+        name: Birim Adı
+        parent_id: Üst Birim
         unit_instruction_language: Öğretim Dili
         unit_instruction_type: Öğretim Türü
+        unit_status: Birim Durumu
+        unit_type: Birim Türü
         university_type: Üniversite Türü
-        parent_id: Üst Birim
+        yoksis_id: YOKSIS ID
   helpers:
     submit:
       unit:
@@ -24,28 +24,28 @@ tr:
   units:
     common:
       units: Birimler
+    create:
+      success: Birim başarıyla oluşturuldu.
+    destroy:
+      success: Birim başarıyla silindi!
+      warning: Birim silinemedi!
+    edit:
+      form_title: Birim Güncelle
+    index:
+      <<: *unit_attributes
+      card_header: Birimler
+      new_unit_link: Yeni Birim Oluştur
+    new:
+      form_title: Birim Oluştur
     search:
-      smart_search_placeholder: Birim adı veya YOKSIS numarası
       duration: Öğretim Süresi
-      unit_status: Birim Durumu
+      smart_search_placeholder: Birim adı veya YOKSIS numarası
       unit_instruction_language: Öğretim Dili
       unit_instruction_type: Öğretim Türü
+      unit_status: Birim Durumu
     show:
       <<: *unit_attributes
       parent: Üst Birim
       registration_documents: Gerekli Belgeler
-    index:
-      <<: *unit_attributes
-      new_unit_link: Yeni Birim Oluştur
-      card_header: Birimler
-    new:
-      form_title: Birim Oluştur
-    edit:
-      form_title: Birim Güncelle
     update:
       success: Birim başarıyla güncellendi.
-    create:
-      success: Birim başarıyla oluşturuldu.
-    destroy:
-      success: Birim başarıyla silindi!
-      warning: Birim silinemedi!
diff --git a/config/locales/models/user/en.yml b/config/locales/models/user/en.yml
index acde8fd3e..9758606c8 100644
--- a/config/locales/models/user/en.yml
+++ b/config/locales/models/user/en.yml
@@ -1,114 +1,114 @@
 en:
   activerecord:
     attributes:
-      user: &user_attributes
-        id_number: ID Number
-        email: E-mail
-        password: Password
-        password_confirmation: Password Confirmation
-        current_password: Current Password
-        preferred_language: Preferred Language
-        password_changed_at: Last Password Change
-        articles_count: Articles Count
-        projects_count: Projects Count
-        profile: Profile Settings
-        preferences: Visibility Settings
+      duty: &duty_attributes
+        employee: Employee
+        end_date: End Date
+        start_date: Start Date
+        temporary: Temporary Duty
+        tenure: Tenure
+        tenure_status: Tenure Status
+        unit_id: Unit
       employee: &employee_attributes
+        id_number: ID Number
         is_active: Is Active?
         title_id: Title
         user_id: User
-        id_number: ID Number
-      duty: &duty_attributes
-        tenure_status: Tenure Status
-        tenure: Tenure
-        temporary: Temporary Duty
-        start_date: Start Date
-        end_date: End Date
-        employee: Employee
-        unit_id: Unit
       position: &position_attributes
         administrative_function_id: Administrative Function
-        start_date: Start Date
         end_date: End Date
-  simple_form:
-    placeholders:
-      user:
-        <<: *user_attributes
-  helpers:
-    submit:
-      user:
-        update: Change my Password
+        start_date: Start Date
+      user: &user_attributes
+        articles_count: Articles Count
+        current_password: Current Password
+        email: E-mail
+        id_number: ID Number
+        password: Password
+        password_changed_at: Last Password Change
+        password_confirmation: Password Confirmation
+        preferences: Visibility Settings
+        preferred_language: Preferred Language
+        profile: Profile Settings
+        projects_count: Projects Count
   devise:
     common:
-      reset_password: Reset Password
       login: Login
       register: Register
+      reset_password: Reset Password
     passwords:
       edit:
         reset_my_password: Reset my Password
       new:
-        send_instructions: Send Reset Password Instructions
         hint: You can request password reset instruction by typing your e-mail.
+        send_instructions: Send Reset Password Instructions
     registrations:
       edit:
         account_settings: Account Settings
-        leave_blank: leave blank if you don't want to change
         current_password: you must enter your current password for changing your e-mail address
+        leave_blank: leave blank if you don't want to change
       new:
-        did_you_forget: Forgot Your Password?
         create_your_account: Create Your Account
+        did_you_forget: Forgot Your Password?
     sessions:
       new:
-        login_to_your_account: Login to your account
+        create_account: Create Account
         did_you_forget: Forgot your password?
-        remember_login: Remember Login
+        login_to_your_account: Login to your account
         registration_description: Students and staff joining to our university need to create an account by registering.
-        create_account: Create Account
+        remember_login: Remember Login
+  helpers:
+    submit:
+      user:
+        update: Change my Password
+  simple_form:
+    placeholders:
+      user:
+        <<: *user_attributes
   users:
-    index:
-      <<: *user_attributes
-      card_header: User Accounts
-      new_user_link: Create a New User
-      addresses: Addresses
-      identities: Identities
     account:
       <<: *user_attributes
     addresses:
-      update_from_mernis: Update from MERNIS
       create_from_mernis: Create from MERNIS
-    identities:
       update_from_mernis: Update from MERNIS
-      create_from_mernis: Create from MERNIS
+    create:
+      success: User successfully created.
+    destroy:
+      success: User successfully deleted!
+      warning: User can not be deleted.
+    edit:
+      form_title: Edit Account
     employees:
       active: Is Active?
-      title: Title
-      employees: Employee Records
       duties: Duties
+      employees: Employee Records
       positions: Positions
       <<: *employee_attributes
       <<: *duty_attributes
       <<: *position_attributes
-    show:
-      account: Account
-      identities: Identities
+      title: Title
+    identities:
+      create_from_mernis: Create from MERNIS
+      update_from_mernis: Update from MERNIS
+    index:
+      <<: *user_attributes
       addresses: Addresses
-      employees: Employees
-    search:
-      smart_search_placeholder: TC/YU number, e-mail address, first of last name
-    edit:
-      form_title: Edit Account
+      card_header: User Accounts
+      identities: Identities
+      new_user_link: Create a New User
     new:
       form_title: Create Account
-    update:
-      success: User successfully updated.
-    create:
-      success: User successfully created.
-    destroy:
-      success: User successfully deleted!
-      warning: User can not be deleted.
     save_address_from_mernis:
         wait: The address was recently created or updated. You can update the address once a week.
         will_update: We have received your request to create or update addresses, the address will be updated within a few seconds.
     save_identity_from_mernis:
         wait: The identity was recently created or updated. You can update the identity once a week.
         will_update: We have received your request for an identity creation or an update, and within a few seconds/minutes the identity will be updated.
+    search:
+      smart_search_placeholder: TC/YU number, e-mail address, first of last name
+    show:
+      account: Account
+      addresses: Addresses
+      employees: Employees
+      identities: Identities
+    update:
+      success: User successfully updated.
diff --git a/config/locales/models/user/tr.yml b/config/locales/models/user/tr.yml
index 0a50c77bb..6d469503b 100644
--- a/config/locales/models/user/tr.yml
+++ b/config/locales/models/user/tr.yml
@@ -1,114 +1,114 @@
 tr:
   activerecord:
     attributes:
-      user: &user_attributes
-        id_number: Kimlik Numarası
-        email: E-mail Adresi
-        password: Parola
-        password_confirmation: Parola (Tekrar)
-        current_password: Mevcut Şifre
-        preferred_language: Tercih Edilen Dil
-        password_changed_at: Son Şifre Değişikliği
-        articles_count: Makale Sayısı
-        projects_count: Proje Sayısı
-        profile: Profil Ayarları
-        preferences: Görünürlük Ayarları
+      duty: &duty_attributes
+        employee_id: Personel
+        end_date: Bitiş Tarihi
+        start_date: Başlangıç Tarihi
+        temporary: Geçici Görevlendirme
+        tenure: Kadrolu
+        tenure_status: Kadro Durumu
+        unit_id: Birim
       employee: &employee_attributes
+        id_number: Kimlik Numarası
         is_active: Aktif mi?
         title_id: Ünvan
         user_id: Kullanıcı
-        id_number: Kimlik Numarası
-      duty: &duty_attributes
-        tenure_status: Kadro Durumu
-        tenure: Kadrolu
-        temporary: Geçici Görevlendirme
-        start_date: Başlangıç Tarihi
-        end_date: Bitiş Tarihi
-        employee_id: Personel
-        unit_id: Birim
       position: &position_attributes
         administrative_function_id: Görev
-        start_date: Başlangıç Tarihi
         end_date: Bitiş Tarihi
-  simple_form:
-    placeholders:
-      user:
-        <<: *user_attributes
-  helpers:
-    submit:
-      user:
-        update: Şifremi Değiştir
+        start_date: Başlangıç Tarihi
+      user: &user_attributes
+        articles_count: Makale Sayısı
+        current_password: Mevcut Şifre
+        email: E-mail Adresi
+        id_number: Kimlik Numarası
+        password: Parola
+        password_changed_at: Son Şifre Değişikliği
+        password_confirmation: Parola (Tekrar)
+        preferences: Görünürlük Ayarları
+        preferred_language: Tercih Edilen Dil
+        profile: Profil Ayarları
+        projects_count: Proje Sayısı
   devise:
     common:
-      reset_password: Şifre Sıfırlama
       login: Giriş Yap
       register: Kayıt Ol
+      reset_password: Şifre Sıfırlama
     passwords:
       edit:
         reset_my_password: Şifremi Sıfırla
       new:
-        send_instructions: Şifre Sıfırlama Talimatlarını Gönder
         hint: Hesabınızda kullandığınız e-mail adresini girerek şifre sıfırlama talimatlarını alabilirsiniz.
+        send_instructions: Şifre Sıfırlama Talimatlarını Gönder
     registrations:
       edit:
         account_settings: Hesap Ayarları
-        leave_blank: değiştirmek istemiyorsanız boş bırakın
         current_password: e-mail adresinizi değiştirebilmek için mevcut şifrenizi girmeniz gerekmektedir
+        leave_blank: değiştirmek istemiyorsanız boş bırakın
       new:
-        did_you_forget: Şifreni mi Unuttun?
         create_your_account: Hesabınızı oluşturun
+        did_you_forget: Şifreni mi Unuttun?
     sessions:
       new:
-        login_to_your_account: Hesabınıza giriş yapın
+        create_account: Hesap Oluştur
         did_you_forget: Şifreni mi Unuttun?
-        remember_login: Girişi Hatırla
+        login_to_your_account: Hesabınıza giriş yapın
         registration_description: Üniversitemize katılan öğrenci ve personellerin, kayıt olarak kendi hesaplarını oluşturmaları gerekmektedir.
-        create_account: Hesap Oluştur
+        remember_login: Girişi Hatırla
+  helpers:
+    submit:
+      user:
+        update: Şifremi Değiştir
+  simple_form:
+    placeholders:
+      user:
+        <<: *user_attributes
   users:
-    index:
-      <<: *user_attributes
-      card_header: Kullanıcı Hesapları
-      new_user_link: Yeni Kullanıcı Oluştur
-      addresses: Adres Bilgileri
-      identities: Kimlik Bilgileri
     account:
       <<: *user_attributes
     addresses:
-      update_from_mernis: MERNİS'ten Güncelle
       create_from_mernis: MERNİS'ten Oluştur
-    identities:
       update_from_mernis: MERNİS'ten Güncelle
-      create_from_mernis: MERNİS'ten Oluştur
+    create:
+      success: Kullanıcı başarıyla oluşturuldu.
+    destroy:
+      success: Kullanıcı başarıyla silindi!
+      warning: Kullanıcı silinemedi!
+    edit:
+      form_title: Hesabı Düzenle
     employees:
       active: Aktif mi?
-      title: Ünvan
-      employees: Personel Kayıtları
       duties: Görevlendirmeler
+      employees: Personel Kayıtları
       positions: İdari Görevler
       <<: *employee_attributes
       <<: *duty_attributes
       <<: *position_attributes
-    show:
-      account: Hesap Bilgileri
-      identities: Kimlik Bilgileri
+      title: Ünvan
+    identities:
+      create_from_mernis: MERNİS'ten Oluştur
+      update_from_mernis: MERNİS'ten Güncelle
+    index:
+      <<: *user_attributes
       addresses: Adres Bilgileri
-      employees: Personel İşlemleri
-    search:
-      smart_search_placeholder: TC/YU numarası, e-mail adresi, ad veya soyad
-    edit:
-      form_title: Hesabı Düzenle
+      card_header: Kullanıcı Hesapları
+      identities: Kimlik Bilgileri
+      new_user_link: Yeni Kullanıcı Oluştur
     new:
       form_title: Hesap Oluştur
-    update:
-      success: Kullanıcı başarıyla güncellendi.
-    create:
-      success: Kullanıcı başarıyla oluşturuldu.
-    destroy:
-      success: Kullanıcı başarıyla silindi!
-      warning: Kullanıcı silinemedi!
     save_address_from_mernis:
         wait: Adres yakın bir zamanda oluşturulmuş veya güncellenmiş. Adresi haftada bir güncelleyebilirsiniz.
         will_update: Adres oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adres güncellenecek.
     save_identity_from_mernis:
         wait: Kimlik yakın bir zamanda oluşturulmuş veya güncellenmiş. Kimliği haftada bir güncelleyebilirsiniz.
         will_update: Kimlik oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde kimlik güncellenecek.
+    search:
+      smart_search_placeholder: TC/YU numarası, e-mail adresi, ad veya soyad
+    show:
+      account: Hesap Bilgileri
+      addresses: Adres Bilgileri
+      employees: Personel İşlemleri
+      identities: Kimlik Bilgileri
+    update:
+      success: Kullanıcı başarıyla güncellendi.
diff --git a/config/locales/models/yoksis_references/en.yml b/config/locales/models/yoksis_references/en.yml
index 219009384..4b0422a4b 100644
--- a/config/locales/models/yoksis_references/en.yml
+++ b/config/locales/models/yoksis_references/en.yml
@@ -2,63 +2,63 @@ en:
   activerecord:
     attributes:
       high_school_type: &high_school_type_attributes
-        name: High School Type
         code: Code
+        name: High School Type
       student_disability_type: &student_disability_type_attributes
-        name: Student Disability Type
         code: Code
+        name: Student Disability Type
       student_drop_out_type: &student_drop_out_type_attributes
-        name: Student Drop Out Type
         code: Code
+        name: Student Drop Out Type
       student_education_level: &student_education_level_attributes
-        name: Student Education Level
         code: Code
+        name: Student Education Level
       student_entrance_point_type: &student_entrance_point_type_attributes
-        name: Student Entrance Point Type
         code: Code
+        name: Student Entrance Point Type
       student_entrance_type: &student_entrance_type_attributes
-        name: Student Entrance Type
         code: Code
+        name: Student Entrance Type
       student_grade: &student_grade_attributes
-        name: Student Grade
         code: Code
+        name: Student Grade
       student_grading_system: &student_grading_system_attributes
-        name: Student Grading System
         code: Code
+        name: Student Grading System
       student_punishment_type: &student_punishment_type_attributes
-        name: Student Punishment Type
         code: Code
+        name: Student Punishment Type
       student_studentship_status: &student_studentship_status_attributes
-        name: Student Studentship Status
         code: Code
+        name: Student Studentship Status
       unit_instruction_language: &unit_instruction_language_attributes
-        name: Unit Instruction Language
         code: Code
+        name: Unit Instruction Language
       unit_instruction_type: &unit_instruction_type_attributes
-        name: Unit Instruction Type
         code: Code
+        name: Unit Instruction Type
       unit_status: &unit_status_attributes
-        name: Unit Statuse
         code: Code
+        name: Unit Statuse
       unit_type: &unit_type_attributes
-        name: Unit Type
         code: Code
         group: Group
+        name: Unit Type
       university_type: &university_type_attributes
-        name: University Type
         code: Code
+        name: University Type
     enums:
       unit_type:
         groups:
-          other: Other
-          university: University
-          faculty: Faculty
-          department: Department
-          program: Program
           committee: Committee
+          department: Department
+          faculty: Faculty
           institute: Institute
-          rectorship: Rectorship
           major: Major
+          other: Other
+          program: Program
+          rectorship: Rectorship
+          university: University
   helpers:
     submit:
       high_school_type:
@@ -108,242 +108,242 @@ en:
         update: Update University Type
   yoksis_references:
     high_school_types:
-      index:
-        <<: *high_school_type_attributes
-        new_high_school_type_link: New High School Type
-        card_header: High School Types
-      new:
-        form_title: Create a High School Type
-      edit:
-        form_title: Update the High School Type
       create:
         success: High school type successfully created.
       destroy:
         success: High school type successfully deleted.
         warning: High school type could not be deleted.
+      edit:
+        form_title: Update the High School Type
+      index:
+        <<: *high_school_type_attributes
+        card_header: High School Types
+        new_high_school_type_link: New High School Type
+      new:
+        form_title: Create a High School Type
       update:
         success: High school type successfully updated.
     student_disability_types:
-      index:
-        <<: *student_disability_type_attributes
-        new_student_disability_type_link: New Student Disability Type
-        card_header: Student Disability Types
-      new:
-        form_title: Create a Student Disability Type
-      edit:
-        form_title: Update the Student Disability Type
       create:
         success: Student disability type successfully created.
       destroy:
         success: Student disability type successfully deleted.
         warning: Student disability type could not be deleted.
+      edit:
+        form_title: Update the Student Disability Type
+      index:
+        <<: *student_disability_type_attributes
+        card_header: Student Disability Types
+        new_student_disability_type_link: New Student Disability Type
+      new:
+        form_title: Create a Student Disability Type
       update:
         success: Student disability type successfully updated.
     student_drop_out_types:
-      index:
-        <<: *student_drop_out_type_attributes
-        new_student_drop_out_type_link: New Student  Type
-        card_header: Student  Types
-      new:
-        form_title: Create a Student Drop Out Type
-      edit:
-        form_title: Update the Student Drop Out Type
       create:
         success: Student drop out type successfully created.
       destroy:
         success: Student drop out type successfully deleted.
         warning: Student drop out type could not be deleted.
+      edit:
+        form_title: Update the Student Drop Out Type
+      index:
+        <<: *student_drop_out_type_attributes
+        card_header: Student  Types
+        new_student_drop_out_type_link: New Student  Type
+      new:
+        form_title: Create a Student Drop Out Type
       update:
         success: Student drop out type successfully updated.
     student_education_levels:
-      index:
-        <<: *student_education_level_attributes
-        new_student_education_level_link: New Student Education Level Type
-        card_header: Student Education Level Types
-      new:
-        form_title: Create a Student Education Level Type
-      edit:
-        form_title: Update the Student Education Level Type
       create:
         success: Student education level type successfully created.
       destroy:
         success: Student education level type successfully deleted.
         warning: Student education level type could not be deleted.
+      edit:
+        form_title: Update the Student Education Level Type
+      index:
+        <<: *student_education_level_attributes
+        card_header: Student Education Level Types
+        new_student_education_level_link: New Student Education Level Type
+      new:
+        form_title: Create a Student Education Level Type
       update:
         success: Student education level type successfully updated.
     student_entrance_point_types:
-      index:
-        <<: *student_entrance_point_type_attributes
-        new_student_entrance_point_type_link: New Student Entrance Point Type
-        card_header: Student Entrance Point Types
-      new:
-        form_title: Create a Student Entrance Point Type
-      edit:
-        form_title: Update the Student Entrance Point Type
       create:
         success: Student entrance point type successfully created.
       destroy:
         success: Student entrance point type successfully deleted.
         warning: Student entrance point type could not be deleted.
+      edit:
+        form_title: Update the Student Entrance Point Type
+      index:
+        <<: *student_entrance_point_type_attributes
+        card_header: Student Entrance Point Types
+        new_student_entrance_point_type_link: New Student Entrance Point Type
+      new:
+        form_title: Create a Student Entrance Point Type
       update:
         success: Student entrance point type successfully updated.
     student_entrance_types:
-      index:
-        <<: *student_entrance_type_attributes
-        new_student_entrance_type_link: New Student Entrance Type
-        card_header: Student Entrance Types
-      new:
-        form_title: Create a Student Entrance Type
-      edit:
-        form_title: Update the Student Entrance Type
       create:
         success: Student entrance type successfully created.
       destroy:
         success: Student entrance type successfully deleted.
         warning: Student entrance type could not be deleted.
+      edit:
+        form_title: Update the Student Entrance Type
+      index:
+        <<: *student_entrance_type_attributes
+        card_header: Student Entrance Types
+        new_student_entrance_type_link: New Student Entrance Type
+      new:
+        form_title: Create a Student Entrance Type
       update:
         success: Student entrance type successfully updated.
     student_grades:
-      index:
-        <<: *student_grade_attributes
-        new_student_grade_link: New Student Grade
-        card_header: Student Grades
-      new:
-        form_title: Create a Student Grade
-      edit:
-        form_title: Update the Student Grade
       create:
         success: Student grade successfully created.
       destroy:
         success: Student grade successfully deleted.
         warning: Student grade could not be deleted.
+      edit:
+        form_title: Update the Student Grade
+      index:
+        <<: *student_grade_attributes
+        card_header: Student Grades
+        new_student_grade_link: New Student Grade
+      new:
+        form_title: Create a Student Grade
       update:
         success: Student grade successfully updated.
     student_grading_systems:
-      index:
-        <<: *student_grading_system_attributes
-        new_student_grading_system_link: New Student Grading System Type
-        card_header: Student Grading System Types
-      new:
-        form_title: Create a Student Grading System Type
-      edit:
-        form_title: Update the Student Grading System Type
       create:
         success: Student grading system successfully created.
       destroy:
         success: Student grading system successfully deleted.
         warning: Student grading system could not be deleted.
+      edit:
+        form_title: Update the Student Grading System Type
+      index:
+        <<: *student_grading_system_attributes
+        card_header: Student Grading System Types
+        new_student_grading_system_link: New Student Grading System Type
+      new:
+        form_title: Create a Student Grading System Type
       update:
         success: Student grading system successfully updated.
     student_punishment_types:
-      index:
-        <<: *student_punishment_type_attributes
-        new_student_punishment_type_link: New Student Punishment Type
-        card_header: Student Punishment Types
-      new:
-        form_title: Create a Student Punishment Type
-      edit:
-        form_title: Update the Student Punishment Type
       create:
         success: Student punishment type successfully created.
       destroy:
         success: Student punishment type successfully deleted.
         warning: Student punishment type could not be deleted.
+      edit:
+        form_title: Update the Student Punishment Type
+      index:
+        <<: *student_punishment_type_attributes
+        card_header: Student Punishment Types
+        new_student_punishment_type_link: New Student Punishment Type
+      new:
+        form_title: Create a Student Punishment Type
       update:
         success: Student punishment type successfully updated.
     student_studentship_statuses:
-      index:
-        <<: *student_studentship_status_attributes
-        new_student_studentship_status_link: New Student Studentship Status
-        card_header: Student Studentship Statuses
-      new:
-        form_title: Create a Student Studentship Status
-      edit:
-        form_title: Update the Student Studentship Status
       create:
         success: Student studentship status successfully created.
       destroy:
         success: Student studentship status successfully deleted.
         warning: Student studentship status could not be deleted.
+      edit:
+        form_title: Update the Student Studentship Status
+      index:
+        <<: *student_studentship_status_attributes
+        card_header: Student Studentship Statuses
+        new_student_studentship_status_link: New Student Studentship Status
+      new:
+        form_title: Create a Student Studentship Status
       update:
         success: Student studentship status successfully updated.
     unit_instruction_languages:
-      index:
-        <<: *unit_instruction_language_attributes
-        new_unit_instruction_language_link: New Unit Instruction Language
-        card_header: Unit Instruction Languages
-      new:
-        form_title: Create a Unit Instruction Language
-      edit:
-        form_title: Update the Unit  Instruction Language
       create:
         success: Unit instruction language successfully created.
       destroy:
         success: Unit instruction language successfully deleted.
         warning: Unit instruction language could not be deleted.
+      edit:
+        form_title: Update the Unit  Instruction Language
+      index:
+        <<: *unit_instruction_language_attributes
+        card_header: Unit Instruction Languages
+        new_unit_instruction_language_link: New Unit Instruction Language
+      new:
+        form_title: Create a Unit Instruction Language
       update:
         success: Unit instruction language successfully updated.
     unit_instruction_types:
-      index:
-        <<: *unit_instruction_type_attributes
-        new_unit_instruction_type_link: New Unit Instruction Type
-        card_header: Unit Instruction Types
-      new:
-        form_title: Create a Unit Instruction Type
-      edit:
-        form_title: Update the Unit Instruction Type
       create:
         success: Unit instruction type successfully created.
       destroy:
         success: Unit instruction type successfully deleted.
         warning: Unit instruction type could not be deleted.
+      edit:
+        form_title: Update the Unit Instruction Type
+      index:
+        <<: *unit_instruction_type_attributes
+        card_header: Unit Instruction Types
+        new_unit_instruction_type_link: New Unit Instruction Type
+      new:
+        form_title: Create a Unit Instruction Type
       update:
         success: Unit instruction type successfully updated.
     unit_statuses:
-      index:
-        <<: *unit_status_attributes
-        new_unit_status_link: New Unit Status
-        card_header: Unit Statuses
-      new:
-        form_title: Create a Unit Status
-      edit:
-        form_title: Update the Unit Status
       create:
         success: Unit status successfully created.
       destroy:
         success: Unit status successfully deleted.
         warning: Unit status could not be deleted.
+      edit:
+        form_title: Update the Unit Status
+      index:
+        <<: *unit_status_attributes
+        card_header: Unit Statuses
+        new_unit_status_link: New Unit Status
+      new:
+        form_title: Create a Unit Status
       update:
         success: Unit status successfully updated.
     unit_types:
-      index:
-        <<: *unit_type_attributes
-        new_unit_type_link: New Unit Type
-        card_header: Unit Types
-      new:
-        form_title: Create a Unit Type
-      edit:
-        form_title: Update the Unit Type
       create:
         success: Unit type successfully created.
       destroy:
         success: Unit type successfully deleted.
         warning: Unit type could not be deleted.
+      edit:
+        form_title: Update the Unit Type
+      index:
+        <<: *unit_type_attributes
+        card_header: Unit Types
+        new_unit_type_link: New Unit Type
+      new:
+        form_title: Create a Unit Type
       update:
         success: Unit type successfully updated.
     university_types:
-      index:
-        <<: *university_type_attributes
-        new_university_type_link: New University Type
-        card_header: University Types
-      new:
-        form_title: Create a University Type
-      edit:
-        form_title: Update the University Type
       create:
         success: University type successfully created.
       destroy:
         success: University type successfully deleted.
         warning: University type could not be deleted.
+      edit:
+        form_title: Update the University Type
+      index:
+        <<: *university_type_attributes
+        card_header: University Types
+        new_university_type_link: New University Type
+      new:
+        form_title: Create a University Type
       update:
         success: University type successfully updated.
diff --git a/config/locales/models/yoksis_references/tr.yml b/config/locales/models/yoksis_references/tr.yml
index 3f54c481e..ca288c5aa 100644
--- a/config/locales/models/yoksis_references/tr.yml
+++ b/config/locales/models/yoksis_references/tr.yml
@@ -2,63 +2,63 @@ tr:
   activerecord:
     attributes:
       high_school_type: &high_school_type_attributes
-        name: Lise Türü
         code: Kodu
+        name: Lise Türü
       student_disability_type: &student_disability_type_attributes
-        name: Öğrenci Engel Türü
         code: Kodu
+        name: Öğrenci Engel Türü
       student_drop_out_type: &student_drop_out_type_attributes
-        name: Öğrenci Ayrılma Nedeni
         code: Kodu
+        name: Öğrenci Ayrılma Nedeni
       student_education_level: &student_education_level_attributes
-        name: Öğrenci Doykm
         code: Kodu
+        name: Öğrenci Doykm
       student_entrance_point_type: &student_entrance_point_type_attributes
-        name: Öğrenci Giriş Puan Türü
         code: Kodu
+        name: Öğrenci Giriş Puan Türü
       student_entrance_type: &student_entrance_type_attributes
-        name: Öğrenci Giriş Türü
         code: Kodu
+        name: Öğrenci Giriş Türü
       student_grade: &student_grade_attributes
-        name: Öğrenci Sınıfı
         code: Kodu
+        name: Öğrenci Sınıfı
       student_grading_system: &student_grading_system_attributes
-        name: Öğrenci Diploma Not Sistemi
         code: Kodu
+        name: Öğrenci Diploma Not Sistemi
       student_punishment_type: &student_punishment_type_attributes
-        name: Öğrenci Ceza Türü
         code: Kodu
+        name: Öğrenci Ceza Türü
       student_studentship_status: &student_studentship_status_attributes
-        name: Öğrencilik Hakkı
         code: Kodu
+        name: Öğrencilik Hakkı
       unit_instruction_language: &unit_instruction_language_attributes
-        name: Öğrenim Dili
         code: Kodu
+        name: Öğrenim Dili
       unit_instruction_type: &unit_instruction_type_attributes
-        name: Öğrenim Türü
         code: Kodu
+        name: Öğrenim Türü
       unit_status: &unit_status_attributes
-        name: Aktiflik Durumu
         code: Kodu
+        name: Aktiflik Durumu
       unit_type: &unit_type_attributes
-        name: Birim Türü
         code: Kodu
         group: Grup
+        name: Birim Türü
       university_type: &university_type_attributes
-        name: Üniversite Türü
         code: Kodu
+        name: Üniversite Türü
     enums:
       unit_type:
         groups:
-          other: Diğer
-          university: Üniversite
-          faculty: Fakülte
-          department: Bölüm
-          program: Program
           committee: Kurul
+          department: Bölüm
+          faculty: Fakülte
           institute: Enstitü
-          rectorship: Rektörlük
           major: Anabilim Dalı
+          other: Diğer
+          program: Program
+          rectorship: Rektörlük
+          university: Üniversite
   helpers:
     submit:
       high_school_type:
@@ -108,242 +108,242 @@ tr:
         update: Üniversite Türünü Güncelle
   yoksis_references:
     high_school_types:
-      index:
-        <<: *high_school_type_attributes
-        new_high_school_type_link: Yeni Lise Türü
-        card_header: Lise Türleri
-      new:
-        form_title: Lise Türü Oluştur
-      edit:
-        form_title: Lise Türünü Güncelle
       create:
         success: Lise türü başarıyla oluşturuldu.
       destroy:
         success: Lise türü başarıyla silindi.
         warning: Lise türü silinemedi!
+      edit:
+        form_title: Lise Türünü Güncelle
+      index:
+        <<: *high_school_type_attributes
+        card_header: Lise Türleri
+        new_high_school_type_link: Yeni Lise Türü
+      new:
+        form_title: Lise Türü Oluştur
       update:
         success: Lise türü başarıyla güncellendi.
     student_disability_types:
-      index:
-        <<: *student_disability_type_attributes
-        new_student_disability_type_link: Yeni Öğrenci Engel Türü
-        card_header: Öğrenci Engel Türleri
-      new:
-        form_title: Öğrenci Engel Türü Oluştur
-      edit:
-        form_title: Öğrenci Engel Türünü Güncelle
       create:
         success: Öğrenci engel türü başarıyla oluşturuldu.
       destroy:
         success: Öğrenci engel türü başarıyla silindi.
         warning: Öğrenci engel türü silinemedi!
+      edit:
+        form_title: Öğrenci Engel Türünü Güncelle
+      index:
+        <<: *student_disability_type_attributes
+        card_header: Öğrenci Engel Türleri
+        new_student_disability_type_link: Yeni Öğrenci Engel Türü
+      new:
+        form_title: Öğrenci Engel Türü Oluştur
       update:
         success: Öğrenci engel türü başarıyla güncellendi.
     student_drop_out_types:
-      index:
-        <<: *student_drop_out_type_attributes
-        new_student_drop_out_type_link: Yeni Öğrenci Ayrılma Nedeni
-        card_header: Öğrenci Ayrılma Nedenleri
-      new:
-        form_title: Öğrenci Ayrılma Nedeni Oluştur
-      edit:
-        form_title: Öğrenci Ayrılma Nedenini Güncelle
       create:
         success: Öğrenci ayrılma nedeni başarıyla oluşturuldu.
       destroy:
         success: Öğrenci ayrılma nedeni başarıyla silindi.
         warning: Öğrenci ayrılma nedeni silinemedi!
+      edit:
+        form_title: Öğrenci Ayrılma Nedenini Güncelle
+      index:
+        <<: *student_drop_out_type_attributes
+        card_header: Öğrenci Ayrılma Nedenleri
+        new_student_drop_out_type_link: Yeni Öğrenci Ayrılma Nedeni
+      new:
+        form_title: Öğrenci Ayrılma Nedeni Oluştur
       update:
         success: Öğrenci ayrılma nedeni başarıyla güncellendi.
     student_education_levels:
-      index:
-        <<: *student_education_level_attributes
-        new_student_education_level_link: Yeni Öğrenci Doykm
-        card_header: Öğrenci Doykm
-      new:
-        form_title: Öğrenci Doykm Oluştur
-      edit:
-        form_title: Öğrenci Doykm Güncelle
       create:
         success: Öğrenci doykm başarıyla oluşturuldu.
       destroy:
         success: Öğrenci doykm başarıyla silindi.
         warning: Öğrenci doykm silinemedi!
+      edit:
+        form_title: Öğrenci Doykm Güncelle
+      index:
+        <<: *student_education_level_attributes
+        card_header: Öğrenci Doykm
+        new_student_education_level_link: Yeni Öğrenci Doykm
+      new:
+        form_title: Öğrenci Doykm Oluştur
       update:
         success: Öğrenci doykm başarıyla güncellendi.
     student_entrance_point_types:
-      index:
-        <<: *student_entrance_point_type_attributes
-        new_student_entrance_point_type_link: Yeni Öğrenci Giriş Türü
-        card_header: Öğrenci Giriş Türleri
-      new:
-        form_title: Öğrenci Giriş Puan Türü Oluştur
-      edit:
-        form_title: Öğrenci Giriş Puan Türünü Güncelle
       create:
         success: Öğrenci giriş puan türü başarıyla oluşturuldu.
       destroy:
         success: Öğrenci giriş puan türü başarıyla silindi.
         warning: Öğrenci giriş puan türü silinemedi!
+      edit:
+        form_title: Öğrenci Giriş Puan Türünü Güncelle
+      index:
+        <<: *student_entrance_point_type_attributes
+        card_header: Öğrenci Giriş Türleri
+        new_student_entrance_point_type_link: Yeni Öğrenci Giriş Türü
+      new:
+        form_title: Öğrenci Giriş Puan Türü Oluştur
       update:
         success: Öğrenci giriş puan türü başarıyla güncellendi.
     student_entrance_types:
-      index:
-        <<: *student_entrance_type_attributes
-        new_student_entrance_type_link: Yeni Öğrenci Giriş Türü
-        card_header: Öğrenci  Türleri
-      new:
-        form_title: Öğrenci Giriş Türü Oluştur
-      edit:
-        form_title: Öğrenci Giriş Türünü Güncelle
       create:
         success: Öğrenci giriş türü başarıyla oluşturuldu.
       destroy:
         success: Öğrenci giriş türü başarıyla silindi.
         warning: Öğrenci giriş türü silinemedi!
+      edit:
+        form_title: Öğrenci Giriş Türünü Güncelle
+      index:
+        <<: *student_entrance_type_attributes
+        card_header: Öğrenci  Türleri
+        new_student_entrance_type_link: Yeni Öğrenci Giriş Türü
+      new:
+        form_title: Öğrenci Giriş Türü Oluştur
       update:
         success: Öğrenci giriş türü başarıyla güncellendi.
     student_grades:
-      index:
-        <<: *student_grade_attributes
-        new_student_grade_link: Yeni Öğrenci Sınıfı
-        card_header: Öğrenci Sınıfı
-      new:
-        form_title: Öğrenci Sınıfı Oluştur
-      edit:
-        form_title: Öğrenci Sınıfını Güncelle
       create:
         success: Öğrenci sınıfı başarıyla oluşturuldu.
       destroy:
         success: Öğrenci sınıfı başarıyla silindi.
         warning: Öğrenci sınıfı silinemedi!
+      edit:
+        form_title: Öğrenci Sınıfını Güncelle
+      index:
+        <<: *student_grade_attributes
+        card_header: Öğrenci Sınıfı
+        new_student_grade_link: Yeni Öğrenci Sınıfı
+      new:
+        form_title: Öğrenci Sınıfı Oluştur
       update:
         success: Öğrenci sınıfı başarıyla güncellendi.
     student_grading_systems:
-      index:
-        <<: *student_grading_system_attributes
-        new_student_grading_system_link: Yeni Öğrenci Diploma Not Sistemi
-        card_header: Öğrenci Diploma Not Sistemleri
-      new:
-        form_title: Öğrenci Diploma Not Sistemi Oluştur
-      edit:
-        form_title: Öğrenci Diploma Not Sistemini Güncelle
       create:
         success: Öğrenci diploma not sistemi başarıyla oluşturuldu.
       destroy:
         success: Öğrenci diploma not sistemi başarıyla silindi.
         warning: Öğrenci diploma not sistemi silinemedi!
+      edit:
+        form_title: Öğrenci Diploma Not Sistemini Güncelle
+      index:
+        <<: *student_grading_system_attributes
+        card_header: Öğrenci Diploma Not Sistemleri
+        new_student_grading_system_link: Yeni Öğrenci Diploma Not Sistemi
+      new:
+        form_title: Öğrenci Diploma Not Sistemi Oluştur
       update:
         success: Öğrenci diploma not sistemi başarıyla güncellendi.
     student_punishment_types:
-      index:
-        <<: *student_punishment_type_attributes
-        new_student_punishment_type_link: Yeni Öğrenci Ceza Türü
-        card_header: Öğrenci Ceza Türleri
-      new:
-        form_title: Öğrenci Ceza Türü Oluştur
-      edit:
-        form_title: Öğrenci Ceza Türünü Güncelle
       create:
         success: Öğrenci ceza türü başarıyla oluşturuldu.
       destroy:
         success: Öğrenci ceza türü başarıyla silindi.
         warning: Öğrenci ceza türü silinemedi!
+      edit:
+        form_title: Öğrenci Ceza Türünü Güncelle
+      index:
+        <<: *student_punishment_type_attributes
+        card_header: Öğrenci Ceza Türleri
+        new_student_punishment_type_link: Yeni Öğrenci Ceza Türü
+      new:
+        form_title: Öğrenci Ceza Türü Oluştur
       update:
         success: Öğrenci ceza türü başarıyla güncellendi.
     student_studentship_statuses:
-      index:
-        <<: *student_studentship_status_attributes
-        new_student_studentship_status_link: Yeni Öğrencilik Hakkı
-        card_header: Öğrencilik Hakları
-      new:
-        form_title: Öğrencilik Hakkı Oluştur
-      edit:
-        form_title: Öğrencilik Hakkı Güncelle
       create:
         success: Öğrencilik hakkı başarıyla oluşturuldu.
       destroy:
         success: Öğrencilik hakkı başarıyla silindi.
         warning: Öğrencilik hakkı silinemedi!
+      edit:
+        form_title: Öğrencilik Hakkı Güncelle
+      index:
+        <<: *student_studentship_status_attributes
+        card_header: Öğrencilik Hakları
+        new_student_studentship_status_link: Yeni Öğrencilik Hakkı
+      new:
+        form_title: Öğrencilik Hakkı Oluştur
       update:
         success: Öğrencilik hakkı başarıyla güncellendi.
     unit_instruction_languages:
-      index:
-        <<: *unit_instruction_language_attributes
-        new_unit_instruction_language_link: Yeni Öğrenim Dili
-        card_header: Öğrenim Dilleri
-      new:
-        form_title: Öğrenim Dili Oluştur
-      edit:
-        form_title: Öğrenim Dilini Güncelle
       create:
         success: Öğrenim Dili başarıyla oluşturuldu.
       destroy:
         success: Öğrenim Dili başarıyla silindi.
         warning: Öğrenim Dili silinemedi!
+      edit:
+        form_title: Öğrenim Dilini Güncelle
+      index:
+        <<: *unit_instruction_language_attributes
+        card_header: Öğrenim Dilleri
+        new_unit_instruction_language_link: Yeni Öğrenim Dili
+      new:
+        form_title: Öğrenim Dili Oluştur
       update:
         success: Öğrenim Dili başarıyla güncellendi.
     unit_instruction_types:
-      index:
-        <<: *unit_instruction_type_attributes
-        new_unit_instruction_type_link: Yeni Öğrenim Türü
-        card_header: Öğrenim Türleri
-      new:
-        form_title: Öğrenim Türü Oluştur
-      edit:
-        form_title: Öğrenim Türünü Güncelle
       create:
         success: Öğrenim türü başarıyla oluşturuldu.
       destroy:
         success: Öğrenim türü başarıyla silindi.
         warning: Öğrenim türü silinemedi!
+      edit:
+        form_title: Öğrenim Türünü Güncelle
+      index:
+        <<: *unit_instruction_type_attributes
+        card_header: Öğrenim Türleri
+        new_unit_instruction_type_link: Yeni Öğrenim Türü
+      new:
+        form_title: Öğrenim Türü Oluştur
       update:
         success: Öğrenim türü başarıyla güncellendi.
     unit_statuses:
-      index:
-        <<: *unit_status_attributes
-        new_unit_status_link: Yeni Aktiflik Durumu
-        card_header: Aktiflik Durumları
-      new:
-        form_title: Aktiflik durumu Oluştur
-      edit:
-        form_title: Aktiflik durumunu Güncelle
       create:
         success: Aktiflik durumu başarıyla oluşturuldu.
       destroy:
         success: Aktiflik durumu başarıyla silindi.
         warning: Aktiflik durumu silinemedi!
+      edit:
+        form_title: Aktiflik durumunu Güncelle
+      index:
+        <<: *unit_status_attributes
+        card_header: Aktiflik Durumları
+        new_unit_status_link: Yeni Aktiflik Durumu
+      new:
+        form_title: Aktiflik durumu Oluştur
       update:
         success: Aktiflik durumu başarıyla güncellendi.
     unit_types:
-      index:
-        <<: *unit_type_attributes
-        new_unit_type_link: Yeni Birim Türü
-        card_header: Birim Türleri
-      new:
-        form_title: Birim Türü Oluştur
-      edit:
-        form_title: Birim Türünü Güncelle
       create:
         success: Birim türü başarıyla oluşturuldu.
       destroy:
         success: Birim türü başarıyla silindi.
         warning: Birim türü silinemedi!
+      edit:
+        form_title: Birim Türünü Güncelle
+      index:
+        <<: *unit_type_attributes
+        card_header: Birim Türleri
+        new_unit_type_link: Yeni Birim Türü
+      new:
+        form_title: Birim Türü Oluştur
       update:
         success: Birim türü başarıyla güncellendi.
     university_types:
-      index:
-        <<: *university_type_attributes
-        new_university_type_link: Yeni Üniversite Türü
-        card_header: Üniversite Türleri
-      new:
-        form_title: Üniversite Türü Oluştur
-      edit:
-        form_title: Üniversite Türünü Güncelle
       create:
         success: Üniversite türü başarıyla oluşturuldu.
       destroy:
         success: Üniversite türü başarıyla silindi.
         warning: Üniversite türü silinemedi!
+      edit:
+        form_title: Üniversite Türünü Güncelle
+      index:
+        <<: *university_type_attributes
+        card_header: Üniversite Türleri
+        new_university_type_link: Yeni Üniversite Türü
+      new:
+        form_title: Üniversite Türü Oluştur
       update:
         success: Üniversite türü başarıyla güncellendi.
diff --git a/config/locales/validators/en.yml b/config/locales/validators/en.yml
index 4de41e1b9..51f98da96 100644
--- a/config/locales/validators/en.yml
+++ b/config/locales/validators/en.yml
@@ -3,18 +3,18 @@ en:
     address:
       max_formal: You can have up to %{limit} formal addresses maximum.
       max_informal: You can add up to %{limit} addresses maximum.
-    identity:
-      max_formal: You can have up to %{limit} identities related with your user account.
-      max_informal: You can create up to %{limit} informal identities.
-    position:
-      multiple_active_repetitive:
-      invalid_end_date: Start date is selected as a date after the end date
     duty:
       active_and_tenure: This user already has an active and tenure duty. Edit the existing duty or make it passive in order to create a new one.
-      multiple_active: This user has already active duty at the selected unit
       invalid_end_date: Start date is selected as a date after the end date
+      multiple_active: This user has already active duty at the selected unit
     employee:
       active: This user already has an active employee. Edit the existing employee or make it passive in order to create a new one.
+    identity:
+      max_formal: You can have up to %{limit} identities related with your user account.
+      max_informal: You can create up to %{limit} informal identities.
     image:
       not_permitted: '%{mime_type} is not an allowed file type. You can upload files in %{extension_whitelist} formats.'
       size_not_satisfied: File size is not between the permitted range. You can upload files from minimum %{minimum} KBs to maximum %{maximum} MBs.
+    position:
+      invalid_end_date: Start date is selected as a date after the end date
+      multiple_active_repetitive:
diff --git a/config/locales/validators/tr.yml b/config/locales/validators/tr.yml
index 32afb2c8b..c65b3e1bb 100644
--- a/config/locales/validators/tr.yml
+++ b/config/locales/validators/tr.yml
@@ -3,18 +3,18 @@ tr:
     address:
       max_formal: En fazla %{limit} tane ikamet adresi ekleyebilirsiniz.
       max_informal: En fazla %{limit} tane adres ekleyebilirsiniz.
-    identity:
-      max_formal: Kullanıcı hesabınıza ilişkin en fazla %{limit} tane kimliğiniz olabilir.
-      max_informal: En fazla %{limit} tane kimlik oluşturabilirsiniz.
-    position:
-      multiple_active_repetitive: Bu personelin seçilen birimde aktif olarak aynı görevi var!
-      invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş.
     duty:
       active_and_tenure: Bu personelin zaten aktif ve kadrolu bir görevi var! Yeni kayıt girmek yerine aktif kaydı düzenleyin veya öncelikle aktif kaydı pasifleştirin.
-      multiple_active: Personelin seçilen birimde zaten aktif görevlendirmesi var!
       invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş.
+      multiple_active: Personelin seçilen birimde zaten aktif görevlendirmesi var!
     employee:
       active: Bu personelin zaten aktif bir personel kaydı var! Yeni kayıt girmek yerine aktif kaydı düzenleyin veya öncelikle aktif kaydı pasifleştirin.
+    identity:
+      max_formal: Kullanıcı hesabınıza ilişkin en fazla %{limit} tane kimliğiniz olabilir.
+      max_informal: En fazla %{limit} tane kimlik oluşturabilirsiniz.
     image:
       not_permitted: '%{mime_type} izin verilen bir dosya türü değil. %{extension_whitelist} türlerinde bir dosya yükleyebilirsiniz'
       size_not_satisfied: Dosya boyutu izin verilen aralıkta değil. Yükleyeceğiniz dosya en az %{minimum} KB, en çok %{maximum} MB boyutunda olabilir.
+    position:
+      invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş.
+      multiple_active_repetitive: Bu personelin seçilen birimde aktif olarak aynı görevi var!

From aa50cab71ffc8315657f2992b816adbdd6859487 Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 16:44:27 +0300
Subject: [PATCH 22/33] Fix missing redirect_with methods

---
 app/controllers/account/duties_controller.rb         | 6 +++++-
 app/controllers/account/employees_controller.rb      | 6 +++++-
 app/controllers/account/positions_controller.rb      | 6 +++++-
 app/controllers/documents_controller.rb              | 6 +++++-
 app/controllers/references/cities_controller.rb      | 6 +++++-
 app/controllers/references/countries_controller.rb   | 6 +++++-
 app/controllers/references/districts_controller.rb   | 6 +++++-
 app/controllers/references/languages_controller.rb   | 6 +++++-
 app/controllers/registration_documents_controller.rb | 6 +++++-
 app/controllers/units_controller.rb                  | 6 +++++-
 10 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/app/controllers/account/duties_controller.rb b/app/controllers/account/duties_controller.rb
index 296d20ff9..beaa5d1e3 100644
--- a/app/controllers/account/duties_controller.rb
+++ b/app/controllers/account/duties_controller.rb
@@ -21,7 +21,11 @@ def update
     end
 
     def destroy
-      @duty.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning')
+      if @duty.destroy
+        redirect_to(@user, notice: t('.success'))
+      else
+        redirect_to(users_path(@user), alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/account/employees_controller.rb b/app/controllers/account/employees_controller.rb
index 266fded8f..f08988924 100644
--- a/app/controllers/account/employees_controller.rb
+++ b/app/controllers/account/employees_controller.rb
@@ -21,7 +21,11 @@ def update
     end
 
     def destroy
-      @employee.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning')
+      if @employee.destroy
+        redirect_to(@user, notice: t('.success'))
+      else
+        redirect_to(users_path(@user), alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/account/positions_controller.rb b/app/controllers/account/positions_controller.rb
index 53ef2f030..bd0d1bcc2 100644
--- a/app/controllers/account/positions_controller.rb
+++ b/app/controllers/account/positions_controller.rb
@@ -22,7 +22,11 @@ def update
     end
 
     def destroy
-      @position.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning')
+      if @position.destroy
+        redirect_to(@user, notice: t('.success'))
+      else
+        redirect_to(users_path(@user), alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 43312eb85..b99746b44 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -27,7 +27,11 @@ def update
   end
 
   def destroy
-    @document.destroy ? redirect_to(documents_path, notice: t('.success')) : redirect_with('warning')
+    if @document.destroy
+      redirect_to(documents_path, notice: t('.success'))
+    else
+      redirect_to(documents_path, alert: t('.warning'))
+    end
   end
 
   private
diff --git a/app/controllers/references/cities_controller.rb b/app/controllers/references/cities_controller.rb
index 599fe1991..27e688ef2 100644
--- a/app/controllers/references/cities_controller.rb
+++ b/app/controllers/references/cities_controller.rb
@@ -27,7 +27,11 @@ def update
     end
 
     def destroy
-      @city.destroy ? redirect_to(@country, notice: t('.success')) : redirect_with('warning')
+      if @city.destroy
+        redirect_to(@country, notice: t('.success'))
+      else
+        redirect_to(@country, alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/references/countries_controller.rb b/app/controllers/references/countries_controller.rb
index 8c37507e0..e62c2a319 100644
--- a/app/controllers/references/countries_controller.rb
+++ b/app/controllers/references/countries_controller.rb
@@ -30,7 +30,11 @@ def update
     end
 
     def destroy
-      @country.destroy ? redirect_to(countries_path, notice: t('.success')) : redirect_with('warning')
+      if @country.destroy
+        redirect_to(countries_path, notice: t('.success'))
+      else
+        redirect_to(countries_path, alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/references/districts_controller.rb b/app/controllers/references/districts_controller.rb
index e64a5757a..48076a4ea 100644
--- a/app/controllers/references/districts_controller.rb
+++ b/app/controllers/references/districts_controller.rb
@@ -21,7 +21,11 @@ def update
     end
 
     def destroy
-      @district.destroy ? redirect_to([@city.country, @city], notice: t('.success')) : redirect_with('warning')
+      if @district.destroy
+        redirect_to([@city.country, @city], notice: t('.success'))
+      else
+        redirect_to([@city.country, @city], alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/references/languages_controller.rb b/app/controllers/references/languages_controller.rb
index 9a278c0e7..6dc30ed19 100644
--- a/app/controllers/references/languages_controller.rb
+++ b/app/controllers/references/languages_controller.rb
@@ -26,7 +26,11 @@ def update
     end
 
     def destroy
-      @language.destroy ? redirect_to(languages_path, notice: t('.success')) : redirect_with('warning')
+      if @language.destroy
+        redirect_to(languages_path, notice: t('.success'))
+      else
+        redirect_to(languages_path, alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/registration_documents_controller.rb b/app/controllers/registration_documents_controller.rb
index 23fc3334c..d26b33f26 100644
--- a/app/controllers/registration_documents_controller.rb
+++ b/app/controllers/registration_documents_controller.rb
@@ -26,7 +26,11 @@ def update
   end
 
   def destroy
-    @registration_document.destroy ? redirect_to(@unit, notice: t('.success')) : redirect_with('warning')
+    if @registration_document.destroy
+      redirect_to(@unit, notice: t('.success'))
+    else
+      redirect_to(@unit, alert: t('.warning'))
+    end
   end
 
   private
diff --git a/app/controllers/units_controller.rb b/app/controllers/units_controller.rb
index 983ac0d02..ce8c3ae2e 100644
--- a/app/controllers/units_controller.rb
+++ b/app/controllers/units_controller.rb
@@ -30,7 +30,11 @@ def update
   end
 
   def destroy
-    @unit.destroy ? redirect_to(units_path, notice: t('.success')) : redirect_with('warning')
+    if @unit.destroy
+      redirect_to(units_path, notice: t('.success'))
+    else
+      redirect_to(units_path, alert: t('.warning'))
+    end
   end
 
   def courses

From b95d6394a8eed5ab409bf39b0e99b39147d9af65 Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 17:26:15 +0300
Subject: [PATCH 23/33] Order by name in controller and views

---
 app/controllers/concerns/reference_resource.rb            | 2 +-
 .../course_management/course_group_types_controller.rb    | 8 ++++++--
 app/controllers/documents_controller.rb                   | 2 +-
 app/views/account/employees/_form.html.erb                | 2 +-
 .../course_management/course_unit_groups/_form.html.erb   | 2 +-
 app/views/course_management/courses/_form.html.erb        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/controllers/concerns/reference_resource.rb b/app/controllers/concerns/reference_resource.rb
index e74958867..96e8adf67 100644
--- a/app/controllers/concerns/reference_resource.rb
+++ b/app/controllers/concerns/reference_resource.rb
@@ -11,7 +11,7 @@ module ReferenceResource
     before_action :set_resource, only: %i[edit update destroy]
 
     def index
-      value = pagy_by_search(@model_name.order(:code))
+      value = pagy_by_search(@model_name.order(:name))
       instance_variable_set("@#{controller_name}", value)
     end
 
diff --git a/app/controllers/course_management/course_group_types_controller.rb b/app/controllers/course_management/course_group_types_controller.rb
index a18d67583..ca8176819 100644
--- a/app/controllers/course_management/course_group_types_controller.rb
+++ b/app/controllers/course_management/course_group_types_controller.rb
@@ -7,7 +7,7 @@ class CourseGroupTypesController < ApplicationController
     before_action :set_course_group_type, only: %i[edit update destroy]
 
     def index
-      @course_group_types = pagy_by_search(CourseGroupType.all)
+      @course_group_types = pagy_by_search(CourseGroupType.order(:name))
     end
 
     def new
@@ -26,7 +26,11 @@ def update
     end
 
     def destroy
-      @course_group_type.destroy ? redirect_with('success') : redirect_with('warning')
+      if @course_group_type.destroy
+        redirect_with('success')
+      else
+        redirect_to(course_group_types_path, alert: t('.warning'))
+      end
     end
 
     private
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index b99746b44..fccc1351f 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -6,7 +6,7 @@ class DocumentsController < ApplicationController
   before_action :set_document, only: %i[edit update destroy show]
 
   def index
-    @pagy, @documents = pagy(Document.all)
+    @pagy, @documents = pagy(Document.order(:name))
   end
 
   def show; end
diff --git a/app/views/account/employees/_form.html.erb b/app/views/account/employees/_form.html.erb
index 181e6d7c0..c30f8fe8b 100644
--- a/app/views/account/employees/_form.html.erb
+++ b/app/views/account/employees/_form.html.erb
@@ -16,7 +16,7 @@
               <%= f.input :title_id, collection: Title.all, required: true %>
             </div>
             <div class='form-group col-sm-12'>
-              <%= f.input :active, required: true %>
+              <%= f.input :active %>
             </div>
             <div class='form-group col-sm-12'>
               <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
diff --git a/app/views/course_management/course_unit_groups/_form.html.erb b/app/views/course_management/course_unit_groups/_form.html.erb
index 6c06090bd..019dbdee7 100644
--- a/app/views/course_management/course_unit_groups/_form.html.erb
+++ b/app/views/course_management/course_unit_groups/_form.html.erb
@@ -18,7 +18,7 @@
               <%= f.input :total_ects_condition, required: true, input_html: { min: 0 } %>
             </div>
             <div class='form-group col-sm-6'>
-              <%= f.association :unit, collection: Unit.without_programs %>
+              <%= f.association :unit, collection: Unit.active.without_programs.order(:name) %>
             </div>
             <div class='form-group col-sm-6'>
               <%= f.association :course_group_type %>
diff --git a/app/views/course_management/courses/_form.html.erb b/app/views/course_management/courses/_form.html.erb
index 4f591dce1..0fb3673b3 100644
--- a/app/views/course_management/courses/_form.html.erb
+++ b/app/views/course_management/courses/_form.html.erb
@@ -19,7 +19,7 @@
           <% end %>
           <div class='row mt-3'>
             <div class='form-group col-sm-4'>
-              <%= f.association :unit, collection: Unit.coursable.active %>
+              <%= f.association :unit, collection: Unit.coursable.active.order(:name) %>
             </div>
             <div class='form-group col-sm-4'>
               <%= f.input :name %>

From 3b77b6d91f4f963de164ef25b8bd5d6d4a1b714b Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 18:31:47 +0300
Subject: [PATCH 24/33] Tidy up locales

---
 app/views/layouts/shared/_sidebar.html.erb    |  2 +-
 config/locales/gems/pagy/en.yml               | 25 ++++++++++---------
 config/locales/gems/pagy/tr.yml               | 19 +++++++-------
 config/locales/gems/simple_form/en.yml        | 14 +++++------
 config/locales/gems/simple_form/tr.yml        | 14 +++++------
 config/locales/models/account/en.yml          |  9 ++++---
 config/locales/models/account/tr.yml          |  7 +++---
 .../locales/models/course_management/en.yml   |  2 +-
 .../locales/models/course_management/tr.yml   |  2 +-
 config/locales/models/references/en.yml       |  1 +
 .../locales/models/student_management/en.yml  |  3 ++-
 .../locales/models/student_management/tr.yml  |  3 ++-
 config/locales/models/user/en.yml             |  2 +-
 config/locales/validators/en.yml              |  2 +-
 14 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/app/views/layouts/shared/_sidebar.html.erb b/app/views/layouts/shared/_sidebar.html.erb
index 8f9234d66..18d87320e 100644
--- a/app/views/layouts/shared/_sidebar.html.erb
+++ b/app/views/layouts/shared/_sidebar.html.erb
@@ -118,7 +118,7 @@
             <%= link_to course_group_types_path, class: 'nav-link' do %>
               <%= fa_icon('clone', text: t('.course_group_types'), class: 'nav-icon') %>
             <% end %>
-          </li>    
+          </li>
         </ul>
       </li>
     </ul>
diff --git a/config/locales/gems/pagy/en.yml b/config/locales/gems/pagy/en.yml
index bb23dce96..c7b387a1a 100644
--- a/config/locales/gems/pagy/en.yml
+++ b/config/locales/gems/pagy/en.yml
@@ -1,22 +1,23 @@
+---
 en:
   pagy:
     compact:
-      of: "of"
-      page: "Page"
+      of: of
+      page: Page
     info:
       item_name:
-        one: "item"
-        other: "items"
-        zero: "items"
-      multiple_pages: "Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total"
+        one: item
+        other: items
+        zero: items
+      multiple_pages: Displaying %{item_name} <b>%{from}-%{to}</b> of <b>%{count}</b> in total
       single_page:
-        one: "Displaying <b>1</b> %{item_name}"
-        other: "Displaying <b>all %{count}</b> %{item_name}"
-        zero: "No %{item_name} found"
+        one: Displaying <b>1</b> %{item_name}
+        other: Displaying <b>all %{count}</b> %{item_name}
+        zero: No %{item_name} found
     items:
-      items: "items per page"
-      show: "Show"
+      items: items per page
+      show: Show
     nav:
       gap: "&hellip;"
-      next: "Next&nbsp;&rsaquo;"
+      next: Next&nbsp;&rsaquo;
       prev: "&lsaquo;&nbsp;Prev"
diff --git a/config/locales/gems/pagy/tr.yml b/config/locales/gems/pagy/tr.yml
index 6e4b6219f..9967a1f54 100644
--- a/config/locales/gems/pagy/tr.yml
+++ b/config/locales/gems/pagy/tr.yml
@@ -1,22 +1,23 @@
+---
 tr:
   pagy:
     compact:
       of: "/"
-      page: "Sayfa"
+      page: Sayfa
     info:
       item_name:
-        one: "kayıt"
-        other: "kayıt"
-        zero: "kayıt"
+        one: kayıt
+        other: kayıt
+        zero: kayıt
       multiple_pages: "<b>%{count}</b> %{item_name} içerisinden <b>%{from}-%{to}</b> kadarı gösteriliyor."
       single_page:
         one: "<b>1</b> %{item_name} gösteriliyor."
-        other: "Toplam <b>%{count}</b> %{item_name} gösteriliyor."
-        zero: "Hiç %{item_name} bulunamadı."
+        other: Toplam <b>%{count}</b> %{item_name} gösteriliyor.
+        zero: Hiç %{item_name} bulunamadı.
     items:
-      items: "sayfa başı"
-      show: "Göster"
+      items: sayfa başı
+      show: Göster
     nav:
       gap: "&hellip;"
-      next: "Sonraki&nbsp;&rsaquo;"
+      next: Sonraki&nbsp;&rsaquo;
       prev: "&lsaquo;&nbsp;Önceki"
diff --git a/config/locales/gems/simple_form/en.yml b/config/locales/gems/simple_form/en.yml
index 93ad81c9f..e1111148e 100644
--- a/config/locales/gems/simple_form/en.yml
+++ b/config/locales/gems/simple_form/en.yml
@@ -1,12 +1,10 @@
+---
 en:
   simple_form:
     error_notification:
-      default_message: "Please review the problems below:"
-    "no": 'No'
+      default_message: 'Please review the problems below:'
+    'no': 'No'
     required:
-      mark: '*'
-      # You can uncomment the line below if you need to overwrite the whole required html.
-      # When using html, text and mark won't be used.
-      # html: '<abbr title="required">*</abbr>'
-      text: 'required'
-    "yes": 'Yes'
+      mark: "*"
+      text: required
+    'yes': 'Yes'
diff --git a/config/locales/gems/simple_form/tr.yml b/config/locales/gems/simple_form/tr.yml
index e45d6c1ea..6a57e5360 100644
--- a/config/locales/gems/simple_form/tr.yml
+++ b/config/locales/gems/simple_form/tr.yml
@@ -1,12 +1,10 @@
+---
 tr:
   simple_form:
     error_notification:
-      default_message: "Lütfen aşağıdaki sorunları gözden geçirin:"
-    "no": 'Hayır'
+      default_message: 'Lütfen aşağıdaki sorunları gözden geçirin:'
+    'no': Hayır
     required:
-      mark: '*'
-      # You can uncomment the line below if you need to overwrite the whole required html.
-      # When using html, text and mark won't be used.
-      # html: '<abbr title="required">*</abbr>'
-      text: 'zorunlu alan'
-    "yes": 'Evet'
+      mark: "*"
+      text: zorunlu alan
+    'yes': Evet
diff --git a/config/locales/models/account/en.yml b/config/locales/models/account/en.yml
index ce836f69d..5274524b5 100644
--- a/config/locales/models/account/en.yml
+++ b/config/locales/models/account/en.yml
@@ -1,3 +1,4 @@
+---
 en:
   account:
     duties:
@@ -53,20 +54,20 @@ en:
         success: Profile successfully updated.
   activerecord:
     attributes:
-      duty: &duty_attributes
-        employee: Employee
+      duty:
+        employee_id: Employee
         end_date: End Date
         start_date: Start Date
         temporary: Temporary Duty
         tenure: Tenure
         tenure_status: Tenure Status
         unit_id: Unit
-      employee: &employee_attributes
+      employee:
         id_number: ID Number
         is_active: Is Active?
         title_id: Title
         user_id: User
-      position: &position_attributes
+      position:
         administrative_function_id: Administrative Function
         end_date: End Date
         start_date: Start Date
diff --git a/config/locales/models/account/tr.yml b/config/locales/models/account/tr.yml
index baddc7f69..027d28799 100644
--- a/config/locales/models/account/tr.yml
+++ b/config/locales/models/account/tr.yml
@@ -1,3 +1,4 @@
+---
 tr:
   account:
     duties:
@@ -53,7 +54,7 @@ tr:
         success: Profiliniz başarıyla güncellendi
   activerecord:
     attributes:
-      duty: &duty_attributes
+      duty:
         employee_id: Personel
         end_date: Bitiş Tarihi
         start_date: Başlangıç Tarihi
@@ -61,12 +62,12 @@ tr:
         tenure: Kadrolu
         tenure_status: Kadro Durumu
         unit_id: Birim
-      employee: &employee_attributes
+      employee:
         id_number: Kimlik Numarası
         is_active: Aktif mi?
         title_id: Ünvan
         user_id: Kullanıcı
-      position: &position_attributes
+      position:
         administrative_function_id: Görev
         end_date: Bitiş Tarihi
         start_date: Başlangıç Tarihi
diff --git a/config/locales/models/course_management/en.yml b/config/locales/models/course_management/en.yml
index d56e701b5..c02c8dcc1 100644
--- a/config/locales/models/course_management/en.yml
+++ b/config/locales/models/course_management/en.yml
@@ -52,7 +52,7 @@ en:
       create:
         success: Course group type created.
       destroy:
-        error: An error occured when deleting the course group type.
+        warning: An error occured when deleting the course group type.
         success: Course group type successfully destroyed.
       edit:
         form_title: Course Group Type successfully updated.
diff --git a/config/locales/models/course_management/tr.yml b/config/locales/models/course_management/tr.yml
index 350522e37..83064f7d2 100644
--- a/config/locales/models/course_management/tr.yml
+++ b/config/locales/models/course_management/tr.yml
@@ -52,7 +52,7 @@ tr:
       create:
         success: Ders grup türü başarıyla oluşturuldu.
       destroy:
-        error: Ders grup türü silinirken bir hata oluştu.
+        warning: Ders grup türü silinirken bir hata oluştu.
         success: Ders grup türü başarıyla silindi.
       edit:
         form_title: Ders Grup Türü Düzenle
diff --git a/config/locales/models/references/en.yml b/config/locales/models/references/en.yml
index b22742dfe..f72825805 100644
--- a/config/locales/models/references/en.yml
+++ b/config/locales/models/references/en.yml
@@ -68,6 +68,7 @@ en:
         form_title: Create Country
         new_country: New Country
       show:
+        <<: *country_attributes
         <<: *city_attributes
         card_header: Cities
         new_city_link: Add a New City
diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml
index 552a95805..e568d60ea 100644
--- a/config/locales/models/student_management/en.yml
+++ b/config/locales/models/student_management/en.yml
@@ -72,7 +72,6 @@ en:
         prospective_students: Prospective Students
       register:
         can_not_register: Can Not Register
-        success: Student successfully registered.
         warning: Student could not be registered.
       search:
         <<: *prospective_student_attributes
@@ -86,3 +85,5 @@ en:
         prospective_student: Prospective Student
         registered_to: 'Already registered to %{program}.'
         temporarily_register: Temporarily Register
+      redirect_with_success:
+        success: Student successfully registered
diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml
index 096529d71..f08e3e31b 100644
--- a/config/locales/models/student_management/tr.yml
+++ b/config/locales/models/student_management/tr.yml
@@ -72,7 +72,6 @@ tr:
         prospective_students: Aday Öğrenciler
       register:
         can_not_register: Kayıt Yapılamaz
-        success: Öğrenci başarıyla kayıt edildi
         warning: Öğrenci kayıt edilemedi
       search:
         <<: *prospective_student_attributes
@@ -86,3 +85,5 @@ tr:
         prospective_student: Aday Öğrenci
         registered_to: '%{program} isimli programda kayıtlı.'
         temporarily_register: Geçici Kayıt Yap
+      redirect_with_success:
+        success: Öğrenci başarıyla kayıt edildi
diff --git a/config/locales/models/user/en.yml b/config/locales/models/user/en.yml
index 9758606c8..549916ee9 100644
--- a/config/locales/models/user/en.yml
+++ b/config/locales/models/user/en.yml
@@ -2,7 +2,7 @@ en:
   activerecord:
     attributes:
       duty: &duty_attributes
-        employee: Employee
+        employee_id: Employee
         end_date: End Date
         start_date: Start Date
         temporary: Temporary Duty
diff --git a/config/locales/validators/en.yml b/config/locales/validators/en.yml
index 51f98da96..bbb81b3c0 100644
--- a/config/locales/validators/en.yml
+++ b/config/locales/validators/en.yml
@@ -17,4 +17,4 @@ en:
       size_not_satisfied: File size is not between the permitted range. You can upload files from minimum %{minimum} KBs to maximum %{maximum} MBs.
     position:
       invalid_end_date: Start date is selected as a date after the end date
-      multiple_active_repetitive:
+      multiple_active_repetitive: This employee already has this position in this unit

From 9a59ae3a39d3c39a0711c82eb9bb666b5c51ba8e Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 18:58:25 +0300
Subject: [PATCH 25/33] Add tests for tenant configuration

---
 test/config/application_config_test.rb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/config/application_config_test.rb b/test/config/application_config_test.rb
index 8aa7546c8..94a9d11eb 100644
--- a/test/config/application_config_test.rb
+++ b/test/config/application_config_test.rb
@@ -19,4 +19,18 @@ class ApplicationConfigTest < ActiveSupport::TestCase
   test 'Time zone should match with Istanbul' do
     assert_equal @config.time_zone, 'Istanbul'
   end
+
+  test 'Default locale should be Turkish' do
+    assert_equal @config.i18n.default_locale, :tr
+  end
+
+  test 'Tenant settings must be configured in tenants/*.yml' do
+    files_count = Dir.glob(Rails.root.join('config', 'tenants', '*.yml')).count
+    assert_operator files_count, :>, 0
+  end
+
+  test 'Configuration can read tenant settings' do
+    assert_not_nil @config.tenant.abbreviation
+    assert_not_nil @config.tenant.host
+  end
 end

From f306b5e52d5bf4c0ce8e14703d6e8335974a5ab1 Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Thu, 27 Sep 2018 19:02:43 +0300
Subject: [PATCH 26/33] Test keys of tenant configuration hash

---
 test/config/application_config_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/config/application_config_test.rb b/test/config/application_config_test.rb
index 94a9d11eb..90d6da434 100644
--- a/test/config/application_config_test.rb
+++ b/test/config/application_config_test.rb
@@ -33,4 +33,16 @@ class ApplicationConfigTest < ActiveSupport::TestCase
     assert_not_nil @config.tenant.abbreviation
     assert_not_nil @config.tenant.host
   end
+
+  test 'Tenant configuration includes keys for various environments' do
+    files = Dir.glob(Rails.root.join('config', 'tenants', '*.yml'))
+
+    files.each do |file|
+      file = YAML.load_file(file)
+      assert file.key?('production')
+      assert file.key?('beta')
+      assert file.key?('test')
+      assert file.key?('development')
+    end
+  end
 end

From 5a071002e0c77b7f4104015d0b4202c9788e29b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Fri, 28 Sep 2018 00:55:29 +0300
Subject: [PATCH 27/33] Add capybara and selenium drivers to Gemfile

---
 Gemfile      |  6 ++++++
 Gemfile.lock | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/Gemfile b/Gemfile
index 6e29c213f..c7115be76 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,6 +67,12 @@ group :development, :test do
   gem 'simplecov', require: false
 end
 
+group :test do
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'selenium-webdriver'
+end
+
 group :development do
   gem 'bullet'
   gem 'fit-commit'
diff --git a/Gemfile.lock b/Gemfile.lock
index b23ace7a5..e1d6f0115 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,6 +49,8 @@ GEM
       nokogiri
     ancestry (3.0.2)
       activerecord (>= 3.2.0)
+    archive-zip (0.11.0)
+      io-like (~> 0.3.0)
     arel (9.0.0)
     ast (2.4.0)
     aws-eventstream (1.0.1)
@@ -83,7 +85,19 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (10.0.2)
+    capybara (3.8.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
     chartkick (3.0.1)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    chromedriver-helper (2.1.0)
+      archive-zip (~> 0.10)
+      nokogiri (~> 1.8)
     cocoon (1.2.11)
     codacy-coverage (2.1.0)
       simplecov
@@ -143,6 +157,7 @@ GEM
     image_processing (1.7.0)
       mini_magick (~> 4.0)
       ruby-vips (>= 2.0.13, < 3)
+    io-like (0.3.0)
     jaro_winkler (1.5.1)
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
@@ -253,6 +268,7 @@ GEM
     ruby-vips (2.0.13)
       ffi (~> 1.9)
     ruby_dep (1.5.0)
+    rubyzip (1.2.2)
     sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -276,6 +292,9 @@ GEM
       nokogiri (>= 1.8.1)
       nori (~> 2.4)
       wasabi (~> 3.4)
+    selenium-webdriver (3.14.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
     sidekiq (5.2.2)
       connection_pool (~> 2.2, >= 2.2.2)
       rack-protection (>= 1.5.0)
@@ -334,6 +353,8 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
+    xpath (3.1.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -347,7 +368,9 @@ DEPENDENCIES
   bullet
   bundler-audit
   byebug
+  capybara
   chartkick
+  chromedriver-helper
   cocoon
   codacy-coverage
   coffee-rails (~> 4.2)
@@ -375,6 +398,7 @@ DEPENDENCIES
   ruby-progressbar
   sassc-rails
   savon (~> 2.12.0)
+  selenium-webdriver
   sidekiq
   simple_form
   simplecov

From d88e5b1f952fc695c85c96984857571eb994257a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Fri, 28 Sep 2018 00:56:29 +0300
Subject: [PATCH 28/33] Configure capybara in test_helper

---
 test/test_helper.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index dba93ad13..f465a446a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -14,11 +14,16 @@
 require 'minitest/autorun'
 require_relative '../config/environment'
 require 'rails/test_help'
+require 'capybara/rails'
+require 'capybara/minitest'
 
 module ActiveSupport
   class TestCase
     include AbstractController::Translation
     include Devise::Test::IntegrationHelpers
+    include Capybara::DSL
+    include Capybara::Minitest::Assertions
+
     fixtures :all
 
     def controller_name
@@ -30,5 +35,13 @@ def create_file_blob(filename, content_type, metadata = nil)
         io: file_fixture(filename).open, filename: filename, content_type: content_type, metadata: metadata
       )
     end
+
+    Capybara.default_driver = :selenium_chrome_headless
+    Capybara.server = :puma, { Silent: true }
+
+    def teardown
+      Capybara.reset_sessions!
+      Capybara.use_default_driver
+    end
   end
 end

From cb5ab6eeebaffa16b4af79b58198eee77a01cb99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Fri, 28 Sep 2018 01:12:14 +0300
Subject: [PATCH 29/33] Do not hide registration block on mobile devices

Fixes #409
---
 app/views/devise/sessions/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index ae4753b9b..4718c3d87 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -36,7 +36,7 @@
         <% end %>
       </div>
     </div>
-    <div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
+    <div class="card text-white bg-primary py-5">
       <div class="card-body text-center">
         <div>
           <h2><%= t('devise.common.register') %></h2>

From 817fb1d6095ba0fc0ad2d816aeb7806b87ac2469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=2E=20Serhat=20D=C3=BCndar?= <msdundars@gmail.com>
Date: Fri, 28 Sep 2018 01:12:41 +0300
Subject: [PATCH 30/33] Test login page and login flow with different screen
 resolutions

---
 test/integration/login_page_flow_test.rb        | 17 +++++++++++++++++
 test/integration/login_page_interaction_test.rb | 15 +++++++++++++++
 test/test_helper.rb                             |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 test/integration/login_page_flow_test.rb
 create mode 100644 test/integration/login_page_interaction_test.rb

diff --git a/test/integration/login_page_flow_test.rb b/test/integration/login_page_flow_test.rb
new file mode 100644
index 000000000..4adf590f5
--- /dev/null
+++ b/test/integration/login_page_flow_test.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class LoginPageFlowTest < ActionDispatch::IntegrationTest
+  SUPPORTED_SCREEN_RESOLUTIONS.each do |resolution|
+    test "can login with correct credentials with a #{resolution} screen" do
+      page.driver.browser.manage.window.resize_to(resolution[0], resolution[1])
+      visit('/')
+      fill_in('user[id_number]', with: users(:serhat).id_number)
+      fill_in('user[password]', with: '123456')
+      check(t('devise.sessions.new.remember_login'))
+      click_button(t('devise.common.login'))
+      assert_equal t('devise.sessions.signed_in'), page.find('div', class: 'toast-message').text
+    end
+  end
+end
diff --git a/test/integration/login_page_interaction_test.rb b/test/integration/login_page_interaction_test.rb
new file mode 100644
index 000000000..7aa38eda8
--- /dev/null
+++ b/test/integration/login_page_interaction_test.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class LoginPageInteractionTest < ActionDispatch::IntegrationTest
+  SUPPORTED_SCREEN_RESOLUTIONS.each do |resolution|
+    test "can see login elements with a #{resolution} screen" do
+      page.driver.browser.manage.window.resize_to(resolution[0], resolution[1])
+      visit('/')
+      assert find_button(t('devise.common.login'), visible: true).visible?
+      assert find_link(t('devise.sessions.new.did_you_forget'), visible: true).visible?
+      assert find_link(t('devise.sessions.new.create_account'), visible: true).visible?
+    end
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f465a446a..af06f803c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -36,6 +36,8 @@ def create_file_blob(filename, content_type, metadata = nil)
       )
     end
 
+    SUPPORTED_SCREEN_RESOLUTIONS = [[360, 640], [1024, 768], [1366, 768], [1920, 1080]].freeze
+
     Capybara.default_driver = :selenium_chrome_headless
     Capybara.server = :puma, { Silent: true }
 

From 605ce905e4224a22db0eb782f0e3719b29865697 Mon Sep 17 00:00:00 2001
From: Emre KURT <emre.kurt@bil.omu.edu.tr>
Date: Fri, 28 Sep 2018 12:49:22 +0300
Subject: [PATCH 31/33] Referanslar dashboarda dilleri ekle

---
 app/views/references/home/index.html.erb | 1 +
 config/locales/models/references/en.yml  | 1 +
 config/locales/models/references/tr.yml  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/references/home/index.html.erb b/app/views/references/home/index.html.erb
index 6cd806d98..609b033c7 100644
--- a/app/views/references/home/index.html.erb
+++ b/app/views/references/home/index.html.erb
@@ -14,4 +14,5 @@
   <%= render 'card', content: UnitStatus.count, title: '.unit_statuses', path: unit_statuses_path %>
   <%= render 'card', content: UnitType.count, title: '.unit_types', path: unit_types_path %>
   <%= render 'card', content: UniversityType.count, title: '.university_types', path: university_types_path %>
+  <%= render 'card', content: Language.count, title: '.languages', path: languages_path %>
 </div>
\ No newline at end of file
diff --git a/config/locales/models/references/en.yml b/config/locales/models/references/en.yml
index f72825805..efb71d894 100644
--- a/config/locales/models/references/en.yml
+++ b/config/locales/models/references/en.yml
@@ -89,6 +89,7 @@ en:
     home:
       card:
         high_school_types: High School Types
+        languages: Languages
         student_disability_types: Disability Types
         student_drop_out_types: Drop Out Types
         student_education_levels: Education Levels
diff --git a/config/locales/models/references/tr.yml b/config/locales/models/references/tr.yml
index 6facaf67b..769c91c5f 100644
--- a/config/locales/models/references/tr.yml
+++ b/config/locales/models/references/tr.yml
@@ -89,6 +89,7 @@ tr:
     home:
       card:
         high_school_types: Lise Türleri
+        languages: Diller
         student_disability_types: Engel Türleri
         student_drop_out_types: Ayrılma Nedenleri
         student_education_levels: Eğitim Düzeyleri

From fffe5839481f25bac920e7d34ff2fe2177b70d09 Mon Sep 17 00:00:00 2001
From: isubas <irfan.subas@uzem.omu.edu.tr>
Date: Fri, 28 Sep 2018 13:39:07 +0300
Subject: [PATCH 32/33] =?UTF-8?q?Css=20linter=C4=B1n=C4=B1n=20!important?=
 =?UTF-8?q?=20i=C3=A7in=20vermi=C5=9F=20oldu=C4=9Fu=20uyar=C4=B1y=C4=B1=20?=
 =?UTF-8?q?ingore=20et?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/custom/select2.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/custom/select2.css b/app/assets/stylesheets/custom/select2.css
index 8ec178285..d0f9442a9 100644
--- a/app/assets/stylesheets/custom/select2.css
+++ b/app/assets/stylesheets/custom/select2.css
@@ -1,3 +1,3 @@
 .select2 {
-  width: 100% !important;
+  width: 100% !important; /* csslint allow: known-properties, important */
 }
\ No newline at end of file

From 1cac32dcc40e5b1e756177ac8db09c16cf9c660f Mon Sep 17 00:00:00 2001
From: msdundar <msdundars@gmail.com>
Date: Fri, 28 Sep 2018 16:19:16 +0300
Subject: [PATCH 33/33] List screen resolutions in multiple-lines

---
 test/test_helper.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index af06f803c..993f6e911 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -36,8 +36,14 @@ def create_file_blob(filename, content_type, metadata = nil)
       )
     end
 
-    SUPPORTED_SCREEN_RESOLUTIONS = [[360, 640], [1024, 768], [1366, 768], [1920, 1080]].freeze
-
+    SUPPORTED_SCREEN_RESOLUTIONS = [
+      [360,   640],
+      [1024,  768],
+      [1366,  768],
+      [1920, 1080]
+    ].freeze
+
+    # Switch to :selenium_chrome for real-time browser experience.
     Capybara.default_driver = :selenium_chrome_headless
     Capybara.server = :puma, { Silent: true }