Editor fixed.

diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
index 0225a7aa7b37205c453fc789639be1317027f322..861b677222d2232f5ba7d4f12f49d11363c4b2b1 100644 (file)
--- a/apps/bookmarks/addBm.php
+++ b/apps/bookmarks/addBm.php
@@ -28,6 +28,6 @@ OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('bookmarks');
 
 require_once('bookmarksHelper.php');
-addBookmark($_GET['url']);
+addBookmark($_GET['url'], '', 'Read-Later');
 
 include 'templates/addBm.php';

diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
index 17688615df8883d8e176ae8b3f84445c7f53a837..7317a154a76e89e8fe61a3fa0c0a438e1a41812f 100644 (file)
--- a/apps/bookmarks/js/bookmarks.js
+++ b/apps/bookmarks/js/bookmarks.js
@@ -126,12 +126,12 @@ function updateBookmarksList(bookmark) {
        $('.bookmarks_list').append(
                '<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
                        '<p class="bookmark_actions">' +
-                               '<span class="bookmark_delete">' +
-                                       '<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
-                               '</span>&nbsp;' +
                                '<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>' +

diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
index bc238c1f40f397c92c2287030f769a57cb079a2f..e260ab0dd46c30c3eaf5b69dc930a78d1b30e6ef 100644 (file)
--- a/apps/files_texteditor/css/style.css
+++ b/apps/files_texteditor/css/style.css
@@ -1,7 +1,8 @@
 #editor{
-       position: absoloute;
+       position: fixed;
        display: block;
-       top: 2em;
+       top: 6.5em;
+       left: 12.5em;
 }
 #editorwrapper{
        position: absoloute;

diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index 7473d5323044c13f1cbe44ad3803415f8643b1c5..e45652b6ef36b46b82e19d00bd9c6ed9fb25fabb 100644 (file)
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -172,6 +172,7 @@ function giveEditorFocus(){
 function showFileEditor(dir,filename){
        if(!editorIsShown()){
                // Loads the file editor and display it.
+               $('#content').append('<div id="editor"></div>');
                var data = $.getJSON(
                        OC.filePath('files_texteditor','ajax','loadfile.php'),
                        {file:filename,dir:dir},
@@ -273,10 +274,10 @@ $(document).ready(function(){
                        var dir=text.substr(0,text.length-file.length-1);
                        showFileEditor(dir,file);
                });
-       }
+       };
        // Binds the file save and close editor events, and gotoline button
        bindControlEvents();
-       
+       $('#editor').remove();
        // Binds the save keyboard shortcut events
        //$(document).unbind('keydown').bind('keydown',checkForSaveKeyPress);
 });