github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-07-08 05:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FileManager stuff

Browse source
This commit is contained in:
Serghey Rodin 2015-10-21 19:29:45 +03:00
parent ab7c5e9ce3
commit dce52823fb
7 changed files with 46 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
web/css/file_manager.css
View file

@ -102,7 +102,7 @@ body { margin: 0; padding: 0; }
ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; border-left: 1px solid #DDDDDD; overflow: auto; } ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; border-left: 1px solid #DDDDDD; overflow: auto; }
.listing li { color: #999999; display: block; height: 34px; margin: 1px 0 0; line-height: 30px; padding: 0; } .listing li { color: #999999; display: block; height: 34px; margin: 1px 0 0; line-height: 30px; padding: 0; }
.listing li span { display: inline-block; float: right; } .listing li span { display: inline-block; float: right; height: 32px; overflow: hidden; }
.listing li .marker { width: 4px; float: left; height: 100%; margin-right: 31px; } .listing li .marker { width: 4px; float: left; height: 100%; margin-right: 31px; }
.listing li.back { } .listing li.back { }
.listing li.file { } .listing li.file { }
@ -200,7 +200,9 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b
.listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -227px; } .listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -227px; }
.listing li .filename { color: #555; cursor: pointer; height: 32px; max-width: 40%; overflow: hidden; float: left; padding: 2px 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; } .listing li .filename-holder { max-width: 40%; overflow: hidden; float: left; height: 35px; }
.listing li .filename { color: #555; cursor: pointer; height: 32px; float: left; padding: 2px 7px 0 7px; border-radius: 3px; transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; -webkit-transition: all 0.18s cubic-bezier(0.4, 0, 0.2, 1) 0s; }
/* .listing li .filename { background: url("/images/folder_.png") no-repeat scroll -2px 6px; color: #555; cursor: pointer; float: left; margin-left: -27px; padding-left: 19px; }*/ /* .listing li .filename { background: url("/images/folder_.png") no-repeat scroll -2px 6px; color: #555; cursor: pointer; float: left; margin-left: -27px; padding-left: 19px; }*/
.listing li .filename:hover { color: #333; background-color: #D1D0CF; } .listing li .filename:hover { color: #333; background-color: #D1D0CF; }
@ -531,7 +533,7 @@ input[type="checkbox"] {
*/ */
@media (max-width: 1400px) { @media (max-width: 1400px) {
.listing li .filename { width: 35%; } .listing li .filename-holder { width: 35%; }
} }
@ -540,13 +542,13 @@ input[type="checkbox"] {
.menu div.button.mkdir { display: none; } .menu div.button.mkdir { display: none; }
.menu div.button.mkfile.small, .menu div.button.mkfile.small,
.menu div.button.mkdir.small { display: inline-block; } .menu div.button.mkdir.small { display: inline-block; }
.listing li .filename { max-width: 30%; } .listing li .filename-holder { max-width: 30%; }
} }
@media (max-width: 1210px) { @media (max-width: 1210px) {
.menu div.button.del { display: none; } .menu div.button.del { display: none; }
.menu div.button.del.small { display: inline-block; } .menu div.button.del.small { display: inline-block; }
.listing li .filename { max-width: 25%; } .listing li .filename-holder { max-width: 25%; }
} }
@ -554,7 +556,7 @@ input[type="checkbox"] {
.menu div.button { display: none; } .menu div.button { display: none; }
.menu div.button.medium, .menu div.button.medium,
.menu div.button.small { display: inline-block; } .menu div.button.small { display: inline-block; }
.listing li .filename { max-width: 20%; } .listing li .filename-holder { max-width: 20%; }
} }
@media (max-width: 1080px) { @media (max-width: 1080px) {
@ -569,11 +571,11 @@ input[type="checkbox"] {
.menu div.button { display: inline-block; } .menu div.button { display: inline-block; }
.menu div.button.small { display: none; } .menu div.button.small { display: none; }
.menu div.copy.button { display: none; } .menu div.copy.button { display: none; }
.listing li .filename { max-width: 40%; } .listing li .filename-holder { max-width: 40%; }
} }
@media (max-width: 720px) { @media (max-width: 720px) {
.listing li .filename { max-width: 30%; } .listing li .filename-holder { max-width: 30%; }
} }
@media (max-width: 600px) { @media (max-width: 600px) {
@ -581,18 +583,18 @@ input[type="checkbox"] {
.menu div.button.medium, .menu div.button.medium,
.menu div.button.small { display: inline-block; } .menu div.button.small { display: inline-block; }
.menu div.copy.button.small { display: none; } .menu div.copy.button.small { display: none; }
.listing li .filename { max-width: 20%; } .listing li .filename-holder { max-width: 20%; }
} }
@media (max-width: 520px) { @media (max-width: 520px) {
.listing li .owner { display: none; } .listing li .owner { display: none; }
.listing li .filename { max-width: 15%; } .listing li .filename-holder { max-width: 15%; }
} }
@media (max-width: 400px) { @media (max-width: 400px) {
.listing li .mode { display: none; } .listing li .mode { display: none; }
.listing li .time { display: none; } .listing li .time { display: none; }
.listing li .filename { max-width: 30%; } .listing li .filename-holder { max-width: 30%; }
} }
@media (max-width: 360px) { @media (max-width: 360px) {
@ -672,9 +674,10 @@ input[type="checkbox"] {
} }
.shortcuts ul { .shortcuts ul {
list-style-type: none; list-style-type: none;
padding: 30px 10px; padding: 30px 20px;
display: inline-block; display: inline-block;
float: left; float: left;
width: 360px;
} }
.shortcuts ul li { .shortcuts ul li {
padding: 5px 20px; padding: 5px 20px;
@ -688,7 +691,6 @@ input[type="checkbox"] {
font-weight: bold; font-weight: bold;
padding: 0 20px 0 0; padding: 0 20px 0 0;
text-align: right; text-align: right;
width: 140px;
} }
.shortcuts ul li span.bigger { .shortcuts ul li span.bigger {
font-size: 18px; font-size: 18px;
@ -715,12 +717,12 @@ input[type="checkbox"] {
background-image: url("/images/sprite.png"); background-image: url("/images/sprite.png");
width: 35px; width: 35px;
height: 35px; height: 35px;
background-position: -283px -68px; background-position: -122px -283px;
border-radius: 18px; border-radius: 18px;
} }
.l-icon-shortcuts:hover { .l-icon-shortcuts:hover {
background-color: #ccc; background-position: -160px -283px;
} }
.l-icon-shortcuts:active { .l-icon-shortcuts:active {
background-color: #98D5CD; background-position: -198px -283px;
} }

2
web/css/file_manager_editor.css
View file

@ -28,7 +28,7 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color:
.ace_gutter, .ace_gutter,
.ace_scroller { padding-top: 10px; } .ace_scroller { padding-top: 0px; }
.ace-twilight .ace_gutter-active-line { margin-top: 10px; } .ace-twilight .ace_gutter-active-line { margin-top: 10px; }
.ace_gutter-cell { color: #777; } .ace_gutter-cell { color: #777; }

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

@ -1156,6 +1156,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
font-size: 13px; font-size: 13px;
} }
.units div:last-child {
border-bottom: none !important;
}
.units .l-unit { .units .l-unit {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
@ -1944,16 +1948,19 @@ div.l-content > div.l-separator:nth-of-type(4) {
.l-icon-shortcuts { .l-icon-shortcuts {
width: 35px; width: 35px;
height: 35px; height: 35px;
background-position: -283px -68px; background-position: -240px -281px;
border-radius: 18px; border-radius: 18px;
} }
.l-icon-shortcuts:hover { .l-icon-shortcuts:hover {
background-color: #ccc; background-position: -160px -281px;
} }
.l-icon-shortcuts:active { .l-icon-shortcuts:active {
background-color: #98D5CD; background-position: -198px -281px;
} }
.l-icon-star-orange { .l-icon-star-orange {
width: 13px; width: 13px;
height: 13px; height: 13px;
@ -2000,14 +2007,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
display: inline-block; display: inline-block;
position: fixed; position: fixed;
top: 92%; top: 92%;
right: 4%; right: 1%;
} }
.to-shortcuts { .to-shortcuts {
display: inline-block; display: inline-block;
position: fixed; position: fixed;
top: 92%; top: 92%;
right: 1%; right: 4%;
} }
@ -2593,6 +2600,7 @@ td.hint {
.l-unit.selected { .l-unit.selected {
background-color: #feef9a; background-color: #feef9a;
color: #555; color: #555;
border-bottom: 1px solid #c0b990;
} }
.l-unit.selected b, .l-unit.selected b,
@ -2804,9 +2812,10 @@ form#vstobjects.suspended {
} }
.shortcuts ul { .shortcuts ul {
list-style-type: none; list-style-type: none;
padding: 30px 15px; padding: 30px 20px;
display: inline-block; display: inline-block;
float: left; float: left;
width: 360px;
} }
.shortcuts ul li { .shortcuts ul li {
padding: 5px 20px; padding: 5px 20px;
@ -2820,7 +2829,10 @@ form#vstobjects.suspended {
font-weight: bold; font-weight: bold;
padding: 0 20px 0 0; padding: 0 20px 0 0;
text-align: right; text-align: right;
width: 140px; /* width: 140px;*/
}
.shortcuts ul li span.bigger {
font-size: 18px;
} }
.description { .description {

BIN
web/images/sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Before After
Before After

7
web/js/file_manager.js
View file

@ -1174,8 +1174,13 @@ FM.selectItem = function(item, box) {
src = $.parseJSON(src); src = $.parseJSON(src);
var tab = FM.getTabLetter(FM.CURRENT_TAB); var tab = FM.getTabLetter(FM.CURRENT_TAB);
if (FM.itemIsArchieve(src)) { if (FM.itemIsArchieve(src)) {
$('.menu-'+tab+' .extract-btn').show(); if($('.menu-'+tab+' .archive.button').first().is(':visible'))
$('.menu-'+tab+' .extract-btn').first().show();
else
$('.menu-'+tab+' .extract-btn.small').show();
} }
else { else {
$('.menu-'+tab+' .extract-btn').hide(); $('.menu-'+tab+' .extract-btn').hide();

2
web/js/templates.js
View file

@ -20,7 +20,7 @@ App.Templates.html = {
</span>\ </span>\
<span class="icon ~!:ITEM_TYPE~!" ></span>\ <span class="icon ~!:ITEM_TYPE~!" ></span>\
<input type="hidden" class="source" value=\'~!:SOURCE~!\'/>\ <input type="hidden" class="source" value=\'~!:SOURCE~!\'/>\
<span class="filename ripple" ~!:CL_ACTION_1~!>~!:NAME~!</span>\ <span class="filename-holder"><div class="filename ripple" ~!:CL_ACTION_1~!>~!:NAME~!</div></span>\
<span class="mode">~!:PERMISSIONS~!</span>\ <span class="mode">~!:PERMISSIONS~!</span>\
<span class="owner">~!:OWNER~!</span>\ <span class="owner">~!:OWNER~!</span>\
<span class="size-unit">~!:SIZE_UNIT~!</span>\ <span class="size-unit">~!:SIZE_UNIT~!</span>\

2
web/templates/file_manager/main.php
View file

@ -91,7 +91,7 @@
<li><span class="key">a</span><?=__('Archive')?></li> <li><span class="key">a</span><?=__('Archive')?></li>
<li><span class="key">F8 / Del</span><?=__('Delete')?></li> <li><span class="key">F8 / Del</span><?=__('Delete')?></li>
<li class="step-top"><span class="key">&lt;Ctrl&gt; + s</span><?=__('Save File (in text editor)')?></li> <li class="step-top"><span class="key">&lt;Ctrl&gt; + s</span><?=__('Save File (in text editor)')?></li>
<li class="step-top"><span class="key">h</span><?=__('Display Shortcuts Help')?></li> <li class="step-top"><span class="key">h</span><?=__('Display/Close shortcuts')?></li>
<li class="step-top"><span class="key">Esc</span><?=__('Close Popup / Cancel')?></li> <li class="step-top"><span class="key">Esc</span><?=__('Close Popup / Cancel')?></li>
</ul> </ul>
<ul> <ul>