1
0
Fork 0
mirror of https://github.com/Oreolek/ifhub.club.git synced 2024-07-05 07:54:24 +03:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Mzhelskiy Maxim 2012-04-14 18:51:42 +04:00
commit 48fe7a2a0e
20 changed files with 120 additions and 80 deletions

View file

@ -4,15 +4,18 @@
// ------------------------------------------------------------------*/
.markItUp a: link,
.markItUp a: visited { color: #000; text-decoration: none; }
.markItUp { width: 600px; margin-bottom: 5px; }
.markItUp { margin-bottom: 5px; }
.markItUpContainer { font: 11px Verdana, Arial, Helvetica, sans-serif; }
.markItUpEditor {
font: 12px "Courier New", Courier, monospace;
padding: 5px;
width: 587px;
height: 200px;
line-height: 18px;
overflow: auto;
width: 100%;
-moz-box-sizing: border-box;
box-sizing: border-box;
border: 1px solid #C0CAD5;
}
.markItUpPreviewFrame {
overflow: auto;
@ -35,7 +38,6 @@
/***************************************************************************************/
/* first row of buttons */
.markItUpHeader {
width: 587px;
background: #eee;
padding: 5px;
border-top: 1px solid #c0cad5;

View file

@ -27,7 +27,6 @@ ls.settings = (function ($) {
{name: ls.lang.get('panel_list_li'), className:'editor-li', openWith:'<li>', closeWith:'</li>' },
{separator:'---------------' },
{name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } },
{name: ls.lang.get('panel_image'), className:'editor-image', replaceWith:'<img src="[!['+ls.lang.get('panel_image_promt')+':!:http://]!]" />' },
{name: ls.lang.get('panel_video'), className:'editor-video', replaceWith:'<video>[!['+ls.lang.get('panel_video_promt')+':!:http://]!]</video>' },
{name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'<a href="[!['+ls.lang.get('panel_url_promt')+':!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
{name: ls.lang.get('panel_user'), className:'editor-user', replaceWith:'<ls user="[!['+ls.lang.get('panel_user_promt')+']!]" />' },
@ -51,7 +50,6 @@ ls.settings = (function ($) {
{name: ls.lang.get('panel_quote'), className:'editor-quote', key:'Q', replaceWith: function(m) { if (m.selectionOuter) return '<blockquote>'+m.selectionOuter+'</blockquote>'; else if (m.selection) return '<blockquote>'+m.selection+'</blockquote>'; else return '<blockquote></blockquote>' } },
{name: ls.lang.get('panel_code'), className:'editor-code', openWith:'<code>', closeWith:'</code>' },
{name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } },
{name: ls.lang.get('panel_image'), className:'editor-image', replaceWith:'<img src="[!['+ls.lang.get('panel_image_promt')+':!:http://]!]" />' },
{name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'<a href="[!['+ls.lang.get('panel_url_promt')+':!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
{name: ls.lang.get('panel_user'), className:'editor-user', replaceWith:'<ls user="[!['+ls.lang.get('panel_user_promt')+']!]" />' },
{separator:'---------------' },

View file

@ -14,8 +14,7 @@ ls.topic = (function ($) {
if (result.bStateError) {
ls.msg.error(null, result.sMsg);
} else {
preview.html(result.sText);
preview.show().html(result.sText);
ls.hook.run('ls_topic_preview_after',[form, preview, result]);
}
});

View file

@ -216,8 +216,8 @@ ls.wall = (function ($) {
if (result.bStateError) {
ls.msg.error(null, result.sMsg);
} else {
$('#wall-item-'+iId).detach();
$('#wall-reply-item-'+iId).detach();
$('#wall-item-'+iId).fadeOut().remove();
$('#wall-reply-item-'+iId).fadeOut().remove();
ls.hook.run('ls_wall_remove_after',[iId, result]);
}
});

View file

@ -75,9 +75,7 @@
<button name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
</form>
<div class="topic" style="display: none;">
<div class="content" id="text_preview"></div>
</div>
<div class="topic-preview" id="text_preview"></div>
{hook run='add_topic_link_end'}

View file

@ -85,7 +85,7 @@
<p><label for="topic_text">{$aLang.topic_create_text}{if !$oConfig->GetValue('view.tinymce')} ({$aLang.topic_create_text_notice}){/if}:</label>
<textarea name="topic_text" class="mce-editor input-text input-width-full" id="topic_text" rows="20">{$_aRequest.topic_text}</textarea></p>
<textarea name="topic_text" class="mce-editor" id="topic_text" rows="20">{$_aRequest.topic_text}</textarea></p>
<div class="topic-photo-upload">
@ -154,9 +154,7 @@
<button name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
</form>
<div class="topic" style="display: none;">
<div class="content" id="text_preview"></div>
</div>
<div class="topic-preview" id="text_preview"></div>
{hook run='add_topic_photoset_end'}

View file

@ -11,10 +11,6 @@
<li class="comment-date"><time datetime="{date_format date=$oWall->getDateAdd() format='c'}">{date_format date=$oWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time></li>
</ul>
{if $oWall->isAllowDelete()}
<a href="#" onclick="return ls.wall.remove({$oWall->getId()});">Удалить</a>
{/if}
<div class="comment-content text">
{$oWall->getText()}
</div>
@ -22,6 +18,10 @@
{if $oUserCurrent and !$aReplyWall}
<ul class="comment-actions">
<li><a href="#" class="link-dotted" onclick="return ls.wall.toggleReply({$oWall->getId()});">Ответить</a></li>
{if $oWall->isAllowDelete()}
<li><a href="#" onclick="return ls.wall.remove({$oWall->getId()});" class="link-dotted">Удалить</a></li>
{/if}
</ul>
{/if}
</div>

View file

@ -7,13 +7,15 @@
<li class="comment-author"><a href="{$oReplyUser->getUserWebPath()}">{$oReplyUser->getLogin()}</a></li>
<li class="comment-date"><time datetime="{date_format date=$oReplyWall->getDateAdd() format='c'}">{date_format date=$oReplyWall->getDateAdd() hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y, H:i"}</time></li>
</ul>
{if $oReplyWall->isAllowDelete()}
<a href="#" onclick="return ls.wall.remove({$oReplyWall->getId()});">Удалить</a>
{/if}
<div class="comment-content text">
{$oReplyWall->getText()}
</div>
{if $oReplyWall->isAllowDelete()}
<ul class="comment-actions">
<li><a href="#" onclick="return ls.wall.remove({$oReplyWall->getId()});" class="link-dotted">Удалить</a></li>
</ul>
{/if}
</div>
{/foreach}

View file

@ -89,9 +89,7 @@
<button name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
</form>
<div class="topic" style="display: none;">
<div class="content" id="text_preview"></div>
</div>
<div class="topic-preview" id="text_preview"></div>
{hook run='add_topic_question_end'}

View file

@ -18,11 +18,13 @@
<fieldset>
<legend>{$aLang.settings_account}</legend>
<p>
<label for="mail">{$aLang.settings_profile_mail}:</label>
<input type="email" name="mail" id="mail" value="{$oUserCurrent->getMail()|escape:'html'}" class="input-text input-width-300" required>
<small class="note">{$aLang.settings_profile_mail_notice}</small>
</p>
<dl class="form-item">
<dt><label for="mail">{$aLang.settings_profile_mail}:</label></dt>
<dd>
<input type="email" name="mail" id="mail" value="{$oUserCurrent->getMail()|escape:'html'}" class="input-text input-width-300" required />
<small class="note">{$aLang.settings_profile_mail_notice}</small>
</dd>
</dl>
</fieldset>
@ -31,14 +33,20 @@
<small class="note note-header">{$aLang.settings_account_password_notice}</small>
<p><label for="password_now">{$aLang.settings_profile_password_current}:</label>
<input type="password" name="password_now" id="password_now" value="" class="input-text input-width-200" /></p>
<dl class="form-item">
<dt><label for="password_now">{$aLang.settings_profile_password_current}:</label></dt>
<dd><input type="password" name="password_now" id="password_now" value="" class="input-text input-width-200" /></dd>
</dl>
<p><label for="password">{$aLang.settings_profile_password_new}:</label>
<input type="password" id="password" name="password" value="" class="input-text input-width-200" /></p>
<p><label for="password_confirm">{$aLang.settings_profile_password_confirm}:</label>
<input type="password" id="password_confirm" name="password_confirm" value="" class="input-text input-width-200" /></p>
<dl class="form-item">
<dt><label for="password">{$aLang.settings_profile_password_new}:</label></dt>
<dd><input type="password" id="password" name="password" value="" class="input-text input-width-200" /></dd>
</dl>
<dl class="form-item">
<dt><label for="password_confirm">{$aLang.settings_profile_password_confirm}:</label></dt>
<dd><input type="password" id="password_confirm" name="password_confirm" value="" class="input-text input-width-200" /></dd>
</dl>
</fieldset>
{hook run='form_settings_account_end'}

View file

@ -63,7 +63,7 @@
<p><label for="topic_text">{$aLang.topic_create_text}{if !$oConfig->GetValue('view.tinymce')} ({$aLang.topic_create_text_notice}){/if}:</label>
<textarea name="topic_text" id="topic_text" rows="20" class="mce-editor input-width-full">{$_aRequest.topic_text}</textarea></p>
<textarea name="topic_text" id="topic_text" rows="20" class="mce-editor">{$_aRequest.topic_text}</textarea></p>
<p><label for="topic_tags">{$aLang.topic_create_tags}:</label>
@ -88,14 +88,12 @@
<button name="submit_topic_publish" id="submit_topic_publish" class="button button-primary">{$aLang.topic_create_submit_publish}</button>
<button name="submit_preview" onclick="jQuery('#text_preview').parent().show(); ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
<button name="submit_preview" onclick="ls.topic.preview('form-topic-add','text_preview'); return false;" class="button">{$aLang.topic_create_submit_preview}</button>
<button name="submit_topic_save" id="submit_topic_save" class="button">{$aLang.topic_create_submit_save}</button>
</form>
<div class="topic" style="display: none;">
<div class="content" id="text_preview"></div>
</div>
<div class="topic-preview" style="display: none;" id="text_preview"></div>
{hook run='add_topic_topic_end'}

View file

@ -79,7 +79,7 @@
<form method="post" id="form_comment" onsubmit="return false;" enctype="multipart/form-data">
{hook run='form_add_comment_begin'}
<textarea name="comment_text" id="form_comment_text" class="input-text input-width-full"></textarea>
<textarea name="comment_text" id="form_comment_text" class=""></textarea>
{hook run='form_add_comment_end'}

View file

@ -71,5 +71,5 @@
.reply-header { font-size: 20px; line-height: 1.3em; margin-bottom: 15px; }
.reply { padding-bottom: 10px; }
.reply textarea { height: 100px; margin-bottom: 10px; }
.reply textarea { height: 100px; }
.reply textarea.loader { background: #f7f7f7 url(../images/loader.gif) no-repeat center;}

View file

@ -94,8 +94,8 @@
.user-list li .author { font-weight: bold; color: #333; }
.user-list-avatar { overflow: hidden; zoom: 1; }
.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 15px; text-align: center; font-size: 11px; margin-bottom: 10px; }
.user-list-avatar li img { margin-bottom: 2px; display: block; }
.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 15px; text-align: center; font-size: 11px; }

View file

@ -2,7 +2,7 @@
СЕТКА
-------------------------------------------- */
#container { max-width: 1000px; margin: 0 auto; margin-bottom: 20px; }
#container { width: 1000px; margin: 0 auto; margin-bottom: 20px; }
#header { padding: 50px 0; position: relative; }
#nav { margin-bottom: 15px; overflow: hidden; }
#wrapper { overflow: hidden; zoom: 1; padding: 30px; background: #fff; border-bottom: 1px solid #eee; box-shadow: 0 0 3px rgba(0,0,0,.1); }

View file

@ -57,4 +57,11 @@
.modal.modal-write .write-list li.write-item-type-poll .write-item-image { background-position: -100px 0; }
.modal.modal-write .write-list li.write-item-type-link .write-item-image { background-position: -200px 0; }
.modal.modal-write .write-list li.write-item-type-photoset .write-item-image { background-position: -300px 0; }
.modal.modal-write .write-list li.write-item-type-blog .write-item-image { background-position: -400px 0; }
.modal.modal-write .write-list li.write-item-type-blog .write-item-image { background-position: -400px 0; }
/* Upload Image */
.modal-image-upload { width: 500px; margin-left: -250px; }

View file

@ -31,7 +31,6 @@
.topic .topic-footer .topic-info li.topic-info-comments a span { color: #777; }
.topic .topic-footer .topic-info li.topic-info-comments a:hover { text-decoration: underline; }
/* Share */
.topic .topic-share { display: none; padding: 3px; margin-bottom: 10px; border: 5px solid #eee; }
@ -120,3 +119,7 @@
.topic.topic-type-talk .talk-recipients h3 { font-size: 16px; font-weight: bold; margin-bottom: 10px; }
/* Topic Preview */
.topic-preview { margin-top: 30px; }
.topic-preview .profile-page-header { border-top: 1px solid #ddd; }
.topic-preview .topic { margin-bottom: 20px; }

View file

@ -1,5 +1,7 @@
{assign var="oUser" value=$oTopic->getUser()}
<h3 class="profile-page-header">Предпросмотр</h3>
<article class="topic topic-type-{$oTopic->getType()}">
<header class="topic-header">
<h1 class="topic-title">
@ -44,8 +46,7 @@
</footer>
</article>
<hr/>
<button name="submit_topic_publish" class="button button-primary" onclick="jQuery('#submit_topic_publish').trigger('click');">{$aLang.topic_create_submit_publish}</button>
<button name="submit_preview" onclick="jQuery('#text_preview').html('').parent().hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
<button name="submit_preview" onclick="jQuery('#text_preview').html('').hide(); return false;" class="button">{$aLang.topic_create_submit_preview_close}</button>
<button name="submit_topic_save" class="button" onclick="jQuery('#submit_topic_save').trigger('click');">{$aLang.topic_create_submit_save}</button>

View file

@ -4,32 +4,60 @@
<a href="#" class="close jqmClose"></a>
</header>
<form method="POST" action="" enctype="multipart/form-data" id="form_upload_img" class="modal-content" onsubmit="return false;">
<p><label for="img_file">{$aLang.uploadimg_file}:</label>
<input type="file" name="img_file" id="img_file" value="" class="input-text input-width-full" /></p>
<script>
jQuery(function($){
$('div.tab-content:not(:first)').hide();
<p><label for="img_url">{$aLang.uploadimg_url}:</label>
<input type="text" name="img_url" id="img_url" value="http://" class="input-text input-width-full" /></p>
$('ul.nav-pills-tabs a').click(function(){
if (this.hash) {
$('.tab-content').hide();
$('ul.nav-pills-tabs li').removeClass('active');
$('.tab-content' + this.hash).show();
$(this).parent('li').addClass('active');
}
});
});
</script>
<div class="modal-content">
<ul class="nav nav-pills nav-pills-tabs">
<li class="active"><a href="#tab_content_pc">Upload</a></li>
<li><a href="#tab_content_link">Link</a></li>
</ul>
<form method="POST" action="" enctype="multipart/form-data" id="tab_content_pc" onsubmit="return false;" class="tab-content">
<p><label for="img_file">{$aLang.uploadimg_file}:</label>
<input type="file" name="img_file" id="img_file" value="" class="input-text input-width-full" /></p>
{hook run="uploadimg_source"}
<p>
<label for="align">{$aLang.uploadimg_align}:</label>
<select name="align" class="input-width-full">
<option value="">{$aLang.uploadimg_align_no}</option>
<option value="left">{$aLang.uploadimg_align_left}</option>
<option value="right">{$aLang.uploadimg_align_right}</option>
<option value="center">{$aLang.uploadimg_align_center}</option>
</select>
</p>
<p><label for="title">{$aLang.uploadimg_title}:</label>
<input type="text" name="title" id="title" value="" class="input-text input-width-full" /></p>
{hook run="uploadimg_additional"}
<button class="button button-primary" onclick="ls.ajaxUploadImg('tab_content_pc','{$sToLoad}');">{$aLang.uploadimg_submit}</button>
<button class="button jqmClose">{$aLang.uploadimg_cancel}</button>
</form>
{hook run="uploadimg_source"}
<p>
<label for="align">{$aLang.uploadimg_align}:</label>
<select name="align" class="input-width-full">
<option value="">{$aLang.uploadimg_align_no}</option>
<option value="left">{$aLang.uploadimg_align_left}</option>
<option value="right">{$aLang.uploadimg_align_right}</option>
<option value="center">{$aLang.uploadimg_align_center}</option>
</select>
</p>
<p><label for="title">{$aLang.uploadimg_title}:</label>
<input type="text" name="title" id="title" value="" class="input-text input-width-full" /></p>
{hook run="uploadimg_additional"}
<button class="button button-primary" onclick="ls.ajaxUploadImg('form_upload_img','{$sToLoad}');">{$aLang.uploadimg_submit}</button>
<button class="button jqmClose">{$aLang.uploadimg_cancel}</button>
</form>
<form method="POST" action="" enctype="multipart/form-data" id="tab_content_link" onsubmit="return false;" style="display: none;" class="tab-content">
<p><label for="img_file">Ссылка на картинку:</label>
<input type="text" name="img_url" id="img_url" value="http://" class="input-text input-width-full" /></p>
<button class="button button-primary" onclick="ls.ajaxUploadImg('tab_content_link','{$sToLoad}');">{$aLang.uploadimg_submit}</button>
<button class="button jqmClose">{$aLang.uploadimg_cancel}</button>
</form>
</div>
</div>

View file

@ -10,10 +10,10 @@
jQuery(function($){
$('div.tab-content:not(:first)').hide();
$('ul.nav-tabs a').click(function(){
$('ul.nav-pills-tabs a').click(function(){
if (this.hash) {
$('div.tab-content').hide();
$('ul.nav-tabs li').removeClass('active');
$('ul.nav-pills-tabs li').removeClass('active');
$('div.tab-content' + this.hash).show();
$(this).parent('li').addClass('active');
}
@ -28,7 +28,7 @@
</script>
<div class="modal-content">
<ul class="nav nav-pills nav-tabs">
<ul class="nav nav-pills nav-pills-tabs">
<li class="active"><a href="#tab_content_login">{$aLang.user_login_submit}</a></li>
{if !$oConfig->GetValue('general.reg.invite')}
<li><a href="#tab_content_register">{$aLang.registration}</a></li>