Skip to content

Commit

Permalink
Merge pull request #64 from devopsdays/reduce_complexity
Browse files Browse the repository at this point in the history 
Reduce complexity
  • Loading branch information
@m1keil
m1keil committed Dec 1, 2015
2 parents ad70dce + e648358 commit cf4b336
Show file tree
Hide file tree
Showing 13 changed files with 155 additions and 308 deletions.
21 changes: 6 additions & 15 deletions config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ theme = "devopsdays-legacy"
baseurl = "http://devopsdays.github.io/"
# baseurl = "http://localhost:1313/"
languageCode = "en-us"
title = "devopsdays"
GoogleAnalytics = "UA-9713393-1"
title = "DevOpsDays"
canonifyurls = false
dataDir = "data"
archetypedir = "archetypes"
Expand All @@ -13,17 +14,7 @@ PaginatePath = "blog"
blog = "/blog/:year/:month/:day/:title/"

[params]
Facebook = "//www.facebook.com/group.php?gid=106761636771"
GATracker = ""
Twitter = "//www.twitter.com/devopsdays"
[params.social]
github = "arresteddevops"
facebook = "Arresteddevops"
facebook_admin = "500557137" # This needs to be a page admin to get domain insights
twitter = "devopsdays"
twitter_domain = "devopsdays.org" # This domain shows in twitter cards as "View on `twitter_domain`"
googleplus = ""
pinterest = ""
instagram = ""
youtube = ""
linkedin = "nozzleio"
Facebook = "//www.facebook.com/group.php?gid=106761636771"
Twitter = "http://www.twitter.com/devopsdays"
Linkedin = "http://www.linkedin.com/groups?home=&gid=2445279"
Groups = "http://groups.google.com/group/devopsdays"
77 changes: 21 additions & 56 deletions themes/devopsdays-legacy/layouts/_default/single.html
View file
Original file line number Diff line number Diff line change
@@ -1,82 +1,47 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" >
<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >

<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript">google.load('jquery', '1.3.2');</script>

<!---This is a combined jAmpersand, jqwindont , jPullquote -->
<script type="text/javascript" src="/js/devops.js"></script>

<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
<!--[if IE]>
<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
<![endif]-->
{{ partial "html_head.html" . }}
</head>


<body>
<div class="container ">
<div class="span-24 last" id="header">
<div class="container">
{{ partial "header.html" . }}
</div>

<div class="span-24 last">
{{ partial "headermenu.html" . }}
</div>

<div class="span-24 last" id="header">
<div class="span-15 first">
<h1>{{ .Title }}</h1>
</div>

<div class="span-8 last">
{{ partial "buttons.html" . }}
</div>
</div>

<div class="span-15 ">
<div class="span-15 last ">
{{ .Content }}
<div class="span-24">
{{ partial "header_menu.html" . }}
</div>
</div>

<div class="span-8 last">
<div class="span-8 last">
{{ partial "twitterfeed.html" . }}
<div class="span-15">
<h1>{{ .Title }}</h1>
</div>
</div>
<div class="span-18 ">
<div style=" padding-top:18px;" class="span-8 last">
<h1>Past </h1>
<div class="span-8 last">
{{ partial "buttons.html" . }}
</div>

<div class="span-18 ">
{{ partial "past.html" . }}
<div class="span-15">
{{ .Content }}
</div>
<div class="span-8 last">
{{ partial "twitterfeed.html" . }}
</div>

</div>

<div class="span-5 last ">
<div style=" padding-top:18px;" class="span-4 last">
<h1>Future </h1>
<div style="padding-top:18px;" class="span-18">
<h1>Past</h1>
</div>
<div style="padding-top:18px;" class="span-5 last">
<h1>Future</h1>
</div>

<div class="span-18">
{{ partial "past.html" . }}
</div>
<div class="span-5 last">
{{ partial "future.html" . }}
</div>

</div>
</div>


{{ partial "googleanalytics.html" . }}
{{ partial "footer.html" . }}

</body>
</html>
82 changes: 0 additions & 82 deletions themes/devopsdays-legacy/layouts/blog/single.html
View file

This file was deleted.

81 changes: 23 additions & 58 deletions themes/devopsdays-legacy/layouts/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,83 +1,48 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" >
<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >

<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript">google.load('jquery', '1.3.2');</script>

<!---This is a combined jAmpersand, jqwindont , jPullquote -->
<script type="text/javascript" src="/js/devops.js"></script>

<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
<!--[if IE]>
<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
<![endif]-->
{{ partial "html_head.html" . }}
</head>


<body onload="initialize()">
<div class="container ">
<div class="span-24 last" id="header">
<body>
<div class="container">
{{ partial "header.html" . }}
</div>

