Merge lp:~davewalker/etherpad/ubuntu-full-width-default into lp:~etherpad/etherpad/ubuntu

[Dave Walker]

Default to full width on page load.

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-04-20 12:43:27 +0000
+++ .pc/applied-patches	2011-04-20 12:43:27 +0000
@@ -1,3 +1,4 @@
 ace.patch
 cleanup.patch
 micro-theme-use-fix.patch
+default-to-fullscreen.patch

=== added directory '.pc/default-to-fullscreen.patch'
=== added file '.pc/default-to-fullscreen.patch/.timestamp'
=== added directory '.pc/default-to-fullscreen.patch/etherpad'
=== added directory '.pc/default-to-fullscreen.patch/etherpad/src'
=== added directory '.pc/default-to-fullscreen.patch/etherpad/src/etherpad'
=== added directory '.pc/default-to-fullscreen.patch/etherpad/src/etherpad/pad'
=== added file '.pc/default-to-fullscreen.patch/etherpad/src/etherpad/pad/padutils.js'
--- .pc/default-to-fullscreen.patch/etherpad/src/etherpad/pad/padutils.js	1970-01-01 00:00:00 +0000
+++ .pc/default-to-fullscreen.patch/etherpad/src/etherpad/pad/padutils.js	2011-04-20 12:43:27 +0000
@@ -0,0 +1,191 @@
+/**
+ * Copyright 2009 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import("fastJSON");
+import("stringutils");
+
+import("etherpad.control.pro.account_control");
+
+import("etherpad.pro.pro_utils");
+import("etherpad.pro.domains");
+import("etherpad.pro.pro_accounts");
+import("etherpad.pro.pro_padmeta");
+import("etherpad.pad.model");
+import("etherpad.sessions.getSession");
+import("etherpad.helpers");
+
+jimport("java.lang.System.out.println");
+
+
+function setCurrentPad(p) {
+  appjet.context.attributes().update("currentPadId", p);
+}
+
+function clearCurrentPad() {
+  appjet.context.attributes()['$minus$eq']("currentPadId");
+}
+
+function getCurrentPad() {
+  var padOpt = appjet.context.attributes().get("currentPadId");
+  if (padOpt.isEmpty()) return null;
+  return padOpt.get();
+}
+
+function _parseCookie(text) {
+  try {
+    var cookieData = fastJSON.parse(unescape(text));
+    return cookieData;
+  }
+  catch (e) {
+    return null;
+  }
+}
+
+function getPrefsCookieData() {
+  var prefsCookie = request.cookies['prefs'];
+  if (!prefsCookie) {
+    return null;
+  }
+
+  return _parseCookie(prefsCookie);
+}
+
+function getPrefsCookieUserId() {
+  var cookieData = getPrefsCookieData();
+  if (! cookieData) {
+    return null;
+  }
+  return cookieData.userId || null;
+}
+
+/**
+ * Not valid to call this function outisde a HTTP request.
+ */
+function accessPadLocal(localPadId, fn, rwMode) {
+  if (!request.isDefined) {
+    throw Error("accessPadLocal() cannot run outside an HTTP request.");
+  }
+  var globalPadId = getGlobalPadId(localPadId);
+  var fnwrap = function(pad) {
+    pad.getLocalId = function() {
+      return getLocalPadId(pad);
+    };
+    return fn(pad);
+  }
+  return model.accessPadGlobal(globalPadId, fnwrap, rwMode);
+}
+
+/**
+ * Not valid to call this function outisde a HTTP request.
+ */
+function getGlobalPadId(localPadId) {
+  if (!request.isDefined) {
+    throw Error("getGlobalPadId() cannot run outside an HTTP request.");
+  }
+  if (pro_utils.isProDomainRequest()) {
+    return makeGlobalId(domains.getRequestDomainId(), localPadId);
+  } else {
+    // etherpad.com pads
+    return localPadId;
+  }
+}
+
+function makeGlobalId(domainId, localPadId) {
+  return [domainId, localPadId].map(String).join('$');
+}
+
+function globalToLocalId(globalId) {
+  var parts = globalId.split('$');
+  if (parts.length == 1) {
+    return parts[0];
+  } else {
+    return parts[1];
+  }
+}
+
+function getLocalPadId(pad) {
+  var globalId = pad.getId();
+  return globalToLocalId(globalId);
+}
+
+function isProPadId(globalPadId) {
+  return (globalPadId.indexOf("$") > 0);
+}
+
+function isProPad(pad) {
+  return isProPadId(pad.getId());
+}
+
+function getDomainId(globalPadId) {
+  var parts = globalPadId.split("$");
+  if (parts.length < 2) {
+    return null;
+  } else {
+    return Number(parts[0]);
+  }
+}
+
+function makeValidLocalPadId(str) {
+  return str.replace(/[^a-zA-Z0-9\-]/g, '-');
+}
+
+function getProDisplayTitle(localPadId, title) {
+  if (title) {
+    return title;
+  }
+  if (stringutils.isNumeric(localPadId)) {
+    return ("Untitled "+localPadId);
+  } else {
+    return (localPadId);
+  }
+}
+
+
+function setOptsAndCookiePrefs(request) {
+  opts = {};
+  if (request.params.fullScreen) { // tokbox, embedding
+    opts.fullScreen = true;
+  }
+  if (request.params.tokbox) {
+    opts.tokbox = true;
+  }
+  if (request.params.sidebar) {
+    opts.sidebar = Boolean(Number(request.params.sidebar));
+  }
+  helpers.addClientVars({opts: opts});
+
+
+  var prefs = getPrefsCookieData();
+
+  var prefsToSet = {
+    fullWidth:false,
+    hideSidebar:false
+  };
+  if (prefs) {
+    prefsToSet.isFullWidth = !! prefs.fullWidth;
+    prefsToSet.hideSidebar = !! prefs.hideSidebar;
+  }
+  if (opts.fullScreen) {
+    prefsToSet.isFullWidth = true;
+    if (opts.tokbox) {
+      prefsToSet.hideSidebar = true;
+    }
+  }
+  if ('sidebar' in opts) {
+    prefsToSet.hideSidebar = ! opts.sidebar;
+  }
+  helpers.addClientVars({cookiePrefsToSet: prefsToSet});
+}

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-20 12:43:27 +0000
+++ debian/changelog	2011-04-20 12:43:27 +0000
@@ -2,8 +2,10 @@
 
   * debian/patches/micro-theme-use-fix.patch: Allow micro theme to be used
     by disabling css caching, which would consistently serve the default theme.
