From f013bb8208bd0db6b755b0ebe42dda63b8984430 Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Thu, 11 Jun 2015 10:08:52 +0300
Subject: [PATCH] =?UTF-8?q?En=20dash=20---=20to=20Em=20dash=20=E2=80=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin/accounts/codes.twig           |  4 +--
 .../application/views/admin/students/add.twig |  6 ++---
 .../views/admin/students/profile.twig         |  4 +--
 .../views/admin/students/upload.twig          |  2 +-
 .../views/admin/subjects/upload.twig          |  2 +-
 .../application/views/admin/teachers/add.twig |  6 ++---
 .../admin/teachers/handler/listOutput.twig    |  2 +-
 .../views/admin/teachers/index.twig           |  4 +--
 .../views/admin/teachers/profile.twig         |  4 +--
 ~dev_rating/application/views/base.twig       |  6 ++---
 .../views/dean_office/credits.twig            |  2 +-
 .../views/dean_office/students/index.twig     |  4 +--
 .../views/dean_office/students/profile.twig   |  4 +--
 .../application/views/student/subject.twig    | 26 +++++++++----------
 .../application/views/teacher/exam.twig       |  2 +-
 .../application/views/teacher/index.twig      |  6 ++---
 16 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/~dev_rating/application/views/admin/accounts/codes.twig b/~dev_rating/application/views/admin/accounts/codes.twig
index a525488d2..3aff72706 100644
--- a/~dev_rating/application/views/admin/accounts/codes.twig
+++ b/~dev_rating/application/views/admin/accounts/codes.twig
@@ -34,7 +34,7 @@
         </div>
         <div class="step_body">
             <select id="facultySelect">
-                <option value="0">--- Подразделение ЮФУ ---</option>
+                <option value="0">— Подразделение ЮФУ —</option>
                 {% for row in Faculties %}
                 <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                 {% endfor %}
@@ -47,7 +47,7 @@
         </div>
         <div class="step_body">
             <select id="gradeSelect">
-                <option value="0">--- РљСѓСЂСЃ ---</option>
+                <option value="0">— Курс —</option>
                 {% for Degree in Grades %}
                 <optgroup label="{{ Degree.Title }}">
                     {% for Grade in Degree.Grades %}
diff --git a/~dev_rating/application/views/admin/students/add.twig b/~dev_rating/application/views/admin/students/add.twig
index d9b472616..40a1b2a85 100644
--- a/~dev_rating/application/views/admin/students/add.twig
+++ b/~dev_rating/application/views/admin/students/add.twig
@@ -37,13 +37,13 @@
         </div>
         <div class="inputGroup_input">
             <select id="facultySelect">
-                <option value="0">--- Подразделение ЮФУ ---</option>
+                <option value="0">— Подразделение ЮФУ —</option>
                 {% for row in Faculties %}
                 <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                 {% endfor %}
             </select>
             <select id="gradeSelect">
-                <option value="0">--- РљСѓСЂСЃ ---</option>
+                <option value="0">— Курс —</option>
                 {% for Degree in Grades %}
                 <optgroup label="{{ Degree.Title }}">
                     {% for Grade in Degree.Grades %}
@@ -53,7 +53,7 @@
                 {% endfor %}
             </select>
             <select id="groupSelect">
-                <option value="0">--- Учебная группа ---</option>
+                <option value="0">— Учебная группа —</option>
             </select>            
         </div>
     </div>
diff --git a/~dev_rating/application/views/admin/students/profile.twig b/~dev_rating/application/views/admin/students/profile.twig
index 4dd6cdf5d..c31dbbabd 100644
--- a/~dev_rating/application/views/admin/students/profile.twig
+++ b/~dev_rating/application/views/admin/students/profile.twig
@@ -35,11 +35,11 @@
         </div>
         <div class="profile_clearFix">
             <div class="label">Имя пользователя:</div>
-            <div class="labeled_info">{{ Account.Login|default('---') }}</div>
+            <div class="labeled_info">{{ Account.Login|default('—') }}</div>
         </div>
         <div class="profile_clearFix">
             <div class="label">E-Mail:</div>