<div class="span-24 last">
{{ partial "headermenu.html" . }}
</div>

<div class="span-24 last" id="header">
<div class="span-15 first">
<h1>Upcoming devopsdays events</h1>
</div>

<div class="span-8 last">
{{ partial "buttons.html" . }}
</div>
</div>

<div class="span-15 ">
<div class="span-15 last ">
{{ partial "upcoming_headline.html" . }}
{{ partial "map.html" .}}
<div class="span-24">
{{ partial "header_menu.html" . }}
</div>
</div>

<div class="span-8 last">
<div class="span-8 last">
{{ partial "twitterfeed.html" . }}
<div class="span-15">
<h1>Upcoming devopsdays events</h1>
</div>
</div>
<div class="span-18 ">
<div style=" padding-top:18px;" class="span-8 last">
<h1>Past </h1>
<div class="span-8 last">
{{ partial "buttons.html" . }}
</div>

<div class="span-18 ">
{{ partial "past.html" . }}
<div class="span-15">
{{ partial "upcoming_headline.html" . }}
{{ partial "map.html" .}}
</div>
<div class="span-8 last">
{{ partial "twitterfeed.html" . }}
</div>

</div>

<div class="span-5 last ">
<div style=" padding-top:18px;" class="span-4 last">
<h1>Future </h1>
<div style="padding-top:18px;" class="span-18">
<h1>Past</h1>
</div>
<div style="padding-top:18px;" class="span-5 last">
<h1>Future</h1>
</div>

<div class="span-18">
{{ partial "past.html" . }}
</div>
<div class="span-5 last">
{{ partial "future.html" . }}
</div>

</div>
</div>


{{ partial "googleanalytics.html" . }}
{{ partial "footer.html" . }}

</body>
</html>
8 changes: 4 additions & 4 deletions themes/devopsdays-legacy/layouts/partials/buttons.html
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div>
<a href="/feed"><img width="32px" height="32px" alt="rss" title="rss feed" src="/images/feed.png"></a>
<a href="http://www.twitter.com/devopsdays"><img width="32px" height="32px" alt="twitter" title="twitter" src="/images/twitter.png"></a>
<a href="http://groups.google.com/group/devopsdays"><img width="32px" height="32px" alt="mail" title="mailinglist" src="/images/email.png"></a>
<a href="http://www.facebook.com/group.php?gid=106761636771"><img width="32px" height="32px" alt="mail" title="facebook" src="/images/facebook.png"></a>
<a href="http://www.linkedin.com/groups?home=&gid=2445279"><img width="32px" height="32px" alt="mail" title="linkedin" src="/images/linkedin.png"></a>
<a href="{{ .Site.Params.Twitter }}"><img width="32px" height="32px" alt="twitter" title="twitter" src="/images/twitter.png"></a>
<a href="{{ .Site.Params.Groups }}"><img width="32px" height="32px" alt="mail" title="mailinglist" src="/images/email.png"></a>
<a href="{{ .Site.Params.Facebook }}"><img width="32px" height="32px" alt="mail" title="facebook" src="/images/facebook.png"></a>
<a href="{{ .Site.Params.Linkedin }}"><img width="32px" height="32px" alt="mail" title="linkedin" src="/images/linkedin.png"></a>
</div>
Empty file removed themes/devopsdays-legacy/layouts/partials/footer.html
View file
Empty file.
2 changes: 1 addition & 1 deletion themes/devopsdays-legacy/layouts/partials/googleanalytics.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-9713393-1']);
_gaq.push(['_setAccount', '{{ .Site.GoogleAnalytics }}']);
_gaq.push(['_trackPageview']);

(function() {
Expand Down
6 changes: 2 additions & 4 deletions themes/devopsdays-legacy/layouts/partials/header.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<div class="span-16 first">
<img src="/images/devopsdays-banner.png" title="devopsdays banner" width="801" height="115" alt="devopdays banner" ><br>
</div>
<div class="span-8 last">
<div class="span-24">
<img src="/images/devopsdays-banner.png" title="devopsdays banner" width="801" height="115" alt="devopdays banner">
</div>
0 ...s-legacy/layouts/partials/headermenu.html → ...-legacy/layouts/partials/header_menu.html
View file
File renamed without changes.
15 changes: 15 additions & 0 deletions themes/devopsdays-legacy/layouts/partials/html_head.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/">

<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript">google.load('jquery', '1.3.2');</script>

<!---This is a combined jAmpersand, jqwindont , jPullquote -->
<script type="text/javascript" src="/js/devops.js"></script>

<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
<!--[if IE]>
<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
<![endif]-->
Loading

0 comments on commit cf4b336

Please sign in to comment.