Skip to content
This repository has been archived by the owner on Mar 16, 2022. It is now read-only.

Commit

Permalink
New header and default layout.
Browse files Browse the repository at this point in the history
  • Loading branch information
jsakuda committed Jun 22, 2014
1 parent 9b226a4 commit 1d45cc4
Show file tree
Hide file tree
Showing 14 changed files with 577 additions and 122 deletions.
14 changes: 14 additions & 0 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="header">
<span><span class="accent">HI</span>CAPACITY</span>
<img class="logo" src="/img/hicap_logo.svg" height="60px">
<div class="subtitle">
<span class="social">a</span>
<span class="social">b</span>
<span class="social">c</span>
<span class="social">e</span>
<span class="social">r</span>
<span class="social">v</span>
<span class="social">Q</span>
<span class="social">,</span>
</div>
</div>
58 changes: 17 additions & 41 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
@@ -1,41 +1,17 @@
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a href="/">
<img src="/img/hicap_logo_sm.png" style="float:left; padding: 10px 9px 0px 9px"></img>
</a>

<nav class="nav-collapse collapse">
<ul class="nav">
<li id="home"><a href="/">Home</a></li>
<li><a href="/calendar">Calendar</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Resources
<b class="caret"></b/>
</a>
<ul class="dropdown-menu">
<li><a href="http://wiki.hicapacity.org/">Wiki</a></li>
<li><a href="http://bit.ly/hicapacity-moderator">Got Ideas?</a></li>
<li><a href="http://groups.google.com/group/honolulu-makerspace">Google Group</a></li>
<li><a href="http://www.techhui.com/group/hicapacity">TechHui</a></li>
<!-- <li><a href="irc://irc.freenode.net/#hicapacity">IRC</a></li> -->
<li><a href="/irc">IRC</a></li>
</ul>
</li>
<li><a href="/events">Events</a></li>
<li><a href="/perks">Perks</a></li>
<li><a href="/membership">Membership</a></li>
<li><a href="/about">About</a></li>
</ul>
<form class="navbar-search" action="/search">
<input type="text" class="search-query" placeholder="Search" name="q" style="border-radius: 4px;"/>
</form>
</nav>
</div> <!-- /container -->
</div> <!-- /navbar-inner -->
</div> <!-- /navbar -->
<div id='cssmenu'>
<ul class="nav">
<li id="home"><a href='/'><span>Home</span></a></li>
<li><a href='/calendar'><span>Calendar</span></a></li>
<li class="has-sub"><a href='#'><span>Resources</span></a>
<ul>
<li><a href='http://bit.ly/hicapacity-moderator'><span>Got Ideas?</span></a></li>
<li><a href='http://www.techhui.com/group/hicapacity'><span>TechHui</span></a></li>
<li><a href='/irc'><span>IRC</span></a></li>
</ul>
</li>
<li><a href='/events'><span>Events</span></a></li>
<li><a href='/services'><span>Services</span></a></li>
<li><a href='/membership'><span>Membership</span></a></li>
<li><a href='/about'><span>About</span></a></li>
</ul>
</div>
92 changes: 14 additions & 78 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,100 +4,36 @@
<title>{{ page.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link href='http://fonts.googleapis.com/css?family=Muli' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap-responsive.css">
<link rel="stylesheet" href="/css/socicon.css">
<link rel="stylesheet" href="/css/site.css">
<link rel="stylesheet" href="/css/events.css">
<link rel="stylesheet" href="/css/github.css">
<link rel="stylesheet" href="/css/css_pirobox/style.css">
<link rel="stylesheet" href="/css/fullcalendar.css">
<link rel="stylesheet" href="/css/menu.css">

<script src="/js/jquery-2.1.1.min.js"></script>
<script src="/js/less-1.1.3.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<!--
<script src="/js/bootstrap-dropdown.js"></script>
<script src="/js/bootstrap-tooltip.js"></script> -->
<script src="/js/dateFormat.min.js"></script>
<script src="/js/events.js"></script>
<script src="/js/github.js"></script>
<script src="/js/pirobox_extended_feb_2011.js"></script>
<script type="text/javascript" src="/js/menu_jquery.js"></script>

<script type="text/javascript">
<script>
$(document).ready(function() {
populateEvents();
populateProjects();

$('.socialMedia').tooltip({ 'placement': 'bottom' }); // tooltips for social media icons

// Setup lightbox
$.piroBox_ext({
piro_speed : 700,
bg_alpha : 0.5,
piro_scroll : true,
piro_drag :false,
piro_nav_pos: 'bottom'
});

// Set the active page on the navigation page
var path = location.pathname.substring(1); // strip the slash in the beginning
path = path.replace(/\/$/, ""); // strip the trailing slash if it exists

if ( path ) {
$('.nav a[href$="' + path + '"]').parent().addClass('active');
}
else {
$('#home').addClass('active');
}

// Insert post comment counts
$('.postComments').each(function(index) {
var element = $(this); // keep the element in scope!
var page_url = element.attr('data-url');
$.getJSON('https://graph.facebook.com/' + page_url, function(json) {
console.log(json);
var comments = 0;
if (json.comments !== undefined) {
comments = json.comments;
}
element.html('Comments (' + comments + ')');
});
});

// Insert urls for share links
$('.postShare').each(function(index) {
var element = $(this); // keep the element in scope!
var share_link = encodeURIComponent(element.attr('data-url'));
var share_title = encodeURIComponent(element.attr('title'));
var url = "http://www.facebook.com/sharer.php?u=" + share_link + "&t=" + share_title;
element.attr('href', url);
});
});
</script>
<meta property="og:title" content="{{ page.title }}" />
<meta property="og:type" content="article" />
<meta property="og:site_name" content="HI Capacity" />
<meta property="og:image" content="http://{{ page.image | image_url }}" />
<meta property="og:description" content="{{ page.description }}" />
</head>

</head>
<body>
{% include navbar.html %}
<!-- <div class="fluid-container sidebar-right" style="min-width: 800px"> -->
<div class="container-fluid">
<div class="row-fluid">
<!-- <div class="fluid-content"> -->
<div class="span9">
{{ content }}
{% include header.html %}
{% include navbar.html %}

<div class="copyright">
&copy HICapacity LLC 2014</script>
</div>
{% include sidebar.html %}
</div>
<div style="clear: both"></div>
</div>
<div class="copyright">
&copy HICapacity LLC <script>document.write((new Date()).getFullYear())</script>
</div>
{% include analytics.html %}
{% include analytics.html %}
</body>
</html>
</html>
103 changes: 103 additions & 0 deletions _layouts/default.old.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
<!DOCTYPE html>
<html>
<head>
<title>{{ page.title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link href='http://fonts.googleapis.com/css?family=Muli' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Questrial' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/bootstrap-responsive.css">
<link rel="stylesheet" href="/css/site.css">
<link rel="stylesheet" href="/css/events.css">
<link rel="stylesheet" href="/css/github.css">
<link rel="stylesheet" href="/css/css_pirobox/style.css">
<link rel="stylesheet" href="/css/fullcalendar.css">
<script src="/js/jquery-2.1.1.min.js"></script>
<script src="/js/less-1.1.3.min.js"></script>
<script src="/js/bootstrap.min.js"></script>
<!--
<script src="/js/bootstrap-dropdown.js"></script>
<script src="/js/bootstrap-tooltip.js"></script> -->
<script src="/js/dateFormat.min.js"></script>
<script src="/js/events.js"></script>
<script src="/js/github.js"></script>
<script src="/js/pirobox_extended_feb_2011.js"></script>

<script type="text/javascript">
$(document).ready(function() {
populateEvents();
populateProjects();

$('.socialMedia').tooltip({ 'placement': 'bottom' }); // tooltips for social media icons

// Setup lightbox
$.piroBox_ext({
piro_speed : 700,
bg_alpha : 0.5,
piro_scroll : true,
piro_drag :false,
piro_nav_pos: 'bottom'
});

// Set the active page on the navigation page
var path = location.pathname.substring(1); // strip the slash in the beginning
path = path.replace(/\/$/, ""); // strip the trailing slash if it exists

if ( path ) {
$('.nav a[href$="' + path + '"]').parent().addClass('active');
}
else {
$('#home').addClass('active');
}

// Insert post comment counts
$('.postComments').each(function(index) {
var element = $(this); // keep the element in scope!
var page_url = element.attr('data-url');
$.getJSON('https://graph.facebook.com/' + page_url, function(json) {
console.log(json);
var comments = 0;
if (json.comments !== undefined) {
comments = json.comments;
}
element.html('Comments (' + comments + ')');
});
});

// Insert urls for share links
$('.postShare').each(function(index) {
var element = $(this); // keep the element in scope!
var share_link = encodeURIComponent(element.attr('data-url'));
var share_title = encodeURIComponent(element.attr('title'));
var url = "http://www.facebook.com/sharer.php?u=" + share_link + "&t=" + share_title;
element.attr('href', url);
});
});
</script>
<meta property="og:title" content="{{ page.title }}" />
<meta property="og:type" content="article" />
<meta property="og:site_name" content="HI Capacity" />
<meta property="og:image" content="http://{{ page.image | image_url }}" />
<meta property="og:description" content="{{ page.description }}" />
</head>

<body>
{% include navbar.html %}
<!-- <div class="fluid-container sidebar-right" style="min-width: 800px"> -->
<div class="container-fluid">
<div class="row-fluid">
<!-- <div class="fluid-content"> -->
<div class="span9">
{{ content }}
</div>
{% include sidebar.html %}
</div>
<div style="clear: both"></div>
</div>
<div class="copyright">
&copy HICapacity LLC <script>document.write((new Date()).getFullYear())</script>
</div>
{% include analytics.html %}
</body>
</html>
Loading

0 comments on commit 1d45cc4

Please sign in to comment.