Manual merge adjustments between master and burgermenu branches.

diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 581f6fe3f1f7befce0cc272b7228aa9d43fc7f90..c1c8cf4fc34dc23cbdbbb1e111fed849aa68b774 100644 (file)
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -32,7 +32,6 @@ Fluidbook.prototype = {
         this.service = new FluidbookService(this, datas.id);
         this.support = new FluidbookSupport(this);
         this.loader = new FluidbookLoader(this);
-        this.index = new FluidbookIndex(this); // ToDo: check this?
         this.search = new FluidbookSearch(this);
         this.pad = new FluidbookPad(this);
         this.links = new FluidbookLinks(this);

diff --git a/js/libs/fluidbook/fluidbook.share.js b/js/libs/fluidbook/fluidbook.share.js
index 28d0e222e620017e5335ac6a45818516a9e3a4c6..8c9dfd5be35237ab02f40a82c53f75e24509e276 100644 (file)
--- a/js/libs/fluidbook/fluidbook.share.js
+++ b/js/libs/fluidbook/fluidbook.share.js
@@ -30,30 +30,47 @@ FluidbookShare.prototype = {
         return res;
     },
     openShare: function (p1, p2, callback) {
-        var view = '<div class="caption">' + this.fluidbook.menu.closeButton() + '<h2>' + this.fluidbook.l10n.__('share') + '</h2></div>';
-        view += '<div class="content">';
-        view += '<ul class="chapters ' +
-            'shareList">';
+        
+        var shareLinks = {},
+            shareHTML = '',
+            view;
+
         if (this.fluidbook.datas.friend) {
-            view += '<li data-level="0"><a href="#" data-service="email" class="share level0"><img height="25" src="data/images/share-email.svg" /> E-mail</a></li>';
+            shareLinks['email'] = 'E-mail';
         }
         if (this.fluidbook.datas.facebook) {
-            view += '<li data-level="0"><a href="#" data-service="facebook" class="share level0"><img height="25" src="data/images/share-facebook.svg" /> Facebook</a></li>';
+            shareLinks['facebook'] = 'Facebook';
         }
         if (this.fluidbook.datas.twitter) {
-            view += '<li data-level="0"><a href="#" data-service="twitter" class="share level0"><img height="25" src="data/images/share-twitter.svg" /> Twitter</a></li>';
+            shareLinks['twitter'] = 'Twitter';
         }
         if (this.fluidbook.datas.googleplus) {
-            view += '<li data-level="0"><a href="#" data-service="googleplus" class="share level0"><img height="25" src="data/images/share-googleplus.svg" /> Google+</a></li>';
+            shareLinks['googleplus'] = 'Google Plus';
         }
         if (this.fluidbook.datas.linkedin) {
-            view += '<li data-level="0"><a href="#" data-service="linkedin" class="share level0"><img height="25" src="data/images/share-linkedin.svg" /> LinkedIn</a></li>';
+            shareLinks['linkedin'] = 'LinkedIn';
         }
         if (this.fluidbook.datas.viadeo) {
-            view += '<li data-level="0"><a href="#" data-service="viadeo" class="share level0"><img height="25" src="data/images/share-viadeo.svg" /> Viadeo</a></li>';
+            shareLinks['viadeo'] = 'Viadeo';
+        }
+
+        // Generate links
+        for (var shareType in shareLinks) {
+            if (shareLinks.hasOwnProperty(shareType)) { // Ensure we don't get inherited properties
+                shareHTML += '<li data-level="0"><a href="#" data-service="' + shareType + '" class="share level0">';
+                shareHTML += getSpriteIcon('interface-' + shareType);
+                shareHTML += ' ' + shareLinks[shareType]
+                shareHTML += '</a></li>';
+            }
         }
+
+        view = '<div class="caption">' + this.closeButton() + '<h2>' + this.fluidbook.l10n.__('share') + '</h2></div>';
+        view += '<div class="content">';
+        view += '<ul class="chapters shareList">';
+        view += shareHTML;
         view += '</ul>';
         view += '</div>';
+
         $("#view").append('<div class="mview" data-menu="share">' + view + '</div>');
         if (callback != undefined) {
             callback();