Skip to content

Commit dce5282

Browse files
serghey-rodinserghey-rodin
committed
FileManager stuff
1 parent ab7c5e9 commit dce5282

File tree

7 files changed

+46
-27
lines changed

7 files changed

+46
-27
lines changed

‎web/css/file_manager.css‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ body { margin: 0; padding: 0; }
102102

103103
ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; border-left: 1px solid #DDDDDD; overflow: auto; }
104104
.listing li { color: #999999; display: block; height: 34px; margin: 1px 0 0; line-height: 30px; padding: 0; }
105-
.listing li span { display: inline-block; float: right; }
105+
.listing li span { display: inline-block; float: right; height: 32px; overflow: hidden; }
106106
.listing li .marker { width: 4px; float: left; height: 100%; margin-right: 31px; }
107107
.listing li.back { }
108108
.listing li.file { }
@@ -200,7 +200,9 @@ ul.listing { list-style-type: none; padding: 18px 0 0; margin: -4px 0 0 -1px; b
200200
.listing li .icon.filetype-xhtml { background: url("/images/flat_icons.png") no-repeat scroll -138px -227px; }
201201

202202

203-
.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; }
203+
.listing li .filename-holder { max-width: 40%; overflow: hidden; float: left; height: 35px; }
204+
.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; }
205+
204206
/* .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; }*/
205207

