github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-15 01:23:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

filemanager improvements

Browse source
This commit is contained in:
Serghey Rodin 2016-08-25 19:33:06 +03:00
parent 03381b828f
commit 136cc17873
32 changed files with 68 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
web/css/styles.min.css vendored
View file

@ -1169,10 +1169,16 @@ div.l-content > div.l-separator:nth-of-type(4) {
vertical-align: middle;
}
.l-sort-toolbar.subtitle {
padding-left: 96px;
}
.l-sort-toolbar td:first-of-type {
padding-left: 40px;
}
.l-sort-toolbar td.step-right:first-of-type {
padding-right: 20px;
}
@ -1963,18 +1969,18 @@ body.mobile .l-unit-toolbar__col--right {
background-position: -1px -442px;
}
.actions-panel__configure:hover a {
background-color: #afafac;
color: #fff;
}
.actions-panel__configure:active a {
background-color: #55c9c0;
color: #fff;
}
.actions-panel__configure:active a {
background-color: #afafac;
color: #fff;
}
.actions-panel__configure:hover a i {
background-position: -41px -442px;
background-position: -81px -442px;
}
.actions-panel__configure:active a i {
background-position: -81px -442px;
background-position: -41px -442px;
}
.actions-panel__configure--active a {
background-color: #55c9c0;
@ -2524,6 +2530,17 @@ a.vst-text:active b{
.vst-textinput:disabled {
background-color: #f1f1f1;
}
.vst-textinput.console{
font-size: 13px;
width: 630px;
height: 300px;
font-family:"Lucida Console", Monaco, monospace;
white-space: pre;
}
#advanced-options .console{
width: 833px;
height: 600px;
}
.generate {
color: #2C9491;
text-decoration: underline;

5
web/file_manager/fm_core.php
View file

@ -237,9 +237,6 @@ class FileManager {
}
function renameFile($item, $target_name) {
// $item = $this->formatFullPath($dir . '/' . $item);
// $dst_item = $this->formatFullPath($dir . '/' . $target_name);
$item = $this->formatFullPath($item);
$dst_item = $this->formatFullPath($target_name);
@ -366,7 +363,7 @@ class FileManager {
'owner' => $info[$this->info_positions['OWNER']],
'group' => $info[$this->info_positions['GROUP']],
'size' => $info[$this->info_positions['SIZE']],
'name' => $info[$this->info_positions['NAME']]
'name' => htmlspecialchars($info[$this->info_positions['NAME']], ENT_QUOTES)
);
}

1
web/inc/i18n/ar.php
View file

@ -285,6 +285,7 @@ $LANG['ar'] = array(
'DNS Support' => 'إضافةإلى بيانات DNS (افتراضي)',
'Mail Support' => 'إضافة إلى نطاقات البريد (افتراضي)',
'Advanced options' => 'المزيد من الخيارات المتقدمة',
'Basic options' => 'Basic options',
'Aliases' => 'الأسماء البديلة (تعمل عمل الاسم الرئيسي)',
'SSL Certificate' => 'شهادة أمان SSL',
'SSL Key' => 'مفتاح شهادة أمان SSL',

1
web/inc/i18n/bs.php
View file

@ -285,6 +285,7 @@ $LANG['bs'] = array(
'DNS Support' => 'DNS podrška',
'Mail Support' => 'Mail podrška',
'Advanced options' => 'Dodatne opcije',
'Basic options' => 'Basic options',
'Aliases' => 'Aliasi',
'SSL Certificate' => 'SSL certifikat',
'SSL Key' => 'SSL Key',

1
web/inc/i18n/cn.php
View file

@ -285,6 +285,7 @@ $LANG['cn'] = array(
'DNS Support' => 'DNS支持',
'Mail Support' => 'Mail支持',
'Advanced options' => '高级选项',
'Basic options' => 'Basic options',
'Aliases' => '别名',
'SSL Certificate' => 'SSL证书',
'SSL Key' => 'SSL Key',

1
web/inc/i18n/cz.php
View file

@ -286,6 +286,7 @@ $LANG['cz'] = array(
'DNS Support' => 'DNS podpora',
'Mail Support' => 'Mail podpora',
'Advanced options' => 'Pokročilé nastavení',
'Basic options' => 'Basic options',
'Aliases' => 'Aliasy',
'SSL Certificate' => 'SSL certifikát',
'SSL Key' => 'SSL klíč',

1
web/inc/i18n/da.php
View file

@ -287,6 +287,7 @@ $LANG['da'] = array(
'DNS Support' => 'DNS Support',
'Mail Support' => 'Mail Support',
'Advanced options' => 'Avancerede Indstillinger',
'Basic options' => 'Basic options',
'Aliases' => 'Aliaser',
'SSL Certificate' => 'SSL Certifikat',
'SSL Key' => 'SSL Key',

1
web/inc/i18n/de.php
View file

@ -285,6 +285,7 @@ $LANG['de'] = array(
'DNS Support' => 'DNS Unterstützung',
'Mail Support' => 'Mail Unterstützung',
'Advanced options' => 'Erweiterte Optionen',
'Basic options' => 'Basic options',
'Aliases' => 'Aliase',
'SSL Certificate' => 'SSL Zertifikat',
'SSL Key' => 'SSL Schlüssel',

1
web/inc/i18n/el.php
View file

@ -286,6 +286,7 @@ $LANG['el'] = array(
'DNS Support' => 'Υποστήριξη DNS',
'Mail Support' => 'Υποστήριξη Mail',
'Advanced options' => 'Προχωρημένες επιλογές',
'Basic options' => 'Basic options',
'Aliases' => 'Ψευδώνυμα',
'SSL Certificate' => 'Πιστοποιητικό SSL',
'SSL Key' => 'Κλειδί SSL',

1
web/inc/i18n/en.php
View file

@ -285,6 +285,7 @@ $LANG['en'] = array(
'DNS Support' => 'DNS Support',
'Mail Support' => 'Mail Support',
'Advanced options' => 'Advanced options',
'Basic options' => 'Basic options',
'Aliases' => 'Aliases',
'SSL Certificate' => 'SSL Certificate',
'SSL Key' => 'SSL Key',

1
web/inc/i18n/es.php
View file

@ -285,6 +285,7 @@ $LANG['es'] = array(
'DNS Support' => 'Soporte para DNS',
'Mail Support' => 'Soporte para Correo',
'Advanced options' => 'Opciones Avanzadas',
'Basic options' => 'Basic options',
'Aliases' => 'Aliases',
'SSL Certificate' => 'Certificado SSL',
'SSL Key' => 'Llave SSL',

1
web/inc/i18n/fa.php
View file

@ -287,6 +287,7 @@ $LANG['fa'] = array(
'DNS Support' => 'پشتیبانی DNS',
'Mail Support' => 'پشتیبانی ایمیل',
'Advanced options' => 'گزینه های پیشرفته',
'Basic options' => 'Basic options',
'Aliases' => 'نام مستعار',
'SSL Certificate' => 'گواهینامه SSL',
'SSL Key' => 'کلید SSL',

1
web/inc/i18n/fi.php
View file

@ -286,6 +286,7 @@ $LANG['fi'] = array(
'DNS Support' => 'Tarvitsee DNS:n',
'Mail Support' => 'Tarvitsee Sähköpostin',
'Advanced options' => 'Lisäasetukset',
'Basic options' => 'Basic options',
'Aliases' => 'Aliakset',
'SSL Certificate' => 'SSL-sertifikaatti',
'SSL Key' => 'SSL-avain',

1
web/inc/i18n/fr.php
View file

@ -285,6 +285,7 @@ $LANG['fr'] = array(
'DNS Support' => 'Support DNS',
'Mail Support' => 'Support Email',
'Advanced options' => 'Options avancées',
'Basic options' => 'Basic options',
'Aliases' => 'Alias',
'SSL Certificate' => 'Certificat SSL',
'SSL Key' => 'Clé SSL',

1
web/inc/i18n/hu.php
View file

@ -289,6 +289,7 @@ $LANG['hu'] = array(
'DNS Support' => 'DNS támogatás',
'Mail Support' => 'Mail támogatás',
'Advanced options' => 'Haladó beállítások',
'Basic options' => 'Basic options',
'Aliases' => 'Aliaszok',
'SSL Certificate' => 'SSL igazolás',
'SSL Key' => 'SSL kulcs',

1
web/inc/i18n/id.php
View file

@ -288,6 +288,7 @@ $LANG['id'] = array(
'DNS Support' => 'Dukungan DNS',
'Mail Support' => 'Dukungan Mail',
'Advanced options' => 'Opsi lanjutan',
'Basic options' => 'Basic options',
'Aliases' => 'Alias',
'SSL Certificate' => 'Sertifikat SSL',
'SSL Key' => 'Kunci SSL',

1
web/inc/i18n/it.php
View file

@ -286,6 +286,7 @@ $LANG['it'] = array(
'DNS Support' => 'Supporto DNS',
'Mail Support' => 'Supporto Mail',
'Advanced options' => 'Opzioni Avanzate',
'Basic options' => 'Basic options',
'Aliases' => 'Alias Dominio',
'SSL Certificate' => 'Certificato SSL',
'SSL Key' => 'SSL Key',

1
web/inc/i18n/ja.php
View file

@ -285,6 +285,7 @@ $LANG['ja'] = array(
'DNS Support' => 'DNSのサポート',
'Mail Support' => 'メールのサポート',
'Advanced options' => '詳細設定',
'Basic options' => 'Basic options',
'Aliases' => 'エイリアス',
'SSL Certificate' => 'SSL証明書',
'SSL Key' => 'SSL鍵',

1
web/inc/i18n/nl.php
View file

@ -286,6 +286,7 @@ $LANG['nl'] = array(
'DNS Support' => 'DNS Ondersteuning',
'Mail Support' => 'Mail Ondersteuning',
'Advanced options' => 'Geavanceerde opties',
'Basic options' => 'Basic options',
'Aliases' => 'Aliassen',
'SSL Certificate' => 'SSL Certificaat',
'SSL Key' => 'SSL Sleutel',

1
web/inc/i18n/no.php
View file

@ -286,6 +286,7 @@ $LANG['no'] = array(
'DNS Support' => 'DNS Støtte',
'Mail Support' => 'Mail Støtte',
'Advanced options' => 'Avanserte Instillinger',
'Basic options' => 'Basic options',
'Aliases' => 'Aliaser',
'SSL Certificate' => 'SSL Sertifikat',
'SSL Key' => 'SSL Nøkkel',

1
web/inc/i18n/pl.php
View file

@ -285,6 +285,7 @@ $LANG['pl'] = array(
'DNS Support' => 'Wsparcie dla DNS',
'Mail Support' => 'Wsparcie dla poczty email',
'Advanced options' => 'Ustawienia zaawansowane',
'Basic options' => 'Basic options',
'Aliases' => 'Aliasy',
'SSL Certificate' => 'Certyfikat SSL',
'SSL Key' => 'Klucz SSL',

1
web/inc/i18n/pt-BR.php
View file

@ -285,6 +285,7 @@ $LANG['pt-BR'] = array(
'DNS Support' => 'Suporte a DNS',
'Mail Support' => 'Suporte a Email',
'Advanced options' => 'Opções Avançadas',
'Basic options' => 'Basic options',
'Aliases' => 'Apelidos',
'SSL Certificate' => 'Certificado SSL',
'SSL Key' => 'Chave SSL',

1
web/inc/i18n/pt.php
View file

@ -285,6 +285,7 @@ $LANG['pt'] = array(
'DNS Support' => 'Suporte a DNS',
'Mail Support' => 'Suporte a Email',
'Advanced options' => 'Opções Avançadas',
'Basic options' => 'Basic options',
'Aliases' => 'Apelidos',
'SSL Certificate' => 'Certificado SSL',
'SSL Key' => 'Chave SSL',

1
web/inc/i18n/ro.php
View file

@ -286,6 +286,7 @@ $LANG['ro'] = array(
'DNS Support' => 'Support DNS',
'Mail Support' => 'Support E-mail',
'Advanced options' => 'Opțiuni avansate',
'Basic options' => 'Basic options',
'Aliases' => 'Aliasuri',
'SSL Certificate' => 'Certificat SSL',
'SSL Key' => 'Cheia SSL',

1
web/inc/i18n/ru.php
View file

@ -286,6 +286,7 @@ $LANG['ru'] = array(
'DNS Support' => 'Поддержка DNS',
'Mail Support' => 'Поддержка почты',
'Advanced options' => 'Дополнительные опции',
'Basic options' => 'Базовые опции',
'Aliases' => 'Алиасы',
'SSL Certificate' => 'SSL сертификат',
'SSL Key' => 'Ключ SSL сертификата',

1
web/inc/i18n/se.php
View file

@ -285,6 +285,7 @@ $LANG['se'] = array(
'DNS Support' => 'DNS-stöd',
'Mail Support' => 'Mail-stöd',
'Advanced options' => 'Avancerade inställningar',
'Basic options' => 'Basic options',
'Aliases' => 'Alias',
'SSL Certificate' => 'SSL-certifikat',
'SSL Key' => 'SSL-nyckel',

1
web/inc/i18n/tr.php
View file

@ -286,6 +286,7 @@ $LANG['tr'] = array(
'DNS Support' => 'DNS Desteği',
'Mail Support' => 'Mail Desteği',
'Advanced options' => 'Gelişmiş seçenekler',
'Basic options' => 'Basic options',
'Aliases' => 'Takma adlar (Alias)',
'SSL Certificate' => 'SSL Sertifikası',
'SSL Key' => 'SSL Anahtarı (Key)',

1
web/inc/i18n/tw.php
View file

@ -288,6 +288,7 @@ $LANG['tw'] = array(
'DNS Support' => 'DNS支援',
'Mail Support' => '信箱支援',
'Advanced options' => '進階選項',
'Basic options' => 'Basic options',
'Aliases' => '次網域',
'SSL Certificate' => 'SSL憑證',
'SSL Key' => 'SSL密鑰',

1
web/inc/i18n/ua.php
View file

@ -286,6 +286,7 @@ $LANG['ua'] = array(
'DNS Support' => 'Підтримка DNS',
'Mail Support' => 'Підтримка пошти',
'Advanced options' => 'Додаткові опції',
'Basic options' => 'Basic options',
'Aliases' => 'Аліаси',
'SSL Certificate' => 'SSL сертификат',
'SSL Key' => 'Ключ SSL сертифікату',

1
web/inc/i18n/vi.php
View file

@ -285,6 +285,7 @@ $LANG['vi'] = array(
'DNS Support' => 'Hỗ trỡ DNS',
'Mail Support' => 'Hỗ trợ email',
'Advanced options' => 'Cấu hình nâng cao',
'Basic options' => 'Basic options',
'Aliases' => 'Ánh xạ',
'SSL Certificate' => 'Chứng chỉ SSL',
'SSL Key' => 'SSL Key',

8
web/js/file_manager.js
View file

@ -651,10 +651,13 @@ FM.generate_listing = function(reply, box) {
var t_index = tab + '_' + i;
o.name = o.name.replace('"', '\"');
o.full_path = o.full_path.replace('"', '\"');
var tpl = Tpl.get('entry_line', 'FM');
tpl.set(':CL_ACTION_1', cl_act);
tpl.set(':SOURCE', $.toJSON(o));
tpl.set(':NAME', o.name);
tpl.set(':SOURCE', $.toJSON(o));
tpl.set(':PERMISSIONS', o.permissions);
tpl.set(':OWNER', o.owner);
tpl.set(':SIZE_VALUE', o.type == 'f' ? FM.humanFileSizeValue(o.size) : ' ');
@ -1842,7 +1845,6 @@ FM.confirmUnpackItem = function () {
}
FM.confirmPackItem = function () {
var tab = FM.getTabLetter(FM.CURRENT_TAB);
var box = FM['TAB_' + tab];
var selected = $(FM['TAB_' + tab] ).find('.dir.active, .dir.selected');
@ -1863,7 +1865,6 @@ FM.confirmPackItem = function () {
}
}
if (selected.length > 0) {
var files_arr = [];
$.each(selected, function(i, o) {
@ -1898,7 +1899,6 @@ FM.confirmPackItem = function () {
if (reply.result == true) {
FM.popupClose();
FM.open(FM['TAB_' + tab + '_CURRENT_PATH'], FM['TAB_' + tab]);
/// FM.open(FM['TAB_' + opposite_tab + '_CURRENT_PATH'], FM['TAB_' + opposite_tab]);
}
else {
FM.showError('unpack_item', reply.message);

4
web/js/init.js
View file

@ -548,6 +548,10 @@ $(document).ready(function(){
VE.navigation.init();
$('.button').attr('title','ctrl+Enter');
$('.button.cancel').attr('title','ctrl+Backspace');
VE.core.register();
if (location.href.search(/list/) != -1) {
var shift_select_ref = $('body').finderSelect({