Skip to content

Commit 4cb234d

Browse files
committed
Various changes for issues I found while poking around current site
* Update links from http:// to https:// where possible * Replace 'ruby-advisory-db' with '_advisories' in Jekyll exclusion list * Fix two config errors (highlighter and atom.xml layout) * Enable DNT for Twitter share button * Remove unused modernizr JS * Add basic Gemfile * Use correct filter for stripping URL protocol
1 parent 3750cbd commit 4cb234d

11 files changed

+18
-47
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.bundle
22
.DS_Store
33
.sass-cache
4+
Gemfile.lock
45
public
56
vendor
67
_site

_config.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,27 @@ url: http://rubysec.com
22
title: RubySec
33
subtitle: Providing security resources for the Ruby community
44
author: RubySec
5-
simple_search: http://google.com/search
5+
simple_search: https://www.google.com/search
66
description: Advisory database of security vulnerabilities found in Ruby projects
77

88
exclude:
9-
- ruby-advisory-db
10-
- vendor
9+
- _advisories
10+
- Gemfile
11+
- Gemfile.lock
1112
- Rakefile
1213
- README.md
14+
- vendor
15+
16+
gems:
17+
- octopress-filters
1318

1419
subscribe_rss: /atom.xml
1520
1621

1722
permalink: /advisories/:title/
1823
category_dir: advisories/categories
1924
markdown: rdiscount
20-
pygments: true
25+
highlighter: pygments
2126

2227
paginate: 10 # Posts per page on the blog index
2328
pagination_dir: advisories # Directory base for pagination URLs eg. /blog/page/2/

_includes/after_footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
22
<script src="{{ root_url }}/assets/bootstrap/js/bootstrap.min.js"></script>
3-
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
3+
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

_includes/article.html

-30
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,5 @@ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% el
2121
</footer>
2222
{% endif %}
2323
{% else %}
24-
{% if page.wordpress_id %}
25-
<div style="float: right; padding-left: 15px; padding-botom: 15px; ">
26-
<script type="text/javascript"><!--
27-
google_ad_client = "ca-pub-7721655128098525";
28-
/* Blog Main */
29-
google_ad_slot = "7466725066";
30-
google_ad_width = 336;
31-
google_ad_height = 280;
32-
//-->
33-
</script>
34-
<script type="text/javascript"
35-
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
36-
</script>
37-
</div>
38-
{% endif %}
39-
4024
<div class="entry-content">{{ content }}</div>
41-
42-
{% if page.wordpress_id %}
43-
<script type="text/javascript"><!--
44-
google_ad_client = "ca-pub-7721655128098525";
45-
/* Blog Bottom */
46-
google_ad_slot = "4562123819";
47-
google_ad_width = 728;
48-
google_ad_height = 90;
49-
//-->
50-
</script>
51-
<script type="text/javascript"
52-
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
53-
</script>
54-
{% endif %}
5525
{% endif %}

_includes/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{% endif %}
88
<td>&nbsp;</td>
99
{% if site.twitter_user %}
10-
<td><a href="http://twitter.com/{{site.twitter_user}}" class="btn"><i class="icon-twitter-sign"></i> On Twitter</a></td>
10+
<td><a href="https://twitter.com/{{site.twitter_user}}" class="btn"><i class="icon-twitter-sign"></i> On Twitter</a></td>
1111
{% endif %}
1212
</tr>
1313
</table>

_includes/navigation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{% if site.simple_search %}
1515
<form action="{{ site.simple_search }}" method="get" class="navbar-search pull-left">
1616
<fieldset role="search">
17-
<input type="hidden" name="q" value="site:{{ site.url | shorthand_url }}" />
17+
<input type="hidden" name="q" value="site:{{ site.url | strip_url_protocol }}" />
1818
<input type="text" name="q" results="0" placeholder="Search" class="search-query span2" />
1919
</fieldset>
2020
</form>

_includes/post/sharing.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<div class="sharing">
22
<br/>
3-
<a href="https://twitter.com/share" class="twitter-share-button" data-via="rubysec">Tweet</a>
3+
<a href="https://twitter.com/share" class="twitter-share-button" data-via="rubysec" data-dnt="true">Tweet</a>
44
</div>

_includes/sidebar.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% unless page.sidebar == false %}
22
<div class="span4 sidebar">
33
<div class="well">
4-
Contact us <a href="http://twitter.com/rubysec">@rubysec</a> (email coming soon), or chat in #rubysec on freenode.
4+
Contact us <a href="https://twitter.com/rubysec">@rubysec</a> (email coming soon), or chat in #rubysec on freenode.
55
</div>
66
<div class="well">
77
<section>

_layouts/advisory.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ <h3>ADVISORIES</h3>
77
<ul>
88
{% if page.advisory.cve %}
99
<li>
10-
<a href="http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-{{ page.advisory.cve }}">CVE-{{ page.advisory.cve }}</a>
10+
<a href="https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-{{ page.advisory.cve }}">CVE-{{ page.advisory.cve }}</a>
1111
</li>
1212
{% endif %}
1313

1414
{% if page.advisory.osvdb %}
1515
<li>
16-
<a href="http://osvdb.org/show/osvdb/{{ page.advisory.osvdb }}">OSVDB-{{ page.advisory.osvdb }}</a>
16+
<a href="https://osvdb.org/show/osvdb/{{ page.advisory.osvdb }}">OSVDB-{{ page.advisory.osvdb }}</a>
1717
</li>
1818
{% endif %}
1919

atom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: nil
2+
layout: null
33
---
44
<?xml version="1.0" encoding="utf-8"?>
55
<feed xmlns="http://www.w3.org/2005/Atom">

javascripts/modernizr-2.0.js

-5
This file was deleted.

0 commit comments

Comments
 (0)