From deacc91328d5d9259f8820f57bb7c36dc6cc3602 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:16:50 -0700 Subject: [PATCH 001/230] Create search.md --- search.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 search.md diff --git a/search.md b/search.md new file mode 100644 index 00000000..dc467423 --- /dev/null +++ b/search.md @@ -0,0 +1,18 @@ +--- +layout: cloud +title: Search Results +toc: main +--- + + From 97591fb5e627e9650feaa43efc7236cb00e57bf6 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:21:05 -0700 Subject: [PATCH 002/230] Update cloud.html --- _layouts/cloud.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index fd113d55..ceb8b79f 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -18,10 +18,10 @@
-
+
Google Cloud Platform - +
-
+
From 1770f230f2dde6d6dd5a9416990b6836346c266e Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:24:34 -0700 Subject: [PATCH 004/230] Update sidebar.js --- js/sidebar.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/sidebar.js b/js/sidebar.js index b59b6ca3..b63629bd 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -16,4 +16,8 @@ $(".tlw-control").click(function() { } }); +$("#searchButton").click(function() { + window.location.replace("http://googledevdocs.github.io/search?q=" + $("#q").val()); +}); + }); // end "ready" From 623c29e16fdaa67f4e2f3b19f55b4c7413ba10ad Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:25:52 -0700 Subject: [PATCH 005/230] Update cloud.html --- _layouts/cloud.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index ca3f328b..781662e2 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -18,13 +18,15 @@
-
+
+
Google Cloud Platform
+
From 4dcc564c512eafd7bfbe64c6f97a93a2cf2cd1eb Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:27:36 -0700 Subject: [PATCH 006/230] Update cloud.html --- _layouts/cloud.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index 781662e2..07af82f7 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -18,7 +18,7 @@
-
+
Google Cloud Platform From 4940301a158e72712ac592e49d54accc64da33bc Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:37:08 -0700 Subject: [PATCH 007/230] Update sidebar.js --- js/sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/sidebar.js b/js/sidebar.js index b63629bd..0d67ec9f 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -17,7 +17,7 @@ $(".tlw-control").click(function() { }); $("#searchButton").click(function() { - window.location.replace("http://googledevdocs.github.io/search?q=" + $("#q").val()); + window.location.replace("/search?q=" + $("#q").val()); }); }); // end "ready" From e03d14a4211da778f95d20f59f9a74099fd9f8d5 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:39:02 -0700 Subject: [PATCH 008/230] Update cloud.html --- _layouts/cloud.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index 07af82f7..4b7a1107 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -18,14 +18,14 @@
- +
Google Cloud Platform
- +
From 1ae183c931f926cef6eb31697511d4ab08a41357 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:39:19 -0700 Subject: [PATCH 009/230] Update cloud.html --- _layouts/cloud.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index 4b7a1107..d79246fe 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -23,9 +23,9 @@ Google Cloud Platform -
+ Search -
+ From 2d2d375bdb018e7b5da5e7397a0bb6d5405d46a7 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:40:29 -0700 Subject: [PATCH 010/230] Update cloud.html --- _layouts/cloud.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/cloud.html b/_layouts/cloud.html index d79246fe..211df38c 100644 --- a/_layouts/cloud.html +++ b/_layouts/cloud.html @@ -18,14 +18,14 @@
-
+
Google Cloud Platform
- +
From fdd8a7a392d2425e13816b4c9f4ff21f67a92bf4 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 17:49:22 -0700 Subject: [PATCH 011/230] Adding Google Webmaster Tools verification file --- googledb1a1313d9ca6e35.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 googledb1a1313d9ca6e35.html diff --git a/googledb1a1313d9ca6e35.html b/googledb1a1313d9ca6e35.html new file mode 100644 index 00000000..5379ad93 --- /dev/null +++ b/googledb1a1313d9ca6e35.html @@ -0,0 +1 @@ +google-site-verification: googledb1a1313d9ca6e35.html \ No newline at end of file From a7e171dc895748192ac445f126872e536cdf1a4b Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 21 May 2014 18:16:51 -0700 Subject: [PATCH 012/230] Update search.md --- search.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/search.md b/search.md index dc467423..aa322855 100644 --- a/search.md +++ b/search.md @@ -3,6 +3,11 @@ layout: cloud title: Search Results toc: main --- + + From f594fd094b1e3cced9dddf540b0d4e2291c6514d Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Thu, 22 May 2014 12:46:53 -0700 Subject: [PATCH 017/230] Update search.md --- search.md | 1 + 1 file changed, 1 insertion(+) diff --git a/search.md b/search.md index 5f165a41..1a3ca39d 100644 --- a/search.md +++ b/search.md @@ -2,6 +2,7 @@ layout: cloud title: Search Results toc: main +rawtables: true ---
{% endcapture %} +{% capture feed %} +function parseRSS(url, callback) { + $.ajax({ + url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent(url), + dataType: 'json', + success: function(data) { + callback(data.responseData.feed); + } + }); +} From a54cc30e2b789be93d0c87d703769a9280b066f7 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 10 Jun 2014 22:05:45 -0700 Subject: [PATCH 038/230] Update jswidgets.html --- _includes/jswidgets.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 53e1b5c1..8e9c991f 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -60,3 +60,4 @@ } }); } +{% endcapture %} From ff9f43e350865f68b4c8b84440fbe7b24e759b60 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 10 Jun 2014 22:06:40 -0700 Subject: [PATCH 039/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 8e9c991f..74be813a 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -53,7 +53,7 @@ {% capture feed %} function parseRSS(url, callback) { $.ajax({ - url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent(url), + url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedurl}}"), dataType: 'json', success: function(data) { callback(data.responseData.feed); From 5319a69e91cbe80d069f16b915b72ef1a292df4c Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 10 Jun 2014 22:08:43 -0700 Subject: [PATCH 040/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 74be813a..5373aac6 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -56,7 +56,7 @@ url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedurl}}"), dataType: 'json', success: function(data) { - callback(data.responseData.feed); + document.write(data.responseData.feed); } }); } From 37a075b9eee125b20a7a5f366fbbbdd3f13fb636 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Tue, 10 Jun 2014 22:14:16 -0700 Subject: [PATCH 041/230] Update jswidgets.html --- _includes/jswidgets.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 5373aac6..a37991fe 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -51,13 +51,18 @@
{% endcapture %} {% capture feed %} + {% endcapture %} From 5ec6d8c25c36695e4a0f5b630fd8336648d6901f Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:31:59 -0700 Subject: [PATCH 042/230] Update index.md --- index.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.md b/index.md index 9ad19039..a464515a 100644 --- a/index.md +++ b/index.md @@ -74,6 +74,13 @@ print s | col 2 is | centered | $12 | | zebra stripes | are neat | $1 | +## Stack Overflow feed + +{% assign feedURL="http://stackoverflow.com/feeds/tag?tagnames=google-app-engine+task-queue&sort=votes" %} +{% assign feedID="testFeed" %} +{% include jswidgets.html %} +{{ feed }} + ## Last Build [![Build Status](https://travis-ci.org/GoogleDevDocs/googledevdocs.github.io.svg?branch=master)](https://travis-ci.org/GoogleDevDocs/googledevdocs.github.io) From 0f4796260b7ac4a60524d8aedc949a94c0d34164 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:34:23 -0700 Subject: [PATCH 043/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index a37991fe..6ad8523e 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -63,6 +63,6 @@ } $(document).ready(function(){ }); -
+
{% endcapture %} From 85fc50043bbfa734b553d5484d69a720e4e14b2a Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:36:11 -0700 Subject: [PATCH 044/230] Update jswidgets.html --- _includes/jswidgets.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 6ad8523e..6d510b72 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -62,6 +62,7 @@ }); } $(document).ready(function(){ + parseRSS({{feedURL}}) });
From c1b9866da8e992856591646352f37ccc0e638a5d Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:36:48 -0700 Subject: [PATCH 045/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 6d510b72..3a485ad3 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -62,7 +62,7 @@ }); } $(document).ready(function(){ - parseRSS({{feedURL}}) + parseRSS("{{feedURL}}") });
From 6ace51f5b1867809ee98c96ae70d84b2bc4b732f Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:37:23 -0700 Subject: [PATCH 046/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 3a485ad3..d05b1ed4 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -57,7 +57,7 @@ url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedURL}}"), dataType: 'json', success: function(data) { - $("${{feedID}}").append('

