Skip to content

Commit c1984b1

Browse files
Heather MillerHeather Miller
Heather Miller
authored and
Heather Miller
committed
Added footers across site, with navigation. Reorganized navigation. New js for dropdowns.
1 parent addd89c commit c1984b1

17 files changed

+321
-164
lines changed

‎_includes/cheatsheet-header.txt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/bootstrap.css" type="text/css" />
2222
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
2323
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
24-
25-
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
26-
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/resources/stylesheets/frontpage.css" />
27-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.js"></script>
28-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
29-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.accordionza.js"></script>
30-
<script src="{{ site.baseurl }}/resources/javascript/frontpage.js" type="text/javascript" ></script>
24+
25+
<!-- Base stylesheet for all pages -->
26+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
3127

3228
<!-- table of contents js -->
3329
<script src="{{ site.baseurl }}/resources/javascript/toc.js" type="text/javascript" ></script>

‎_includes/contributing-header.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
2626
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
2727

28+
<!-- Base stylesheet for all pages -->
29+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
30+
2831
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
2932
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
3033
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.accordionza.js"></script>

‎_includes/footer.txt‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,40 @@
1+
<div class="footer">
2+
<div class="container">
3+
<ul>
4+
<li><h5>API</h5></li>
5+
<li><a href="http://www.scala-lang.org/api/current/">Current</a></li>
6+
<li><a href="http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/index.html">Nightly</a></li>
7+
</ul>
8+
<ul>
9+
<li><h5>Learn</h5></li>
10+
<li><a href="{{ site.baseurl }}/overviews">Guides & Overviews</a></li>
11+
<li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
12+
<li><a href="{{ site.baseurl }}/style">Scala Style Guide</a></li>
13+
</ul>
14+
<ul>
15+
<li><h5>Quickref</h5></li>
16+
<li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
17+
<li><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a></li>
18+
</ul>
19+
<ul>
20+
<li><h5>Contribute</h5></li>
21+
<li><a href="http://github.com/scala/scala.github.com">Source Code</a></li>
22+
<li><a href="{{ site.baseurl }}/contribute.html">Contributors Guide</a></li>
23+
</ul>
24+
<ul>
25+
<li><h5>Other Resources</h5></li>
26+
<li><a href="http://wiki.scala-lang.org">Wiki</a></li>
27+
<li><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a></li>
28+
</ul>
29+
</div>
30+
<div class="container copyright">
31+
<p>Copyright &copy; 2011 EPFL. All rights reserved.</p>
32+
</div>
33+
</div>
134

2-
<script type="text/javascript">
3-
$('#toc').toc({exclude: 'h1, h5, h6', context: '', autoId: true, numerate: false});
4-
</script>
35+
<script type="text/javascript">
36+
$('#toc').toc({exclude: 'h1, h5, h6', context: '', autoId: true, numerate: false});
37+
</script>
538

