Skip to content

Commit 5d73a9e

Browse files
committed
sidenav fix
- temp fix - todo: something about the way the toc.js is implemented in the layout requires the js scripts to be in the header - see: http://projects.jga.me/toc/#toc3
1 parent 23531e0 commit 5d73a9e

File tree

1 file changed

+127
-142
lines changed

1 file changed

+127
-142
lines changed

_layouts/bootstrap.html

Lines changed: 127 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -10,128 +10,122 @@
1010
</title>
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
13+
14+
<!-- CSS -->
1315
<link href='http://fonts.googleapis.com/css?family=Philosopher&amp;subset=latin' rel='stylesheet' type='text/css'>
14-
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css">
16+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css" rel="stylesheet">
17+
1518
<link rel="stylesheet" href="/css/codeception.css">
1619
<link rel="stylesheet" href="/css/contributors.css">
1720
<link rel="stylesheet" type="text/css" media="screen" href="/css/syntax.css">
21+
<!-- SCRIPTS -->
1822
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js" type="text/javascript"></script>
23+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
1924
<script src="/js/jquery.toc.min.js" type="text/javascript" charset="utf-8"></script>
2025
<script src="/js/contributors.js" type="text/javascript" charset="utf-8"></script>
2126

27+
<!-- Other -->
2228
<link title="Codeception Blog" type="application/rss+xml" rel="alternate" href="/rss.xml">
2329
<link rel="shortcut icon" href="/images/favicon.png">
2430
<link rel="author" href="https://plus.google.com/+Codeception">
2531
</head>
32+
2633
<body>{% capture guides %}{% include guides.html %}{% endcapture %}
27-
{% capture modules %}{% include modules.html %}{% endcapture %}
28-
{% capture reference %}{% include reference.html %}{% endcapture %}
29-
<nav class="navbar nav-custom navbar-inverse">
30-
<div class="container">
31-
<div class="navbar-header">
32-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
33-
<span class="sr-only">Toggle navigation</span>
34-
<span class="icon-bar"></span>
35-
<span class="icon-bar"></span>
36-
<span class="icon-bar"></span>
37-
</button>
38-
<a href="/" class="navbar-brand"><img src="/images/toplogo.png" alt="codeception"/></a>
39-
</div>
40-
<div class="navbar-inner">
41-
<ul class="nav navbar-nav navbar-collapse collapse menu">
42-
<li>
43-
<a href="/quickstart">Quickstart</a>
44-
</li>
45-
<li>
46-
</li>
47-
<li class="dropdown">
48-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Guides
49-
<b class="caret"></b>
50-
</a>
51-
<ul class="dropdown-menu">
52-
{{ guides }}
53-
</ul>
54-
</li>
55-
<li class="dropdown">
56-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Modules
57-
<b class="caret"></b>
58-
</a>
59-
<ul class="dropdown-menu dropdown-modules">
60-
{{ modules }}
61-
</ul>
62-
</li>
63-
<li class="dropdown">
64-
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Reference
65-
<b class="caret"></b>
66-
</a>
67-
<ul class="dropdown-menu">
68-
{{ reference }}
34+
{% capture modules %}{% include modules.html %}{% endcapture %}
35+
{% capture reference %}{% include reference.html %}{% endcapture %}
36+
<nav class="navbar nav-custom navbar-inverse">
37+
<div class="container">
38+
<div class="navbar-header">
39+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
40+
<span class="sr-only">Toggle navigation</span>
41+
<span class="icon-bar"></span>
42+
<span class="icon-bar"></span>
43+
<span class="icon-bar"></span>
44+
</button>
45+
<a href="/" class="navbar-brand"><img src="/images/toplogo.png" alt="codeception"/></a>
46+
</div>
47+
<div class="collapse navbar-collapse menu ">
48+
<ul class="nav navbar-nav navbar-left">
49+
<li><a href="/quickstart">Quick Start</a></li>
6950
</ul>
70-
</li>
71-
<li>
72-
<a href="/video">Video</a>
73-
</li>
74-
<li>
75-
<a href="/blog">Blog</a>
76-
</li>
77-
<li class="dropdown">
78-
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
79-
Community
80-
<b class="caret"></b>
81-
</a>
82-
<ul class="dropdown-menu">
83-
<li><a href="http://phptest.club/category/codeception">Community Forum</a></li>
84-
<li><a href="http://automated-testing.info/category/codeception">Russian Community</a></li>
85-
<li><a href="http://stackoverflow.com/questions/tagged/codeception">StackOverflow</a></li>
51+
<ul class="nav navbar-nav navbar-right">
52+
<li class="dropdown">
53+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Guides
54+
<b class="caret"></b>
55+
</a>
56+
<ul class="dropdown-menu">
57+
{{ guides }}
58+
</ul>
59+
</li>
60+
<li class="dropdown">
61+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Modules
62+
<b class="caret"></b>
63+
</a>
64+
<ul class="dropdown-menu dropdown-modules">
65+
{{ modules }}
66+
</ul>
67+
</li>
68+
<li>
69+
<a href="/addons">Extensions</a>
70+
</li>
71+
<li class="dropdown">
72+
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> Reference
73+
<b class="caret"></b>
74+
</a>
75+
<ul class="dropdown-menu">
76+
{{ reference }}
77+
</ul>
78+
</li>
79+
<li class="dropdown">
80+
<a class="dropdown-toggle" data-toggle="dropdown" href="http://phptest.club/category/codeception">
81+
Community
82+
<b class="caret"></b>
83+
</a>
84+
<ul class="dropdown-menu">
85+
<li><a href="/blog">Blog</a> </li>
86+
<li><a href="http://phptest.club/category/codeception">Community Forum</a></li>
87+
<li><a href="http://automated-testing.info/category/codeception">Russian Community</a></li>
88+
<li><a href="http://stackoverflow.com/questions/tagged/codeception">StackOverflow</a></li>
89+
<li><a href="/video">Nettuts+ Video Course</a></li>
90+
</ul>
91+
</li>
8692
</ul>
87-
</li>
88-
<li>
89-
<a href="/credits">Credits</a>
90-
</li>
91-
<li>
92-
<a href="/install">Install</a>
93-
</li>
94-
<li>
95-
<a href="/addons">Addons</a>
96-
</li>
97-
<li>
98-
<a href="/changelog">Changelog</a>
99-
</li>
100-
</ul>
101-
</div>
102-
</div> <!-- /.container -->
103-
</nav>
104-
<div class="container">
105-
{{ content }}
106-
</div>
107-
<div id="footer">
93+
</div>
94+
</div> <!-- /.container -->
95+
</nav>
96+
97+
<!-- CONTENT -->
10898
<div class="container">
109-
<div class="row">
110-
<div class="col-sm-4 col-lg-4">
111-
<h3>Credits</h3>
99+
{{ content }}
100+
</div>
101+
102+
<div id="footer">
103+
<div class="container">
104+
<div class="row">
105+
<div class="col-sm-4 col-lg-4">
106+
<h3>Credits</h3>
112107

