From aad22cd390c6933f06c83e904e76e87f41f54681 Mon Sep 17 00:00:00 2001
From: pimka <pimka@ro.ru>
Date: Sun, 7 Sep 2014 13:30:27 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
=?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=A2=D0=B5=D0=BC?=
=?UTF-8?q?=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
~dev_rating/application/views/base.twig | 9 ++++++-
~dev_rating/media/css/errorButton.css | 32 ++++++++++++++++++++++---
~dev_rating/media/js/errDialog.js | 2 +-
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/~dev_rating/application/views/base.twig b/~dev_rating/application/views/base.twig
index 901434641..d7d6798d8 100644
--- a/~dev_rating/application/views/base.twig
+++ b/~dev_rating/application/views/base.twig
@@ -90,9 +90,16 @@
</div>
<div class="dialogMyMessagesBtn">Мои сообщения</div>
<div class="dialogMyMessages">Вы пока не отправили ни одного сообщения</div>
+
+ <div class="dialogMessageTitle">
+ <input id="messageTitle" placeholder="Тема сообщения">
+ </div>
+
<div class="dialogTextMessage">
- <textarea id="message"></textarea>
+ <textarea id="message" placeholder="Сообщение"></textarea>
</div>
+
+
<div class="dialogSendButton">
<div class="buttonText">Сообщить</div>
</div>
diff --git a/~dev_rating/media/css/errorButton.css b/~dev_rating/media/css/errorButton.css
index fe6972c64..6ca17e7bf 100644
--- a/~dev_rating/media/css/errorButton.css
+++ b/~dev_rating/media/css/errorButton.css
@@ -87,14 +87,40 @@
color: #000000;
}
+
+.dialogMessageTitle {
+ margin-left: 13px;
+ margin-right: 13px;
+ margin-top: 5px;
+
+ padding-right: 22px;
+ padding-bottom: 5px;
+ padding-left: 2px;
+ padding-top: 2px;
+}
+
+#messageTitle {
+ height: 100%;
+ width: 100%;
+ padding: 9px;
+ border: solid 1px #E5E5E5;
+ outline: 0;
+ font: normal 13px/100% Verdana, Tahoma, sans-serif;
+
+ box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+ -moz-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+ -webkit-box-shadow: rgba(0,0,0, 0.1) 0px 0px 8px;
+
+}
+
.dialogTextMessage {
/* border: 1px solid black;*/
margin-left: 13px;
margin-right: 13px;
margin-top: 5px;
height: 150px;
- padding-right: 20px;
- padding-bottom: 20px;
+ padding-right: 22px;
+ padding-bottom: 30px;
padding-left: 3px;
padding-top: 2px;
}
@@ -104,7 +130,7 @@
resize: none;
overflow: auto;
width: 100%;
- height: 148px;
+ height: 100%;
/*border: 1px solid black*/
diff --git a/~dev_rating/media/js/errDialog.js b/~dev_rating/media/js/errDialog.js
index 9d02c6c59..6c0371cb9 100644
--- a/~dev_rating/media/js/errDialog.js
+++ b/~dev_rating/media/js/errDialog.js
@@ -5,7 +5,7 @@ $(document).ready(function() {
$('#errDialog').dialog({
autoOpen: false,
resizable: false,
- modal: true,
+ modal: false,
width: 490,
// height: 400,
show: {
--
GitLab