Skip to content

Commit

Permalink
Изменено меню создания топиков, исправлены мелкие баги
Browse files Browse the repository at this point in the history
  • Loading branch information
deniart committed Apr 16, 2012
1 parent 168ddd2 commit 1d5af9e
Show file tree
Hide file tree
Showing 9 changed files with 83 additions and 71 deletions.
2 changes: 1 addition & 1 deletion templates/language/russian.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
'blog_menu_top_period_7d' => 'За 7 дней', 'blog_menu_top_period_7d' => 'За 7 дней',
'blog_menu_top_period_30d' => 'За 30 дней', 'blog_menu_top_period_30d' => 'За 30 дней',
'blog_menu_top_period_all' => 'За все время', 'blog_menu_top_period_all' => 'За все время',
'blog_menu_create' => 'Создать блог', 'blog_menu_create' => 'Блог',
/** /**
* Создание/редактирование блога * Создание/редактирование блога
*/ */
Expand Down
7 changes: 0 additions & 7 deletions templates/skin/developer-jquery/actions/ActionBlog/add.tpl
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
{include file='header.tpl' menu='topic_action'} {include file='header.tpl' menu='topic_action'}
{else} {else}
{include file='header.tpl'} {include file='header.tpl'}
{/if}



{if $sEvent=='add'}
<h2 class="page-header">{$aLang.blog_create}</h2>
{else}
{include file='menu.blog_edit.tpl'} {include file='menu.blog_edit.tpl'}
{/if} {/if}


Expand Down
6 changes: 2 additions & 4 deletions templates/skin/developer-jquery/actions/ActionLink/add.tpl
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,7 @@
{include file='header.tpl' menu='topic_action'}


{if $sEvent=='add'} {if $sEvent=='add'}
<h2 class="page-header">{$aLang.topic_link_create}</h2> {include file='header.tpl' menu='topic_action'}
{else} {else}
{include file='header.tpl'}
<h2 class="page-header">{$aLang.topic_link_edit}</h2> <h2 class="page-header">{$aLang.topic_link_edit}</h2>
{/if} {/if}


Expand Down
15 changes: 6 additions & 9 deletions templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl
Original file line number Original file line Diff line number Diff line change
@@ -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'}
<h2 class="page-header">{$aLang.topic_photoset_edit}</h2>
{/if}




{if $oConfig->GetValue('view.tinymce')} {if $oConfig->GetValue('view.tinymce')}
Expand Down Expand Up @@ -32,14 +37,6 @@
</script> </script>
{if $sEvent=='add'}
<h2 class="page-header">{$aLang.topic_photoset_create}</h2>
{else}
<h2 class="page-header">{$aLang.topic_photoset_edit}</h2>
{/if}
<form id="photoset-upload-form" method="POST" enctype="multipart/form-data" onsubmit="return false;"> <form id="photoset-upload-form" method="POST" enctype="multipart/form-data" onsubmit="return false;">
<p id="topic-photo-upload-input" class="topic-photo-upload-input"> <p id="topic-photo-upload-input" class="topic-photo-upload-input">
<label for="">{$aLang.topic_photoset_choose_image}:</label> <label for="">{$aLang.topic_photoset_choose_image}:</label>
Expand Down
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,7 @@
{include file='header.tpl' menu='topic_action'}


{if $sEvent=='add'} {if $sEvent=='add'}
<h2 class="page-header">{$aLang.topic_question_create}</h2> {include file='header.tpl' menu='topic_action'}
{else} {else}
{include file='header.tpl'}
<h2 class="page-header">{$aLang.topic_question_edit}</h2> <h2 class="page-header">{$aLang.topic_question_edit}</h2>
{/if} {/if}


Expand Down
19 changes: 7 additions & 12 deletions templates/skin/developer-jquery/actions/ActionTopic/add.tpl
Original file line number Original file line Diff line number Diff line change
@@ -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'}
<h2 class="page-header">{$aLang.topic_topic_edit}</h2>
{/if}



{if $oConfig->GetValue('view.tinymce')} {if $oConfig->GetValue('view.tinymce')}
<script src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script> <script src="{cfg name='path.root.engine_lib'}/external/tinymce-jq/tiny_mce.js"></script>
Expand All @@ -20,17 +26,6 @@
{/if} {/if}
{if $sEvent=='add'}
<h2 class="page-header">{$aLang.topic_topic_create}</h2>
{else}
<h2 class="page-header">{$aLang.topic_topic_edit}</h2>
{/if}
{hook run='add_topic_topic_begin'} {hook run='add_topic_topic_begin'}
Expand Down
15 changes: 15 additions & 0 deletions templates/skin/developer-jquery/css/common.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -133,14 +133,28 @@
.tag-cloud li .tag-size-10 { font-size: 22px; } .tag-cloud li .tag-size-10 { font-size: 22px; }





