mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-01 14:05:07 +03:00
Исправления шаблонов
This commit is contained in:
parent
df2422ac19
commit
34e4f5d0e9
|
@ -35,7 +35,11 @@ function fileQueueError(file, errorCode, message) {
|
||||||
|
|
||||||
function fileDialogComplete(numFilesSelected, numFilesQueued) {
|
function fileDialogComplete(numFilesSelected, numFilesQueued) {
|
||||||
try {
|
try {
|
||||||
photosetCloseForm();
|
if (!window.jQuery) {
|
||||||
|
photosetCloseForm();
|
||||||
|
} else {
|
||||||
|
ls.photoset.closeForm();
|
||||||
|
}
|
||||||
if (numFilesQueued > 0) {
|
if (numFilesQueued > 0) {
|
||||||
this.startUpload();
|
this.startUpload();
|
||||||
}
|
}
|
||||||
|
@ -69,7 +73,7 @@ function uploadSuccess(file, serverData) {
|
||||||
if (!window.jQuery) {
|
if (!window.jQuery) {
|
||||||
addTopicImage(JSON.decode(serverData, true));
|
addTopicImage(JSON.decode(serverData, true));
|
||||||
} else {
|
} else {
|
||||||
addTopicImage(jQuery.parseJSON(serverData));
|
ls.photoset.addPhoto(jQuery.parseJSON(serverData));
|
||||||
}
|
}
|
||||||
|
|
||||||
progress.setStatus("Image uploaded.");
|
progress.setStatus("Image uploaded.");
|
||||||
|
|
|
@ -195,7 +195,7 @@ tinyMCE.init({
|
||||||
<img src="{$oPhoto->getWebPath(100)}" alt="image" />
|
<img src="{$oPhoto->getWebPath(100)}" alt="image" />
|
||||||
<textarea onBlur="ls.photoset.setPreviewDescription({$oPhoto->getId()}, this.value)">{$oPhoto->getDescription()}</textarea><br />
|
<textarea onBlur="ls.photoset.setPreviewDescription({$oPhoto->getId()}, this.value)">{$oPhoto->getDescription()}</textarea><br />
|
||||||
<a href="javascript:ls.photoset.deletePhoto({$oPhoto->getId()})" class="image-delete">Удалить</a>
|
<a href="javascript:ls.photoset.deletePhoto({$oPhoto->getId()})" class="image-delete">Удалить</a>
|
||||||
<span class="photo-preview-state">
|
<span id="photo_preview_state_{$oPhoto->getId()}" class="photo-preview-state">
|
||||||
{if $bIsMainPhoto}
|
{if $bIsMainPhoto}
|
||||||
{$aLang.topic_photoset_is_preview}
|
{$aLang.topic_photoset_is_preview}
|
||||||
{else}
|
{else}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{include file='header.tpl' menu='people'}
|
{include file='header.tpl'}
|
||||||
|
|
||||||
|
|
||||||
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
||||||
|
|
|
@ -32,6 +32,11 @@
|
||||||
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
|
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
|
||||||
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
||||||
<li {if $sMenuItemSelect=='top'}class="active"{/if}><a href="{router page='top'}">{$aLang.blog_menu_top}</a></li>
|
<li {if $sMenuItemSelect=='top'}class="active"{/if}><a href="{router page='top'}">{$aLang.blog_menu_top}</a></li>
|
||||||
|
{if $oUserCurrent}
|
||||||
|
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
||||||
|
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
||||||
|
</li>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{hook run='main_menu'}
|
{hook run='main_menu'}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
var lsLang = new Array();
|
var lsLang = new Array();
|
||||||
lsLang['mark_as_preview'] = 'Отметить как превью';
|
lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
|
||||||
lsLang['preview'] = 'Превью';
|
lsLang['photoset_preview'] = 'Превью';
|
||||||
lsLang['delete'] = 'Удалить';
|
lsLang['photoset_delete'] = 'Удалить';
|
||||||
|
lsLang['photoset_confirm_delete'] = 'Удалить фото?';
|
||||||
|
|
||||||
|
lsLang['userfield_confirm_delete'] = 'Удалить поле?';
|
|
@ -6,8 +6,8 @@ ls.photoset =( function ($) {
|
||||||
if (!response.bStateError) {
|
if (!response.bStateError) {
|
||||||
template = '<li id="photo_'+response.id+'"><a href="#"><img src="'+response.file+'" alt="image" /></a>'
|
template = '<li id="photo_'+response.id+'"><a href="#"><img src="'+response.file+'" alt="image" /></a>'
|
||||||
+'<textarea onBlur="ls.photoset.setPreviewDescription('+response.id+', this.value)"></textarea><br />'
|
+'<textarea onBlur="ls.photoset.setPreviewDescription('+response.id+', this.value)"></textarea><br />'
|
||||||
+'<a href="javascript:ls.photoset.deletePhoto('+response.id+')" class="image-delete">'+lsLang['delete']+'</a>'
|
+'<a href="javascript:ls.photoset.deletePhoto('+response.id+')" class="image-delete">'+lsLang['photoset_delete']+'</a>'
|
||||||
+'<span class="photo-preview-state"><a href="javascript:ls.photoset.setPreview('+response.id+')" class="mark-as-preview">'+lsLang['mark_as_preview']+'</a></span></li>';
|
+'<span id="photo_preview_state_'+response.id+'" class="photo-preview-state"><a href="javascript:ls.photoset.setPreview('+response.id+')" class="mark-as-preview">'+lsLang['photoset_mark_as_preview']+'</a></span></li>';
|
||||||
$('#swfu_images').append(template);
|
$('#swfu_images').append(template);
|
||||||
ls.msg.notice(response.sMsgTitle,response.sMsg);
|
ls.msg.notice(response.sMsgTitle,response.sMsg);
|
||||||
} else {
|
} else {
|
||||||
|
@ -18,7 +18,8 @@ ls.photoset =( function ($) {
|
||||||
|
|
||||||
this.deletePhoto = function(id)
|
this.deletePhoto = function(id)
|
||||||
{
|
{
|
||||||
ls.ajax(aRouter['photoset']+'deleteimage', {'id':id}, function(response){
|
if (!confirm(lsLang['photoset_confirm_delete'])) {return;}
|
||||||
|
ls.ajax(aRouter['photoset']+'deleteimage', {'id':id}, function(response){
|
||||||
if (!response.bStateError) {
|
if (!response.bStateError) {
|
||||||
$('#photo_'+id).remove();
|
$('#photo_'+id).remove();
|
||||||
ls.msg.notice(response.sMsgTitle,response.sMsg);
|
ls.msg.notice(response.sMsgTitle,response.sMsg);
|
||||||
|
@ -34,10 +35,11 @@ ls.photoset =( function ($) {
|
||||||
|
|
||||||
$('.marked-as-preview').each(function (index, el) {
|
$('.marked-as-preview').each(function (index, el) {
|
||||||
$(el).removeClass('marked-as-preview');
|
$(el).removeClass('marked-as-preview');
|
||||||
$(el).children('span').html('<a href="javascript:ls.photoset.setDescription('+$(el).attr('id').slice($(el).attr('id').lastIndexOf('_')+1)+')" class="mark-as-preview">'+lsLang['mark_as_preview']+'</a>');
|
tmpId = $(el).attr('id').slice($(el).attr('id').lastIndexOf('_')+1);
|
||||||
|
$('#photo_preview_state_'+tmpId).html('<a href="javascript:ls.photoset.setDescription('+tmpId+')" class="mark-as-preview">'+lsLang['photoset_mark_as_preview']+'</a>');
|
||||||
});
|
});
|
||||||
$('#photo_'+id).addClass('marked-as-preview');
|
$('#photo_'+id).addClass('marked-as-preview');
|
||||||
$('#photo_'+id).children('span').html(lsLang['preview']);
|
$('#photo_preview_state_'+id).html(lsLang['photoset_preview']);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.setPreviewDescription = function(id, text)
|
this.setPreviewDescription = function(id, text)
|
||||||
|
|
|
@ -40,9 +40,9 @@ ls.userfield =( function ($) {
|
||||||
'<div class="uf-actions"><a href="javascript:ls.userfield.showEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
|
'<div class="uf-actions"><a href="javascript:ls.userfield.showEditForm('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/edit.png"></a> '+
|
||||||
'<a href="javascript:ls.userfield.deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.png"></a></div>';
|
'<a href="javascript:ls.userfield.deleteUserfield('+data.id+')"><img src="'+DIR_STATIC_SKIN+'/images/delete.png"></a></div>';
|
||||||
$('#user_field_list').append(liElement);
|
$('#user_field_list').append(liElement);
|
||||||
$('#field_'+id+' .userfield_admin_name').html(name);
|
$('#field_'+data.id+' .userfield_admin_name').html(name);
|
||||||
$('#field_'+id+' .userfield_admin_title').html(title);
|
$('#field_'+data.id+' .userfield_admin_title').html(title);
|
||||||
$('#field_'+id+' .userfield_admin_pattern').text(pattern);
|
$('#field_'+data.id+' .userfield_admin_pattern').text(pattern);
|
||||||
ls.msg.notice(data.sMsgTitle,data.sMsg);
|
ls.msg.notice(data.sMsgTitle,data.sMsg);
|
||||||
} else {
|
} else {
|
||||||
ls.msg.error(data.sMsgTitle,data.sMsg);
|
ls.msg.error(data.sMsgTitle,data.sMsg);
|
||||||
|
@ -68,7 +68,8 @@ ls.userfield =( function ($) {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.deleteUserfield = function(id) {
|
this.deleteUserfield = function(id) {
|
||||||
ls.ajax(aRouter['admin']+'userfields', {'action':'delete', 'id':id}, function(data) {
|
if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
|
||||||
|
ls.ajax(aRouter['admin']+'userfields', {'action':'delete', 'id':id}, function(data) {
|
||||||
if (!data.bStateError) {
|
if (!data.bStateError) {
|
||||||
$('#field_'+id).remove();
|
$('#field_'+id).remove();
|
||||||
ls.msg.notice(data.sMsgTitle,data.sMsg);
|
ls.msg.notice(data.sMsgTitle,data.sMsg);
|
||||||
|
|
|
@ -9,10 +9,5 @@
|
||||||
</ul>
|
</ul>
|
||||||
{/if}
|
{/if}
|
||||||
</li>
|
</li>
|
||||||
{if $oUserCurrent}
|
|
||||||
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
|
||||||
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
|
||||||
</li>
|
|
||||||
{/if}
|
|
||||||
{hook run='menu_people'}
|
{hook run='menu_people'}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{include file='header.tpl' menu='people'}
|
{include file='header.tpl'}
|
||||||
|
|
||||||
|
|
||||||
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
||||||
|
|
|
@ -53,6 +53,11 @@
|
||||||
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.clean_posts}</a></li>
|
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.clean_posts}</a></li>
|
||||||
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
|
<li {if $sMenuHeadItemSelect=='blogs'}class="active"{/if}><a href="{router page='blogs'}">{$aLang.blogs}</a></li>
|
||||||
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
||||||
|
{if $oUserCurrent}
|
||||||
|
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
||||||
|
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
||||||
|
</li>
|
||||||
|
{/if}
|
||||||
|
|
||||||
{hook run='main_menu'}
|
{hook run='main_menu'}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
var lsLang = new Array();
|
var lsLang = new Array();
|
||||||
lsLang['mark_as_preview'] = 'Отметить как превью';
|
lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
|
||||||
lsLang['preview'] = 'Превью';
|
lsLang['photoset_preview'] = 'Превью';
|
||||||
lsLang['delete'] = 'Удалить';
|
lsLang['photoset_delete'] = 'Удалить';
|
||||||
|
lsLang['photoset_confirm_delete'] = 'Удалить фото?';
|
||||||
|
|
||||||
|
lsLang['userfield_confirm_delete'] = 'Удалить поле?';
|
|
@ -137,6 +137,7 @@ function addTopicImage(response)
|
||||||
|
|
||||||
function deleteTopicImage(id)
|
function deleteTopicImage(id)
|
||||||
{
|
{
|
||||||
|
if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
|
||||||
new Request.JSON({
|
new Request.JSON({
|
||||||
url: aRouter['photoset']+'deleteimage',
|
url: aRouter['photoset']+'deleteimage',
|
||||||
data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
|
data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
|
||||||
|
|
|
@ -89,6 +89,7 @@ function updateUserfield() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteUserfield(id) {
|
function deleteUserfield(id) {
|
||||||
|
if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
|
||||||
new Request.JSON({
|
new Request.JSON({
|
||||||
url: aRouter['admin']+'userfields',
|
url: aRouter['admin']+'userfields',
|
||||||
data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
|
data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
|
||||||
|
|
|
@ -9,10 +9,5 @@
|
||||||
</ul>
|
</ul>
|
||||||
{/if}
|
{/if}
|
||||||
</li>
|
</li>
|
||||||
{if $oUserCurrent}
|
|
||||||
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
|
||||||
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
|
||||||
</li>
|
|
||||||
{/if}
|
|
||||||
{hook run='menu_people'}
|
{hook run='menu_people'}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{include file='header.tpl' menu='people'}
|
{include file='header.tpl'}
|
||||||
|
|
||||||
|
|
||||||
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
<h2 class="stream-header">{$aLang.stream_personal_title}</h2>
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<div class="stream-settings-userlist">
|
<div class="stream-settings-userlist">
|
||||||
<p><input type="text" id="userfeed_users_complete" autocomplete="off" />
|
<p><input type="text" id="userfeed_users_complete" autocomplete="off" />
|
||||||
<a href="javascript:lsUserfeed.appendUser()">{$aLang.userfeed_block_users_append}</a></p>
|
<a href="javascript:lsUserfeed.appendUser()">{$aLang.userfeed_block_users_append}</a></p>
|
||||||
{if count($aStreamSubscribedUsers)}
|
{if count($aUserfeedSubscribedUsers)}
|
||||||
<ul id="userfeed_block_users_list">
|
<ul id="userfeed_block_users_list">
|
||||||
{foreach from=$aUserfeedSubscribedUsers item=oUser}
|
{foreach from=$aUserfeedSubscribedUsers item=oUser}
|
||||||
{assign var=iUserId value=$oUser->getId()}
|
{assign var=iUserId value=$oUser->getId()}
|
||||||
|
|
|
@ -27,6 +27,11 @@
|
||||||
<ul class="nav-main">
|
<ul class="nav-main">
|
||||||
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.blogs}</a></li>
|
<li {if $sMenuHeadItemSelect=='blog'}class="active"{/if}><a href="{router page='blog'}">{$aLang.blogs}</a></li>
|
||||||
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
<li {if $sMenuHeadItemSelect=='people'}class="active"{/if}><a href="{router page='people'}">{$aLang.people}</a></li>
|
||||||
|
{if $oUserCurrent}
|
||||||
|
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
||||||
|
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
||||||
|
</li>
|
||||||
|
{/if}
|
||||||
{hook run='main_menu'}
|
{hook run='main_menu'}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
var lsLang = new Array();
|
var lsLang = new Array();
|
||||||
lsLang['mark_as_preview'] = 'Отметить как превью';
|
lsLang['photoset_mark_as_preview'] = 'Отметить как превью';
|
||||||
lsLang['preview'] = 'Превью';
|
lsLang['photoset_preview'] = 'Превью';
|
||||||
lsLang['delete'] = 'Удалить';
|
lsLang['photoset_delete'] = 'Удалить';
|
||||||
|
lsLang['photoset_confirm_delete'] = 'Удалить фото?';
|
||||||
|
|
||||||
|
lsLang['userfield_confirm_delete'] = 'Удалить поле?';
|
|
@ -148,6 +148,7 @@ function addTopicImage(response)
|
||||||
|
|
||||||
function deleteTopicImage(id)
|
function deleteTopicImage(id)
|
||||||
{
|
{
|
||||||
|
if (!confirm(lsLang['photoset_confirm_delete'])) {return;}
|
||||||
new Request.JSON({
|
new Request.JSON({
|
||||||
url: aRouter['photoset']+'deleteimage',
|
url: aRouter['photoset']+'deleteimage',
|
||||||
data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
|
data: {'id':id, 'security_ls_key': LIVESTREET_SECURITY_KEY },
|
||||||
|
|
|
@ -89,6 +89,7 @@ function updateUserfield() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function deleteUserfield(id) {
|
function deleteUserfield(id) {
|
||||||
|
if (!confirm(lsLang['userfield_confirm_delete'])) {return;}
|
||||||
new Request.JSON({
|
new Request.JSON({
|
||||||
url: aRouter['admin']+'userfields',
|
url: aRouter['admin']+'userfields',
|
||||||
data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
|
data: {'action':'delete', 'id':id, 'security_ls_key':LIVESTREET_SECURITY_KEY},
|
||||||
|
|
|
@ -10,10 +10,5 @@
|
||||||
</ul>
|
</ul>
|
||||||
{/if}
|
{/if}
|
||||||
</li>
|
</li>
|
||||||
{if $oUserCurrent}
|
|
||||||
<li {if $sMenuItemSelect=='stream'}class="active"{/if}>
|
|
||||||
<a href="{router page='stream'}">{$aLang.stream_personal_title}</a>
|
|
||||||
</li>
|
|
||||||
{/if}
|
|
||||||
{hook run='menu_people'}
|
{hook run='menu_people'}
|
||||||
</ul>
|
</ul>
|
Loading…
Reference in a new issue