113-
<p>
114-
Codeception is a BDD-styled PHP testing framework, brought to you by <a href="http://codeception.com/credits">Codeception Team</a>.
115-
Logo by <a
108+
<p>
109+
Codeception is a BDD-styled PHP testing framework, brought to you by <a href="http://codeception.com/credits">Codeception Team</a>.
110+
Logo by <a
116111
href="https://twitter.com/adnanblog">Mr. Adnan</a>. OpenSource <strong>MIT Licensed</strong>.
117-
</p>
112+
</p>
118113

119-
<div>
114+
<div>
115+
<a href="https://github.com/codeception/codeception" class="pull-left">
116+
<img src="/images/github.png">
117+
</a>
120118

121-
<a href="https://github.com/codeception/codeception" class="pull-left">
122-
<img src="/images/github.png">
123-
</a>
119+
<a href="https://twitter.com/codeception" class="pull-left">
120+
<img src="/images/twitter.png">
121+
</a>
124122

125-
<a href="https://twitter.com/codeception" class="pull-left">
126-
<img src="/images/twitter.png">
127-
</a>
128-
129-
<a href="http://www.facebook.com/pages/Codeception/288959711204412" class="pull-left">
130-
<img src="/images/facebook.png">
131-
</a>
123+
<a href="http://www.facebook.com/pages/Codeception/288959711204412" class="pull-left">
124+
<img src="/images/facebook.png">
125+
</a>
132126