/* Валидатор /* Валидатор
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
.validate-error-show { color: #f00; font-weight: bold; font-size: 12px; } .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; }




/* Разное /* Разное
Expand Down Expand Up @@ -192,6 +206,7 @@
.mb-10 { margin-bottom: 10px !important; } .mb-10 { margin-bottom: 10px !important; }
.mb-15 { margin-bottom: 15px !important; } .mb-15 { margin-bottom: 15px !important; }
.mb-20 { margin-bottom: 20px !important; } .mb-20 { margin-bottom: 20px !important; }
.mb-30 { margin-bottom: 30px !important; }


.clearfix:before, .clearfix:before,
.clearfix:after { content: ""; display: table; } .clearfix:after { content: ""; display: table; }
Expand Down
74 changes: 46 additions & 28 deletions templates/skin/developer-jquery/menu.topic_action.tpl
Original file line number Original file line Diff line number Diff line change
@@ -1,30 +1,48 @@
<ul class="nav nav-nested"> <script>
<li {if $sMenuSubItemSelect=='add'}class="active"{/if}> jQuery(function($){
<a href="{cfg name='path.root.web'}/{if $sMenuItemSelect=='add_blog'}topic{else}{$sMenuItemSelect}{/if}/add/">{$aLang.topic_menu_add}</a> var menu = $('#create-dropdown-menu');
{if $sMenuSubItemSelect=='add'}
<ul class="sub-menu" > var pos = $('#create-dropdown-link').position();
<li {if $sMenuItemSelect=='topic'}class="active"{/if}><a href="{router page='topic'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_topic}</a></li> menu.css({ 'left': pos.left - 5 });
<li {if $sMenuItemSelect=='question'}class="active"{/if}><a href="{router page='question'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_question}</a></li>
<li {if $sMenuItemSelect=='link'}class="active"{/if}><a href="{router page='link'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_link}</a></li> $('.create-dropdown-link').click(function(){
<li {if $sMenuItemSelect=='photoset'}class="active"{/if}><a href="{router page='photoset'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_photoset}</a></li> menu.slideToggle();
{hook run='menu_topic_action_add_item'} return false;
<li {if $sMenuItemSelect=='add_blog'}class="active"{/if}><a href="{router page='blog'}add/">{$aLang.blog_menu_create}</a></li> });
</ul>
{/if}
</li>

<li {if $sMenuSubItemSelect=='saved'}class="active"{/if}>
<a href="{router page='topic'}saved/">{$aLang.topic_menu_saved}</a>
{if $sMenuSubItemSelect=='saved'}
<ul class="sub-menu" >
{hook run='menu_topic_action_saved_item'}
</ul>
{/if}
</li>

{hook run='menu_topic_action'}
</ul>


$(document).click(function(){
menu.slideUp();
});
$('body').on("click", "#create-dropdown, #create-dropdown-link", function(e) {
e.stopPropagation();
});
});
</script>
<a href="{router page='topic'}saved/" class="drafts">{$aLang.topic_menu_saved} {if $iUserCurrentCountTopicDraft}({$iUserCurrentCountTopicDraft}){/if}</a>
{hook run='menu_topic_action_saved_item'}
<div class="create-dropdown" id="create-dropdown">
<h2 class="page-header">Создать <a href="#" class="create-dropdown-link link-dashed" id="create-dropdown-link">{$aLang.topic_menu_add_topic}</a></h2>
<ul class="create-dropdown-menu" id="create-dropdown-menu" style="display: none">
<li {if true}class="active"{/if}><a href="{router page='topic'}add/">{$aLang.topic_menu_add_topic}</a></li>
<li {if false}class="active"{/if}><a href="{router page='blog'}add/">{$aLang.blog_menu_create}</a></li>
{hook run='menu_topic_action'}
</ul>
</div>
{if $sMenuSubItemSelect=='add' && $sMenuItemSelect!='add_blog'}
<ul class="nav nav-pills mb-30">
<li {if $sMenuItemSelect=='topic'}class="active"{/if}><a href="{router page='topic'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_topic}</a></li>
<li {if $sMenuItemSelect=='question'}class="active"{/if}><a href="{router page='question'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_question}</a></li>
<li {if $sMenuItemSelect=='link'}class="active"{/if}><a href="{router page='link'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_link}</a></li>
<li {if $sMenuItemSelect=='photoset'}class="active"{/if}><a href="{router page='photoset'}{$sMenuSubItemSelect}/">{$aLang.topic_menu_add_photoset}</a></li>
{hook run='menu_topic_action_add_item'}
</ul>
{/if}
10 changes: 4 additions & 6 deletions templates/skin/developer-jquery/window_write.tpl
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@
<a href="{router page='blog'}add" class="write-item-image"></a> <a href="{router page='blog'}add" class="write-item-image"></a>
<a href="{router page='blog'}add" class="write-item-link">Блог</a> <a href="{router page='blog'}add" class="write-item-link">Блог</a>
</li> </li>
{if $iUserCurrentCountTopicDraft} <li class="write-item-type-draft">
<li class="write-item-type-draft"> <a href="{router page='topic'}saved/" class="write-item-image"></a>
<a href="{router page='topic'}saved/" class="write-item-image"></a> <a href="{router page='topic'}saved/" class="write-item-link">{$aLang.topic_menu_saved} {if $iUserCurrentCountTopicDraft}({$iUserCurrentCountTopicDraft}){/if}</a>
<a href="{router page='topic'}saved/" class="write-item-link">{$aLang.topic_menu_saved} ({$iUserCurrentCountTopicDraft})</a> </li>
</li>
{/if}
</ul> </ul>
</div> </div>
{/strip} {/strip}
Expand Down

0 comments on commit 1d5af9e

Please sign in to comment.