Add (mirrored from $url) on repository index pages When a repository is mirrored from another location, the site may want to list the upstream URL to document where it is mirrored from. Change-Id: Ic717d5b43b2e1e3d7cf488a3172c7ca60874ac8d
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryDescription.java b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryDescription.java index 06ee4da..3942393 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryDescription.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryDescription.java
@@ -21,5 +21,6 @@ public String name; public String cloneUrl; public String description; + public String mirroredFromUrl; public Map<String, String> branches; }
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java index 6659718..11f0e9e 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/RepositoryIndexServlet.java
@@ -69,6 +69,7 @@ walk.release(); } return ImmutableMap.of("cloneUrl", desc.cloneUrl, + "mirroredFromUrl", Strings.nullToEmpty(desc.mirroredFromUrl), "description", Strings.nullToEmpty(desc.description), "branches", getRefs(req, Constants.R_HEADS, Ordering.from(RefComparator.INSTANCE)), "tags", tags);
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css b/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css index 94460ab..02add81 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/static/gitiles.css
@@ -120,6 +120,11 @@ border-bottom: #ddd solid 1px; /* BORDER */ padding-bottom: 5px; /* VPADDING */ } +.repository-mirrored-from { + font-size: 85%; + font-style: italic; + padding-left: 1em; +} .repository-refs { width: 650px; }
diff --git a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy index 02bb4da..cf4173c 100644 --- a/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy +++ b/gitiles-servlet/src/main/resources/com/google/gitiles/templates/RepositoryIndex.soy
@@ -21,6 +21,7 @@ * @param breadcrumbs breadcrumbs for this page. * @param cloneUrl clone URL for this repository. * @param description description text of the repository. + * @param? mirroredFromUrl URL this repository is mirrored from. * @param? branches list of branch objects with url and name keys. * @param? tags list of tag objects with url and name keys. */ @@ -32,8 +33,17 @@ {param breadcrumbs: $breadcrumbs /} {/call} -{if $description} - <div class="repository-description">{$description}</div> +{if $description or $mirroredFromUrl} + <div class="repository-description"> + {$description} + {if $mirroredFromUrl} + <div class="repository-mirrored-from"> + {msg desc="Informational text describing source of repository"} + (mirrored from <a href="{$mirroredFromUrl}">{$mirroredFromUrl}</a>) + {/msg} + </div> + {/if} + </div> {/if} <textarea rows="1" cols="150" class="clone-line"