133-
<a href="https://plus.google.com/b/108429499160233541695/108429499160233541695/posts"
134-
class="pull-left">
127+
<a href="https://plus.google.com/b/108429499160233541695/108429499160233541695/posts"
128+
class="pull-left">
135129
<img src="/images/gplus.png">
136130
</a>
137131

@@ -141,21 +135,19 @@ <h3>Credits</h3>
141135
<h4>Sponsored by</h4>
142136
<a href="https://www.rebilly.com/">
143137
<img src="/images/Rebilly.png" style="width:300px;" alt="Your Partner
144-
In Subscription Billing
145-
Uncover your revenue potential with
146-
our recurring billing software." title="Your Partner
147-
In Subscription Billing">
138+
In Subscription Billing
139+
Uncover your revenue potential with
140+
our recurring billing software." title="Your Partner
141+
In Subscription Billing">
148142
</a>
149-
150-
151-
<!-- <a href="http://2amigos.us/">
152-
<img src="/images/2amigos.png" style="opacity: 0.7"
153-
alt="Sponsored by 2AmigOS web development and consultancy in Miami"
154-
title="Sponsored by 2AmigOS web development and consultancy in Miami">
155-
</a>
156-
--> </div>
157-
158-
143+
<!--
144+
<a href="http://2amigos.us/">
145+
<img src="/images/2amigos.png" style="opacity: 0.7"
146+
alt="Sponsored by 2AmigOS web development and consultancy in Miami"
147+
title="Sponsored by 2AmigOS web development and consultancy in Miami">
148+
</a>
149+
-->
150+
</div>
159151
</div>
160152

161153
<div class="col-sm-8 col-lg-8">
@@ -164,28 +156,24 @@ <h3>Thanks to all our contributors</h3>
164156
<div id="contributors"></div>
165157

166158
<div>
167-
<div class="addthis_toolbox addthis_default_style ">
168-
<a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
169-
<a class="addthis_button_tweet"></a>
170-
<a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
171-
</div>
172-
<script type="text/javascript">var addthis_config = {"data_track_addressbar":true};</script>
173-
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-501c6975683af72f"></script>
174-
175-
</div>
176-
177-
</div>
178-
</div>
179-
</div>
180-
</div>
181-
<div id="copyright">
159+
<div class="addthis_toolbox addthis_default_style ">
160+
<a class="addthis_button_facebook_like" fb:like:layout="button_count"></a>
161+
<a class="addthis_button_tweet"></a>
162+
<a class="addthis_button_google_plusone" g:plusone:size="medium"></a>
163+
</div>
164+
<script type="text/javascript">var addthis_config = {"data_track_addressbar":true};</script>
165+
<script type="text/javascript" src="http://s7.addthis.com/js/250/addthis_widget.js#pubid=ra-501c6975683af72f"></script>
166+
167+
</div>
168+
</div>
169+
</div>
170+
</div>
171+
<div id="copyright">
182172
© 2011&ndash;{{ site.time | date: '%Y' }}
183173
</div>
174+
</div>
184175

185-
186-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
187176
<script type="text/javascript">
188-
189177
var _gaq = _gaq || [];
190178
_gaq.push(['_setAccount', 'UA-1899308-9']);
191179
_gaq.push(['_trackPageview']);
@@ -198,7 +186,6 @@ <h3>Thanks to all our contributors</h3>
198186
var s = document.getElementsByTagName('script')[0];
199187
s.parentNode.insertBefore(ga, s);
200188
})();
201-
202189
</script>
203190

204191
<script>
@@ -212,14 +199,12 @@ <h3>Thanks to all our contributors</h3>
212199

213200
<div id="bugira_widget" style="position: fixed; right: 10px; bottom: 0px;"></div>
214201
<script type="text/javascript">var __bugira_config = {"api_key": "dste248173q7"};
215-
(function () {
216-
var w = document.createElement('script');
217-
w.type = 'text/javascript';
218-
w.async = true;
219-
w.src = 'http://bugiracdn.appspot.com/bugira-widget.js';
220-
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(w);
221-
})();</script>
222-
223-
202+
(function () {
203+
var w = document.createElement('script');
204+
w.type = 'text/javascript';
205+
w.async = true;
206+
w.src = 'http://bugiracdn.appspot.com/bugira-widget.js';
207+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(w);
208+
})();</script>
224209
</body>
225210
</html>

0 commit comments

Comments
 (0)