ave-cms-team
/
ave-cms
mirror of https://github.com/avecms/AVE.cms.git
4
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fixes

pull/3/head
M@d D3n 5 years ago
parent
cdb7ed729c
commit
c4ee1ef5b3
4 changed files with 223 additions and 209 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      admin/templates/browser/browser_2frames.tpl
  2. 4
      admin/templates/js/main.js
  3. 2
      admin/templates/main.tpl
  4. 8
      lib/scripts/uploader/browserplus.js

84
admin/templates/browser/browser_2frames.tpl
Unescape View File

@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
@ -22,7 +22,7 @@
<!-- JS files --> <!-- JS files -->
{include file="../scripts.tpl"} {include file="../scripts.tpl"}
<script type="text/javascript" src="http://bp.yahooapis.com/2.4.21/browserplus-min.js"></script> <script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/browserplus.js"></script>
<script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/plupload.full.min.js"></script> <script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/plupload.full.min.js"></script>
<script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/jquery.plupload.queue.js"></script> <script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/jquery.plupload.queue.js"></script>
<script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/i18n/{$smarty.session.admin_language}.js"></script> <script type="text/javascript" src="{$ABS_PATH}lib/scripts/uploader/i18n/{$smarty.session.admin_language}.js"></script>
@ -35,6 +35,8 @@
var ave_theme = "{$smarty.const.DEFAULT_THEME_FOLDER}"; var ave_theme = "{$smarty.const.DEFAULT_THEME_FOLDER}";
var ave_admintpl = "{$tpl_dir}"; var ave_admintpl = "{$tpl_dir}";
$sess = '{$sess}';
$(document).ready(function(){ldelim} $(document).ready(function(){ldelim}
$('.openDialog').prop( $('.openDialog').prop(
@ -65,11 +67,11 @@
</script> </script>
</head> </head>
<body> <body>
<!-- Wrapper --> <!-- Wrapper -->
<div class="wrapper"> <div class="wrapper">
<!-- Content --> <!-- Content -->
<div class="content" id="contentPage" style="padding: 0px;"> <div class="content" id="contentPage" style="padding: 0px;">
@ -81,8 +83,8 @@
</div> </div>
</div> </div>
<div class="widget first"> <div class="widget first">
<form style="display:inline;" name="bForm" onSubmit="return false;" class="mainForm"> <form style="display:inline;" name="bForm" onSubmit="return false;" class="mainForm">
<table cellpadding="0" cellspacing="0" width="100%" class="tableStatic"> <table cellpadding="0" cellspacing="0" width="100%" class="tableStatic">
<tr> <tr>
<td> <td>
@ -117,84 +119,84 @@
</tr> </tr>
{/if} {/if}
</table> </table>
</form> </form>
</div> </div>
</div> </div>
<div class="fix"></div> <div class="fix"></div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
function getUrlParam(paramName) function getUrlParam(paramName)
{ldelim} {ldelim}
var reParam = new RegExp('(?:[\?&]|&amp;)' + paramName + '=([^&]+)', 'i') ; var reParam = new RegExp('(?:[\?&]|&amp;)' + paramName + '=([^&]+)', 'i') ;
var match = window.location.search.match(reParam) ; var match = window.location.search.match(reParam) ;
return (match && match.length > 1) ? match[1] : '' ; return (match && match.length > 1) ? match[1] : '' ;
{rdelim} {rdelim}
function submitTheForm() {ldelim} function submitTheForm() {ldelim}
if (document.bForm.bFileName.value == '' && ('{$target}' != 'dir' && '{$target}' != 'directory' && '{$target}' != 'cascad')) {ldelim} if (document.bForm.bFileName.value == '' && ('{$target}' != 'dir' && '{$target}' != 'directory' && '{$target}' != 'cascad')) {ldelim}
alert('{#MAIN_MP_PLEASE_SELECT#}'); alert('{#MAIN_MP_PLEASE_SELECT#}');
{rdelim} {rdelim}
else {ldelim} else {ldelim}
{if $target=='link'} {if $target=='link'}
var funcNum = getUrlParam('CKEditorFuncNum'); var funcNum = getUrlParam('CKEditorFuncNum');
var fileUrl = '{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; var fileUrl = '{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl); window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl);
{elseif $target=='link_image'} {elseif $target=='link_image'}
window.opener.document.getElementById('txtLnkUrl').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; window.opener.document.getElementById('txtLnkUrl').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
{elseif $target=='txtUrl'} {elseif $target=='txtUrl'}
var funcNum = getUrlParam('CKEditorFuncNum'); var funcNum = getUrlParam('CKEditorFuncNum');
var fileUrl = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value var fileUrl = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value
window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl); window.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl);
{elseif $target=='navi'} {elseif $target=='navi'}
window.opener.document.getElementById('{$smarty.request.id|escape}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; window.opener.document.getElementById('{$smarty.request.id|escape}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
{elseif $target=='img_feld' || $target_img=='img_feld'} {elseif $target=='img_feld' || $target_img=='img_feld'}
window.opener.document.getElementById('img_feld__{$target_id}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; window.opener.document.getElementById('img_feld__{$target_id}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
window.opener.document.getElementById('_img_feld__{$target_id}').src = '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; window.opener.document.getElementById('_img_feld__{$target_id}').src = '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
window.opener.$('.preview__{$target_id}').attr("href", '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value); window.opener.$('.preview__{$target_id}').attr("href", '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value);
{elseif $target!='' && $target_id!='' && $target_id!=null} {elseif $target!='' && $target_id!='' && $target_id!=null}
{if $target=='image'} {if $target=='image'}
window.opener.$('#preview__{$target_id}').attr('src', '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value); window.opener.$('#preview__{$target_id}').attr('src', '../index.php?mode=f&width=128&height=128&thumb=/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value);
window.opener.$('.preview__{$target_id}').attr('href', '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value); window.opener.$('.preview__{$target_id}').attr('href', '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value);
window.opener.$('#{$target}__{$target_id}').val('/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value); window.opener.$('#{$target}__{$target_id}').val('/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value);
{/if} {/if}
{if $target=='dir'} {if $target=='dir'}
var bdn = document.bForm.bDirName.value.split('/').reverse(); var bdn = document.bForm.bDirName.value.split('/').reverse();
window.opener.document.getElementById('{$target}__{$target_id}').value = bdn[1]; window.opener.document.getElementById('{$target}__{$target_id}').value = bdn[1];
{/if} {/if}
{if $target=='directory'} {if $target=='directory'}
window.opener.$.fn.myPlugin('/{$mediapath}' + document.bForm.bDirName.value, {$target_id}); window.opener.$.fn.myPlugin('/{$mediapath}' + document.bForm.bDirName.value, {$target_id});
{/if} {/if}
{if $target=='cascad'} {if $target=='cascad'}
{assign var=data value="_"|explode:$target_id} {assign var=data value="_"|explode:$target_id}
window.opener.$.fn.myPlugin('/{$mediapath}' + document.bForm.bDirName.value, {$data[0]}, {$data[1]}); window.opener.$.fn.myPlugin('/{$mediapath}' + document.bForm.bDirName.value, {$data[0]}, {$data[1]});
{/if} {/if}
{elseif $target!='all'} {elseif $target!='all'}
{if $smarty.request.fillout=='dl'} {if $smarty.request.fillout=='dl'}
window.opener.document.getElementById('{$smarty.request.target|escape}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value; window.opener.document.getElementById('{$smarty.request.target|escape}').value = '/{$mediapath}' + document.bForm.bDirName.value + document.bForm.bFileName.value;
{else} {else}
window.opener.updatePreview(); window.opener.updatePreview();
{/if} {/if}
{/if} {/if}
setTimeout("self.close();", 100); setTimeout("self.close();", 100);
{rdelim} {rdelim}
{rdelim} {rdelim}
function NewFolder() {ldelim} function NewFolder() {ldelim}
var title = '{#MAIN_MP_CREATE_FOLDER#}'; var title = '{#MAIN_MP_CREATE_FOLDER#}';
var text = '{#MAIN_ADD_FOLDER#}'; var text = '{#MAIN_ADD_FOLDER#}';
jPrompt(text, '', title, function(b){ldelim} jPrompt(text, '', title, function(b){ldelim}
@ -211,18 +213,20 @@ function NewFolder() {ldelim}
{rdelim} {rdelim}
{rdelim} {rdelim}
); );
{rdelim} {rdelim}
</script>
</script> <script type="text/javascript" src="{$ABS_PATH}admin/lang/{$smarty.session.admin_language}/scripts.js"></script>
<!-- Footer --> <!-- Footer -->
<div id="footer"> <div id="footer">
<div class="wrapper"> <div class="wrapper">
<span class="floatleft">{#oficial_site#}: {$smarty.const.APP_INFO}</span> <span class="floatleft">{#oficial_site#}: {$smarty.const.APP_INFO}</span>
<span class="floatleft ml20">{#support#}: <a href="mailto:support@ave-cms.ru">support@ave-cms.ru</a></span> <span class="floatleft ml20">{#support#}: <a href="mailto:support@ave-cms.ru">support@ave-cms.ru</a></span>
<span class="floatright">{$smarty.const.APP_NAME} v{$smarty.const.APP_VERSION}</span> <span class="floatright">{$smarty.const.APP_NAME} v{$smarty.const.APP_VERSION}</span>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

4
admin/templates/js/main.js
Unescape View File

@ -66,7 +66,7 @@ function openLinkWindow(target, doc, document_alias) {
if (typeof scrollbar == 'undefined') var scrollbar = 1; if (typeof scrollbar == 'undefined') var scrollbar = 1;
var left = (screen.width - width) / 2; var left = (screen.width - width) / 2;
var top = (screen.height - height) / 2; var top = (screen.height - height) / 2;
window.open('index.php?doc=' + doc + '&target=' + target + '&document_alias=' + document_alias + '&do=docs&action=showsimple&cp={$sess}&pop=1', 'pop', 'left=' + left + ',top=' + top + ',width=' + width + ',height=' + height + ',scrollbars=' + scrollbar + ',resizable=1'); window.open('index.php?doc=' + doc + '&target=' + target + '&document_alias=' + document_alias + '&do=docs&action=showsimple&cp=' + sess + '&pop=1', 'pop', 'left=' + left + ',top=' + top + ',width=' + width + ',height=' + height + ',scrollbars=' + scrollbar + ',resizable=1');
} }
function openFileWindow(target, id, document_alias) { function openFileWindow(target, id, document_alias) {
@ -76,7 +76,7 @@ function openFileWindow(target, id, document_alias) {
if (typeof scrollbar == 'undefined') var scrollbar = 1; if (typeof scrollbar == 'undefined') var scrollbar = 1;
var left = (screen.width - width) / 2; var left = (screen.width - width) / 2;
var top = (screen.height - height) / 2; var top = (screen.height - height) / 2;
window.open('index.php?do=browser&id=' + id + '&type=file&target=navi&cp={$sess}', 'pop', 'left=' + left + ',top=' + top + ',width=' + width + ',height=' + height + ',scrollbars=' + scrollbar + ',resizable=1'); window.open('index.php?do=browser&id=' + id + '&type=file&target=navi&cp=' + sess, 'pop', 'left=' + left + ',top=' + top + ',width=' + width + ',height=' + height + ',scrollbars=' + scrollbar + ',resizable=1');
} }
// Функция-плагин для включения tipsy сразу для всех классов внутри элемента // Функция-плагин для включения tipsy сразу для всех классов внутри элемента

2
admin/templates/main.tpl
Unescape View File

@ -33,6 +33,8 @@
var ave_path = "{$ABS_PATH}"; var ave_path = "{$ABS_PATH}";
var ave_theme = "{$smarty.const.DEFAULT_THEME_FOLDER}"; var ave_theme = "{$smarty.const.DEFAULT_THEME_FOLDER}";
var ave_admintpl = "{$tpl_dir}"; var ave_admintpl = "{$tpl_dir}";
var sess = '{$sess}';
</script> </script>
<script type="text/javascript" language="JavaScript"> <script type="text/javascript" language="JavaScript">

8
lib/scripts/uploader/browserplus.js
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save