Syntax highlighting with highlightjs

onur · onur · commit 04ff2f815c78 · 2016-06-24T00:49:00.000+03:00
Also remove padding of first header in README,
and remove some trailing whitespaces in style.scss
diff --git a/src/web/crate_details.rs b/src/web/crate_details.rs
@@ -178,6 +178,7 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
         .and_then(|details| {
             Page::new(details)
                 .set_true("show_package_navigation")
+                .set_true("javascript_highlightjs")
                 .set_true("package_navigation_crate_tab")
                 .to_resp("crate_details")
         })
diff --git a/src/web/source.rs b/src/web/source.rs
@@ -217,28 +217,31 @@ pub fn source_browser_handler(req: &mut Request) -> IronResult<Response> {
     };
 
 
-    let content = if let Some(file) = file {
+    let (content, is_rust_source) = if let Some(file) = file {
         // serve the file with DatabaseFileHandler if file isn't text and not empty
         if !file.mime.starts_with("text") && !file.is_empty() {
             return Ok(file.serve());
         } else if file.mime.starts_with("text") && !file.is_empty() {
-            String::from_utf8(file.content).ok()
+            (String::from_utf8(file.content).ok(), file.path.ends_with(".rs"))
         } else {
-            None
+            (None, false)
         }
     } else {
-        None
+        (None, false)
     };
 
     let list = FileList::from_path(&conn, &name, &version, &req_path);
 
     let page = Page::new(list)
                    .set_bool("show_parent_link", !req_path.is_empty())
+                   .set_true("javascript_highlightjs")
                    .set_true("show_package_navigation")
                    .set_true("package_source_tab");
 
     if let Some(content) = content {
-        page.set("file_content", &content).to_resp("source")
+        page.set("file_content", &content)
+            .set_bool("file_content_rust_source", is_rust_source)
+            .to_resp("source")
     } else {
         page.to_resp("source")
     }
diff --git a/templates/footer.hbs b/templates/footer.hbs
@@ -1,2 +1,3 @@
+{{#if varsb.javascript_highlightjs}}<script type="text/javascript" charset="utf-8">hljs.initHighlighting();</script>{{/if}}
 </body>
 </html>
diff --git a/templates/header.hbs b/templates/header.hbs
@@ -10,6 +10,11 @@
     <link rel="stylesheet" href="/rustdoc/rustdoc-20160526-1.10.0-nightly-97e3a2401.css" type="text/css" media="all" />
     <link rel="stylesheet" href="/rustdoc/main-20160526-1.10.0-nightly-97e3a2401.css" type="text/css" media="all" />
     <link rel="stylesheet" href="/style.css" type="text/css" media="all" />
+    {{#if varsb.javascript_highlightjs}}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/styles/github.min.css" type="text/css" media="all" />
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/highlight.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.4.0/languages/rust.min.js" type="text/javascript" charset="utf-8"></script>
+    {{/if}}
     <title>{{#if title}}{{title}} - {{/if}}{{#if content.metadata.name}}{{content.metadata.name}} {{content.metadata.version}} - {{/if}}Cratesfyi</title>
   </head>
   <body>
diff --git a/templates/source.hbs b/templates/source.hbs
@@ -28,7 +28,7 @@
     </div>
     {{#if ../varss.file_content}}
     <div class="pure-u-19-24">
-      <pre>{{ ../varss.file_content }}</pre>
+      <pre><code{{#if ../varsb.file_content_rust_source}} class="rust"{{/if}}>{{ ../varss.file_content }}</code></pre>
     </div>
     {{/if}}
   </div>
diff --git a/templates/style.scss b/templates/style.scss
@@ -41,11 +41,6 @@ strong {
     font-weight: 500;
 }
 
-pre {
-    background-color: $color-background-code;
-    padding: 14px;
-}
-
 .pure-button-normal {
     background-color: #fff;
     box-sizing: border-box !important;
@@ -149,7 +144,7 @@ div.recent-releases-container {
         display: block;
         border-bottom: 1px solid $color-border;
         padding: .4em 1em;
-        
+
         @media #{$media-lg} {
             padding: .4em 0;
             margin: 0 1em;
@@ -168,7 +163,7 @@ div.recent-releases-container {
     .description {
         font-family: $font-family-serif;
         font-weight: normal;
-        @media #{$media-sm} { 
+        @media #{$media-sm} {
             font-size: 1em;
             white-space: nowrap;
             overflow: hidden;
@@ -177,7 +172,7 @@ div.recent-releases-container {
     }
 
     .description:hover {
-        @media #{$media-sm} { 
+        @media #{$media-sm} {
             overflow: visible;
             white-space: normal;
         }
@@ -304,8 +299,29 @@ div.package-page-container {
         }
     }
 
-    div.package-details p {
-        font-family: $font-family-serif;
+    div.package-details {
+        p {
+            font-family: $font-family-serif;
+        }
+
+        h1:first-child,
+        h2:first-child,
+        h3:first-child,
+        h4:first-child,
+        h5:first-child,
+        h6:first-child {
+            margin-top: 0;
+        }
+    }
+
+    pre {
+        background-color: inherit;
+        margin: 0;
+        padding: 0;
+
+        code {
+            white-space: pre;
+        }
     }
 }
 
@@ -326,7 +342,7 @@ div.cratesfyi-package-container {
         margin: 0;
         padding: 0 0 20px 16px;
 
-        @media #{$media-sm} { 
+        @media #{$media-sm} {
             white-space: nowrap;
             overflow: hidden;
             text-overflow: ellipsis;
@@ -388,6 +404,6 @@ div.search-page-search-form {
         max-width: 300px;
         padding: .4em 1em;
     }
-    
+
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+{{#if varsb.javascript_highlightjs}}<script type="text/javascript" charset="utf-8">hljs.initHighlighting();</script>{{/if}}`
`1`	`2`	`</body>`
`2`	`3`	`</html>`