opendev/gerrit
Code Issues Proposed changes

Revert "Change style of commit message box display and use UiBinder."

Browse Source 
This reverts commit 28c680bc28.

The UI is too damn ugly.

Change-Id: Id0139657535537e7e12becad4ace4a643f5dbe94
This commit is contained in:
Shawn O. Pearce
2012-06-12 16:35:03 -07:00
parent 23c571899e
commit 70968dd6e0
2 changed files with 13 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.java
View File

@@ -14,57 +14,29 @@
package com.google.gerrit.client.changes; package com.google.gerrit.client.changes;
import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.ui.CommentLinkProcessor; import com.google.gerrit.client.ui.CommentLinkProcessor;
import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.PreElement;
import com.google.gwt.dom.client.Style.Display;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.HTMLPanel;
import com.google.gwtexpui.safehtml.client.SafeHtml; import com.google.gwtexpui.safehtml.client.SafeHtml;
import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder; import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
public class CommitMessageBlock extends Composite { public class CommitMessageBlock extends Composite {
interface Binder extends UiBinder<HTMLPanel, CommitMessageBlock> { private final HTML description;
}
private static Binder uiBinder = GWT.create(Binder.class);
@UiField
PreElement commitSummaryPre;
@UiField
PreElement commitBodyPre;
public CommitMessageBlock() { public CommitMessageBlock() {
initWidget(uiBinder.createAndBindUi(this)); description = new HTML();
description.setStyleName(Gerrit.RESOURCES.css().changeScreenDescription());
initWidget(description);
} }
public void display(final String commitMessage) { public void display(final String commitMessage) {
String commitSummary = ""; SafeHtml msg = new SafeHtmlBuilder().append(commitMessage);
String commitBody = ""; msg = msg.linkify();
msg = CommentLinkProcessor.apply(msg);
String[] splitCommitMessage = commitMessage.split("\n", 2); msg = new SafeHtmlBuilder().openElement("p").append(msg).closeElement("p");
commitSummary = splitCommitMessage[0]; msg = msg.replaceAll("\n\n", "</p><p>");
commitBody = splitCommitMessage[1]; msg = msg.replaceAll("\n", "<br />");
SafeHtml.set(description, msg);
// Hide commit body if there is no body
if (commitBody.trim().isEmpty()) {
commitBodyPre.getStyle().setDisplay(Display.NONE);
}
// Linkify commit summary
SafeHtml commitSummaryLinkified = new SafeHtmlBuilder().append(commitSummary);
commitSummaryLinkified = commitSummaryLinkified.linkify();
commitSummaryLinkified = CommentLinkProcessor.apply(commitSummaryLinkified);
// Linkify commit body
SafeHtml commitBodyLinkified = new SafeHtmlBuilder().append(commitBody);
commitBodyLinkified = commitBodyLinkified.linkify();
commitBodyLinkified = CommentLinkProcessor.apply(commitBodyLinkified);
commitSummaryPre.setInnerHTML(commitSummaryLinkified.asString());
commitBodyPre.setInnerHTML(commitBodyLinkified.asString());
} }
} }

76
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommitMessageBlock.ui.xml
View File

@@ -1,76 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2012 The Android Open Source Project
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.
-->
<ui:UiBinder xmlns:ui='urn:ui:com.google.gwt.uibinder'
xmlns:g='urn:import:com.google.gwt.user.client.ui'>
<ui:style>
@eval selectionColor com.google.gerrit.client.Gerrit.getTheme().selectionColor;
@eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;
@eval backgroundColor com.google.gerrit.client.Gerrit.getTheme().backgroundColor;
.commitMessageTable {
border-collapse: separate;
border-spacing: 0;
margin-bottom: 10px;
}
.header {
border: 1px solid trimColor;
padding: 2px 6px 1px;
background-color: trimColor;
white-space: nowrap;
color: textColor;
font-size: 10pt;
}
.contents {
border-bottom: 1px solid trimColor;
border-left: 1px solid trimColor;
border-right: 1px solid trimColor;
padding: 5px;
}
.contents span {
font-weight: bold;
}
.contents pre {
margin: 0;
}
.commitSummary {
font-weight: bold;
}
.commitBody {
margin-top: 10px;
}
</ui:style>
<g:HTMLPanel>
<table class='{style.commitMessageTable}'>
<tr><th class='{style.header}'>Commit Message</th></tr>
<tr><td class='{style.contents}'>
<pre class='{style.commitSummary}' ui:field='commitSummaryPre'/>
<pre class='{style.commitBody}' ui:field='commitBodyPre'/>
</td></tr>
</table>
</g:HTMLPanel>
</ui:UiBinder>