rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-03-02 02:29:25 +01:00
Code Issues Releases Activity

Add Date to bookamrk list and fix some style pbms

Browse Source
This commit is contained in:
Brice Maron 2012-08-05 21:34:01 +00:00
parent 566055f4e6
commit 5692e8904d
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/bookmarks.css
View File

@ -256,6 +256,7 @@ li:hover em { display : none; }
} }
#view_type { #view_type {
display:none; /* @TODO: Remove when image view is ready*/
position: absolute; position: absolute;
right: 33.5em; right: 33.5em;
top: 0; top: 0;
@ -284,12 +285,21 @@ li:hover em { display : none; }
} }
.bookmark_desc{ .bookmark_desc{
height: 2em; height: 1.5em;
padding-left:1em;
white-space:nowrap; white-space:nowrap;
text-overflow:ellipsis; text-overflow:ellipsis;
overflow:hidden; overflow:hidden;
display:block; display:block;
} }
.bookmark_date {
font-size:small;
position: absolute;
right: 6em;
color:gray;
/* margin-top:2.5em; */
margin-right: 0.2em;
}
/* /*
.bm_view_img .bookmark_single:hover .bookmark_url{ .bm_view_img .bookmark_single:hover .bookmark_url{
display:block; display:block;

5
js/bookmarks.js
View File

@ -229,6 +229,8 @@ function updateBookmarksList(bookmark) {
} }
if(bookmark.title == '') bookmark.title = bookmark.url; if(bookmark.title == '') bookmark.title = bookmark.url;
bookmark.added_date = new Date();
bookmark.added_date.setTime(parseInt(bookmark.added)*1000);
if(bookmark_view == 'image') { //View in images if(bookmark_view == 'image') { //View in images
service_url = formatString(shot_provider, {url: encodeEntities(bookmark.url), title: bookmark.title, width: 200}); service_url = formatString(shot_provider, {url: encodeEntities(bookmark.url), title: bookmark.title, width: 200});
$('.bookmarks_list').append( $('.bookmarks_list').append(
@ -255,7 +257,7 @@ function updateBookmarksList(bookmark) {
} }
$('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag); $('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag);
} }
else { else { // View in text
$('.bookmarks_list').append( $('.bookmarks_list').append(
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' + '<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
'<p class="bookmark_actions">' + '<p class="bookmark_actions">' +
@ -270,6 +272,7 @@ function updateBookmarksList(bookmark) {
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' + '<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
'</p>' + '</p>' +
'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' + '<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
'<p class="bookmark_date">' + formatDate(bookmark.added_date) + '</p>' +
'<p class="bookmark_desc">'+ encodeEntities(bookmark.description) + '</p>' + '<p class="bookmark_desc">'+ encodeEntities(bookmark.description) + '</p>' +
'</div>' '</div>'
); );