Permalink
Browse files

merged with Taylors CSS changes

  • Loading branch information...
1 parent 0e3f0af commit d665909f5befc2f383a35f785e7323621496c00c Eduardo Pelegri-Llopart committed Apr 20, 2012
View
@@ -1,7 +1,7 @@
---
layout: basic
-title: BlackBerry® Community Wiki
+title: Welcome to the BlackBerry® Community Wiki
---
{% include common-defs.md %}
View
@@ -1,2 +1,2 @@
-force-prefix: "/Community"
-# force-prefix: ""
+# force-prefix: "/Community"
+force-prefix: ""
@@ -1,7 +1,10 @@
-<html>
+<!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() {
@@ -27,37 +30,41 @@
<!-- End of Google Analytics code -->
</head>
<body>
- <div class="header">
- <div class="logo" onclick="logoClick()">&nbsp;</div>
- <div class="github-logo" onclick="document.location='http://github.com/blackberry'">&nbsp;</div>
+ <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 class="center">
- <table class="content">
- <tr>
+
+ <div id="wrapper">
+ <div id="left">
<!-- Left Column / TOC / Global Navigation -->
<!-- Possibly included, may vary between TOC and Technology?? -->
- {{ lcol }}
+ {{ lcol }}
+ </div>
+
+ <div id="content">
+ <h1>{{ page.title }}</h1>
- <!-- Center Column / Content -->
- <!-- From content provided by page -->
- <td valign="top" class="content-column">
- <div>
- {{ ccol }}
- {{ content }}
+ {% if rcol != "" %}
+ <div id="right">
+ <!-- Right Column / Menu / Entry Highlights -->
+ <!-- Probably included depending on the type of entry -->
+ {{ rcol }}
+ </div>
+ {% endif %}
- </div>
- </td>
- <!-- Right Column / Menu / Entry Highlights -->
- <!-- Probably included depending on the type of entry -->
- {{ rcol }}
+ <!-- Center Column / Content -->
+ <!-- From content provided by page -->
+ {{ ccol }}
+ {{ content }}
- <tr>
- </table>
- <div class="footer">
- <div style="border-style: none none dashed none; border-width: 1px; border-color: Silver;margin-top: 40px;"></div>
- <p style="font-size: 8.5pt;color:Gray;text-decoration:italics;text-align: center;">Copyright 1999-2011 Research In Motion Limited. 295 Phillip Street, Waterloo, Ontario, Canada, N2L 3W8. All Rights Reserved.</p>
+ <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>
@@ -1,18 +1,25 @@
-<td valign="top" class="toc-column">
- <div class="toc">
- <!-- A section -->
- <div class="toc-header">Search</div>
- <div class="toc-item"><a href="{{ base-url }}/news.html">&nbsp;</a></div>
- <div class="toc-header">Quick Links</div>
- <div class="toc-item"><a href="{{ base-url }}/Community_Wiki.html">Home</a></div>
- <div class="toc-item"><a href="{{ base-url }}/BlackBerry_10.html">BlackBerry 10</a></div>
- <div class="toc-item"><a href="{{ base-url }}/Events.html">Events</a></div>
- <div class="toc-item"><a href="{{ base-url }}/Staying_Connected.html">Staying Connected</a></div>
- <div class="toc-item"><a href="{{ base-url }}/Open_Source.html">Open Source</a></div>
- <div class="toc-item"><a href="{{ base-url }}/All_Pages.html">All Pages</a></div>
- <!-- Another section -->
- <div class="toc-header">Other</div>
- <div class="toc-item"><a href="{{ base-url }}/other/Contribute.html">Contribute</a></div>
- <div class="toc-item"><a href="{{ base-url }}/other/Legal.html">Legal</a></div>
- </div>
-</td>
+<div id="toc">
+ <ul>
+ <li>Search
+ <ul>
+ <li><a href="{{ base-url }}/news.html">&nbsp;</a></li>
+ </ul>
+ </li>
+ <li>Quick Links
+ <ul>
+ <li><a href="{{ base-url }}/Community_Wiki.html">Home</a></li>
+ <li><a href="{{ base-url }}/BlackBerry_10.html">BlackBerry 10</a></li>
+ <li><a href="{{ base-url }}/Events.html">Events</a></li>
+ <li><a href="{{ base-url }}/Staying_Connected.html">Staying Connected</a></li>
+ <li><a href="{{ base-url }}/Open_Source.html">Open Source</a></li>
+ <li><a href="{{ base-url }}/All_Pages.html">All Pages</a></li>
+ </ul>
+ </li>
+ <li>Other
+ <ul>
+ <li><a href="{{ base-url }}/other/Contribute.html">Contribute</a></li>
+ <li><a href="{{ base-url }}/other/Legal.html">Legal</a></li>
+ </ul>
+ </li>
+ </ul>
+</div>
@@ -1,19 +1,17 @@
<!-- Right Column / Menu / Entry Highlights -->
<!-- Probably included depending on the type of entry -->
-<td valign="top" class="menu-column">
- <div class="menu">
- <div class="menu-header">{{ page.name }}</div>
- <div class="menu-item"><em>{{ page.oneline }}</em></div>
- <div class="menu-item"><em>Status: </em>{{ page.status }}</div>
- <div class="menu-item"><em>Platform: </em>{{ page.platform }}</div>
+ <table>
+ <caption>{{ page.name }}</caption>
+ <tr><td colspan="2">{{ page.oneline }}</td></tr>
+ <tr><th scope="row">Status</th><td>{{ page.status }}</td></tr>
+ <tr><th scope="row">Platform</th><td>{{ page.platform }}</td></tr>
{% if page.license %}
- <div class="menu-item"><em>License: </em>{{ page.license }}</div>
+ <tr><th scope="row">License</th><td>{{ page.license }}</td></tr>
{% endif %}
{% if page.tags %}
- <div class="menu-item"><em>Tags: </em>{{ page.tags }}</div>
+ <tr><th scope="row">Tags</th><td>{{ page.tags }}</td></tr>
{% endif %}
{% if page.complink %}
- <div class="menu-item"><a href="{{ page.complink }}">Component Site</a></div>
+ <tr><td colspan="2"><a href="{{ page.complink }}">Component Site</a></td></tr>
{% endif %}
- </div>
-</td>
+ </table>
View
@@ -4,20 +4,18 @@
{% if page.oneline %}
{% capture rcol %}
-<td valign="top" class="menu-column">
- <div class="menu">
- <div class="menu-header">{{ page.title }}</div>
- <div class="menu-item"><em>{{ page.oneline }}</em></div>
- {% if page.tags %}
- <div class="menu-item"><em>Tags: </em>{{ page.tags }}</div>
- {% endif %}
- </div>
-</td>
+<table>
+ <caption>{{ page.title }}</caption>
+ <tr><td colspan="2">{{ page.oneline }}</td></tr>
+ {% if page.tags %}
+ <tr><th scope="row">Tags</th><td>{{ page.tags }}</td></tr>
+ {% endif %}
+</table>
{% endcapture %}
{% else %}
-{% assign rcol = "" %}
+{% capture rcol %}{% endcapture %}
{% endif %}
-{% capture ccol %}<h1>{{ page.title }}</h1>{% endcapture %}
+{% capture ccol %}{% endcapture %}
{% include common-include.html %}
View
@@ -3,6 +3,6 @@
{% capture lcol %}{% include default-navigation.html %}{% endcapture %}
{% capture rcol %}{% include default-summary.html %}{% endcapture %}
-{% capture ccol %}<h1>{{ page.title }}</h1>{% endcapture %}
+{% assign ccol = "" %}
{% include common-include.html %}
View
@@ -1,9 +1,9 @@
{% assign base-url = site.force-prefix %}
{% capture lcol %}{% include default-navigation.html %}{% endcapture %}
-{% assign rcol = "" %}
+{% capture rcol %}{% endcapture %}
-{% capture ccol %}<h1>{{ page.title }}</h1>
+{% capture ccol %}
{% if page.details %}
<h3>Details</h3>
{{ page.details | markdownify }}
View
@@ -3,17 +3,15 @@
{% capture lcol %}{% include default-navigation.html %}{% endcapture %}
{% capture rcol %}
-<td valign="top" class="menu-column">
- <div class="menu">
- <div class="menu-header">{{ page.title }}</div>
- <div class="menu-item"><em>{{ page.oneline }}</em></div>
- {% if page.tags %}
- <div class="menu-item"><em>Tags: </em>{{ page.tags }}</div>
- {% endif %}
- </div>
-</td>
+<table>
+ <caption>{{ page.title }}</caption>
+ <tr><td colspan="2">{{ page.oneline }}</td></tr>
+ {% if page.tags %}
+ <tr><th scope="row">Tags</th><td>{{ page.tags }}</td></tr>
+ {% endif %}
+</table>
{% endcapture %}
-{% capture ccol %}<h1>{{ page.title }}</h1>{% endcapture %}
+{% capture ccol %}{% endcapture %}
{% include common-include.html %}
View
@@ -4,26 +4,27 @@
{% if page.oneline %}
{% capture rcol %}
-<td valign="top" class="menu-column">
- <div class="menu">
- <div class="menu-header">{{ page.title }}</div>
- <div class="menu-item"><em>{{ page.oneline }}</em></div>
- {% if page.forum %}
- <div class="menu-item"><em>Forum: </em>{{ page.forum }}</div>
- {% endif %}
- {% if page.tags %}
- <div class="menu-item"><em>Tags: </em>{{ page.tags }}</div>
- {% endif %}
- {% if page.techlink %}
- <div class="menu-item"><a href="{{ page.techlink }}">website</a></div>
- {% endif %}
- </div>
+<table>
+ <caption>{{ page.title }}</caption>
+ <tr><td colspan="2">{{ page.oneline }}</td></tr>
+ {% if page.forum %}
+ <tr><th scope="row">Forum</th><td>{{ page.forum }}</td></tr>
+ {% endif %}
+ {% if page.tags %}
+ <tr><th scope="row">Tags</th><td>{{ page.tags }}</td></tr>
+ {% endif %}
+ {% if page.techlink %}
+ <tr><td colspan="2"><a href="{{ page.techlink }}">Technology Site</a></td></tr>
+ {% endif %}
</td>
+
+</table>
+
{% endcapture %}
{% else %}
-{% assign rcol = "" %}
+{% capture rcol %}{% endcapture %}
{% endif %}
-{% capture ccol %}<h1>{{ page.title }}</h1>{% endcapture %}
+{% capture ccol %}{% endcapture %}
{% include common-include.html %}
Oops, something went wrong.

0 comments on commit d665909

Please sign in to comment.