Permalink
Browse files

Cleaned up the Note machinery in col2 and col3

  • Loading branch information...
1 parent 7765191 commit 8141a2a6697fc3c165ca2ef1a85dfd9a20faadd5 @pelegri pelegri committed Jul 6, 2012
Showing with 94 additions and 6 deletions.
  1. +8 −5 Wanted_Pages.md
  2. +69 −0 _includes/col2-include.html
  3. +3 −1 _includes/col3-include.html
  4. +7 −0 _layouts/col2.html
  5. +7 −0 css/github.css
View
@@ -1,16 +1,19 @@
---
-layout: col3
+layout: col2
title: Wanted Pages
-note: "This is a list of all the wanted pages. As you provide the content for a Wanted page, remember to
-move it from here to All_Pages.md. Also remember to add it to Recent_Pages.md and to
-the map in _includes/common-defs.md"
+note: "A list of all the wanted pages; some are just Names with brief notes; some are pages under construction.\
+\n
+Editors will periodically do passes through the names and create pages that can be edited easily\
+\n
+As you complete a page, remember to remove it from here and add it to All Pages, Recent Pages and the common-defs map"
---
{% include common-defs.md %}
-### Just Names
+### Names
* Wikitude - Wikitude.com
* Immigration Projects
+* FreeImage - [home](http://freeimage.sourceforge.net/license.html), [tweet](http://bit.ly/MaMulx)/[@lynxluna](http://twitter.com/lynxluna), [repo](https://github.com/lynxluna/freeimage)
### Pages
* [Android](Android.html)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>{{ page.title }}</title>
+ <link id="stylesheet" href="{{ base-url }}/css/github.css" rel="stylesheet" type="text/css"></link>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <script type="text/javascript">
+
+ function logoClick() {
+ document.location = 'http://' + document.location.host;
+ }
+
+ </script>
+<!-- Start of Google Analytics code -->
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-28534102-2']);
+ _gaq.push(['_setDomainName', 'github.com']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script>
+<!-- End of Google Analytics code -->
+ </head>
+ <body>
+ <div id="header_wrap">
+ <div id="header">
+ <p id="blackberry-logo"><img src="{{ base-url }}/images/logo.png" alt="BlackBerry" /> Community Wiki</p>
+ <a id="github-logo" href="#"><img src="{{ base-url }}/images/github-logo.png" alt="Github" /></a>
+ </div>
+ </div>
+
+ <div id="wrapper">
+ <div id="left">
+ <!-- Left Column / TOC / Global Navigation -->
+ <!-- Possibly included, may vary between TOC and Technology?? -->
+ {{ lcol }}
+ </div>
+
+ <div id="content">
+ <h1>{{ page.title }}</h1>
+
+{% if page.note %}
+<p style="margin-top:10px; margin-bottom: 10px;">
+<strong>Note</strong>
+<br/>
+{{ page.note | newline_to_br }}
+</p>
+{% endif %}
+ <!-- content provided by page -->
+ <div id="col2">
+ {{ content }}
+ </div>
+
+ <p id="copyright" style="font-size: 8.5pt; text-align: center;">Copyright 1999-2011 Research In Motion Limited. 295 Phillip Street, Waterloo, Ontario, Canada, N2L 3W8. All Rights Reserved.</p>
+ </div>
+
+
+ </div>
+
+ </body>
+</html>
@@ -49,7 +49,9 @@ <h1>{{ page.title }}</h1>
{% if page.note %}
<p style="margin-top:10px; margin-bottom: 10px;">
-<strong>Note</strong> - {{ page.note }}
+<strong>Note</strong>
+<br/>
+{{ page.note | newline_to_br }}
</p>
{% endif %}
<!-- content provided by page -->
View
@@ -0,0 +1,7 @@
+{% assign base-url = site.baseurl %}
+
+{% capture lcol %}{% include default-navigation.html %}{% endcapture %}
+{% capture rcol %}{% endcapture %}
+{% capture ccol %}{% endcapture %}
+
+{% include col2-include.html %}
View
@@ -206,6 +206,13 @@ h4 {
padding-top: 10px;
}
+#col2 {
+ column-count: 2;
+ -moz-column-count: 2;
+ -webkit-column-count: 2;
+ padding-top: 10px;
+}
+
table.plaintable {
border-width: 0px;
border-spacing: 2px;

0 comments on commit 8141a2a

Please sign in to comment.