206208
.listing li .filename:hover { color: #333; background-color: #D1D0CF; }
@@ -531,7 +533,7 @@ input[type="checkbox"] {
531533
*/
532534

533535
@media (max-width: 1400px) {
534-
.listing li .filename { width: 35%; }
536+
.listing li .filename-holder { width: 35%; }
535537
}
536538

537539

@@ -540,21 +542,21 @@ input[type="checkbox"] {
540542
.menu div.button.mkdir { display: none; }
541543
.menu div.button.mkfile.small,
542544
.menu div.button.mkdir.small { display: inline-block; }
543-
.listing li .filename { max-width: 30%; }
545+
.listing li .filename-holder { max-width: 30%; }
544546
}
545547

546548
@media (max-width: 1210px) {
547549
.menu div.button.del { display: none; }
548550
.menu div.button.del.small { display: inline-block; }
549-
.listing li .filename { max-width: 25%; }
551+
.listing li .filename-holder { max-width: 25%; }
550552
}
551553

552554

553555
@media (max-width: 1180px) {
554556
.menu div.button { display: none; }
555557
.menu div.button.medium,
556558
.menu div.button.small { display: inline-block; }
557-
.listing li .filename { max-width: 20%; }
559+
.listing li .filename-holder { max-width: 20%; }
558560
}
559561

560562
@media (max-width: 1080px) {
@@ -569,30 +571,30 @@ input[type="checkbox"] {
569571
.menu div.button { display: inline-block; }
570572
.menu div.button.small { display: none; }
571573
.menu div.copy.button { display: none; }
572-
.listing li .filename { max-width: 40%; }
574+
.listing li .filename-holder { max-width: 40%; }
573575
}
574576

575577
@media (max-width: 720px) {
576-
.listing li .filename { max-width: 30%; }
578+
.listing li .filename-holder { max-width: 30%; }
577579
}
578580

579581
@media (max-width: 600px) {
580582
.menu div.button { display: none; }
581583
.menu div.button.medium,
582584
.menu div.button.small { display: inline-block; }
583585
.menu div.copy.button.small { display: none; }
584-
.listing li .filename { max-width: 20%; }
586+
.listing li .filename-holder { max-width: 20%; }
585587
}
586588

587589
@media (max-width: 520px) {
588590
.listing li .owner { display: none; }
589-
.listing li .filename { max-width: 15%; }
591+
.listing li .filename-holder { max-width: 15%; }
590592
}
591593

592594
@media (max-width: 400px) {
593595
.listing li .mode { display: none; }
594596
.listing li .time { display: none; }
595-
.listing li .filename { max-width: 30%; }
597+
.listing li .filename-holder { max-width: 30%; }
596598
}
597599

598600
@media (max-width: 360px) {
@@ -672,9 +674,10 @@ input[type="checkbox"] {
672674
}
673675
.shortcuts ul {
674676
list-style-type: none;
675-
padding: 30px 10px;
677+
padding: 30px 20px;
676678
display: inline-block;
677679
float: left;
680+
width: 360px;
678681
}
679682
.shortcuts ul li {
680683
padding: 5px 20px;
@@ -688,7 +691,6 @@ input[type="checkbox"] {
688691
font-weight: bold;
689692
padding: 0 20px 0 0;
690693
text-align: right;
691-
width: 140px;
692694
}
693695
.shortcuts ul li span.bigger {
694696
font-size: 18px;
@@ -715,12 +717,12 @@ input[type="checkbox"] {
715717
background-image: url("/images/sprite.png");
716718
width: 35px;
717719
height: 35px;
718-
background-position: -283px -68px;
720+
background-position: -122px -283px;
719721
border-radius: 18px;
720722
}
721723
.l-icon-shortcuts:hover {
722-
background-color: #ccc;
724+
background-position: -160px -283px;
723725
}
724726
.l-icon-shortcuts:active {
725-
background-color: #98D5CD;
727+
background-position: -198px -283px;
726728
}

‎web/css/file_manager_editor.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ input.save:active { border: 1px solid #FFCC00; background-color: #FFCC00; color:
2828

2929

3030
.ace_gutter,
31-
.ace_scroller { padding-top: 10px; }
31+
.ace_scroller { padding-top: 0px; }
3232
.ace-twilight .ace_gutter-active-line { margin-top: 10px; }
3333

3434
.ace_gutter-cell { color: #777; }

‎web/css/styles.min.css‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,6 +1156,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
11561156
font-size: 13px;
11571157
}
11581158

1159+
.units div:last-child {
1160+
border-bottom: none !important;
1161+
}
1162+
11591163
.units .l-unit {
11601164
border-bottom: 1px solid #ddd;
11611165
}
@@ -1944,16 +1948,19 @@ div.l-content > div.l-separator:nth-of-type(4) {
19441948
.l-icon-shortcuts {
19451949
width: 35px;
19461950
height: 35px;
1947-
background-position: -283px -68px;
1951+
background-position: -240px -281px;
19481952
border-radius: 18px;
19491953
}
19501954
.l-icon-shortcuts:hover {
1951-
background-color: #ccc;
1955+
background-position: -160px -281px;
19521956
}
19531957
.l-icon-shortcuts:active {
1954-
background-color: #98D5CD;
1958+
background-position: -198px -281px;
19551959
}
19561960

1961+
1962+
1963+
19571964
.l-icon-star-orange {
19581965
width: 13px;
19591966
height: 13px;
@@ -2000,14 +2007,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
20002007
display: inline-block;
20012008
position: fixed;
20022009
top: 92%;
2003-
right: 4%;
2010+
right: 1%;
20042011
}
20052012

20062013
.to-shortcuts {
20072014
display: inline-block;
20082015
position: fixed;
20092016
top: 92%;
2010-
right: 1%;
2017+
right: 4%;
20112018
}
20122019

20132020

@@ -2593,6 +2600,7 @@ td.hint {
25932600
.l-unit.selected {
25942601
background-color: #feef9a;
25952602
color: #555;
2603+
border-bottom: 1px solid #c0b990;
25962604
}
25972605

25982606
.l-unit.selected b,
@@ -2804,9 +2812,10 @@ form#vstobjects.suspended {
28042812
}
28052813
.shortcuts ul {
28062814
list-style-type: none;
2807-
padding: 30px 15px;
2815+
padding: 30px 20px;
28082816
display: inline-block;
28092817
float: left;
2818+
width: 360px;
28102819
}
28112820
.shortcuts ul li {
28122821
padding: 5px 20px;
@@ -2820,7 +2829,10 @@ form#vstobjects.suspended {
28202829
font-weight: bold;
28212830
padding: 0 20px 0 0;
28222831
text-align: right;
2823-
width: 140px;
2832+
/* width: 140px;*/
2833+
}
2834+
.shortcuts ul li span.bigger {
2835+
font-size: 18px;
28242836
}
28252837

28262838
.description {

‎web/images/sprite.png‎

3.81 KB
Loading

‎web/js/file_manager.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,13 @@ FM.selectItem = function(item, box) {
11741174
src = $.parseJSON(src);
11751175
var tab = FM.getTabLetter(FM.CURRENT_TAB);
11761176

1177+
1178+
11771179
if (FM.itemIsArchieve(src)) {
1178-
$('.menu-'+tab+' .extract-btn').show();
1180+
if($('.menu-'+tab+' .archive.button').first().is(':visible'))
1181+
$('.menu-'+tab+' .extract-btn').first().show();
1182+
else
1183+
$('.menu-'+tab+' .extract-btn.small').show();
11791184
}
11801185
else {
11811186
$('.menu-'+tab+' .extract-btn').hide();

‎web/js/templates.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ App.Templates.html = {
2020
</span>\
2121
<span class="icon ~!:ITEM_TYPE~!" ></span>\
2222
<input type="hidden" class="source" value=\'~!:SOURCE~!\'/>\
23-
<span class="filename ripple" ~!:CL_ACTION_1~!>~!:NAME~!</span>\
23+
<span class="filename-holder"><div class="filename ripple" ~!:CL_ACTION_1~!>~!:NAME~!</div></span>\
2424
<span class="mode">~!:PERMISSIONS~!</span>\
2525
<span class="owner">~!:OWNER~!</span>\
2626
<span class="size-unit">~!:SIZE_UNIT~!</span>\

‎web/templates/file_manager/main.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<li><span class="key">a</span><?=__('Archive')?></li>
9292
<li><span class="key">F8 / Del</span><?=__('Delete')?></li>
9393
<li class="step-top"><span class="key">&lt;Ctrl&gt; + s</span><?=__('Save File (in text editor)')?></li>
94-
<li class="step-top"><span class="key">h</span><?=__('Display Shortcuts Help')?></li>
94+
<li class="step-top"><span class="key">h</span><?=__('Display/Close shortcuts')?></li>
9595
<li class="step-top"><span class="key">Esc</span><?=__('Close Popup / Cancel')?></li>
9696
</ul>
9797
<ul>

0 commit comments

Comments
 (0)