From c24433ed93d91bd1aee085455bffbd48a5381f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A8=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D0=B2?= <solidovic@gmail.com> Date: Tue, 23 Dec 2014 23:01:48 +0300 Subject: [PATCH] ... --- ~dev_rating/application/views/teacher/exam.twig | 2 +- ~dev_rating/media/js/rating.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/~dev_rating/application/views/teacher/exam.twig b/~dev_rating/application/views/teacher/exam.twig index 49fa56e72..a82ef8413 100644 --- a/~dev_rating/application/views/teacher/exam.twig +++ b/~dev_rating/application/views/teacher/exam.twig @@ -113,7 +113,7 @@ {% else %} <td id="col_{{ col }}" class="commonCell {{ td_class }}"> <input type="text" value="{{ r.Rate }}" {% if r.ModuleType == 'extra' %} - placeholder="{% if r.MaxRate > 0 %} max {{r.MaxRate}} {% else %} 0 {% endif %}"{% endif %}> + placeholder="{% if r.MaxRate > 0 %} макс. {{r.MaxRate}} {% else %} --- {% endif %}"{% endif %}> </td> {% endif %} {% endfor %} diff --git a/~dev_rating/media/js/rating.js b/~dev_rating/media/js/rating.js index 58b699e34..7cfac75c8 100644 --- a/~dev_rating/media/js/rating.js +++ b/~dev_rating/media/js/rating.js @@ -101,9 +101,10 @@ $(function() { if (t > 31 && t < 39) g_submoduleMaxRate = 38 - t; else g_submoduleMaxRate = 0; - if (g_submoduleMaxRate > 0) - jThis.children("input").attr("placeholder", "max "+g_submoduleMaxRate); - else jThis.children("input").attr("placeholder", "0"); + + //if (g_submoduleMaxRate > 0) + // jThis.children("input").attr("placeholder", "макс. "+g_submoduleMaxRate); + //else jThis.children("input").attr("placeholder", "---"); } // Получаем студента -- GitLab