Merge pull request rust-lang#1242 from GuillaumeGomez/make-repository-link-more-obvious

Make it more obvious that this is the repository link

Author: GuillaumeGomez

src/web/crate_details.rs

@@ -53,6 +53,7 @@ struct GitHubMetadata {
     stars: i32,
     forks: i32,
     issues: i32,
+    name: Option<String>,
 }
 
 fn optional_markdown<S>(markdown: &Option<String>, serializer: S) -> Result<S::Ok, S::Error>
@@ -101,6 +102,7 @@ impl CrateDetails {
                 github_repos.stars AS github_stars,
                 github_repos.forks AS github_forks,
                 github_repos.issues AS github_issues,
+                github_repos.name AS github_name,
                 releases.is_library,
                 releases.yanked,
                 releases.doc_targets,
@@ -136,6 +138,7 @@ impl CrateDetails {
                 issues: krate.get("github_issues"),
                 stars: krate.get("github_stars"),
                 forks: krate.get("github_forks"),
+                name: krate.get("github_name"),
             })
         } else {
             None

src/web/page/templates.rs

@@ -301,9 +301,9 @@ impl tera::Filter for IconType {
         let mut aria_hidden = true;
         let icon_name = tera::escape_html(value.as_str().expect("Icons only take strings"));
         let class = if args.get("fw").and_then(|fw| fw.as_bool()).unwrap_or(false) {
-            "class=\"fa-svg fa-svg-fw\""
+            "fa-svg fa-svg-fw"
         } else {
-            "class=\"fa-svg\""
+            "fa-svg"
         };
         let aria_label = args
             .get("aria-label")
@@ -332,9 +332,12 @@ impl tera::Filter for IconType {
         let icon_file_string = font_awesome_as_a_crate::svg(type_, &icon_name[..]).unwrap_or("");
 
         let icon = format!(
-            r#"<span {class} aria-hidden="{aria_hidden}"{aria_label}{id}>{icon_file_string}</span>"#,
+            "<span \
+                class=\"{class} {class_extra}\" \
+                aria-hidden=\"{aria_hidden}\"{aria_label}{id}>{icon_file_string}</span>",
             icon_file_string = icon_file_string,
             class = class,
+            class_extra = args.get("extra").and_then(|s| s.as_str()).unwrap_or(""),
             aria_hidden = aria_hidden,
             aria_label = aria_label,
             id = id,

templates/crate/details.html

@@ -76,7 +76,13 @@
                                     {# TODO: add support for hosts besides github (#35) #}
                                     {%- if details.github_metadata -%}
                                         {{ "github" | fab(fw=true) }}
-                                        {{ "star" | fas(fw=true) }} {{ details.github_metadata.stars }}
+                                        {% if details.github_metadata.name %}
+                                            {{details.github_metadata.name}}
+                                        {% else %}
+                                            Repository
+                                        {% endif %}
+                                        <br>
+                                        {{ "star" | fas(fw=true, extra="left-margin") }} {{ details.github_metadata.stars }}
                                         {{ "code-branch" | fas(fw=true) }} {{ details.github_metadata.forks }}
                                         {{ "exclamation-circle" | fas(fw=true) }} {{ details.github_metadata.issues }}
 

templates/rustdoc/topbar.html

@@ -62,10 +62,7 @@
                             {%- if krate.github_metadata -%}
                                 <li class="pure-menu-item">
                                     <a href="{{ krate.repository_url }}" class="pure-menu-link">
-                                        {{ "github" | fab(fw=true) }}
-                                        {{ "star" | fas(fw=true) }} {{ krate.github_metadata.stars }}
-                                        {{ "code-branch" | fas(fw=true) }} {{ krate.github_metadata.forks }}
-                                        {{ "exclamation-circle" | fas(fw=true) }} {{ krate.github_metadata.issues }}
+                                        {{ "code-branch" | fas(fw=true) }} Repository
                                     </a>
                                 </li>
 

templates/style/_fa.scss

@@ -4,6 +4,10 @@
     display: inline-block;
 }
 
+.fa-svg.left-margin {
+    margin-left: 1.25em;
+}
+
 .fa-svg svg {
     width: 1em;
     height: 1em;