diff --git a/templates/language/russian.php b/templates/language/russian.php index a669412f..eaea2673 100644 --- a/templates/language/russian.php +++ b/templates/language/russian.php @@ -101,7 +101,7 @@ return array( 'blog_menu_top_period_7d' => 'За 7 дней', 'blog_menu_top_period_30d' => 'За 30 дней', 'blog_menu_top_period_all' => 'За все время', - 'blog_menu_create' => 'Создать блог', + 'blog_menu_create' => 'Блог', /** * Создание/редактирование блога */ diff --git a/templates/skin/developer-jquery/actions/ActionBlog/add.tpl b/templates/skin/developer-jquery/actions/ActionBlog/add.tpl index 8b96649f..b7353309 100644 --- a/templates/skin/developer-jquery/actions/ActionBlog/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionBlog/add.tpl @@ -2,13 +2,6 @@ {include file='header.tpl' menu='topic_action'} {else} {include file='header.tpl'} -{/if} - - - -{if $sEvent=='add'} - -{else} {include file='menu.blog_edit.tpl'} {/if} diff --git a/templates/skin/developer-jquery/actions/ActionLink/add.tpl b/templates/skin/developer-jquery/actions/ActionLink/add.tpl index 24ece76c..b5b7269c 100644 --- a/templates/skin/developer-jquery/actions/ActionLink/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionLink/add.tpl @@ -1,9 +1,7 @@ -{include file='header.tpl' menu='topic_action'} - - {if $sEvent=='add'} - + {include file='header.tpl' menu='topic_action'} {else} + {include file='header.tpl'} {/if} diff --git a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl index b06c189f..783b9012 100644 --- a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl @@ -1,4 +1,9 @@ -{include file='header.tpl' menu='topic_action' showWhiteBack=true} +{if $sEvent=='add'} + {include file='header.tpl' menu='topic_action'} +{else} + {include file='header.tpl'} + +{/if} {if $oConfig->GetValue('view.tinymce')} @@ -32,14 +37,6 @@ - -{if $sEvent=='add'} - -{else} - -{/if} - -

diff --git a/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl b/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl index 30eb2095..286f9d73 100644 --- a/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl @@ -1,9 +1,7 @@ -{include file='header.tpl' menu='topic_action'} - - {if $sEvent=='add'} -

+ {include file='header.tpl' menu='topic_action'} {else} + {include file='header.tpl'} {/if} diff --git a/templates/skin/developer-jquery/actions/ActionTopic/add.tpl b/templates/skin/developer-jquery/actions/ActionTopic/add.tpl index 12e1ac4e..a8e56b50 100644 --- a/templates/skin/developer-jquery/actions/ActionTopic/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionTopic/add.tpl @@ -1,4 +1,10 @@ -{include file='header.tpl' menu='topic_action'} +{if $sEvent=='add'} + {include file='header.tpl' menu='topic_action'} +{else} + {include file='header.tpl'} + +{/if} + {if $oConfig->GetValue('view.tinymce')} @@ -20,17 +26,6 @@ {/if} - - - - -{if $sEvent=='add'} - -{else} - -{/if} - - {hook run='add_topic_topic_begin'} diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css index 45194518..b35a1a81 100644 --- a/templates/skin/developer-jquery/css/common.css +++ b/templates/skin/developer-jquery/css/common.css @@ -133,14 +133,28 @@ .tag-cloud li .tag-size-10 { font-size: 22px; } + /* Валидатор ---------------------------------------------------------------*/ .validate-error-show { color: #f00; font-weight: bold; font-size: 12px; } +/* Выпадающее меню создания топика +---------------------------------------------------------------*/ +.create-dropdown { position: relative; margin-right: 120px; } +.create-dropdown a { font-weight: normal; } +.create-dropdown-link { text-transform: lowercase; } +.create-dropdown-menu { position: absolute; top: 32px; overflow: hidden; background: #fff; border: 1px solid #ddd; min-width: 150px; box-shadow: 0 0 5px #ddd; border-radius: 3px; } +.create-dropdown-menu li { font-size: 14px; line-height: 1em; } +.create-dropdown-menu li a { display: block; padding: 10px 15px; } +.create-dropdown-menu li a:hover { background: #fafafa; } +.create-dropdown-menu li.active a { color: #333; } +.create-dropdown-menu li.active a:hover { cursor: default; } + +.drafts { float: right; margin-top: 10px; } /* Разное @@ -192,6 +206,7 @@ .mb-10 { margin-bottom: 10px !important; } .mb-15 { margin-bottom: 15px !important; } .mb-20 { margin-bottom: 20px !important; } +.mb-30 { margin-bottom: 30px !important; } .clearfix:before, .clearfix:after { content: ""; display: table; } diff --git a/templates/skin/developer-jquery/menu.topic_action.tpl b/templates/skin/developer-jquery/menu.topic_action.tpl index 82cdb67d..d57cb458 100644 --- a/templates/skin/developer-jquery/menu.topic_action.tpl +++ b/templates/skin/developer-jquery/menu.topic_action.tpl @@ -1,30 +1,48 @@ - - - + + + +{$aLang.topic_menu_saved} {if $iUserCurrentCountTopicDraft}({$iUserCurrentCountTopicDraft}){/if} +{hook run='menu_topic_action_saved_item'} + + +
+ + + +
+ + +{if $sMenuSubItemSelect=='add' && $sMenuItemSelect!='add_blog'} + +{/if} diff --git a/templates/skin/developer-jquery/window_write.tpl b/templates/skin/developer-jquery/window_write.tpl index c94458e2..021ac060 100644 --- a/templates/skin/developer-jquery/window_write.tpl +++ b/templates/skin/developer-jquery/window_write.tpl @@ -27,12 +27,10 @@ Блог - {if $iUserCurrentCountTopicDraft} -
  • - - {$aLang.topic_menu_saved} ({$iUserCurrentCountTopicDraft}) -
  • - {/if} +
  • + + {$aLang.topic_menu_saved} {if $iUserCurrentCountTopicDraft}({$iUserCurrentCountTopicDraft}){/if} +
  • {/strip}