Skip to content
Snippets Groups Projects
Commit 7b9fb84f authored by Robin Appelman's avatar Robin Appelman
Browse files

Merge branch 'master' into filesystem

parents d514b1d9 f1982965
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
apps/bookmarks/css/bookmarks.css
+ 27
− 20
View file @ 7b9fb84f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
} }
.bookmarks_list { .bookmarks_list {
margin-top: 45px; margin-top: 36px;
} }
.bookmarks_addBml { .bookmarks_addBml {
...@@ -36,42 +36,49 @@ ...@@ -36,42 +36,49 @@
} }
.bookmark_actions { .bookmark_actions {
position: absolute;
right: 1em;
top: 0.7em;
display: none; display: none;
font-size: smaller;
color: #666;
padding-left: 4em;
}
.bookmark_actions span:hover {
cursor: pointer;
text-decoration: underline;
} }
.bookmark_actions span { margin: 0 0.4em; }
.bookmark_actions img { opacity: 0.3; }
.bookmark_actions img:hover { opacity: 1; cursor: pointer; }
.bookmark_single { .bookmark_single {
position: relative;
padding: 0.5em 1em; padding: 0.5em 1em;
border-bottom: 1px solid #DDD;
-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
} }
.bookmark_single:hover { .bookmark_single:hover {
background-color: #EAEAEA; background-color:#f8f8f8
} }
.bookmark_single:hover .bookmark_actions { .bookmark_single:hover .bookmark_actions {
display: block; display: block;
} }
.bookmark_title { .bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
font-size: larger; .bookmark_url { display: none; color: #999; }
color: blue; .bookmark_single:hover .bookmark_url { display: inline; }
text-decoration: underline; .bookmark_tags {
} position: absolute;
top: 0.5em;
.bookmark_url { right: 6em;
color: green; text-align: right;
} }
.bookmark_tag { .bookmark_tag {
color: #ff3333; display: inline-block;
} color: white;
margin: 0 0.2em;
padding: 0 0.4em;
background-color: #1D2D44;
border-radius: 0.4em;
opacity: 0.2;
}
.bookmark_tag:hover { opacity: 0.5; }
.loading_meta { .loading_meta {
display: none; display: none;
......
apps/bookmarks/js/bookmarks.js
+ 8
− 6
View file @ 7b9fb84f
...@@ -85,10 +85,10 @@ function addOrEditBookmark(event) { ...@@ -85,10 +85,10 @@ function addOrEditBookmark(event) {
$('.bookmarks_add').children('p').children('.bookmarks_input').val(''); $('.bookmarks_add').children('p').children('.bookmarks_input').val('');
$('.bookmarks_list').prepend( $('.bookmarks_list').prepend(
'<div class="bookmark_single" data-id="' + bookmark_id + '" >' + '<div class="bookmark_single" data-id="' + bookmark_id + '" >' +
'<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
'<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' + '<p class="bookmark_title"><a href="' + url + '" target="_blank" class="bookmark_link">' + title + '</a></p>' +
'<p class="bookmark_url">' + url + '</p>' +
'<p class="bookmark_tags">' + tagshtml + '</p>' + '<p class="bookmark_tags">' + tagshtml + '</p>' +
'<p class="bookmark_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></p>' + '<p class="bookmark_url">' + url + '</p>' +
'</div>' '</div>'
); );
} }
...@@ -146,6 +146,7 @@ function updateBookmarksList(bookmark) { ...@@ -146,6 +146,7 @@ function updateBookmarksList(bookmark) {
var tags = encodeEntities(bookmark.tags).split(' '); var tags = encodeEntities(bookmark.tags).split(' ');
var taglist = ''; var taglist = '';
for ( var i=0, len=tags.length; i<len; ++i ){ for ( var i=0, len=tags.length; i<len; ++i ){
if(tags[i] != '')
taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> '; taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> ';
} }
if(!hasProtocol(bookmark.url)) { if(!hasProtocol(bookmark.url)) {
...@@ -153,12 +154,14 @@ function updateBookmarksList(bookmark) { ...@@ -153,12 +154,14 @@ function updateBookmarksList(bookmark) {
} }
$('.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"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span>&nbsp;<span class="bookmark_edit"><img src="img/edit.png" title="Edit"></span></p>' +
'<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' + '<p class="bookmark_title"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a></p>' +
'<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' + '<p class="bookmark_url">' + encodeEntities(bookmark.url) + '</p>' +
'<p class="bookmark_tags">' + taglist + '</p>' +
'<p class="bookmark_actions"><span class="bookmark_delete">Delete</span>&nbsp;<span class="bookmark_edit">Edit</span></p>' +
'</div>' '</div>'
); );
if(taglist != '') {
$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
}
} }
function updateOnBottom() { function updateOnBottom() {
...@@ -178,7 +181,6 @@ function recordClick(event) { ...@@ -178,7 +181,6 @@ function recordClick(event) {
function encodeEntities(s){ function encodeEntities(s){
try { try {
return $('<div/>').text(s).html(); return $('<div/>').text(s).html();
} catch (ex) { } catch (ex) {
return ""; return "";
} }
......
apps/gallery/js/albums.js
+ 6
− 6
View file @ 7b9fb84f
...@@ -46,14 +46,14 @@ Albums={ ...@@ -46,14 +46,14 @@ Albums={
var a = Albums.albums[i]; var a = Albums.albums[i];
var local=$(displayTemplate); var local=$(displayTemplate);
local.attr('data-album',a.name); local.attr('data-album',a.name);
$(".gallery_album_decoration a.rename", local).click(function(name,event){ $(".gallery_album_decoration a.rename", local).bind('click', {name: a.name},function(event){
event.preventDefault(); event.preventDefault();
galleryRename(name); galleryRename(event.data.name);
}.bind(null,a.name)); });
$(".gallery_album_decoration a.remove", local).click(function(name,event){ $(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(event){
event.preventDefault(); event.preventDefault();
galleryRemove(name); galleryRemove(a.data.name);
}.bind(null,a.name)); });
$("a.view", local).attr('href','?view='+a.name); $("a.view", local).attr('href','?view='+a.name);
$('h1',local).text(a.name); $('h1',local).text(a.name);
$(".gallery_album_cover", local).attr('title',a.name); $(".gallery_album_cover", local).attr('title',a.name);
......
files/css/files.css
+ 2
− 1
View file @ 7b9fb84f
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
.file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;} .file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
.file_upload_filename.active { border-bottom-right-radius:0 } .file_upload_filename.active { border-bottom-right-radius:0 }
.file_upload_filename { z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; padding:.3em; } .file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; }
.file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; } .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
......
files/templates/index.php
+ 2
− 5
View file @ 7b9fb84f
...@@ -3,13 +3,10 @@ ...@@ -3,13 +3,10 @@
<?php if (!isset($_['readonly']) || !$_['readonly']):?> <?php if (!isset($_['readonly']) || !$_['readonly']):?>
<div class="actions"> <div class="actions">
<div id='new' class='button'> <div id='new' class='button'>
<a> <a><?php echo $l->t('New');?></a>
<?php echo $l->t('New');?>
</a>
<ul class="popup popupTop"> <ul class="popup popupTop">
<li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li> <li style="background-image:url('<?php echo mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
<li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li> <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
<!-- <li style="background-image:url('<?php echo mimetype_icon('dir') ?>')" data-type='web'><p><?php echo $l->t('From the web');?></p></li> -->
</ul> </ul>
</div> </div>
<div class="file_upload_wrapper svg"> <div class="file_upload_wrapper svg">
...@@ -17,7 +14,7 @@ ...@@ -17,7 +14,7 @@
<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
<button class="file_upload_filename"><img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button> <button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo image_path("core", "actions/upload.svg"); ?>" /></button>
<input class="file_upload_start" type="file" name='files[]'/> <input class="file_upload_start" type="file" name='files[]'/>
<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment