opendev/gerrit
Code Issues Proposed changes

Shrink the footer to be a single line

Browse Source 
This makes the footer take up very little vertical space by putting
all elements on a single line and removing the padding.  This saves a
lot of vertical room on CodeMirrorDemo style screens where the footer
cannot scroll.

Change-Id: I3bd30c9476942c3b7255fcbd815634f4224e772b
This commit is contained in:
Shawn Pearce
2013-07-16 17:54:16 -07:00
parent 426a46d751
commit 82bf85a10a
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
View File

@@ -72,7 +72,6 @@ import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTMLTable.CellFormatter; import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
import com.google.gwt.user.client.ui.InlineHTML; import com.google.gwt.user.client.ui.InlineHTML;
import com.google.gwt.user.client.ui.InlineLabel; import com.google.gwt.user.client.ui.InlineLabel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwtexpui.clippy.client.CopyableLabel; import com.google.gwtexpui.clippy.client.CopyableLabel;
import com.google.gwtexpui.user.client.UserAgent; import com.google.gwtexpui.user.client.UserAgent;
@@ -434,28 +433,23 @@ public class Gerrit implements EntryPoint {
} }
private static void populateBottomMenu(RootPanel btmmenu, HostPageData hpd) { private static void populateBottomMenu(RootPanel btmmenu, HostPageData hpd) {
final Label keyHelp = new Label(C.keyHelp());
keyHelp.setStyleName(RESOURCES.css().keyhelp());
btmmenu.add(keyHelp);
String vs = hpd.version; String vs = hpd.version;
if (vs == null || vs.isEmpty()) { if (vs == null || vs.isEmpty()) {
vs = "dev"; vs = "dev";
} }
FlowPanel poweredBy = new FlowPanel(); btmmenu.add(new InlineLabel(C.keyHelp()));
poweredBy.setStyleName(RESOURCES.css().version()); btmmenu.add(new InlineLabel(" | "));
poweredBy.add(new InlineHTML(M.poweredBy(vs))); btmmenu.add(new InlineHTML(M.poweredBy(vs)));
if (getConfig().getReportBugUrl() != null) { if (getConfig().getReportBugUrl() != null) {
poweredBy.add(new InlineLabel(" | "));
Anchor a = new Anchor( Anchor a = new Anchor(
C.reportBug(), C.reportBug(),
getConfig().getReportBugUrl()); getConfig().getReportBugUrl());
a.setTarget("_blank"); a.setTarget("_blank");
a.setStyleName(""); a.setStyleName("");
poweredBy.add(a); btmmenu.add(new InlineLabel(" | "));
btmmenu.add(a);
} }
btmmenu.add(poweredBy);
} }
private void onModuleLoad2(HostPageData hpd) { private void onModuleLoad2(HostPageData hpd) {

2
gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
View File

@@ -140,7 +140,6 @@ public interface GerritCss extends CssResource {
String infoBlock(); String infoBlock();
String infoTable(); String infoTable();
String inputFieldTypeHint(); String inputFieldTypeHint();
String keyhelp();
String labelList(); String labelList();
String leftMostCell(); String leftMostCell();
String lineHeader(); String lineHeader();
@@ -230,6 +229,5 @@ public interface GerritCss extends CssResource {
String userInfoPopup(); String userInfoPopup();
String useridentity(); String useridentity();
String usernameField(); String usernameField();
String version();
String watchedProjectFilter(); String watchedProjectFilter();
} }

7
gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
View File

@@ -61,12 +61,11 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
.version, #gerrit_btmmenu {
.keyhelp { clear: both;
color: #a0adcc; color: #a0adcc;
right: 0;
padding-right: 10px;
text-align: right; text-align: right;
padding-right: 10px;
} }
.version a, .version a,

4
gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/HostPage.html
View File

@@ -44,9 +44,9 @@
</noscript> </noscript>
</div> </div>
<div id="gerrit_body"></div> <div id="gerrit_body"></div>
<div style="clear: both; margin-top: 15px; padding-top: 2px; margin-bottom: 15px;"> <div style="clear: both">
<div id="gerrit_footer"></div> <div id="gerrit_footer"></div>
<div id="gerrit_btmmenu" style="clear: both;"></div> <div id="gerrit_btmmenu"></div>
</div> </div>
<iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe> <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
<script id="gerrit_module"></script> <script id="gerrit_module"></script>