' + data.responseData.feed + '

'); + $("#{{feedID}}").append('

' + data.responseData.feed + '

'); } }); } From de0c573c5608e4b7c5201526045710122de3fd43 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:41:01 -0700 Subject: [PATCH 047/230] Update jswidgets.html --- _includes/jswidgets.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index d05b1ed4..f5057644 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -57,7 +57,9 @@ url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedURL}}"), dataType: 'json', success: function(data) { - $("#{{feedID}}").append('

' + data.responseData.feed + '

'); + for(i=0;i' + data.responseData.feed[i].title + '

'); + } } }); } From d1aa35e7f31d93c3bcdeb9d84bbc82612a33ccf8 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:42:31 -0700 Subject: [PATCH 048/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index f5057644..91b6dd44 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -58,7 +58,7 @@ dataType: 'json', success: function(data) { for(i=0;i' + data.responseData.feed[i].title + '

'); + $("#{{feedID}}").append('

' + data.responseData.feed.length + ' feed, entries: ' + data.responseData.feed.entries.length + '

'); } } }); From d7d5c86802b9d5f601aa0e69cb783f0993104af7 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:43:27 -0700 Subject: [PATCH 049/230] Update jswidgets.html --- _includes/jswidgets.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 91b6dd44..7dd89151 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -57,8 +57,8 @@ url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedURL}}"), dataType: 'json', success: function(data) { - for(i=0;i' + data.responseData.feed.length + ' feed, entries: ' + data.responseData.feed.entries.length + '

