From fd61c1cefe4b0bcabddf5d481816866b1245e0e6 Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Sat, 10 Jan 2015 17:19:46 +0000
Subject: [PATCH] expo-20 ready

---
 .../includes/accounts/current_user.html       | 29 +++++--
 templates/client/includes/show_logo.html      |  3 +-
 templates/client/static_client/css/main.css   | 81 +++++++++++++++++++
 3 files changed, 104 insertions(+), 9 deletions(-)

diff --git a/templates/client/includes/accounts/current_user.html b/templates/client/includes/accounts/current_user.html
index f698e97f..45dd4933 100644
--- a/templates/client/includes/accounts/current_user.html
+++ b/templates/client/includes/accounts/current_user.html
@@ -414,15 +414,28 @@
             {# END about #}
 
             {# companies #}
+            <div class="my-companies-block editable">
+                <div class="ia-title">{% trans 'Мои компании:' %}</div>
+
+                {% with companies=request.user.created_company.all %}
+                    {% for company in companies %}
+                        <div class="company">
+                            <a href="{{ company.get_permanent_url }}">
+                                <span class="logo">
+                                   {% include 'client/includes/show_logo.html' with obj=company %}
+                                </span>
+                                <span class="title">
+                                    {{ company.name }}
+                                </span>
+                            </a>
+                        </div>
+                    {% endfor %}
+                {% endwith %}
 
-            {% with companies=request.user.created_company.all %}
-                {% for company in companies %}
-                    {# ссылка с названиями #}
-                    <a href="{{ company.get_permanent_url }}">{{ company.name }}</a>
-                    {# лого #}
-                    {% include 'client/includes/show_logo.html' with obj=company %}
-                {% endfor %}
-            {% endwith %}
+            </div>
+            <div class="add-company-block">
+                <a class="button icon-add" href="#">{% trans 'Добавить компанию' %}</a>
+            </div>
 
             {# END companies #}
 
diff --git a/templates/client/includes/show_logo.html b/templates/client/includes/show_logo.html
index 900fa744..df1a0698 100644
--- a/templates/client/includes/show_logo.html
+++ b/templates/client/includes/show_logo.html
@@ -8,5 +8,6 @@
         <img src="{{ obj.get_logo.file_path.url }}" alt="" />
     {% endif %}
 {% else %}
-    <img src="{% static 'client/img/no-logo.png' %}" alt="" />
+
+    <img src="{% static 'client/img/no-logo.png' %}" class="no-logo" alt="" />
 {% endif %}
\ No newline at end of file
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index 88ef06c7..53b97e46 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -12675,6 +12675,87 @@ hr + .rq-note {
 		.edit-profile .i-pict.p-editable img{
 			z-index: 0;
 		}
+		.my-companies-block:after{
+			content: '';
+			display: block;
+			clear: both;
+
+		}
+		.my-companies-block .ia-title{
+			font-family: 'dindisplay_pro', sans-serif;
+			font-size: 20px;
+			line-height: 23px;
+			margin-bottom: 30px;
+		}
+			.my-companies-block	.company{
+				display: block;
+				-webkit-box-sizing: border-box;
+				-moz-box-sizing: border-box;
+				box-sizing: border-box;
+				width: 25%;
+				float: left;
+
+			}
+			/*добавить меньшую длину для разрешения меньше 1200*/
+				.my-companies-block	.company a{
+					display: block;
+					width: 180px;
+					margin-left: auto;
+					margin-right: auto;
+				}
+				.my-companies-block	.company .logo{
+					display: block;
+					width: 100%;
+					height: 180px;
+					-webkit-box-sizing: border-box;
+					-moz-box-sizing: border-box;
+					box-sizing: border-box;
+					border-radius: 4px;
+					border-top: 1px solid #CCCBC6;
+					background-color: #ffffff;
+				}
+
+					.my-companies-block	.company .logo img.no-logo{
+						margin-top: 58px;
+					}
+					.my-companies-block	.company .logo img{
+						display: table;
+						margin-left: auto;
+						margin-right: auto;
+					}
+				/*.my-companies-block	.company .title:after{*/
+					/*content: '';*/
+					/*display: block;*/
+					/*clear: both;*/
+				/*}*/
+				.my-companies-block	.company .title{
+					display: block;
+					color: #606060;
+					margin-top: 8px;
+					text-decoration: underline;
+					text-align: center;
+					position: relative;
+
+				}
+				.my-companies-block	.company a:hover .title{
+					text-decoration: none;
+				}
+				.my-companies-block.editable .company .title:before{
+					content: '';
+					width: 18px;
+					height: 16px;
+					background: url(../img/sprites.png) -117px -145px no-repeat;
+					position: absolute;
+					left: 0;
+					top: 0;
+				}
+	.add-company-block{
+		margin-top: 2em;
+	}
+	/*.add-company-block .icon-add:before{*/
+		/*background-position: -425px -52px;*/
+	/*}*/
+
 
 /************************\
 # страница редактирования профиля