Skip to content

Issue 210 - More extra space has gone useless from the right side of the files list #210 #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dinukadesilva wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Issue 210 - More extra space has gone useless from the right side of the files list #210 #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85b033f
[210]: Changed styles to improve the directory listing.
dinukadesilva Dec 24, 2015
d87a644
[210]: Changed the way how it had arranged the directory listing to m…
dinukadesilva Dec 24, 2015
b9bcc8d
[210]: Fixed the directory structure to sort by columns
dinukadesilva Dec 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 62 additions & 61 deletions content/src/editor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,77 +827,78 @@ body#pencildoc #diigolet-csm {
padding: 0
}

.directory {
height: 100%;
padding: 10px;
overflow: auto;
/*transition: padding 0.3s;*/
}

.directory-searchable{
padding-top: 20px;
}

.directory .column {
display: inline-block;
float: left;
margin-top: 12px
}

.directory .item {
display: inline-block;
float: left;
clear: left;
text-decoration: none;
color: #222;
cursor: pointer;
width: 154px;
div {
margin: 0px;
max-height: 154px;
padding: 2px 0;
span {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.caption {
text-align: center;
}
.thumbnail {
background-color: #eeeeee;
width: 100px;
height: 100px;
margin-top: 16px;
margin-left: 27px;
border: 1px #ccc solid;
border-radius: 4px;
padding: 2px;
}
.directory {
height: 100%;
overflow: auto;
.column {
display: inline-block;
float: left;
margin-top: 25px;
min-width: 104px;
width: 130px;
text-align: center;
}
&:hover {
text-decoration: underline;
color: blue;
div .thumbnail {
padding: 0px;
border-width: 2px;
border-color: #1679FF;

.item {
display: inline-block;
clear: left;
text-decoration: none;
color: #222;
cursor: pointer;
width: 100px;
margin: 0 auto;
div {
margin: 0px;
max-height: 154px;
span {
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.caption {
text-align: center;
font-size: 23px;
}
.caption-normal {
text-align: left;
font-size: 23px;
}
.thumbnail {
background-color: #eeeeee;
width: 100px;
height: 100px;
border: 1px #ccc solid;
border-radius: 4px;
}
}
span:not(.caption) {
display: table;
&:hover, &.right-click-active {
text-decoration: underline;
position: relative;
background-color: #f5f5f5;
padding-right: 6px;
color: blue;
div .thumbnail {
padding: 0px;
border-width: 2px;
border-color: #1679FF;
}
span:not(.caption) {
display: table;
text-decoration: underline;
position: relative;
background-color: #f5f5f5;
padding-right: 6px;
}
}
}
}

.directory .create {
color: #1e90ff;
div .thumbnail {
border-style: dashed;
.create {
color: #1e90ff;
div .thumbnail {
border-style: dashed;
}
}
}

Expand Down
54 changes: 16 additions & 38 deletions content/src/view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1394,13 +1394,25 @@ function updatePaneLinks(pane) {
directory = $('<div class="directory"></div>').appendTo('#' + pane);

// width is full directory width minus padding minus scrollbar width.
width = Math.floor(directory.width() - getScrollbarWidth());
width = Math.floor(directory.width() - getScrollbarWidth() - 1);
col = $('<div class="column"></div>').appendTo(directory);
var colMinWidth = fwidth(col);

var colCount = Math.round(width / colMinWidth);
var rawCount = Math.floor(list.length / colCount) + ((list.length % colCount) > 0 ? 1 : 0);
for (var x = 1; x < colCount; x++) {
$('<div class="column"></div>').appendTo(directory);
}

var cols = $(directory).find('.column').css('width', (Math.floor(width * 100 / colCount) / 100) + "px");

for (j = 0; j < list.length; j++) {
//Initialize the item and add it to the appropriate column
item = $('<a/>', {
class: 'item' + (list[j].href ? '' : ' create'),
href: list[j].href
}).appendTo(col);
}).appendTo(cols.eq(Math.floor(j / rawCount)));

figure = $('<div/>').appendTo(item);
thumbnail = list[j].thumbnail;
// Only show thumbs if it is a supported type, and showThumb is enabled.
Expand All @@ -1412,47 +1424,13 @@ function updatePaneLinks(pane) {
}).appendTo(figure);
$('<span/>', { text: list[j].name, class: 'caption' }).appendTo(figure);
} else {
$('<span/>', { text: list[j].name }).appendTo(figure);
$('<span/>', { text: list[j].name, class: 'caption-normal' }).appendTo(figure);
}
if (list[j].link) {
item.data('link', list[j].link);
}
}
items = directory.find('.item');
maxwidth = 0;
for (j = 0; j < items.length; j++) {
maxwidth = Math.max(maxwidth, Math.ceil(fwidth(items.get(j))));
}
colcount = Math.min(items.length, Math.floor(width / Math.max(1, maxwidth)));
colsize = items.length;
while (colcount < items.length) {
// Attempt shorter columns from colcount + 1 (or colsize - 1 if shorter).
colsize = Math.min(colsize - 1, Math.ceil(items.length / (colcount + 1)));
tightwidth = 0;
colsdone = 0;
j = 0;
for (colnum = 0; j < items.length; colnum++) {
maxwidth = 0;
for (j = colnum * colsize;
j < items.length && j < (colnum + 1) * colsize; j++) {
maxwidth = Math.max(maxwidth, Math.ceil(fwidth(items.get(j))));
}
tightwidth += maxwidth;
colsdone += 1;
if (tightwidth > width) { break; }
}
if (tightwidth > width) { break; }
colcount = colsdone;
if (colsize <= 1) { break; }
}
colsize = Math.ceil(items.length / colcount);
for (colnum = 1; colnum * colsize < items.length; colnum++) {
col = $('<div class="column"></div>').appendTo(directory);
for (j = colnum * colsize;
j < items.length && j < (colnum + 1) * colsize; j++) {
items.eq(j).appendTo(col);
}
}

directory.on('click', '.item', function(e) {
if (!e.shiftKey && !e.ctrlKey & !e.metaKey && !e.altKey) {
var link = $(this).data('link');
Expand Down