639
<script type="text/javascript">
740
$(function() {

‎_includes/frontpage-content.txt‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<div id="wrapper">
2-
31
<header class="scrollingmenu">
42
<!--<h2>Here is some type of meaningful headline.</h2>-->
53
<h2>Community-driven documentation for Scala.</h2>
@@ -62,15 +60,39 @@
6260
<div class="span8">
6361
<h1>Contributions Welcomed!</h1>
6462
This site was designed so it would be easy for core committers and the community alike to build documentation. We'd love help of any kind-- from detailed articles or overviews of Scala's language features, to help converting documents to markdown.
65-
63+
<p>&nbsp;</p>
6664
<p><b>If you'd like to help us, please see the <a href="{{ site.baseurl }}/contributing.html">Contributing</a> section of the site, and feel free to contact <a href="http://people.epfl.ch/heather.miller">Heather</a>.</b></p>
6765

6866
<div id="recentcomments" class="dsq-widget"><h2 class="dsq-widget-title">Recent Comments</h2><script type="text/javascript" src="http://scalasip.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=32&excerpt_length=200"></script></div>
6967

68+
69+
<script type="text/javascript" charset="utf-8">
70+
var is_ssl = ("https:" == document.location.protocol);
71+
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
72+
document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
73+
</script>
74+
75+
<script type="text/javascript" charset="utf-8">
76+
var feedback_widget_options = {};
77+
78+
feedback_widget_options.display = "overlay";
79+
feedback_widget_options.company = "scaladocs";
80+
feedback_widget_options.placement = "left";
81+
feedback_widget_options.color = "#404040";
82+
feedback_widget_options.style = "idea";
83+
84+
85+
86+
87+
88+
89+
90+
91+
var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
92+
</script>
93+
7094
</div>
7195

7296
</div>
7397
</div>
74-
</div>
75-
76-
</div>
98+
</div>

‎_includes/frontpage-footer.txt‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,36 @@
1-
<script type="text/javascript" charset="utf-8">
2-
var is_ssl = ("https:" == document.location.protocol);
3-
var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
4-
document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
5-
</script>
6-
7-
<script type="text/javascript" charset="utf-8">
8-
var feedback_widget_options = {};
9-
10-
feedback_widget_options.display = "overlay";
11-
feedback_widget_options.company = "scaladocs";
12-
feedback_widget_options.placement = "left";
13-
feedback_widget_options.color = "#404040";
14-
feedback_widget_options.style = "idea";
15-
16-
17-
18-
19-
20-
21-
22-
23-
var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
24-
</script>
25-
1+
<div class="footer">
2+
<div class="container">
3+
<ul>
4+
<li><h5>API</h5></li>
5+
<li><a href="http://www.scala-lang.org/api/current/">Current</a></li>
6+
<li><a href="http://www.scala-lang.org/archives/downloads/distrib/files/nightly/docs/library/index.html">Nightly</a></li>
7+
</ul>
8+
<ul>
9+
<li><h5>Learn</h5></li>
10+
<li><a href="{{ site.baseurl }}/overviews">Guides & Overviews</a></li>
11+
<li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
12+
<li><a href="{{ site.baseurl }}/style">Scala Style Guide</a></li>
13+
</ul>
14+
<ul>
15+
<li><h5>Quickref</h5></li>
16+
<li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
17+
<li><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a></li>
18+
</ul>
19+
<ul>
20+
<li><h5>Contribute</h5></li>
21+
<li><a href="http://github.com/scala/scala.github.com">Source Code</a></li>
22+
<li><a href="{{ site.baseurl }}/contribute.html">Contributors Guide</a></li>
23+
</ul>
24+
<ul>
25+
<li><h5>Other Resources</h5></li>
26+
<li><a href="http://wiki.scala-lang.org">Wiki</a></li>
27+
<li><a href="{{ site.baseurl }}/sips">Scala Improvement Process</a></li>
28+
</ul>
29+
</div>
30+
<div class="container copyright">
31+
<p>Copyright &copy; 2011 EPFL. All rights reserved.</p>
32+
</div>
33+
</div>
2634
</body>
2735
</html>
2836

‎_includes/frontpage-header.txt‎

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,24 @@
2222
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
2323
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
2424

25+
<!-- Base stylesheet for all pages -->
26+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
27+
2528
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
2629
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/resources/stylesheets/frontpage.css" />
27-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.js"></script>
2830
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
2931
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.accordionza.js"></script>
3032
<script src="{{ site.baseurl }}/resources/javascript/frontpage.js" type="text/javascript" ></script>
3133

32-
<!-- prettyprint js to prepend generated pre/code tags -->
33-
<script type="text/javascript">
34-
function styleCode()
35-
{
36-
if (typeof disableStyleCode != "undefined")
37-
{
38-
return;
39-
}
40-
var a = false;
41-
$("pre code").parent().each(function()
42-
{
43-
if (!$(this).hasClass("prettyprint"))
44-
{
45-
$(this).addClass("prettyprint lang-scala linenums");
46-
a = true
47-
}
48-
});
49-
if (a) { prettyPrint() }
50-
}
51-
</script>
5234

5335
<style type="text/css">
54-
html, body {
36+
html {
37+
background-color: #bcbcbc;
38+
}
39+
40+
body {
5541
padding-top: 36px;
56-
height: 100%;
42+
height: 100%;
5743
background:url({{ site.baseurl }}/resources/images/bg.jpg) no-repeat top center #310808;
5844
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
5945
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
@@ -74,7 +60,6 @@
7460
text-shadow: 0 1px 2px rgba(0,0,0,.5);
7561
}
7662
.bottom {
77-
height: 100%;
7863
background-color: #bcbcbc;
7964
padding-top: 20px;
8065
border-top: 1px solid #8e397d;
@@ -130,11 +115,7 @@
130115
width: 0;
131116
}
132117

133-
/* every page should need this */
134-
input, textarea, select, .uneditable-input {
135-
width: 165px;
136-
}
137-
118+
138119
</style>
139120

140121
</head>

‎_includes/index-header.txt‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/prettify.css" type="text/css" />
1515
<script src="{{ site.baseurl }}/resources/javascript/prettify/prettify.js" type="text/javascript" ></script>
1616

17-
<!-- search CSS -->
18-
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/search.css" type="text/css" />
19-
2017
<!-- jquery js -->
2118
<script src="{{ site.baseurl }}/resources/javascript/jquery.js" type="text/javascript" ></script>
2219

@@ -25,15 +22,8 @@
2522
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown.js" type="text/javascript" ></script>
2623
<script src="{{ site.baseurl }}/resources/javascript/bootstrap-dropdown-app.js" type="text/javascript" ></script>
2724

28-
<!-- You may want to change the paths below, according to your own CSS and JavaScript setup -->
29-
<link rel="stylesheet" type="text/css" href="{{ site.baseurl }}/resources/stylesheets/frontpage.css" />
30-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.js"></script>
31-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.easing.js"></script>
32-
<script type="text/javascript" src="{{ site.baseurl }}/resources/javascript/jquery.accordionza.js"></script>
33-
<script src="{{ site.baseurl }}/resources/javascript/frontpage.js" type="text/javascript" ></script>
34-
35-
<!-- table of contents js -->
36-
<script src="{{ site.baseurl }}/resources/javascript/toc.js" type="text/javascript" ></script>
25+
<!-- Base stylesheet for all pages -->
26+
<link rel="stylesheet" href="{{ site.baseurl }}/resources/stylesheets/base.css" type="text/css" />
3727

3828
<!-- prettyprint js to prepend generated pre/code tags -->
3929
<script type="text/javascript">
@@ -55,16 +45,31 @@
5545
if (a) { prettyPrint() }
5646
}
5747
</script>
48+
49+
<script type="text/javascript">
50+
jQuery(document).ready(function($) {
51+
52+
var offset = $(".push").height() + $(".scrollingmenu").height() + 36;
53+
if ( offset + $('.bottom').height() < $(window).height() ) {
54+
var height = $(window).height() - offset;
55+
$('.bottom').css("height", height);
56+
}
57+
58+
});
59+
</script>
60+
5861

5962
<style type="text/css">
60-
html, body {
63+
64+
body {
6165
padding-top: 36px;
6266
height: 100%;
6367
background:url({{ site.baseurl }}/resources/images/bg-short.jpg) no-repeat top center #310808;
6468
-webkit-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
6569
-moz-box-shadow: inset 0 10px 50px rgba(0,0,0,.6);
6670
/* box-shadow: inset 0 10px 30px rgba(0,0,0,.3);*/
6771
}
72+
6873
.scrollingmenu {
6974
width: 940px;
7075
margin-left: auto;
@@ -79,11 +84,8 @@
7984
line-height: 1;
8085
text-shadow: 0 1px 2px rgba(0,0,0,.5);
8186
}
82-
.container {
83-
min-height: 100%;
84-
}
87+
8588
.bottom {
86-
min-height: 100%;
8789
background-color: #bcbcbc;
8890
padding-top: 20px;
8991
border-top: 1px solid #8e397d;
@@ -228,11 +230,13 @@
228230
color: #aaaaaa;
229231
}
230232

231-
.page-header-index{margin-bottom:17px;border-bottom:1px solid #808080;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
232-
233-
input, textarea, select, .uneditable-input {
234-
width: 165px;
235-
}
233+
.page-header-index{
234+
margin-bottom:17px;
235+
border-bottom:1px solid #808080;
236+
-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
237+
-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
238+
box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);
239+
}
236240

237241
</style>
238242

‎_includes/topbar.txt‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,26 @@
1717
</ul>
1818
</li>
1919

20-
<li><a href="{{ site.baseurl }}/overviews">Guides</a></li>
21-
<li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
22-
<li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
23-
<li><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a></li>
24-
<li><a href="{{ site.baseurl }}/style">Style Guide</a></li>
25-
<li><a href="{{ site.baseurl }}/contributing.html">Contributing</a></li>
20+
<li class="menu">
21+
<a href="#" class="menu">Learn</a>
22+
<ul class="menu-dropdown">
23+
<li><a href="{{ site.baseurl }}/overviews">Guides & Overviews</a></li>
24+
<li><a href="{{ site.baseurl }}/tutorials">Tutorials</a></li>
25+
<li><a href="{{ site.baseurl }}/style">Scala Style Guide</a></li>
26+
</ul>
27+
</li>
28+
29+
<li class="menu">
30+
<a href="#" class="menu">Quickref</a>
31+
<ul class="menu-dropdown">
32+
<li><a href="{{ site.baseurl }}/glossary">Glossary</a></li>
33+
<li><a href="{{ site.baseurl }}/cheatsheets">Cheatsheets</a></li>
34+
</ul>
35+
</li>
36+
37+
<li><a href="{{ site.baseurl }}/contribute.html">Contribute</a></li>
38+
<li><a href="{{ site.baseurl }}/sips">SIPs</a></li>
39+
<li><a href="http://wiki.scala-lang.org">Wiki</a></li>
2640
</ul>
2741
<form method="get" id="searchform" action="{{ site.baseurl }}/search.html">
2842
<input type="text" placeholder="Search" class="field" name="q" id="q"/>
@@ -31,4 +45,4 @@
3145
</ul>
3246
</div>
3347
</div>
34-
</div>
48+
</div>

0 commit comments

Comments
 (0)