-            <div class="labeled_info">{{ Account.EMail|default('---') }}</div>
+            <div class="labeled_info">{{ Account.EMail|default('—') }}</div>
         </div>
     </div>
     <div class="action_bar">
diff --git a/~dev_rating/application/views/admin/students/upload.twig b/~dev_rating/application/views/admin/students/upload.twig
index 4f707715d..9a8b3e236 100644
--- a/~dev_rating/application/views/admin/students/upload.twig
+++ b/~dev_rating/application/views/admin/students/upload.twig
@@ -23,7 +23,7 @@
         </div>
         <div class="step_body">
             <select id="facultySelect" name="facultyID">
-                <option value="0">--- Подразделение ЮФУ ---</option>
+                <option value="0">— Подразделение ЮФУ —</option>
                 {% for row in Faculties %}
                 <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                 {% endfor %}
diff --git a/~dev_rating/application/views/admin/subjects/upload.twig b/~dev_rating/application/views/admin/subjects/upload.twig
index 4eb0bb5a1..28244fe09 100644
--- a/~dev_rating/application/views/admin/subjects/upload.twig
+++ b/~dev_rating/application/views/admin/subjects/upload.twig
@@ -27,7 +27,7 @@
         </div>
         <div class="step_body">
             <select id="facultySelect" name="facultyID">
-                <option value="0">--- Подразделение ЮФУ ---</option>
+                <option value="0">— Подразделение ЮФУ —</option>
                 {% for row in Faculties %}
                 <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                 {% endfor %}
diff --git a/~dev_rating/application/views/admin/teachers/add.twig b/~dev_rating/application/views/admin/teachers/add.twig
index 952897a1b..8389ba757 100644
--- a/~dev_rating/application/views/admin/teachers/add.twig
+++ b/~dev_rating/application/views/admin/teachers/add.twig
@@ -27,19 +27,19 @@
         </div>
         <div class="inputGroup_input">
             <select id="jobPositionSelect">
-                <option value="0">--- Академическая должность ---</option>
+                <option value="0">— Академическая должность —</option>
                 {% for row in JobPositions %}
                 <option value="{{ row.ID }}">{{ row.Name }}</option>
                 {% endfor %}     
             </select>
             <select id="facultySelect">
-                <option value="0">--- Подразделение ЮФУ ---</option>
+                <option value="0">— Подразделение ЮФУ —</option>
                 {% for row in Faculties %}
                 <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                 {% endfor %}
             </select>
             <select id="departmentSelect">
-                <option value="0">--- Кафедра ---</option>
+                <option value="0">— Кафедра —</option>
             </select>
         </div>
     </div>
diff --git a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
index e88ce746d..157cc13b7 100644
--- a/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
+++ b/~dev_rating/application/views/admin/teachers/handler/listOutput.twig
@@ -12,7 +12,7 @@
         <div class="search_item_info">
             <div class="search_item_firstLine">{{ HTML.anchor('admin/profile/teacher/' ~ row.AccountID, 
                 row.LastName ~  ' ' ~ row.FirstName ~ ' ' ~ row.SecondName)|raw }}</div>
-            <div class="search_item_secondLine">{{ row.JobPositionName }}, {{ row.DepartmentName|default('---') }}</div>
+            <div class="search_item_secondLine">{{ row.JobPositionName }}, {{ row.DepartmentName|default('—') }}</div>
         </div>
         <div class="search_item_actions">
             <a href="#">Редактировать</a>
diff --git a/~dev_rating/application/views/admin/teachers/index.twig b/~dev_rating/application/views/admin/teachers/index.twig
index d80afadc5..e43c2c6e9 100644
--- a/~dev_rating/application/views/admin/teachers/index.twig
+++ b/~dev_rating/application/views/admin/teachers/index.twig
@@ -25,7 +25,7 @@
                 <div class='search_inputFilters'>
                     <div class='filterLarge'>
                         <select id="facultySelect">
