From 22ea14281a59f722c1385c1041df4b6bb732f1d7 Mon Sep 17 00:00:00 2001 From: ElenaMetelitsa <ami96@list.ru> Date: Mon, 13 Jul 2015 13:46:05 +0300 Subject: [PATCH] New request style --- media/css/reports.css | 18 +++++++++ media/css/test.css | 3 -- media/js/reports.js | 9 +++++ ~dev_rating/application/views/admin/base.twig | 2 +- .../views/admin/requests/errors.twig | 38 ++++++++++++------- 5 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 media/css/reports.css delete mode 100644 media/css/test.css create mode 100644 media/js/reports.js diff --git a/media/css/reports.css b/media/css/reports.css new file mode 100644 index 000000000..e7df96018 --- /dev/null +++ b/media/css/reports.css @@ -0,0 +1,18 @@ +.errTitle{ + font-size: large; + cursor: pointer; + } +.repBlock{ + border: solid; + border-width: 1px ; + border-color: #8ba7f6; + padding: 7px; + margin-bottom: 10px; +} +.reqImg{ + float:left; + width: 100px; +} +.repInfo{ + display: none; +} \ No newline at end of file diff --git a/media/css/test.css b/media/css/test.css deleted file mode 100644 index 3ffd17aeb..000000000 --- a/media/css/test.css +++ /dev/null @@ -1,3 +0,0 @@ -p{ - color: #0000cc; -} \ No newline at end of file diff --git a/media/js/reports.js b/media/js/reports.js new file mode 100644 index 000000000..921b3b686 --- /dev/null +++ b/media/js/reports.js @@ -0,0 +1,9 @@ +$(function(){ + $(".errTitle").click(function(e){ + var id_click = e.target.id; + console.log(id_click + " 11111"); + var id_id = id_click.replace('errTitle','#repInfo'); + console.log(id_id); + $(id_id).toggle(400); + }) +}) \ No newline at end of file diff --git a/~dev_rating/application/views/admin/base.twig b/~dev_rating/application/views/admin/base.twig index f8b551572..61935a2e5 100644 --- a/~dev_rating/application/views/admin/base.twig +++ b/~dev_rating/application/views/admin/base.twig @@ -36,7 +36,7 @@ {{ HTML.style('static/css/admin/macro.css')|raw }} {#{{ HTML.style('static/css/actionButton.css')|raw }}#} {{ HTML.style('static/css/common/buttons.css')|raw }} - + {{ HTML.style('static/css/common/buttons.css')|raw }} {{ HTML.script('static/js/libs/jquery-1.11.1.min.js')|raw }} {{ HTML.script('static/js/config.js')|raw }} diff --git a/~dev_rating/application/views/admin/requests/errors.twig b/~dev_rating/application/views/admin/requests/errors.twig index 257b8eab8..eb429bf7d 100644 --- a/~dev_rating/application/views/admin/requests/errors.twig +++ b/~dev_rating/application/views/admin/requests/errors.twig @@ -2,22 +2,32 @@ {% block title %}Поддержка{% endblock %} +{% block media %}{{ HTML.style('/static/css/reports.css')|raw }} +{{ HTML.script('/static/js/reports.js')|raw }} +{% endblock %} {% block main_top_title %}Сообщения в службу поддержки{% endblock %} {% block main_content %} - <table border="1"> - {% for ind, req in Requests %} - <tr> - <td>{{ ind }} </td> - <td>{{ req.ID }}</td> - <td>{{ req.Title }}</td> - <td>{{ req.Status }}</td> - <td> - {% if req.IsImage == '1' %} - <img src="{{ [URL.site("support/image/preview"), req.ID]|join('/') }}"> - {% endif %} - </td> - </tr> +<div></div> + <div class="listPage1"> + {% for req in Requests %} + <div class="repBlock" > + <div> + <div class="errTitle" id="{{ "errTitle"~req.ID }}" style="float: left">{{ req.Title }}</div> + + <div style="float: right">{{ req.Status }}</div></div> + {#<div style="float: left">{{ ind }} </div> + <div style="float: left">{{ req.ID }}</div>#} + <div id="{{ "repInfo"~req.ID }}" class="repInfo"> + <div class ="reqImg"> + {% if req.IsImage == '1' %} + <img src="{{ [URL.site("support/image/preview"), req.ID]|join('/') }}"> + {% endif %} + </div> + <div><p>{{ req.Description}}</p></div> + </div> + + </div> {% endfor %} - </table> + </div> {% endblock %} -- GitLab