diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
index 233d4a02944f667951ae602b97bd7bed2a652796..48f0bede1103decaf7fed854506c681da6163324 100644
--- a/apps/bookmarks/css/bookmarks.css
+++ b/apps/bookmarks/css/bookmarks.css
@@ -18,7 +18,7 @@
}
.bookmarks_list {
- margin-top: 45px;
+ margin-top: 36px;
}
.bookmarks_addBml {
@@ -36,42 +36,49 @@
}
.bookmark_actions {
+ position: absolute;
+ right: 1em;
+ top: 0.7em;
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 {
+ position: relative;
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 {
- background-color: #EAEAEA;
+ background-color:#f8f8f8
}
.bookmark_single:hover .bookmark_actions {
display: block;
}
-.bookmark_title {
- font-size: larger;
- color: blue;
- text-decoration: underline;
-}
-
-.bookmark_url {
- color: green;
+.bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
+.bookmark_url { display: none; color: #999; }
+.bookmark_single:hover .bookmark_url { display: inline; }
+.bookmark_tags {
+ position: absolute;
+ top: 0.5em;
+ right: 6em;
+ text-align: right;
}
-
.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 {
display: none;
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 51646e5382bf8075e862706cf0473bcf38559f6a..b43c3deb59c58d2addf4990a38d4c4590dd832c6 100644
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -85,10 +85,10 @@ function addOrEditBookmark(event) {
$('.bookmarks_add').children('p').children('.bookmarks_input').val('');
$('.bookmarks_list').prepend(
'<div class="bookmark_single" data-id="' + bookmark_id + '" >' +
+ '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <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_url">' + url + '</p>' +
'<p class="bookmark_tags">' + tagshtml + '</p>' +
- '<p class="bookmark_actions"><span class="bookmark_delete">Delete</span> <span class="bookmark_edit">Edit</span></p>' +
+ '<p class="bookmark_url">' + url + '</p>' +
'</div>'
);
}
@@ -146,19 +146,22 @@ function updateBookmarksList(bookmark) {
var tags = encodeEntities(bookmark.tags).split(' ');
var taglist = '';
for ( var i=0, len=tags.length; i<len; ++i ){
- taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> ';
+ if(tags[i] != '')
+ taglist = taglist + '<a class="bookmark_tag" href="?tag=' + encodeURI(tags[i]) + '">' + tags[i] + '</a> ';
}
if(!hasProtocol(bookmark.url)) {
bookmark.url = 'http://' + bookmark.url;
}
$('.bookmarks_list').append(
'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
+ '<p class="bookmark_actions"><span class="bookmark_delete"><img src="img/delete.png" title="Delete"></span> <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_url">' + encodeEntities(bookmark.url) + '</p>' +
- '<p class="bookmark_tags">' + taglist + '</p>' +
- '<p class="bookmark_actions"><span class="bookmark_delete">Delete</span> <span class="bookmark_edit">Edit</span></p>' +
'</div>'
);
+ if(taglist != '') {
+ $('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
+ }
}
function updateOnBottom() {
@@ -178,7 +181,6 @@ function recordClick(event) {
function encodeEntities(s){
try {
return $('<div/>').text(s).html();
-
} catch (ex) {
return "";
}
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
index 59efb5b5659a05096ba4c281156d57ae591a48c4..d2b4d858b5580459d080cbfe5a96abac7c1fb044 100644
--- a/apps/gallery/js/albums.js
+++ b/apps/gallery/js/albums.js
@@ -46,14 +46,14 @@ Albums={
var a = Albums.albums[i];
var local=$(displayTemplate);
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();
- galleryRename(name);
- }.bind(null,a.name));
- $(".gallery_album_decoration a.remove", local).click(function(name,event){
+ galleryRename(event.data.name);
+ });
+ $(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(event){
event.preventDefault();
- galleryRemove(name);
- }.bind(null,a.name));
+ galleryRemove(a.data.name);
+ });
$("a.view", local).attr('href','?view='+a.name);
$('h1',local).text(a.name);
$(".gallery_album_cover", local).attr('title',a.name);
diff --git a/files/css/files.css b/files/css/files.css
index 5238c6a7f7bf00c3a1a5051cc36a544285d2020b..512e462cb6f9f4395e6e752365231374e73af560 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -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_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; }
diff --git a/files/templates/index.php b/files/templates/index.php
index fa4643de75ae8b927b7ee8440dcaa5f458f9b399..7e9505dec2f936435791c8eea86457c0c91bd143 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -3,13 +3,10 @@
<?php if (!isset($_['readonly']) || !$_['readonly']):?>
<div class="actions">
<div id='new' class='button'>
- <a>
- <?php echo $l->t('New');?>
- </a>
+ <a><?php echo $l->t('New');?></a>
<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('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>
</div>
<div class="file_upload_wrapper svg">
@@ -17,7 +14,7 @@
<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" 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"> <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[]'/>
<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>