From 78242baad8ed9f0326ec2ab46ad1b7ab402fb81e Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Mon, 7 May 2012 09:02:25 +0700 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D1=81=D1=82=D0=BA=D0=B0=20Sy?= =?UTF-8?q?nio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../actions/ActionSettings/account.tpl | 4 +- .../actions/ActionSettings/invite.tpl | 4 + .../actions/ActionSettings/profile.tpl | 3 - .../actions/ActionSettings/tuning.tpl | 3 - templates/skin/developer/menu.settings.tpl | 3 + .../skin/synio/actions/ActionBlogs/index.tpl | 2 +- .../skin/synio/actions/ActionPeople/index.tpl | 18 +- .../ActionProfile/created_comments.tpl | 1 + .../actions/ActionProfile/created_notes.tpl | 1 + .../actions/ActionProfile/created_topics.tpl | 1 + .../ActionProfile/favourite_comments.tpl | 2 +- .../ActionProfile/favourite_topics.tpl | 2 +- .../synio/actions/ActionProfile/friends.tpl | 2 +- .../actions/ActionProfile/profile_top.tpl | 40 +- .../synio/actions/ActionProfile/sidebar.tpl | 80 ++-- .../synio/actions/ActionProfile/stream.tpl | 2 +- .../skin/synio/actions/ActionProfile/wall.tpl | 6 +- .../actions/ActionProfile/wall_items.tpl | 48 +-- .../ActionProfile/wall_items_reply.tpl | 16 +- .../synio/actions/ActionProfile/whois.tpl | 376 +++++++++--------- .../synio/actions/ActionSettings/account.tpl | 61 ++- .../synio/actions/ActionSettings/invite.tpl | 29 +- .../synio/actions/ActionSettings/profile.tpl | 213 +++++----- .../synio/actions/ActionSettings/tuning.tpl | 24 +- .../skin/synio/actions/ActionStream/all.tpl | 2 + .../synio/actions/ActionStream/events.tpl | 5 +- .../skin/synio/actions/ActionStream/user.tpl | 2 + .../skin/synio/actions/ActionTalk/add.tpl | 1 - .../synio/actions/ActionTalk/blacklist.tpl | 39 +- .../synio/actions/ActionTalk/favourites.tpl | 1 - .../skin/synio/actions/ActionTalk/filter.tpl | 29 +- .../skin/synio/actions/ActionTalk/friends.tpl | 20 +- .../skin/synio/actions/ActionTalk/inbox.tpl | 4 - .../skin/synio/actions/ActionTalk/read.tpl | 49 +-- .../synio/actions/ActionTalk/speakers.tpl | 5 +- .../synio/blocks/block.tagsFavouriteTopic.tpl | 8 +- templates/skin/synio/blog_list.tpl | 36 +- templates/skin/synio/comment.tpl | 8 +- templates/skin/synio/comment_list.tpl | 31 +- templates/skin/synio/css/base.css | 54 ++- templates/skin/synio/css/blocks.css | 20 +- templates/skin/synio/css/buttons.css | 42 +- templates/skin/synio/css/comments.css | 17 +- templates/skin/synio/css/common.css | 171 ++++++-- templates/skin/synio/css/forms.css | 11 +- templates/skin/synio/css/icons.css | 4 + templates/skin/synio/css/modals.css | 23 +- templates/skin/synio/css/navs.css | 2 +- templates/skin/synio/css/profile.css | 45 ++- templates/skin/synio/css/reset.css | 2 +- templates/skin/synio/css/tables.css | 41 +- templates/skin/synio/css/topic.css | 74 +--- templates/skin/synio/css/wall.css | 36 +- templates/skin/synio/images/icons-synio.png | Bin 16978 -> 22930 bytes templates/skin/synio/images/update.gif | Bin 2183 -> 1686 bytes templates/skin/synio/js/synio.js | 9 +- templates/skin/synio/menu.profile.content.tpl | 8 + templates/skin/synio/menu.profile_created.tpl | 2 - .../skin/synio/menu.profile_favourite.tpl | 2 - templates/skin/synio/menu.settings.tpl | 2 + templates/skin/synio/menu.talk.tpl | 2 +- templates/skin/synio/toolbar_admin.tpl | 2 +- templates/skin/synio/toolbar_scrollup.tpl | 2 +- templates/skin/synio/toolbar_topic.tpl | 4 +- templates/skin/synio/topic_part_footer.tpl | 84 ++-- templates/skin/synio/user_list.tpl | 22 +- templates/skin/synio/user_list_avatar.tpl | 3 +- 67 files changed, 1035 insertions(+), 830 deletions(-) create mode 100644 templates/skin/synio/menu.profile.content.tpl diff --git a/templates/skin/developer/actions/ActionSettings/account.tpl b/templates/skin/developer/actions/ActionSettings/account.tpl index 603dd000..fbd5e011 100644 --- a/templates/skin/developer/actions/ActionSettings/account.tpl +++ b/templates/skin/developer/actions/ActionSettings/account.tpl @@ -2,12 +2,10 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} -

{$aLang.settings_menu}

- {include file='menu.settings.tpl'} + {hook run='settings_account_begin'}
diff --git a/templates/skin/developer/actions/ActionSettings/invite.tpl b/templates/skin/developer/actions/ActionSettings/invite.tpl index 8ae33c73..2620a04f 100644 --- a/templates/skin/developer/actions/ActionSettings/invite.tpl +++ b/templates/skin/developer/actions/ActionSettings/invite.tpl @@ -2,6 +2,10 @@ {include file='header.tpl' menu='settings'} +{include file='actions/ActionProfile/profile_top.tpl'} +{include file='menu.settings.tpl'} + + {$aLang.settings_invite_notice} "{$aLang.settings_invite_submit}" {hook run='settings_invite_begin'} diff --git a/templates/skin/developer/actions/ActionSettings/profile.tpl b/templates/skin/developer/actions/ActionSettings/profile.tpl index 5114c3ca..c7c34505 100644 --- a/templates/skin/developer/actions/ActionSettings/profile.tpl +++ b/templates/skin/developer/actions/ActionSettings/profile.tpl @@ -2,10 +2,7 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} -

{$aLang.settings_menu}

- {include file='menu.settings.tpl'} diff --git a/templates/skin/developer/actions/ActionSettings/tuning.tpl b/templates/skin/developer/actions/ActionSettings/tuning.tpl index fadf0a4c..c07039cb 100644 --- a/templates/skin/developer/actions/ActionSettings/tuning.tpl +++ b/templates/skin/developer/actions/ActionSettings/tuning.tpl @@ -2,10 +2,7 @@ {include file='header.tpl'} - {include file='actions/ActionProfile/profile_top.tpl'} -

{$aLang.settings_menu}

- {include file='menu.settings.tpl'} diff --git a/templates/skin/developer/menu.settings.tpl b/templates/skin/developer/menu.settings.tpl index 95aeee46..de56062d 100644 --- a/templates/skin/developer/menu.settings.tpl +++ b/templates/skin/developer/menu.settings.tpl @@ -1,3 +1,6 @@ +

{$aLang.settings_menu}

+ +