+  * debian/patches/default-to-fullscreen.patch: Default to having full screen
+    (full width) pads on pad load.
 
- -- Dave Walker (Daviey) <[e-mail]>  Wed, 20 Apr 2011 12:25:27 +0100
+ -- Dave Walker (Daviey) <[e-mail]>  Wed, 20 Apr 2011 12:54:11 +0100
 
 etherpad (1.1+jarless1-0ubuntu1~ppa8) natty; urgency=low
 

=== added file 'debian/patches/default-to-fullscreen.patch'
--- debian/patches/default-to-fullscreen.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/default-to-fullscreen.patch	2011-04-20 12:43:27 +0000
@@ -0,0 +1,14 @@
+Description: Default to using full screen (full width)
+ pads on page load, can still make it smaller if desired.
+Author: Dave Walker (Daviey) <[e-mail]>
+
+--- a/etherpad/src/etherpad/pad/padutils.js
++++ b/etherpad/src/etherpad/pad/padutils.js
+@@ -159,6 +159,7 @@
+   if (request.params.fullScreen) { // tokbox, embedding
+     opts.fullScreen = true;
+   }
++  opts.fullScreen = true;
+   if (request.params.tokbox) {
+     opts.tokbox = true;
+   }

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-20 12:43:27 +0000
+++ debian/patches/series	2011-04-20 12:43:27 +0000
@@ -1,3 +1,4 @@
 ace.patch
 cleanup.patch
 micro-theme-use-fix.patch
+default-to-fullscreen.patch

=== modified file 'etherpad/src/etherpad/pad/padutils.js'
--- etherpad/src/etherpad/pad/padutils.js	2011-04-13 08:00:43 +0000
+++ etherpad/src/etherpad/pad/padutils.js	2011-04-20 12:43:27 +0000
@@ -159,6 +159,7 @@
   if (request.params.fullScreen) { // tokbox, embedding
     opts.fullScreen = true;
   }
+  opts.fullScreen = true;
   if (request.params.tokbox) {
     opts.tokbox = true;
   }