From 6a9f4c0be2c3bc790973803d5b85070ae2a1366d Mon Sep 17 00:00:00 2001 From: Eduardo Pelegri-Llopart Date: Sun, 15 Apr 2012 13:56:56 -0700 Subject: [PATCH] Local Changes --- All_Pages.md | 58 +++++++++++++++++++++------------------- OpenGL.md | 36 +++++++++++++++++++++++++ PhoneGap.md | 7 ++++- WebGL.md | 24 +++++++++++++---- WebWorks.md | 3 +++ Webkit.md | 23 +++++++++++++--- _ignore/Issues.txt | 10 +++++++ _ignore/TODO.txt | 3 +++ _includes/common-defs.md | 14 ++++++++++ threeJS.md | 2 ++ 10 files changed, 143 insertions(+), 37 deletions(-) create mode 100644 OpenGL.md create mode 100644 _includes/common-defs.md diff --git a/All_Pages.md b/All_Pages.md index f9bad42..12da774 100644 --- a/All_Pages.md +++ b/All_Pages.md @@ -3,39 +3,43 @@ title: All Pages layout: basic --- -This should be an automatically generate list of all the pages in the wiki. +{% include common-defs.md %} -In the meantime, here is a _manually-generated_ listing: +This should be an automatically generate list of all the pages in the wiki, but, in the meantime, here is a _manually-generated_ listing: -Main Pages: +**Technologies, Components, Products** -* [All_Pages](All_Pages.html) -* [Apache Cordova](ApacheCordova.html) -* [bbUI.js](bbUIjs.html) -* [BlackBerry 10](BlackBerry_10.html) -* [Clifford_Hung](Clifford_Hung.html) -* [Community_Wiki](Community_Wiki.html) -* [Frogatto](Frogatto.html) +* [Apache Cordova] +* [bbUI.js] +* [BlackBerry 10] +* [Frogatto] +* [OpenCV] +* [OpenFrameworks] +* [OpenGL] +* [Open Source] +* [threeJS] +* [WebGL] +* [Webkit] +* [WebWorks] + +**People Pages** + +* [Clifford Hung](Clifford_Hung.html) * [Laurence Muller](Laurence_Muller.html) -* [OpenCV](OpenCV.html) -* [OpenFrameworks](OpenFrameworks.html) -* [Open_Source](Open_Source.html) -* [Staying_Connected](Staying_Connected.html) -* [threeJS](threeJS.html) * [Tim Neil](Tim_Neil.html) -* [WebGL](WebGL.html) -* [Webkit](Webkit.html) -* [WebWorks](WebWorks.html) -FAQ Pages: +**FAQ Pages** * none so far. -Other Pages: - -* [other/Contribute](other/Contribute.html) -* [other/Legal](other/Legal.html) -* [other/example-basic](other/example-basic.html) -* [other/example-component](other/example-component.html) -* [other/example-faq](other/example-faq.html) -* [other/example-people](other/example-people.html) \ No newline at end of file +**Other Pages** + +* [All Pages](All_Pages.html) +* [Community Wiki](Community_Wiki.html) +* [Contribute](other/Contribute.html) +* [Legal](other/Legal.html) +* [Staying Connected](Staying_Connected.html) +* [Example: basic](other/example-basic.html) +* [Example: component](other/example-component.html) +* [Example: faq](other/example-faq.html) +* [Example: people](other/example-people.html) \ No newline at end of file diff --git a/OpenGL.md b/OpenGL.md new file mode 100644 index 0000000..0ce6939 --- /dev/null +++ b/OpenGL.md @@ -0,0 +1,36 @@ +--- +name: OpenGL +oneline: High Performance.... OpenGL +status: GA +platform: HTML5 +complink: https://github.com/blackberry/WebGL-Samples +links: + - TBD - Wikipedia + - W3C site + +title: OpenGL +tags: HTML5, Component, WebGL + +description: "OpenGL here..." +contacts: + - whoever + +layout: component +--- + +{% include common-defs.md %} + +Supported in PlayBook 2.0 via [WebWorks](WebWorks.html). +Also supported in the PlayBook 2.0 browser but end-user needs to explicitly allow its use. + +### Additional Links + +Wikipedia +Chronos sitezb + +### Contacts + + +### Also See +[WebGL], [NDK-Samples], [GamePlay] + diff --git a/PhoneGap.md b/PhoneGap.md index 2735efb..fc3f3f5 100644 --- a/PhoneGap.md +++ b/PhoneGap.md @@ -1,6 +1,6 @@ --- name: PhoneGap -oneline: Cross-Platform HTML5 Framework +oneline: Cross-Platform HTML5 Framework [test][1] status: GA platform: HTML5 complink: TBD @@ -13,6 +13,7 @@ layout: component title: PhoneGap - ?? description: "PhoneGap is an Open Source Cross-Platform HTML5 Framework. RIM contributed support for its devices. + Also see [Apache Cordova](Apache_Cordova.html)" contacts: @@ -21,6 +22,7 @@ contacts: tags: OpenSource, HTML5, Component --- +{% include common-defs %} PhoneGap is an Open Source Cross-Platform HTML5 Framework that was developed by Nitobi. RIM participated in PhoneGap to add support for the BlackBerry Smartphones and the BlackBerry PlayBook, and to provide alignment with WebWorks. @@ -29,3 +31,6 @@ Adobe continues to contribute to the technology, currently in the incubator unde [Apache Cordova](Apache_Cordova.html) and provides tools and other services around it. See [Apache Cordova](Apache_Cordova.html). +And see [Apache Cordova][foo]. And see [this is a one][1]. + + [foo]: http://example.com/ (Optional Title Here) diff --git a/WebGL.md b/WebGL.md index aef09ae..dcda1db 100644 --- a/WebGL.md +++ b/WebGL.md @@ -8,14 +8,28 @@ links: - TBD - Wikipedia - W3C site -layout: component - title: WebGL -description: here... +tags: HTML5, Component, WebGL + +description: "WebGL here..." contacts: - '[Jonathan Feldstein]' -tags: HTML5, Component, WebGL + +layout: component --- +{% include common-defs.md %} + Supported in PlayBook 2.0 via [WebWorks](WebWorks.html). -Also supported in the PlayBook 2.0 browser but end-user needs to explicitly allow its use. \ No newline at end of file +Also supported in the PlayBook 2.0 browser but end-user needs to explicitly allow its use. + +### Additional Links +* [Wikipedia](http://en.wikipedia.org/wiki/WebGL) +* [WebGL @ Khronos](http://www.khronos.org/webgl/) +* [WebGL Wiki @ Khronos](http://www.khronos.org/webgl/wiki_1_15/index.php/Main_Page) + +### Contacts +[Jonathan Feldstein], others + +### Also See +[OpenGL], [TunnelTilt], [NDK-Samples] \ No newline at end of file diff --git a/WebWorks.md b/WebWorks.md index 11eff35..5759ce9 100644 --- a/WebWorks.md +++ b/WebWorks.md @@ -24,6 +24,9 @@ contacts: tags: OpenSource, HTML5, Component --- +{% include common-defs.md %} + + Currently the runtime for BlackBerry WebWorks on the BlackBerry smartphones is based on Java while that for the BlackBerry PlayBook is based on Adobe AIR. WebWorks is fully Open Sourced and is developed transparently. diff --git a/Webkit.md b/Webkit.md index 8e4e54e..21b55b8 100644 --- a/Webkit.md +++ b/Webkit.md @@ -5,19 +5,23 @@ status: GA platform: HTML5 complink: https://webkit.org links: - - TBD - Wikipedia + - http://en.wikipedia.org/wiki/WebKit - http://github.com/blackberry/Webkit-Smartphone - http://github.com/blackberry/Webkit-PlayBook -layout: component - title: Webkit +tags: HTML5, Component, Webkit + description: here... contacts: - '[George Staikos]' -tags: HTML5, Component, Webkit + +layout: component --- +{% include common-defs.md %} + + Torch Mobile was an early participant in the Webkit community. RIM acquired Torch Mobile in XXX and RIM first used it in its BB6 smartphones. During DevCon 2010 America, RIM indicated a commitment to re-engaging in the Webkit community @@ -29,3 +33,14 @@ and [WebWorks-PlayBook](http://github.com/blackberry/Webkit-Playbook) repositories. +### Additional Links +[Wikipedia](http://en.wikipedia.org/wiki/WebKit), +[Webkit-Smartphone repo](http://github.com/blackberry/Webkit-Smartphone), +[WebKit-PlayBook repo](http://github.com/blackberry/Webkit-PlayBook) + + +### Contacts + + +### Also See +[HTML5], [WebWorks] \ No newline at end of file diff --git a/_ignore/Issues.txt b/_ignore/Issues.txt index 08a1ee1..3522b7b 100644 --- a/_ignore/Issues.txt +++ b/_ignore/Issues.txt @@ -31,3 +31,13 @@ What are the frameworks / pillars? E.g. HTML5 or WebWorks? === 04 === How to handle "Also see:"? + +>>>>>> NOTE TO SELF <<<<<< + +On how to use more of markdown in wiki + + (0) Manually include the common references in each Wiki page + (1) Create a new filter that uses that map of common references +... + + probably move Description and Contacts from the layout to the free portion of the page diff --git a/_ignore/TODO.txt b/_ignore/TODO.txt index bf37dc2..9a66d98 100644 --- a/_ignore/TODO.txt +++ b/_ignore/TODO.txt @@ -1 +1,4 @@ +GamePlay +NDK-Samples Ripple +TunnelTilt diff --git a/_includes/common-defs.md b/_includes/common-defs.md new file mode 100644 index 0000000..5006fad --- /dev/null +++ b/_includes/common-defs.md @@ -0,0 +1,14 @@ +[apache_cordova]: "The Open Source HTML5 Cross-Platform Framework" +[bbuijs]: "A WebWorks-based Framework to write HTML5 applications using BBOS and BB10 Conventions" +[blackberry_10]: "The next generation BlackBerry Platform" +[frogatto]: "A 2-D Game" +[gameplay]: "Portable, OpenSource Gaming Framework" +[ndksamples]: "Native Samples that can be used with the NDK" +[opencv]: "Language that leverages GPUs" +[openframeworks]: "Open Source Framework for Creative Media Applications" +[opengl]: "Language .." +[open_source]: "Open Source Actvities at RIM" +[threejs]: "A WebL 3-D Framework" +[webgl]: "OpenGL ES 2.0 for the Web" +[webkit]: "An Open Source Browser Layout Engine" +[webworks]: "A framework to write HTML5 Applications for the BlackBerry Platform" diff --git a/threeJS.md b/threeJS.md index 74b9a9c..e4ec162 100644 --- a/threeJS.md +++ b/threeJS.md @@ -18,4 +18,6 @@ contacts: tags: OpenSource, WebWorks, Component, WebGL --- +{% include common-defs.md %} + We have started contributing upstream TBD - Link to OpenBBNews post. Still plenty of work to do. \ No newline at end of file