Skip to content

Commit ca8b130

Browse files
nygrenhnygrenh
committed
Migrate from sh to highlight.js
1 parent 9ba78cf commit ca8b130

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+34
-2098
lines changed

‎app/assets/javascripts/reviews.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//= require sh
2-
31
var PagePresence = (function() {
42
var changeCallbacks = [];
53
var initialCallbacks = [];

‎app/assets/javascripts/solutions.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
// ...
2-
//= require sh

‎app/assets/javascripts/submissions.js

-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
// ...
2-
//= require sh

‎app/assets/stylesheets/main.scss

+17
Original file line numberDiff line numberDiff line change
@@ -407,3 +407,20 @@ tr>.align-right {
407407
.navbar {
408408
margin-bottom: 1rem;
409409
}
410+
411+
td.hljs-ln-numbers {
412+
user-select: none;
413+
414+
text-align: center;
415+
color: #ccc;
416+
//border-right: 1px solid #CCC;
417+
vertical-align: top;
418+
padding-right: 5px;
419+
420+
/* your custom style here */
421+
}
422+
423+
/* for block of code */
424+
td.hljs-ln-code {
425+
padding-left: 10px !important;
426+
}

‎app/assets/stylesheets/reviews.css

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
/* ...
22
*= require_self
3-
*= require shCore
4-
*= require shThemeDefault
53
*/

‎app/assets/stylesheets/solutions.css

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
/* ...
22
*= require_self
3-
*= require shCore
4-
*= require shThemeDefault
53
*/

‎app/assets/stylesheets/submissions.css

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
/* ...
22
*= require_self
3-
*= require shCore
4-
*= require shThemeDefault
53
*/

‎app/views/files/_files.html.erb

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
<script type="text/javascript">
2-
$(document).ready(function() {
3-
SyntaxHighlighter.all();
4-
});
5-
</script>
6-
71
<% just_one_html_prelude = (files.count {|f| f.html_prelude != nil } == 1) %>
82
<% if just_one_html_prelude %>
93
<%= raw(files.find {|f| f.html_prelude != nil }.html_prelude) %>
@@ -12,14 +6,13 @@
126
<% running_idx = 0 %>
137
<div class="solution-files">
148
<% for file in files %>
15-
<br>
169
<div class="card">
1710
<div class="card-body">
1811
<h2>
1912
<a class="panel-group-toggle" data-toggle="collapse" data-parent="#panel-group2" href="#<%= running_idx += 1 %>">
2013
<%= file.path %></a>
2114
</h2>
22-
<div id="<%= running_idx %>" class="panel-collapse">
15+
<div id="<%= running_idx %>" class="panel-collapse collapse show">
2316
<div>
2417
<% if !just_one_html_prelude && file.html_prelude %>
2518
<%= raw(file.html_prelude) %>
@@ -32,13 +25,14 @@
3225
when '.sass' then 'css'
3326
when '.hpp' then 'h'
3427
when '.properties' then 'plain'
35-
when '.r' then 'plain'
36-
when '' then 'plain'
28+
when '.py' then 'python'
29+
when '.R' then 'r'
30+
when '' then 'markup'
3731
else File.extname(file.path)[1..-1]
3832
end
3933
%>
4034
<div class="col-md-12" class="file-container">
41-
<pre class="brush: <%= brush %>"><%= force_utf8_violently(file.contents) %></pre>
35+
<pre><code class="brush"><%= force_utf8_violently(file.contents) %></code></pre>
4236
</div>
4337
</div>
4438
</div>

‎app/views/layouts/application.html.erb

+7
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
comet_js_url('jquery/jquery.cometd.js')
2525
)
2626
%>
27+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-light.min.css" integrity="sha256-aw9uGjVU5OJyMYN70Vu2kZ1DDVc1slcJCS2XvuPCPKo=" crossorigin="anonymous" />
2728
</head>
2829
<body class="default">
2930
<%= render partial: 'layouts/navigation' %>
@@ -43,6 +44,12 @@
4344
<%= yield %>
4445
</div>
4546
</div>
47+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous"></script>
48+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlightjs-line-numbers.js/2.1.0/highlightjs-line-numbers.min.js" integrity="sha256-ORy35NeVPhp5u86UDEs69WrNPjYJ899tayoT/y0NJ/I=" crossorigin="anonymous"></script>
49+
<script>
50+
hljs.initHighlightingOnLoad();
51+
hljs.initLineNumbersOnLoad();
52+
</script>
4653
</body>
4754
</html>
4855

‎app/views/submissions/_logs.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="row">
22
<div class="col-md-11">
33
<h2>Full sandbox log</h2>
4-
<pre><%= @submission.vm_log %></pre>
4+
<pre style="whitespace: pre-wrap"><%= @submission.vm_log %></pre>
55
</div>
66
</div>

‎app/views/submissions/show.html.erb

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
<li class="nav-item"><a class="nav-link" href="#valgrind" >Valgrind</a></li>
2323
<% end %>
2424
<% if !@submission.vm_log.blank? && (can? :read_vm_log, @submission) %>
25-
<li class=""><a href="#logs">Logs</a></li>
25+
<li class="nav-item"><a class="nav-link" href="#logs">Logs</a></li>
2626
<% end %>
27-
<li class="active nav-item"><a class="nav-link" href="#files">Files</a></li>
27+
<li class="active nav-item"><a class="nav-link" href="#files">Files</a></li>
2828
</ul>
2929

30+
<br>
31+
3032
<div class="row">
3133
<div class="col-md-12">
3234
<div class="tab-content">

‎vendor/assets/javascripts/sh.js

-28
This file was deleted.

‎vendor/assets/javascripts/sh/shAutoloader.js

-17
This file was deleted.

‎vendor/assets/javascripts/sh/shBrushAS3.js

-59
This file was deleted.

‎vendor/assets/javascripts/sh/shBrushAppleScript.js

-75
This file was deleted.

‎vendor/assets/javascripts/sh/shBrushBash.js

-59
This file was deleted.

0 commit comments

Comments
 (0)