From 6c8f9b15d5710bcdfd6e6deba767f43c467fec90 Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Tue, 11 Oct 2016 10:59:10 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A8=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=20Synio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/user/js/user-fields.js         |  4 +-
 .../components/editor/css/tinymce-content.css |  2 +-
 .../skin/synio/components/forms/css/forms.css | 13 +++++--
 .../synio/components/nav/css/layout-nav.css   |  6 ++-
 .../skin/synio/components/user/component.json |  3 +-
 .../synio/components/user/css/settings.css    | 12 ++++++
 .../components/user/settings/profile.tpl      | 38 ++++++++++---------
 .../skin/synio/layouts/layout.base.tpl        |  7 +++-
 8 files changed, 57 insertions(+), 28 deletions(-)
 create mode 100644 application/frontend/skin/synio/components/user/css/settings.css

diff --git a/application/frontend/components/user/js/user-fields.js b/application/frontend/components/user/js/user-fields.js
index da07d5a3..919af78c 100644
--- a/application/frontend/components/user/js/user-fields.js
+++ b/application/frontend/components/user/js/user-fields.js
@@ -11,7 +11,7 @@
 (function($) {
     "use strict";
 
-    $.widget( "livestreet.lsUserFields", {
+    $.widget( "livestreet.lsUserFields", $.livestreet.lsComponent, {
         /**
          * Дефолтные опции
          */
@@ -39,7 +39,7 @@
          * @private
          */
         _create: function () {
-            var _this = this;
+            this._super();
 
             this.elements = {
                 template: $( this.option( 'selectors.template' ) ),
diff --git a/application/frontend/skin/synio/components/editor/css/tinymce-content.css b/application/frontend/skin/synio/components/editor/css/tinymce-content.css
index dace3f5e..bc531f13 100644
--- a/application/frontend/skin/synio/components/editor/css/tinymce-content.css
+++ b/application/frontend/skin/synio/components/editor/css/tinymce-content.css
@@ -8,7 +8,7 @@ body {
     line-height: 1.6em;
     font-family: Verdana, "Helvetica Neue", Helvetica, Arial, sans-serif;
     color: #000;
-    background-color: #fbfcfc;
+    background-color: #fff;
 }
 
 /**
diff --git a/application/frontend/skin/synio/components/forms/css/forms.css b/application/frontend/skin/synio/components/forms/css/forms.css
index 3195736a..f53135c2 100644
--- a/application/frontend/skin/synio/components/forms/css/forms.css
+++ b/application/frontend/skin/synio/components/forms/css/forms.css
@@ -65,16 +65,16 @@ select[multiple] {
 .fieldset {
     margin-bottom: 25px;
     border-radius: 5px;
-    background-color: #eef4fb;
+    background-color: #f1f7fd;
 }
 .fieldset:last-child {
     margin-bottom: 0;
 }
 .fieldset-header {
-    padding: 15px;
+    padding: 20px;
 }
 .fieldset-body, .fieldset-footer {
-    padding: 0 15px 15px;
+    padding: 0 20px 20px;
 }
 .fieldset-title {
     font-size: 20px;
@@ -84,7 +84,7 @@ select[multiple] {
 .fieldset-help {
     color: #aaa;
     font-size: 13px;
-    margin-top: 15px;
+    margin-top: 20px;
 }
 
 /**
@@ -118,4 +118,9 @@ select[multiple] {
     border-radius: 5px;
     padding: 20px 20px;
     background: #f8fbfe;
+}
+.syn-form-panel .fieldset {
+    border-radius: 0;
+    margin-left: -20px;
+    margin-right: -20px;
 }
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/nav/css/layout-nav.css b/application/frontend/skin/synio/components/nav/css/layout-nav.css
index b1888133..9cf628de 100644
--- a/application/frontend/skin/synio/components/nav/css/layout-nav.css
+++ b/application/frontend/skin/synio/components/nav/css/layout-nav.css
@@ -3,6 +3,7 @@
 }
 .layout-nav-right {
     float: right;
+    margin: 1px 0 1px;
 }
 .layout-nav-create {
     float: left;
@@ -83,9 +84,12 @@
     border: none;
 }
 
-.layout-nav-top .ls-badge {
+.ls-nav-item .ls-badge {
     background: none;
     padding: 0;
     font-weight: normal;
     color: #b1c4ce;
+}
+.ls-nav-item:hover .ls-badge {
+    color: #fff;
 }
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/user/component.json b/application/frontend/skin/synio/components/user/component.json
index ae7f9818..5dbfdb71 100644
--- a/application/frontend/skin/synio/components/user/component.json
+++ b/application/frontend/skin/synio/components/user/component.json
@@ -1,5 +1,6 @@
 {
     "styles": {
-        "user-list": "css/user-list.css"
+        "user-list": "css/user-list.css",
+        "settings": "css/settings.css"
     }
 }
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/user/css/settings.css b/application/frontend/skin/synio/components/user/css/settings.css
new file mode 100644
index 00000000..aec9e853
--- /dev/null
+++ b/application/frontend/skin/synio/components/user/css/settings.css
@@ -0,0 +1,12 @@
+.user-field-item {
+    margin-bottom: 10px;
+}
+.user-field-item:last-child {
+    margin-bottom: 10px;
+}
+.user-field-item > * {
+    vertical-align: middle;
+}
+.user-field-item i {
+    cursor: pointer;
+}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/user/settings/profile.tpl b/application/frontend/skin/synio/components/user/settings/profile.tpl
index 17b69089..c26c89ae 100644
--- a/application/frontend/skin/synio/components/user/settings/profile.tpl
+++ b/application/frontend/skin/synio/components/user/settings/profile.tpl
@@ -9,7 +9,7 @@
 
 {* Шаблон пользовательского поля (userfield) *}
 {function name=userfield}
-    <div class="ls-mb-15 js-user-field-item" {if ! $field}id="user-field-template" style="display:none;"{/if}>
+    <div class="user-field-item js-user-field-item" {if ! $field}id="user-field-template" style="display:none;"{/if}>
         <select name="profile_user_field_type[]">
             {foreach $aUserFieldsContact as $fieldAll}
                 <option value="{$fieldAll->getId()}" {if $field && $fieldAll->getId() == $field->getId()}selected{/if}>
@@ -19,7 +19,7 @@
         </select>
 
         <input type="text" name="profile_user_field_value[]" value="{if $field}{$field->getValue()|escape}{/if}" class="ls-width-200">
-        {component 'icon' icon='remove' classes='js-user-field-item-remove' attributes=[ title => {lang 'common.remove'} ]}
+        {component 'syn-icon' icon='trash' classes='js-user-field-item-remove' attributes=[ title => {lang 'common.remove'} ]}
     </div>
 {/function}
 
@@ -97,24 +97,28 @@
 
 
     {* Контакты *}
-    <fieldset class="js-user-fields">
-        <legend>{lang name='user.settings.profile.contact'}</legend>
+    <div class="fieldset js-user-fields">
+        <header class="fieldset-header">
+            <h3 class="fieldset-title">{lang name='user.settings.profile.contact'}</h3>
+        </header>
 
-        {$contacts = $user->getUserFieldValues( true, array('contact', 'social') )}
+        <div class="fieldset-body">
+            {$contacts = $user->getUserFieldValues( true, array('contact', 'social') )}
 
-        {* Список пользовательских полей, шаблон определен в начале файла *}
-        <div class="js-user-field-list ls-mb-15">
-            {foreach $contacts as $contact}
-                {call userfield field=$contact}
-            {foreachelse}
-                {component 'blankslate' classes='js-user-fields-empty' text=$aLang.common.empty}
-            {/foreach}
+            {* Список пользовательских полей, шаблон определен в начале файла *}
+            <div class="js-user-field-list ls-mb-15">
+                {foreach $contacts as $contact}
+                    {call userfield field=$contact}
+                {foreachelse}
+                    {component 'blankslate' classes='js-user-fields-empty' text=$aLang.common.empty}
+                {/foreach}
+            </div>
+
+            {if $aUserFieldsContact}
+                {component 'button' type='button' classes='js-user-fields-submit' text=$aLang.common.add}
+            {/if}
         </div>
-
-        {if $aUserFieldsContact}
-            {component 'button' type='button' classes='js-user-fields-submit' text=$aLang.common.add}
-        {/if}
-    </fieldset>
+    </div>
 
     {* @hook Конец формы с настройками профиля *}
     {hook run='user_settings_profile_end'}
diff --git a/application/frontend/skin/synio/layouts/layout.base.tpl b/application/frontend/skin/synio/layouts/layout.base.tpl
index 8c90fd6b..d692faf9 100644
--- a/application/frontend/skin/synio/layouts/layout.base.tpl
+++ b/application/frontend/skin/synio/layouts/layout.base.tpl
@@ -76,7 +76,10 @@
             </div>
 
             {* Первый уровень навигации *}
-            {component 'nav' hook='main_nav' classes='layout-nav-top' params=$layoutNav[0]}
+            {* Отображаем его вверху только если уровней навигации > 1 *}
+            {if count($layoutNav) > 1}
+                {component 'nav' hook='main_nav' classes='layout-nav-top' params=$layoutNav[0]}
+            {/if}
         </div>
     </nav>
 
@@ -111,7 +114,7 @@
                         {if is_array($layoutNav)}
                             {foreach $layoutNav as $layoutNavItem}
                                 {* Пропускаем первый уровень навигации который отображается выше *}
-                                {if $layoutNavItem@index === 0}{continue}{/if}
+                                {if $layoutNavItem@index === 0 && count($layoutNav) > 1}{continue}{/if}
 
                                 {if is_array($layoutNavItem)}
                                     {component 'nav' mods='pills' params=$layoutNavItem assign=_layoutNavItemContent}