'); + for(i=0;i' + data.responseData.feed.entries[i].title + '

'); } } }); From bae1b56bb8fa05616d156e03213de912efe8f363 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 10:48:17 -0700 Subject: [PATCH 050/230] Update jswidgets.html --- _includes/jswidgets.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 7dd89151..16b25531 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -57,8 +57,10 @@ url: document.location.protocol + '//ajax.googleapis.com/ajax/services/feed/load?v=1.0&num=10&callback=?&q=' + encodeURIComponent("{{feedURL}}"), dataType: 'json', success: function(data) { - for(i=0;i' + data.responseData.feed.entries[i].title + '

'); + var feedLimit = 5; + if (data.responseData.feed.entries.length<5) feedLimit = data.responseData.feed.entries.length; + for(i=0;i' + data.responseData.feed.entries[i].title + '
'); } } }); From 0afa269c14a13945d0e1b8a3be4b8a762eb2b162 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 11:23:11 -0700 Subject: [PATCH 051/230] Update jswidgets.html --- _includes/jswidgets.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 16b25531..130915a1 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -61,6 +61,7 @@ if (data.responseData.feed.entries.length<5) feedLimit = data.responseData.feed.entries.length; for(i=0;i' + data.responseData.feed.entries[i].title + '
'); + if (i==4) $("#{{feedID}}").append('See more...'); } } }); From 2a4bf6ab43b6962f62b34d9a1d21ed2a888dbc65 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:14:40 -0700 Subject: [PATCH 052/230] Create sidebar.css --- css/sidebar.css | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 css/sidebar.css diff --git a/css/sidebar.css b/css/sidebar.css new file mode 100644 index 00000000..24ada1b9 --- /dev/null +++ b/css/sidebar.css @@ -0,0 +1,81 @@ +#related-sidebar, +.sidebar { + float:right; + margin: 0 0px 15px 15px; + padding:0px; + clear:right; +} + +.sidebar, +#related-sidebar #related-info, +#related-sidebar #related-stackoverflow { + width: 240px; + padding:15px; + margin-top:15px; + border-radius: 5px; +} + +#related-sidebar #related-info, +#related-sidebar #related-stackoverflow { + background-color:#efefef; + border:1px solid #ccc; +} + +.sidebar { + border: 1px solid #ccc; +} + +#related-sidebar nav header { + font-weight: bold; + font-size: 133%; +} + +#related-sidebar ul { + list-style-type:square; +} + +#related-sidebar iframe { + margin-bottom: 1em; + width: 240px; + height: 130px; +} + +/* Transform the repeated article elements to act as a list using CSS */ +#related-sidebar .feed.rendered>article { + display: list-item; + list-style-type: square; + padding: 0; + margin-left: 26px; + font-size: 10pt; + color: #000; +} + +#related-sidebar .feed.rendered>article header { + font-size: 10pt; + padding: 0; + line-height: 1.67; + display: inline; +} + +#related-sidebar .feed { + margin-bottom: 1em; +} + +#related-sidebar .feed>article a { + text-decoration: underline; +} + +#related-sidebar .more { + font-weight: bold; +} + +#related-bigvid { + float: right; + clear: right; + width: 400px; + height: 225px; + margin-left: 15px; +} + +/* Fix the H2's border from flowing into the floats */ +body.docs h2, aside { overflow-x: auto;} From e6ab822433185b06bda19905c94ebb367dd66e50 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:19:42 -0700 Subject: [PATCH 053/230] Create sidebar.html --- _includes/sidebar.html | 347 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 347 insertions(+) create mode 100644 _includes/sidebar.html diff --git a/_includes/sidebar.html b/_includes/sidebar.html new file mode 100644 index 00000000..db983931 --- /dev/null +++ b/_includes/sidebar.html @@ -0,0 +1,347 @@ +{% comment %} +{% endcomment %} + +{% comment %} Check for the existance of tags that the sidebar cares about. {% endcomment %} +{% if sotag1 or sotag2 or sotag3 or sotag4 or sotag5 %} + {% capture thereAreSOTags %}1{% endcapture %} +{% endif %} +{% if topicurl1 or topicurl2 or topicurl3 or topicurl4 or topicurl5 %} + {% capture thereAreTopics %}1{% endcapture %} +{% endif %} +{% if sampleurl1 or sampleurl2 or sampleurl3 or sampleurl4 or sampleurl5 %} + {% capture thereAreSamples %}1{% endcapture %} +{% endif %} +{% if miscurl1 or miscurl2 or miscurl3 or miscurl4 or miscurl5 %} + {% capture thereAreMiscURLs %}1{% endcapture %} +{% endif %} +{% if feedurl and feedheading %} + {% capture thereIsAFeed %}1{% endcapture %} +{% endif %} +{% if videoid1 or videoid2 %} + {% capture thereAreVideos %}1{% endcapture %} +{% endif %} + + + +{% if bigvid %} + +{% endif %} + + +{% if thereAreTopics or thereAreSamples or thereAreMiscURLs or thereIsAFeed or thereAreVideos or thereAreSOTags %} + {% comment %} OK, populate the 240px container {% endcomment %} + +{% endif %}{% comment %} end of: if thereAreTopics or thereAreSamples or thereAreMiscURLs or thereIsAFeed or thereAreVideos or thereAreSOTags, aka the 240px container content {% endcomment %} + +{% comment %} Include the sidebar CSS file: {% endcomment %} + + +{% comment %} Now, "unset" all variables so that this can be included multiple times for notes {% endcomment %} +{% capture tags %}{% endcapture %} +{% capture warning %}{% endcapture %} +{% capture important %}{% endcapture %} +{% capture caution %}{% endcapture %} +{% capture thereAreSOTags %}{% endcapture %} +{% capture sotag1 %}{% endcapture %} +{% capture sotag2 %}{% endcapture %} +{% capture sotag3 %}{% endcapture %} +{% capture sotag4 %}{% endcapture %} +{% capture sotag5 %}{% endcapture %} +{% capture thereIsAFeed %}{% endcapture %} +{% capture feedurl %}{% endcapture %} +{% capture feedheading %}{% endcapture %} +{% capture thereAreMiscURLs %}{% endcapture %} +{% capture misc_section_heading %}{% endcapture %} +{% capture miscurl1 %}{% endcapture %} +{% capture miscurl2 %}{% endcapture %} +{% capture miscurl3 %}{% endcapture %} +{% capture miscurl4 %}{% endcapture %} +{% capture miscurl5 %}{% endcapture %} +{% capture misctitle1 %}{% endcapture %} +{% capture misctitle2 %}{% endcapture %} +{% capture misctitle3 %}{% endcapture %} +{% capture misctitle4 %}{% endcapture %} +{% capture misctitle5 %}{% endcapture %} +{% capture thereAreSamples %}{% endcapture %} +{% capture sampleurl1 %}{% endcapture %} +{% capture sampleurl2 %}{% endcapture %} +{% capture sampleurl3 %}{% endcapture %} +{% capture sampleurl4 %}{% endcapture %} +{% capture sampleurl5 %}{% endcapture %} +{% capture sampletitle1 %}{% endcapture %} +{% capture sampletitle2 %}{% endcapture %} +{% capture sampletitle3 %}{% endcapture %} +{% capture sampletitle4 %}{% endcapture %} +{% capture sampletitle5 %}{% endcapture %} +{% capture thereAreTopics %}{% endcapture %} +{% capture topicurl1 %}{% endcapture %} +{% capture topicurl2 %}{% endcapture %} +{% capture topicurl3 %}{% endcapture %} +{% capture topicurl4 %}{% endcapture %} +{% capture topicurl5 %}{% endcapture %} +{% capture topictitle1 %}{% endcapture %} +{% capture topictitle2 %}{% endcapture %} +{% capture topictitle3 %}{% endcapture %} +{% capture topictitle4 %}{% endcapture %} +{% capture topictitle5 %}{% endcapture %} +{% capture thereAreVideos %}{% endcapture %} +{% capture videoid1 %}{% endcapture %} +{% capture videoid2 %}{% endcapture %} +{% capture bigvid %}{% endcapture %} From c028454cb3e23722b4b3e7ac0a90f10c68366615 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:21:48 -0700 Subject: [PATCH 054/230] Update index.md --- index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.md b/index.md index a464515a..eb41c693 100644 --- a/index.md +++ b/index.md @@ -3,7 +3,8 @@ layout: cloud title: Tech Demo for GH-Pages + Markdown + Jekyll + DevSite theme toc: main --- - +{% assign bigvid="ytT2-kL9v2o" %} +{% include sidebar.html %} Testing Markdown + Includes + Submoduled templates ## Included Markdown content From 713a205eb3f5e2c6e3a719dd1af25985911f9562 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:23:06 -0700 Subject: [PATCH 055/230] Update sidebar.html --- _includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index db983931..ba0b08d6 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -291,7 +291,7 @@ {% endif %}{% comment %} end of: if thereAreTopics or thereAreSamples or thereAreMiscURLs or thereIsAFeed or thereAreVideos or thereAreSOTags, aka the 240px container content {% endcomment %} {% comment %} Include the sidebar CSS file: {% endcomment %} - + {% comment %} Now, "unset" all variables so that this can be included multiple times for notes {% endcomment %} {% capture tags %}{% endcapture %} From 0a24c4250fb2f0100b5beb5bfbe5abfca9a8d513 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:25:18 -0700 Subject: [PATCH 056/230] Update sidebar.css --- css/sidebar.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/css/sidebar.css b/css/sidebar.css index 24ada1b9..a858955a 100644 --- a/css/sidebar.css +++ b/css/sidebar.css @@ -76,6 +76,3 @@ height: 225px; margin-left: 15px; } - -/* Fix the H2's border from flowing into the floats */ -body.docs h2, aside { overflow-x: auto;} From 8ff6789528ea73d981f15c7577463ed3855a15bb Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:26:06 -0700 Subject: [PATCH 057/230] Update sidebar.css --- css/sidebar.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/css/sidebar.css b/css/sidebar.css index a858955a..3c814d1f 100644 --- a/css/sidebar.css +++ b/css/sidebar.css @@ -1,7 +1,9 @@ #related-sidebar, .sidebar { float:right; - margin: 0 0px 15px 15px; + margin: 0 0px 0px 0px; + border-left: 15px solid #fff; + border-bottom: 15px solid #fff; padding:0px; clear:right; } From a9532f2f9fa579c731746ed628c9240e12b16b70 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:28:36 -0700 Subject: [PATCH 058/230] Update sidebar.css --- css/sidebar.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/sidebar.css b/css/sidebar.css index 3c814d1f..c66fe2e9 100644 --- a/css/sidebar.css +++ b/css/sidebar.css @@ -76,5 +76,6 @@ clear: right; width: 400px; height: 225px; - margin-left: 15px; + border-left: 15px solid #fff; + border-bottom: 15px solid #fff; } From 6d3bb3ac92920bce6e6e99d27d78501d2feeefb9 Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:29:52 -0700 Subject: [PATCH 059/230] Update sidebar.css --- css/sidebar.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/sidebar.css b/css/sidebar.css index c66fe2e9..b2cca5f7 100644 --- a/css/sidebar.css +++ b/css/sidebar.css @@ -73,6 +73,7 @@ #related-bigvid { float: right; + float: top; clear: right; width: 400px; height: 225px; From c00d6267cec3bd4919b52ff0fe550400dc39f1ad Mon Sep 17 00:00:00 2001 From: johndmulhausen Date: Wed, 11 Jun 2014 14:35:46 -0700 Subject: [PATCH 060/230] Update jswidgets.html --- _includes/jswidgets.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/jswidgets.html b/_includes/jswidgets.html index 130915a1..2a85f4fc 100644 --- a/_includes/jswidgets.html +++ b/_includes/jswidgets.html @@ -48,7 +48,7 @@ $("#pageTOC").append(result); }); -
+
{% endcapture %} {% capture feed %}