-                            <option value="0">--- Подразделение ЮФУ ---</option>
+                            <option value="0">— Подразделение ЮФУ —</option>
                             {% for row in Faculties %}
                             <option value="{{ row.ID }}">{{ row.Name }} ({{ row.Abbr }})</option>
                             {% endfor %}
@@ -34,7 +34,7 @@
                     
                     <div class='filterLarge'>
                         <select id="departmentSelect">
-                            <option value="0">--- Кафедра ---</option>
+                            <option value="0">— Кафедра —</option>
                         </select>
                     </div>
                 </div>            
diff --git a/~dev_rating/application/views/admin/teachers/profile.twig b/~dev_rating/application/views/admin/teachers/profile.twig
index 278632cbb..7c0d472b2 100644
--- a/~dev_rating/application/views/admin/teachers/profile.twig
+++ b/~dev_rating/application/views/admin/teachers/profile.twig
@@ -35,11 +35,11 @@
         </div>
         <div class="profile_clearFix">
             <div class="label">Имя пользователя:</div>
-            <div class="labeled_info">{{ Account.Login|default('---') }}</div>
+            <div class="labeled_info">{{ Account.Login|default('—') }}</div>
         </div>
         <div class="profile_clearFix">
             <div class="label">E-Mail:</div>
-            <div class="labeled_info">{{ Account.EMail|default('---') }}</div>
+            <div class="labeled_info">{{ Account.EMail|default('—') }}</div>
         </div>
     </div>
     <div class="action_bar">
diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig
index 47c0e4b35..7ca1bb127 100644
--- a/~dev_rating/application/views/base.twig
+++ b/~dev_rating/application/views/base.twig
@@ -34,7 +34,7 @@
 	<title>{% block title %}{% endblock %} | {{ System.Title }}</title>
 	<meta http-equiv="Cache-Control" content="no-cache">
 	<link href='https://fonts.googleapis.com/css?family=PT+Sans&subset=cyrillic-ext,latin' rel='stylesheet' type='text/css'>
