diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php index 0225a7aa7b..861b677222 100644 --- 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 17688615df..7317a154a7 100644 --- a/apps/bookmarks/js/bookmarks.js +++ b/apps/bookmarks/js/bookmarks.js @@ -126,12 +126,12 @@ function updateBookmarksList(bookmark) { $('.bookmarks_list').append( '
' + '

' + - '' + - '' + - ' ' + '' + '' + '' + + '' + + '' + + ' ' + '

' + '

'+ '' + encodeEntities(bookmark.title) + '' + diff --git a/apps/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css index bc238c1f40..e260ab0dd4 100644 --- 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 7473d53230..e45652b6ef 100644 --- 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('

'); 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); });