Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js
===================================================================
diff -u
--- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js	(revision 0)
+++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js	(revision 8369ef2443c67cab61cd26c9b0b0c067e4ff4f42)
@@ -0,0 +1,287 @@
+var $sidedivinner, fadeColor, getAuthorClassName, init, authorNameAndColorFromAuthorId, authorLines, isStyleFuncSupported, out$ = typeof exports != 'undefined' && exports || this;
+function allClasses($node){
+  var ref$;
+  return ((ref$ = $node.attr('class')) != null ? ref$ : '').split(' ');
+}
+out$.postAceInit = postAceInit;
+function postAceInit(hook_name, arg$){
+  var ace;
+  ace = arg$.ace;
+  $sidedivinner = $('iframe[name="ace_outer"]').contents().find('#sidedivinner').addClass('authorColors');
+  return ace.callWithAce(function(ace){
+    var $doc, $body, x$;
+    $doc = $(ace.ace_getDocument());
+    $body = $doc.find('body');
+    x$ = $body.get(0).ownerDocument;
+    x$.addEventListener('focus', function(){
+      $sidedivinner.addClass('authorColors');
+      return $body.addClass('focus');
+    }, true);
+    x$.addEventListener('blur', function(){
+      $sidedivinner.removeClass('authorColors');
+      return $body.removeClass('focus');
+    }, true);
+    return x$;
+  });
+}
+function derivePrimaryAuthor($node){
+  var byAuthor, mPA, authorClass, author, value;
+  byAuthor = {};
+  $node.find('span').each(function(){
+    var $this, i$, ref$, len$, spanclass, results$ = [];
+    $this = $(this);
+    for (i$ = 0, len$ = (ref$ = allClasses($this)).length; i$ < len$; ++i$) {
+      spanclass = ref$[i$];
+      if (/^author/.exec(spanclass)) {
+        byAuthor[spanclass] == null && (byAuthor[spanclass] = 0);
+        results$.push(byAuthor[spanclass] += $this.text().length);
+      }
+    }
+    return results$;
+  });
+  mPA = 0;
+  authorClass = null;
+  for (author in byAuthor) {
+    value = byAuthor[author];
+    if (value > mPA) {
+      mPA = value;
+      authorClass = author;
+    }
+  }
+  return authorClass;
+}
+function toggleAuthor($node, prefix, authorClass){
+  var hasClass, myClass, i$, ref$, len$, c;
+  hasClass = false;
+  myClass = prefix + "-" + authorClass;
+  for (i$ = 0, len$ = (ref$ = allClasses($node)).length; i$ < len$; ++i$) {
+    c = ref$[i$];
+    if (c.indexOf(prefix) === 0) {
+      if (c === myClass) {
+        hasClass = true;
+      } else {
+        $node.removeClass(c);
+      }
+    }
+  }
+  if (hasClass) {
+    return false;
+  }
+  $node.addClass(myClass);
+  return true;
+}
+function updateDomline($node){
+  var lineNumber, authorClass;
+  lineNumber = $node.index() + 1;
+  if (!lineNumber) {
+    return false;
+  }
+  authorClass = $node.text().length > 0 ? derivePrimaryAuthor($node) : "none";
+  toggleAuthor($node, "primary", authorClass);
+  return authorViewUpdate($node, lineNumber, null, authorClass);
+}
+function extractAuthor($node){
+  var ref$, a, ref1$;
+  return (ref$ = (function(){
+    var i$, ref$, len$, results$ = [];
+    for (i$ = 0, len$ = (ref$ = allClasses($node)).length; i$ < len$; ++i$) {
+      a = ref$[i$];
+      if (/^primary-/.exec(a)) {
+        results$.push(a);
+      }
+    }
+    return results$;
+  }())) != null ? (ref1$ = ref$[0]) != null ? ref1$.replace(/^primary-/, '') : void 8 : void 8;
+}
+function authorViewUpdate($node, lineNumber, prevAuthor, authorClass){
+  var $authorContainer, prev, prevId, ref$, authorChanged, next, logicalPrevAuthor;
+  $authorContainer = $sidedivinner.find("div:nth-child(" + lineNumber + ")");
+  authorClass == null && (authorClass = extractAuthor($node));
+  if (!prevAuthor) {
+    prev = $authorContainer;
+    while ((prev = prev.prev()) && prev.length) {
+      prevAuthor = extractAuthor(prev);
+      if (prevAuthor !== 'none') {
+        break;
+      }
+    }
+  }
+  if (prevAuthor === authorClass) {
+    $authorContainer.addClass('concise');
+  } else {
+    $authorContainer.removeClass('concise');
+  }
+  prevId = (ref$ = $authorContainer.attr('id')) != null ? ref$.replace(/^ref-/, '') : void 8;
+  if (prevId === $node.attr('id')) {
+    authorChanged = toggleAuthor($authorContainer, "primary", authorClass);
+    if (!authorChanged) {
+      return;
+    }
+  } else {
+    $authorContainer.attr('id', 'ref-' + $node.attr('id'));
+    toggleAuthor($authorContainer, "primary", authorClass);
+  }
+  next = $node.next();
+  if (next.length) {
+    logicalPrevAuthor = authorClass === 'none' ? prevAuthor : authorClass;
+    return authorViewUpdate(next, lineNumber + 1, logicalPrevAuthor);
+  }
+}
+fadeColor = function(colorCSS, fadeFrac){
+  var color;
+  color = colorutils.css2triple(colorCSS);
+  return colorutils.triple2css(colorutils.blend(color, [1, 1, 1], fadeFrac));
+};
+getAuthorClassName = function(author){
+  return 'author-' + author.replace(/[^a-y0-9]/g, function(c){
+    if (c === '.') {
+      return '-';
+    } else {
+      return 'z' + c.charCodeAt(0) + 'z';
+    }
+  });
+};
+function outerInit(outerDynamicCSS){
+  var x$, y$, z$, z1$;
+  x$ = outerDynamicCSS.selectorStyle('#sidedivinner > div.primary-author-none');
+  x$.borderRight = 'solid 0px ';
+  x$.paddingRight = '5px';
+  y$ = outerDynamicCSS.selectorStyle('#sidedivinner > div.concise::before');
+  y$.content = "' '";
+  z$ = outerDynamicCSS.selectorStyle('#sidedivinner > div');
+  z$.fontSize = '0px';
+  z$.paddingRight = '10px';
+  z1$ = outerDynamicCSS.selectorStyle('#sidedivinner > div::before');
+  z1$.fontSize = 'initial';
+  z1$.textOverflow = 'ellipsis';
+  z1$.overflow = 'hidden';
+  return init = true;
+}
+out$.aceSetAuthorStyle = aceSetAuthorStyle;
+function aceSetAuthorStyle(name, context){
+  var dynamicCSS, outerDynamicCSS, parentDynamicCSS, info, author, authorSelector, color, authorClass, authorName, x$, y$, z$, z1$, z2$;
+  dynamicCSS = context.dynamicCSS, outerDynamicCSS = context.outerDynamicCSS, parentDynamicCSS = context.parentDynamicCSS, info = context.info, author = context.author;
+  if (!init) {
+    outerInit(outerDynamicCSS);
+  }
+  authorSelector = ".authorColors span." + authorClass;
+  if (info) {
+    if (!(color = info.bgcolor)) {
+      return 1;
+    }
+    authorClass = getAuthorClassName(author);
+    authorName = authorNameAndColorFromAuthorId(author).name;
+    x$ = dynamicCSS.selectorStyle(".authorColors.focus span." + authorClass);
+    x$.borderBottom = "2px solid " + color;
+    y$ = parentDynamicCSS.selectorStyle(authorSelector);
+    y$.borderBottom = "2px solid " + color;
+    z$ = dynamicCSS.selectorStyle(".authorColors.focus .primary-" + authorClass + " ." + authorClass);
+    z$.borderBottom = '0px';
+    z1$ = outerDynamicCSS.selectorStyle("#sidedivinner.authorColors > div.primary-" + authorClass);
+    z1$.borderRight = "solid 5px " + color;
+    z1$.paddingRight = '5px';
+    z2$ = outerDynamicCSS.selectorStyle("#sidedivinner > div.primary-" + authorClass + "::before");
+    z2$.content = "'" + authorName + "'";
+  } else {
+    dynamicCSS.removeSelectorStyle(".authorColors.focus span." + authorClass);
+    parentDynamicCSS.removeSelectorStyle(authorSelector);
+  }
+  return 1;
+}
+authorNameAndColorFromAuthorId = function(authorId){
+  var myAuthorId, authorObj;
+  myAuthorId = pad.myUserInfo.userId;
+  if (myAuthorId === authorId) {
+    return {
+      name: 'Me',
+      color: pad.myUserInfo.colorId
+    };
+  }
+  authorObj = {};
+  $('#otheruserstable > tbody > tr').each(function(){
+    var x$;
+    if (authorId === $(this).data('authorid')) {
+      x$ = $(this);
+      x$.find('.usertdname').each(function(){
+        return authorObj.name = $(this).text() || 'Unknown Author';
+      });
+      x$.find('.usertdswatch > div').each(function(){
+        return authorObj.color = $(this).css('background-color');
+      });
+      return authorObj;
+    }
+  });
+  
+  if (!authorObj || !authorObj.name) {
+	authorObj = clientVars.collab_client_vars.historicalAuthorData[authorId];
+  }
+
+  // Added for LAMS: identify new authors
+  if (!authorObj || !authorObj.name) {
+	  $.each(pad.collabClient.getConnectedUsers(), function(){
+		 if (this.userId === authorId) {
+			 authorObj = this;
+			 return false;
+		 } 
+	  });
+  }
+
+  return authorObj || {
+    name: 'Unknown Author',
+    color: '#fff'
+  };
+};
+authorLines = {};
+out$.acePostWriteDomLineHTML = acePostWriteDomLineHTML;
+function acePostWriteDomLineHTML(hook_name, args, cb){
+  return setTimeout(function(){
+    return updateDomline($(args.node));
+  }, 200);
+}
+out$.aceEditEvent = aceEditEvent;
+function aceEditEvent(hook_name, context, cb){
+  var callstack, x$;
+  callstack = context.callstack;
+  if (callstack.type !== 'setWraps') {
+    return;
+  }
+  x$ = $('iframe[name="ace_outer"]').contents();
+  x$.find('#sidediv').css({
+    'padding-right': '0px'
+  });
+  x$.find('#sidedivinner').css({
+    'max-width': '180px',
+    overflow: 'hidden'
+  });
+  return x$;
+}
+isStyleFuncSupported = CSSStyleDeclaration.prototype.getPropertyValue != null;
+if (!isStyleFuncSupported) {
+  CSSStyleDeclaration.prototype.getPropertyValue = function(a){
+    return this.getAttribute(a);
+  };
+  CSSStyleDeclaration.prototype.setProperty = function(styleName, value, priority){
+    var rule;
+    this.setAttribute(styleName, value);
+    priority = typeof priority !== 'undefined' ? priority : '';
+    if (!(priority === '')) {
+      rule = new RegExp(RegExp.escape(styleName) + '\\s*:\\s*' + RegExp.escape(value + '(\\s*;)?', 'gmi'));
+      return this.cssText = this.cssText.replace(rule, styleName + ': ' + value + ' !' + priority + ';');
+    }
+  };
+  CSSStyleDeclaration.prototype.removeProperty = function(a){
+    return this.removeAttribute(a);
+  };
+  CSSStyleDeclaration.prototype.getPropertyPriority = function(styleName){
+    var rule;
+    rule = new RegExp(RegExp.escape(styleName) + '\\s*:\\s*[^\\s]*\\s*!important(\\s*;)?', 'gmi');
+    if (rule.test(this.cssText)) {
+      return 'important';
+    } else {
+      return '';
+    }
+  };
+}
+RegExp.escape = function(text){
+  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+};
\ No newline at end of file
Index: lams_build/conf/etherpad/etherpad-lite/node_modules/ep_authornames/static/js/index.js
===================================================================
diff -u
--- lams_build/conf/etherpad/etherpad-lite/node_modules/ep_authornames/static/js/index.js	(revision 0)
+++ lams_build/conf/etherpad/etherpad-lite/node_modules/ep_authornames/static/js/index.js	(revision 8369ef2443c67cab61cd26c9b0b0c067e4ff4f42)
@@ -0,0 +1,51 @@
+exports.acePostWriteDomLineHTML = function(hook_name, args, cb){
+	var className2Author = function (className) {
+	  if (className.substring(0, 7) == "author-") {
+		return className.substring(7).replace(/[a-y0-9]+|-|z.+?z/g, function(cc) {
+		  if (cc == '-') { return '.'; }
+		  else if (cc.charAt(0) == 'z') {
+			return String.fromCharCode(Number(cc.slice(1, -1)));
+		  }
+		  else {
+			return cc;
+		  }
+		});
+	  }
+	  return null;
+	};
+	
+	var className2AuthorName = function(className) {
+		var authorId = className2Author(className);
+		var authorObj = clientVars.collab_client_vars.historicalAuthorData[authorId];
+		if (authorObj) {
+		  return authorObj.name;
+		} else {
+		  // Added for LAMS: identify new authors
+		  $.each(pad.collabClient.getConnectedUsers(), function(){
+			 if (this.userId === authorId) {
+				 authorObj = this;
+				 return false;
+			 } 
+		  });
+		  if (authorObj) {
+			  return authorObj.name;
+		  }
+		  return "unknown author: " + authorId;
+		}
+	};
+	
+	$(args.node).find('span').each(function(span){
+                $(this).map(
+			function() {
+				if(this.classList[0]){
+					var mainClass = this.classList[0];
+					if(mainClass.substring(0,7) === 'author-') {
+						this.title = className2AuthorName(mainClass);
+					}
+				}
+			}
+		);
+	});
+	return cb;
+}
+