-	{# -------------------------------------------------------------------------------------------------------------- #}
+	{# ————————————————————————————————————-- #}
 	{{ HTML.style('media/less/common.css')|raw }}
 	{#
 		HTML.style('media/css/messages.css')
@@ -43,7 +43,7 @@
 		HTML.style('media/css/error.css')
 		HTML.style('media/css/global.css')
 	#}
-	{# -------------------------------------------------------------------------------------------------------------- #}
+	{# ————————————————————————————————————-- #}
 	{{ HTML.script('media/js/jquery-1.11.1.min.js')|raw }}
 	{{ HTML.script('media/js/config.js')|raw }}
 
@@ -63,7 +63,7 @@
 		HTML.script('media/js/ui/jquery-ui.js')
 		HTML.script('media/js/errDialog.js')
 	#}
-	{# -------------------------------------------------------------------------------------------------------------- #}
+	{# ————————————————————————————————————-- #}
 	<script>
 		$(function() {
 			$('input, textarea').placeholder();
diff --git a/~dev_rating/application/views/dean_office/credits.twig b/~dev_rating/application/views/dean_office/credits.twig
index 2eeff56b3..06b8acbdd 100644
--- a/~dev_rating/application/views/dean_office/credits.twig
+++ b/~dev_rating/application/views/dean_office/credits.twig
@@ -24,7 +24,7 @@
             </select>
             <div class="infoBox">
                 <div style="text-overflow: clip; height:1em">
-                    <b>Преподаватели:</b> <span id="teachersOfDiscipline">---</span>
+                    <b>Преподаватели:</b> <span id="teachersOfDiscipline">—</span>
                 </div>
                 <table width="100%" style="text-align: center; border-spacing: 5px; margin: 10px 0;">
                     <tr>
diff --git a/~dev_rating/application/views/dean_office/students/index.twig b/~dev_rating/application/views/dean_office/students/index.twig
index 662ca2129..1475a20d2 100644
--- a/~dev_rating/application/views/dean_office/students/index.twig
+++ b/~dev_rating/application/views/dean_office/students/index.twig
@@ -24,7 +24,7 @@
 
                     <div class='filter'>
                         <select id="gradeSelect">
-                            <option value="0">--- РљСѓСЂСЃ ---</option>
+                            <option value="0">— Курс —</option>
                             {% for Degree in Grades %}
                                 <optgroup label="{{ Degree.Title }}">
                                     {% for Grade in Degree.Grades %}
@@ -37,7 +37,7 @@
 
                     <div class='filter'>
                         <select id="groupSelect">
-                            <option value="0">--- Учебная группа ---</option>
+                            <option value="0">— Учебная группа —</option>
                         </select>
                     </div>
 
diff --git a/~dev_rating/application/views/dean_office/students/profile.twig b/~dev_rating/application/views/dean_office/students/profile.twig
index 4f560af17..fd425ac01 100644
--- a/~dev_rating/application/views/dean_office/students/profile.twig
+++ b/~dev_rating/application/views/dean_office/students/profile.twig
@@ -34,11 +34,11 @@
         {% endif %}
         <div class="profile_clearFix">
             <div class="label">Имя пользователя:</div>
-            <div class="labeled_info">{{ Account.Login|default('---') }}</div>
+            <div class="labeled_info">{{ Account.Login|default('—') }}</div>
         </div>
         <div class="profile_clearFix">
             <div class="label">E-Mail:</div>
-            <div class="labeled_info">{{ Account.EMail|default('---') }}</div>
+            <div class="labeled_info">{{ Account.EMail|default('—') }}</div>
         </div>
 
         <div style="margin-top: 20px">
diff --git a/~dev_rating/application/views/student/subject.twig b/~dev_rating/application/views/student/subject.twig
index eca87a45d..3054ddc7f 100644
--- a/~dev_rating/application/views/student/subject.twig
+++ b/~dev_rating/application/views/student/subject.twig
@@ -21,7 +21,7 @@
 {% block main_content %}
 
     <div class="pageTitle">
-        <h2>{{ Discipline.SubjectName|default('---') }}</h2>
+        <h2>{{ Discipline.SubjectName|default('—') }}</h2>
     </div>
 
     <div class="disciplineInfo first">
@@ -34,7 +34,7 @@
 
         <div class="clearFix">
             <div class="label">Форма аттестации:</div>
-            <div class="content">{{ Discipline.control|default('---') }}</div>
+            <div class="content">{{ Discipline.control|default('—') }}</div>
         </div>
         <div class="clearFix">
             <div class="label">Семестр:</div>
@@ -109,7 +109,7 @@
                 </div>
                 <div class="submodulePercent">
                     {% if Submodule.MaxRate <= 0 %}
-                        ---
+                        —
                     {% else %}
                         {{ (Submodule.Rate  * 100) // Submodule.MaxRate }} %
                     {% endif %}
@@ -118,7 +118,7 @@
                     {% if Submodule.Date != 0 %}
                         {{ Submodule.Date|date('d.m.Y') }}
                     {% else %}
-                        ---
+                        —
                     {% endif %}
                 </div>
             </div>
@@ -145,7 +145,7 @@
                     <div class="submoduleTitle">Добор баллов</div>
                     <div class="submoduleRate">{{ DisciplineMap.Extra.Rate }}</div>
                     <div class="submodulePercent">&nbsp;</div>
-                    <div class="submoduleDate">---</div>
+                    <div class="submoduleDate">—</div>
                 </div>
             </div>
         {% endif %}
@@ -158,7 +158,7 @@
     <h3 class="blockTitle">Экзамен</h3>
     <div class="blockMargin">
         <div class="tableTitle Extra">
-            Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('---') }}&raquo;
+            Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;
         </div>
         {% if DisciplineMap.Bonus is not empty %}
         <div class="submoduleBlock">
@@ -174,14 +174,14 @@
                 {% if DisciplineMap.Bonus.Date != 0 %}
                     {{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
                 {% else %}
-                    ---
+                    —
                 {% endif %}
             </div>
         </div>
         {% endif %}
         {% if DisciplineMap.Exam is not empty %}
             <div class="submoduleBlock">
-                <div class="submoduleTitle">Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('---') }}&raquo;</div>
+                <div class="submoduleTitle">Экзамен по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;</div>
                 <div class="submoduleRate">{{ DisciplineMap.Exam.Rate }} / {{ DisciplineMap.Exam.MaxRate }}</div>
                 <div class="submodulePercent">
                     {% if DisciplineMap.Exam.MaxRate == 0 %} 0 {% else %} {{ (DisciplineMap.Exam.Rate  * 100) // DisciplineMap.Exam.MaxRate }} % {% endif %}
@@ -190,7 +190,7 @@
                     {% if DisciplineMap.Exam.Date != 0 %}
                         {{ DisciplineMap.Exam.Date|date('d.m.Y') }}
                     {% else %}
-                        ---
+                        —
                     {% endif %}
                 </div>
             </div>
@@ -212,11 +212,11 @@
             {% if Admission > 0 %}
                 Для получения зачета необходимо набрать ещё {{ Admission }} {{ Rus.NumEnding(Admission, ['балл', 'балла', 'баллов']) }}.
             {% else %}
-                Поздравляем, Вы получили зачет по курсу &laquo;{{ Discipline.SubjectName|default('---') }}&raquo;!
+                Поздравляем, Вы получили зачет по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;!
             {% endif %}
             {% if ExtraRate or not Admission or DisciplineMap.Bonus is not empty %}
             <div class="tableTitle Extra">
-                Зачет по курсу &laquo;{{ Discipline.SubjectName|default('---') }}&raquo;
+                Зачет по курсу &laquo;{{ Discipline.SubjectName|default('—') }}&raquo;
             </div>
             {% if ExtraRate or not Admission %}
                 <div class="blockMargin">
@@ -224,7 +224,7 @@
                         <div class="submoduleTitle">Добор баллов</div>
                         <div class="submoduleRate">{{ DisciplineMap.Extra.Rate }}</div>
                         <div class="submodulePercent">&nbsp;</div>
-                        <div class="submoduleDate">---</div>
+                        <div class="submoduleDate">—</div>
                     </div>
                 </div>
             {% endif %}
@@ -242,7 +242,7 @@
                         {% if DisciplineMap.Bonus.Date != 0 %}
                             {{ DisciplineMap.Bonus.Date|date('d.m.Y') }}
                         {% else %}
-                            ---
+                            —
                         {% endif %}
                     </div>
                 </div>
diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig
index 7f1ddb16e..b4140b83c 100644
--- a/~dev_rating/application/views/teacher/exam.twig
+++ b/~dev_rating/application/views/teacher/exam.twig
@@ -155,7 +155,7 @@
 										{% if r.MaxRate > 0 %}
 											placeholder="макс. {{r.MaxRate}}" 
 										{% else %} 
-											placeholder="---" 
+											placeholder="—"
 											disabled="disabled" 
 										{% endif %}
 									{% endif %}
diff --git a/~dev_rating/application/views/teacher/index.twig b/~dev_rating/application/views/teacher/index.twig
index 9835207d9..d16a3a5ef 100644
--- a/~dev_rating/application/views/teacher/index.twig
+++ b/~dev_rating/application/views/teacher/index.twig
@@ -23,16 +23,16 @@
             {% endif %}
                     <tr class="group_block">
                         <td class='info_cell td_group'>
-                            {{ Discipline.Groups|default('---') }}
+                            {{ Discipline.Groups|default('—') }}
                         </td>
                         <td class='info_cell td_control'>
-                            {{ Discipline.Control|default('---') }}
+                            {{ Discipline.Control|default('—') }}
                         </td>
                         <td class='info_cell td_teachers'>
                             {% for teacher in Discipline.Teachers %}
                                 <div>{{ teacher }}</div>
                             {% else %}
-                                ---
+                                —
                             {% endfor %}
                         </td>
                         <td class='action_cell'>
-- 
GitLab