Shift the error page "More" button over to text.

chrome/renderer/resources/neterror.js

Index: chrome/renderer/resources/neterror.js
diff --git a/chrome/renderer/resources/neterror.js b/chrome/renderer/resources/neterror.js
index b518a87c935abf9c682d56bd2900270d8a06d9b3..bcbcdc6fc16ed779da1d4ec0a4459660a8952395 100644
--- a/chrome/renderer/resources/neterror.js
+++ b/chrome/renderer/resources/neterror.js
@@ -5,19 +5,19 @@
 function toggleHelpBox() {
   var helpBoxOuter = document.getElementById('help-box-outer');
   helpBoxOuter.classList.toggle('hidden');
-  var moreLessButton = document.getElementById('more-less-button');
+  var detailsButton = document.getElementById('details-button');
   if (helpBoxOuter.classList.contains('hidden')) {
-    moreLessButton.innerText = moreLessButton.moreText;
+    detailsButton.innerText = detailsButton.detailsText;
   } else {
-    moreLessButton.innerText = moreLessButton.lessText;
+    detailsButton.innerText = detailsButton.hideDetailsText;
   }

[Dan Beam, 2014/08/04 17:19:03]

nit: no curlies

[Randy Smith (Not in Mondays), 2014/08/04 18:05:27]

Done.

 }
 
 function diagnoseErrors() {
-  var extension_id = "idddmepepmjcgiedknnmlbadcokidhoa";
-  var diagnose_frame = document.getElementById('diagnose-frame');
-  diagnose_frame.innerHTML =
-      '<iframe src="chrome-extension://' + extension_id +
+  var extensionId = 'idddmepepmjcgiedknnmlbadcokidhoa';
+  var diagnoseFrame = document.getElementById('diagnose-frame');
+  diagnoseFrame.innerHTML =
+      '<iframe src="chrome-extension://' + extensionId +
       '/index.html"></iframe>';
 }
 
@@ -41,7 +41,7 @@ function updateIconClass(classList, newClass) {
   var oldClass;
 
   if (classList.hasOwnProperty('last_icon_class')) {
-    oldClass = classList['last_icon_class']
+    oldClass = classList['last_icon_class'];
     if (oldClass == newClass)
       return;
   }
@@ -94,21 +94,40 @@ function loadStaleButtonClick() {
   }
 }
 
-function moreButtonClick() {
+function detailsButtonClick() {
   if (window.errorPageController) {
-    errorPageController.moreButtonClick();
+    errorPageController.detailsButtonClick();
   }
 }
 
+// Sets up the proper button layout for the current platform.

[mmenke, 2014/08/04 15:57:39]

This should be just above setButtonLayout.

[Randy Smith (Not in Mondays), 2014/08/04 16:14:41]

Done.

+var primaryControlOnLeft = true;
 <if expr="is_macosx or is_ios or is_linux or is_android">
-// Re-orders buttons. Used on Mac, Linux, and Android, where reload should go
-// on the right.
-function swapButtonOrder() {
+primaryControlOnLeft = false;
+</if>
+
+function setButtonLayout() {
+  var buttonsDiv = document.getElementById('buttons');
+  var controlButtonDiv = document.getElementById('control-buttons');
   var reloadButton = document.getElementById('reload-button');
-  var moreLessButton = document.getElementById('more-less-button');
+  var detailsButton = document.getElementById('details-button');
   var staleLoadButton = document.getElementById('stale-load-button');
-  reloadButton.parentNode.insertBefore(moreLessButton, reloadButton);
-  reloadButton.parentNode.insertBefore(staleLoadButton, reloadButton)
+
+  var primaryButton = reloadButton;
+  var secondaryButton = staleLoadButton;
+  var primaryControlOnLeft = true;

[Dan Beam, 2014/08/04 17:19:03]

probably meant to remove this?

[Randy Smith (Not in Mondays), 2014/08/04 18:05:27]

Yeah, not sure how my (first round of :-}) testing didn't catch that.  Done.

+
+  if (primaryControlOnLeft) {

[Dan Beam, 2014/08/04 17:19:03]

nit:

<if expr="is_win>
    buttons.classList.add('suggested-right');
    controlButtonDiv.insertBefore(secondaryButton, primaryButton);
</if>
<if expr="not is_win">
    buttons.classList.add('suggested-left');
    controlButtonDiv.insertBefore(primaryButton, secondaryButton);
</if>

[Randy Smith (Not in Mondays), 2014/08/04 18:05:27]

You're directly contradicting bauerb@'s request that I move the grit out of the
JS.  I don't suppose you'd be willing not to push on the point?  If I have to
wait for you guys to work out who's authoritative, I really don't think I'm
landing this today, as I suspect he's home and possibly asleep.

[Bernhard Bauer, 2014/08/04 20:39:53]

Not asleep, just having dinner :) To briefly reiterate my argument for Dan, I
would rather do these decisions in Javascript (similar to how we define and
check cr.isMac, cr.isWin etc. in Javascript) rather than <if>-ing them. Later we
could replace the <if> definition with one at runtime and move it to a shared
file.

In the interest of not blocking this CL, I'm okay with landing either version
though. I just wanted to say my piece :)

+    buttons.classList.add('suggested-left');
+    controlButtonDiv.insertBefore(primaryButton, secondaryButton);
+  } else {
+    buttons.classList.add('suggested-right');
+    controlButtonDiv.insertBefore(secondaryButton, primaryButton);
+  }
+
+  if (reloadButton.style.display == 'none' &&
+      staleLoadButton.style.display == 'none') {
+    detailsButton.classList.add('singular');
+  }
 }
-document.addEventListener("DOMContentLoaded", swapButtonOrder);
-</if>
+document.addEventListener('DOMContentLoaded', setButtonLayout);