diff --git a/css/style.css b/css/style.css
index cf6e1af5..0b498a47 100755
--- a/css/style.css
+++ b/css/style.css
@@ -116,58 +116,45 @@
white-space: nowrap;
}
-#odf-toolbar{
+.claro #header{
text-align: left;
position: absolute;
width: 100%;
padding:0;
- z-index: 500;
+ z-index: 500 !important;
}
-#odf-toolbar #dropdown{
+#header #dropdown{
right: auto;
- top: 83px;
+ top: 45px;
}
-#body-user #document-title #header{
- height: 45px;
+#header .padded{
+ margin-right:40px;
}
-#document-title{
- padding: 4px 0 5px;
- border-bottom: 1px solid #E9E9E9;
-
- text-align: center;
- font-weight: bold;
- color:#fff;
- background-color:#1d2d44;
-}
-
-#document-title div.logo-wide{
- float: left;
- margin: 5px;
- z-index: 110;
-}
-
-#document-title div{
- position: relative;
-}
-#document-title .filename {
- margin-top: 8px !important;
- width: 300px;
-}
-#document-title-container {
- padding-top: 7px;
+#document-title {
+ min-width:300px;
+ padding: 7px;
font-weight: normal;
+ color: #FFF;
+}
+
+#ocToolbar .filename{
+ padding: 5px 6px;
+ min-width: 300px;
+ margin-top: 0;
}
#odf-close{
- margin-top: 0;
+ position:absolute;
+ right:0;
+ margin: 8px;
float: right;
}
#odf-close.icon-close {
- height: 29px;
- width: 29px;
+ height: 23px;
+ width: 23px;
}
#odf-invite{
@@ -198,7 +185,7 @@
#documents-overlay-below{
right: 72px;
- top: 83px;
+ top: 45px;
filter:alpha(opacity=100);
opacity: 1;
background:#fff;
@@ -224,8 +211,9 @@
#warning-connection-lost{
position: relative;
z-index: 2000;
- margin-top: 35px;
- padding: 8px 0;
+ height: 19px;
+ margin-top: -2px;
+ padding: 13px 0;
text-align: center;
color: #ffffff;
background-color: #CE7070;
@@ -234,8 +222,9 @@
}
#warning-connection-lost img {
- margin-right: 4px;
- float: right;
+ position: absolute;
+ top: 12px;
+ right: 10px;
height: 20px;
}
@@ -254,7 +243,7 @@
}
#members {
- padding-top: 86px !important;
+ padding-top: 47px !important;
background-color: #ddd !important;
}
@@ -286,23 +275,46 @@
font-size: 10px !important;
}
-#toolbar {
- top: 45px !important;
+#ocToolbar, #ocToolbarInside{
border-bottom: none !important;
- padding: 5px 0 0 !important;
+ background: none !important;
box-shadow: none !important;
- background-color: rgba(255,255,255,.95);
+}
+
+#toolbar {
+ position:static !important;
+ min-height: 29px !important;
+ border-bottom: none !important;
+ border-radius: 2px;
+ margin: 7px 30px 0 0 !important;
+ padding: 0 !important;
+ box-shadow: none !important;
+ background: #F5F5F5 !important;
+}
+
+#ocToolbar .dijitToolbar{
+ float:left;
}
#toolbar > .dijit{
+ margin-top: 2px !important;
margin-left:3px;
}
#toolbar > span.dijit{
margin-left: 0;
}
+#toolbar > .dijitComboBox{
+ margin: 3px 5px 0 3px !important;
+}
+
+#toolbar > .dijitComboBox .dijitInputInner{
+vertical-align: middle;
+line-height: 1.45em;
+}
+
#container {
- top: 83px !important;
+ top: 44px !important;
}
#canvas > div {
@@ -326,6 +338,7 @@ editinfo > div.editInfoMarker:hover {
.dijitToolbar{
min-height: 31px;
+ line-height: 1em;
}
.dijitToolbar .dijitDropDownButton {
@@ -351,11 +364,6 @@ margin-top: -1px;
.dojoTabular thead,.dojoTabular tfoot {background-color: #efefef; border: 1px solid #ccc; border-width: 1px 0;}
.dojoTabular th,.dojoTabular td {padding: 0.25em 0.5em;}
-/* raise notification z-index above the documents app */
-#odf-toolbar + #notification-container {
- z-index: 501;
-}
-
document p{
cursor:auto;
}
diff --git a/js/3rdparty/webodf/editor/Tools.js b/js/3rdparty/webodf/editor/Tools.js
index f2da402d..602edff0 100644
--- a/js/3rdparty/webodf/editor/Tools.js
+++ b/js/3rdparty/webodf/editor/Tools.js
@@ -53,8 +53,9 @@ define("webodf/editor/Tools", [
"webodf/editor/widgets/imageInserter",
"webodf/editor/widgets/paragraphStylesDialog",
"owncloud/widgets/zoomCombo",
+ "owncloud/widgets/ocToolbar",
"webodf/editor/EditorSession"],
- function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomCombo, EditorSession) {
+ function (ready, MenuItem, DropDownMenu, Button, DropDownButton, Toolbar, ParagraphAlignment, SimpleStyles, UndoRedoMenu, CurrentStyle, AnnotationControl, EditHyperlinks, ImageInserter, ParagraphStylesDialog, ZoomCombo, OcToolbar, EditorSession) {
"use strict";
return function Tools(args) {
@@ -68,6 +69,7 @@ define("webodf/editor/Tools", [
formatDropDownMenu, formatMenuButton,
paragraphStylesMenuItem, paragraphStylesDialog, simpleStyles, currentStyle,
zoomCombo,
+ ocToolbar,
undoRedoMenu,
editorSession,
paragraphAlignment,
@@ -121,6 +123,10 @@ define("webodf/editor/Tools", [
// init
ready(function () {
+ ocToolbar = new OcToolbar(function (widget) {
+ widget.startup();
+ });
+
toolbar = new Toolbar({}, "toolbar");
// Undo/Redo
@@ -271,7 +277,7 @@ define("webodf/editor/Tools", [
});
closeButton.placeAt(toolbar);
}
-
+ toolbar.startup();
setEditorSession(editorSession);
});
};
diff --git a/js/documents.js b/js/documents.js
index 42298417..30812a4b 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -143,37 +143,6 @@ $.widget('oc.documentOverlay', {
}
});
-$.widget('oc.documentToolbar', {
- options : {
- innerhtml : '' +
- ' ' +
- '
' +
-
- '' +
- ' ' +
- ' ' +
- '  + ')
' +
- ''
- },
- _create : function (){
- $(this.element).html(this.options.innerhtml).hide().prependTo(document.body);
- },
- show : function (){
- $(this.element).show();
- },
- hide : function(){
- $(this.element).fadeOut('fast');
- $(this.element).html(this.options.innerhtml);
- }
-});
-
var documentsMain = {
isEditormode : false,
useUnstable : false,
@@ -182,6 +151,8 @@ var documentsMain = {
esId : false,
ready :false,
fileName: null,
+ canShare : false,
+ toolbar : '',
UI : {
/* Editor wrapper HTML */
@@ -208,18 +179,12 @@ var documentsMain = {
documentsMain.UI.mainTitle = $('title').text();
},
- showEditor : function(title, canShare){
+ showEditor : function(title){
if (documentsMain.isGuest){
// !Login page mess wih WebODF toolbars
$(document.body).attr('id', 'body-user');
}
- $('#document-title-container').text(title);
- if (!canShare){
- $('#odf-invite').remove();
- } else {
- $('#odf-invite').show();
- }
$(document.body).addClass("claro");
$(document.body).prepend(documentsMain.UI.container);
// in case we are on the public sharing page we shall display the odf into the preview tag
@@ -231,11 +196,9 @@ var documentsMain = {
if (documentsMain.isGuest){
// !Login page mess wih WebODF toolbars
$(document.body).attr('id', 'body-login');
- $('header,footer,nav').show();
+ $('footer,nav').show();
}
- documentsMain.toolbar.documentToolbar('hide');
-
// Fade out editor
$('#mainContainer').fadeOut('fast', function() {
$('#mainContainer').remove();
@@ -269,14 +232,14 @@ var documentsMain = {
showLostConnection : function(){
$('#memberList .memberListButton').css({opacity : 0.3});
- $('#odf-toolbar').children(':not(#document-title)').hide();
+ $('#ocToolbar').children(':not(#document-title)').hide();
$('').prependTo('#memberList');
- $('' + t('documents', 'No connection to server. Trying to reconnect.') +'
 +')
' + t('documents', 'No connection to server. Trying to reconnect.') +'
'
+ + '
',
+ postCreate: function () {
+ this.inherited(arguments);
+ // FixMe: this should not be global
+ domStyle.set(this.domNode, "display", !!documentsMain.canShare ? "block" : "none");
+ },
+ showDropdown: function (event) {
+ event.preventDefault();
+ if (OC.Share.droppedDown) {
+ OC.Share.hideDropDown();
+ } else {
+ (function () {
+ var target = OC.Share.showLink;
+ OC.Share.showLink = function () {
+ var r = target.apply(this, arguments);
+ $('#linkText').val($('#linkText').val().replace('index.php/s/', 'public.php?service=documents&t='));
+ return r;
+ };
+ })();
+
+ OC.Share.showDropDown(
+ 'file',
+ parent.location.hash.replace(/\W*/g, ''),
+ $("#header"),
+ true,
+ OC.PERMISSION_READ | OC.PERMISSION_SHARE | OC.PERMISSION_UPDATE
+ );
+ }
+ }
+ });
+ }
+);
diff --git a/js/widgets/ocToolbar.js b/js/widgets/ocToolbar.js
new file mode 100644
index 00000000..f4b86103
--- /dev/null
+++ b/js/widgets/ocToolbar.js
@@ -0,0 +1,53 @@
+/*global define,require */
+
+define("owncloud/widgets/ocToolbar",
+ [
+ "dojo/ready",
+ "owncloud/widgets/ocLogo",
+ "owncloud/widgets/ocShare",
+ "owncloud/widgets/ocClose",
+ "owncloud/widgets/titleBar",
+ "webodf/editor/EditorSession"
+ ],
+ function (ready, OcLogo, OcShare, OcClose, TitleBar, EditorSession) {
+ "use strict";
+ return function OcToolbar(callback) {
+ var tr = runtime.tr,
+ ocToolbar,
+ ocToolbarInside,
+ ocLogo,
+ ocShare,
+ ocClose,
+ titleBar
+ ;
+ function makeWidget(callback) {
+ require(["dijit/Toolbar"], function (Toolbar) {
+ ocToolbar = new Toolbar({}, "ocToolbar");
+ ocToolbarInside = new Toolbar({}, "ocToolbarInside");
+ // OC Logo
+ ocLogo = new OcLogo();
+ ocLogo.placeAt(ocToolbarInside);
+ ocLogo.startup();
+ // OC Share
+ ocShare = new OcShare();
+ ocShare.placeAt(ocToolbarInside);
+ ocShare.startup();
+ //title
+ titleBar = new TitleBar();
+ titleBar.placeAt(ocToolbarInside);
+ titleBar.startup();
+ // OC Close
+ ocClose = new OcClose();
+ ocClose.placeAt(ocToolbar);
+ ocClose.startup();
+ });
+ return callback(ocToolbar);
+ }
+ ;
+ // init
+ makeWidget(function (widget) {
+ return callback(widget);
+ });
+ };
+ }
+);
\ No newline at end of file
diff --git a/js/widgets/titleBar.js b/js/widgets/titleBar.js
new file mode 100644
index 00000000..8402c137
--- /dev/null
+++ b/js/widgets/titleBar.js
@@ -0,0 +1,70 @@
+/*global define,require */
+define("owncloud/widgets/titleBar",
+ ["dojo/_base/declare", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "webodf/editor/EditorSession"],
+ function (declare, _WidgetBase, _TemplatedMixin, EditorSession) {
+ return declare("TitleBar", [_WidgetBase, _TemplatedMixin], {
+ title : '',
+ templateString:
+ '',
+ buildRendering: function () {
+ // FixMe: this should not be global
+ this.title = documentsMain.fileName;
+ this.inherited(arguments);
+ },
+ showRenamePrompt: function () {
+ var name = documentsMain.fileName;
+ var lastPos = name.lastIndexOf('.');
+ var extension = name.substr(lastPos + 1);
+ name = name.substr(0, lastPos);
+ var input = $('').val(name);
+ $('#document-title').parent().append(input);
+ $('#document-title').hide();
+
+ input.on('blur', function () {
+ var newName = input.val();
+ if (!newName || newName === name) {
+ input.tipsy('hide');
+ input.remove();
+ $('#document-title').show();
+ return;
+ }
+ else {
+ newName = newName + '.' + extension;
+ try {
+ input.tipsy('hide');
+ input.removeClass('error');
+ if (Files.isFileNameValid(newName)) {
+ input.tipsy('hide');
+ input.remove();
+ $('#document-title').show();
+ documentsMain.renameDocument(newName);
+ }
+ }
+ catch (error) {
+ input.attr('title', error);
+ input.tipsy({gravity: 'n', trigger: 'manual'});
+ input.tipsy('show');
+ input.addClass('error');
+ }
+ }
+ });
+ input.on('keyup', function (event) {
+ if (event.keyCode === 27) {
+ // cancel by putting in an empty value
+ $(this).val('');
+ $(this).blur();
+ event.preventDefault();
+ }
+ if (event.keyCode === 13) {
+ $(this).blur();
+ event.preventDefault();
+ }
+ });
+ input.focus();
+ input.selectRange(0, name.length);
+ }
+ });
+ }
+);
diff --git a/js/widgets/zoomCombo.js b/js/widgets/zoomCombo.js
index 67dbf94b..8adf0891 100644
--- a/js/widgets/zoomCombo.js
+++ b/js/widgets/zoomCombo.js
@@ -39,11 +39,11 @@ define("owncloud/widgets/zoomCombo",
maxHeight: 200,
store: zoomStore,
searchAttr: "name",
+ class: "dijit",
value: defaultZoom,
style: {
- height: '21px',
+ height: '20px',
width: '60px',
- margin: "2px 10px 0 0",
float: 'right'
}
});