rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-02-21 18:54:32 +01:00
Code Issues Releases Activity

Add first shot of Image view ... need more work

Browse Source
This commit is contained in:
Brice Maron 2012-07-01 22:12:59 +00:00
parent b374301911
commit f568b64fcc
3 changed files with 103 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
css/bookmarks.css
View File

@ -234,4 +234,36 @@ li:hover em { display : none; }
position: absolute; position: absolute;
right: 0.1em; right: 0.1em;
top: 50%; top: 50%;
}
#view_type {
position: absolute;
right: 13.5em;
top: 0;
}
/***** Lis View *****/
.bm_view_img .bookmark_single{
width: 240px;
float: left;
height: 240px;
margin: 1em;
/* background: none repeat scroll 0 0 #EEEEEE; */
border-radius: 8px 8px 8px 8px;
box-shadow: 0 0 5px rgba(34, 25, 25, 0.5);
}
.bm_view_img .bookmark_single .shot{
text-align:center;
}
.bm_view_img .bookmark_single .shot img{
border: 1px solid black;
width: 228px;
height: 160px
}
.bm_view_img .bookmark_single:hover .bookmark_url{
display:block;
} }

86
js/bookmarks.js
View File

@ -3,7 +3,11 @@ var bookmarks_loading = false;
var bookmarks_sorting = 'bookmarks_sorting_recent'; var bookmarks_sorting = 'bookmarks_sorting_recent';
var bookmark_view = 'image';
$(document).ready(function() { $(document).ready(function() {
$('.bookmarks_list').addClass('bm_view_img');
$('#view_type input').click(switchView);
$('#bookmark_add_submit').click(addBookmark); $('#bookmark_add_submit').click(addBookmark);
$(window).resize(function () { $(window).resize(function () {
fillWindow($('.bookmarks_list')); fillWindow($('.bookmarks_list'));
@ -19,6 +23,21 @@ $(document).ready(function() {
getBookmarks(); getBookmarks();
}); });
function switchView(){
$(this).hide();
if($(this).hasClass('image')) { //Then List
$('.bookmarks_list').addClass('bm_view_list');
$('.bookmarks_list').removeClass('bm_view_img');
$('#view_type input.list').show();
bookmark_view = 'list';
} else { // Then Image
$('.bookmarks_list').addClass('bm_view_img');
$('.bookmarks_list').removeClass('bm_view_list');
$('#view_type input.image').show();
bookmark_view = 'image';
}
filterTagsChanged(); //Refresh the view
}
function addFilterTag(event) { function addFilterTag(event) {
event.preventDefault(); event.preventDefault();
$('#tag_filter input').tagit('createTag', $(this).text()); $('#tag_filter input').tagit('createTag', $(this).text());
@ -161,27 +180,54 @@ function updateBookmarksList(bookmark) {
bookmark.url = 'http://' + bookmark.url; bookmark.url = 'http://' + bookmark.url;
} }
if(bookmark.title == '') bookmark.title = bookmark.url; if(bookmark.title == '') bookmark.title = bookmark.url;
$('.bookmarks_list').append(
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' + if(bookmark_view == 'image') { //View in images
'<p class="bookmark_actions">' + $('.bookmarks_list').append(
'<span class="bookmark_edit">' + '<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' + '<p class="shot"><img src="'+ "http://screenshots.bookmarkly.com/thumb?url="+encodeEntities(bookmark.url) +'"></p>'+
'</span>' + '<p class="bookmark_actions">' +
'<span class="bookmark_delete">' + '<span class="bookmark_edit">' +
'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' + '<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
'</span>&nbsp;' + '</span>' +
'</p>' + '<span class="bookmark_delete">' +
'<p class="bookmark_title">'+ '<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' + '</span>&nbsp;' +
'</p>' + '</p>' +
'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' + '<p class="bookmark_title">'+
'</div>' '<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
); '</p>' +
$('div[data-id="'+ bookmark.id +'"]').data('record', bookmark); '<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
if(taglist != '') { '</div>'
$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>'); );
$('div[data-id="'+ bookmark.id +'"]').data('record', bookmark);
if(taglist != '') {
$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
}
$('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag);
}
else {
$('.bookmarks_list').append(
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
'<p class="bookmark_actions">' +
'<span class="bookmark_edit">' +
'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
'</span>' +
'<span class="bookmark_delete">' +
'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
'</span>&nbsp;' +
'</p>' +
'<p class="bookmark_title">'+
'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
'</p>' +
'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
'</div>'
);
$('div[data-id="'+ bookmark.id +'"]').data('record', bookmark);
if(taglist != '') {
$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
}
$('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag);
} }
$('div[data-id="'+ bookmark.id +'"] a.bookmark_tag').bind('click', addFilterTag);
} }

5
templates/list.php
View File

@ -10,6 +10,11 @@
<input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" /> <input type="hidden" id="bookmarkFilterTag" value="<?php echo $_['req_tag']; ?>" />
<div id="controls"> <div id="controls">
<input type="submit" value="<?php echo $l->t('New bookmark'); ?>" id="bookmark_add_submit" /> <input type="submit" value="<?php echo $l->t('New bookmark'); ?>" id="bookmark_add_submit" />
<div id="view_type">
<input type="button" class="list" value="<?php echo $l->t('List')?>" />
<input type="button" class="image" style="display:none" value="<?php echo $l->t('Image')?>" />
</div>
</div> </div>
<div id="leftcontent"> <div id="leftcontent">
<p id="tag_filter"> <p id="tag_filter">