From 1b223a58aee825281cbc9b53f4ede21544bf4a0a Mon Sep 17 00:00:00 2001
From: pavel <pavel.handleman@gmail.com>
Date: Mon, 29 Dec 2014 14:31:21 +0000
Subject: [PATCH] EXPO-30 frontend part

---
 templates/client/gulpfile.js                        | 2 +-
 templates/client/includes/company/company_edit.html | 8 ++++----
 templates/client/static_client/css/main.css         | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/templates/client/gulpfile.js b/templates/client/gulpfile.js
index 3de420a3..419ee0e5 100644
--- a/templates/client/gulpfile.js
+++ b/templates/client/gulpfile.js
@@ -76,6 +76,6 @@ gulp.task('watch-js', function () {
 gulp.task('watch-css', function () {
 	gulp.watch("static_client/css/main.css", ["main-css"]);
 });
-gulp.task('watch-vorkflow', function () {
+gulp.task('watch-workflow', function () {
 	gulp.watch(["static_client/css/main.css","static_client/js/_modules/*.js"], ["main-css","minify-modules"]);
 });
diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html
index 7d5f79b3..943036cc 100644
--- a/templates/client/includes/company/company_edit.html
+++ b/templates/client/includes/company/company_edit.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load template_filters %}
 
-<div class="m-article">
+<div class="m-article edit-profile">
     <div class="item-wrap clearfix">
 
         <aside>
@@ -208,8 +208,6 @@
 
             <div class="i-contacts clearfix">
                 <div class="ic-buttons ic-buttons_pos dd_width_4">
-                    <a class="button icon-edit icb-edit-profile" href="#">редактировать профиль</a>
-                    <a class="button orange icon-edit icb-exit-edit" href="#">завершить редактирование</a>
 
                     <div class="ic-buttons_text">Добавить профили в соц.сетях:</div>
 
@@ -551,7 +549,9 @@
 <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
 <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
 <!-- page module-->
-<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.company{% if debug %}{% else %}.min{% endif %}.js"></script>
+<!--todo: вернуть минифицированную версию-->
+<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.company{% if debug %}{% else %}.min{% endif %}.js"></script>-->
+<script src="{% static 'client/js/_modules/page.company.js' %}"></script>
 <script>
 	//js module initialization
 	EXPO.company.init({
diff --git a/templates/client/static_client/css/main.css b/templates/client/static_client/css/main.css
index c0aded53..560e2a8e 100644
--- a/templates/client/static_client/css/main.css
+++ b/templates/client/static_client/css/main.css
@@ -12619,6 +12619,7 @@ hr + .rq-note {
 
 /************************\
 # страница редактирования профиля
+  пользователь  и компания
 \***********************/
 
 	.edit-profile .edit-wrap{
@@ -12639,3 +12640,8 @@ hr + .rq-note {
 		.edit-profile .i-pict.p-editable img{
 			z-index: 0;
 		}
+
+/************************\
+# страница редактирования профиля
+  компания
+\***********************/