From 1f4bf78619daf472481ce1933a957ffc5ff4e9cb Mon Sep 17 00:00:00 2001 From: tomjohnson1492 Date: Mon, 30 May 2016 16:53:12 -0700 Subject: [PATCH] updated install instructions --- _includes/custom/usermap.md | 22 +++++++++ css/customstyles.css | 40 +++++++++++++++++ images/workflowarrow.png | Bin 0 -> 3595 bytes index.md | 54 ++++++++++++++++++---- mydoc/mydoc_about_ruby_gems_bundler.md | 1 + mydoc/mydoc_install_jekyll_on_mac.md | 55 +++++++++-------------- mydoc/mydoc_install_jekyll_on_windows.md | 46 +++++++++++-------- product2/p2_sample1.md | 8 ++++ product2/p2_sample2.md | 8 ++++ product2/p2_sample3.md | 8 ++++ product2/p2_sample4.md | 8 ++++ product2/p2_sample5.md | 9 ++++ product2/p2_sample6.md | 9 ++++ product2/p2_sample7.md | 9 ++++ 14 files changed, 216 insertions(+), 61 deletions(-) create mode 100644 _includes/custom/usermap.md create mode 100644 images/workflowarrow.png diff --git a/_includes/custom/usermap.md b/_includes/custom/usermap.md new file mode 100644 index 0000000..4222ac1 --- /dev/null +++ b/_includes/custom/usermap.md @@ -0,0 +1,22 @@ + +
+ + + + + + + + + + + + + + + + + +
Connect to ADB
→
Download and Build the Starter Kit
→
Take a Tour
→
Load Your Widgets
→
Query for Something
→
Filter for Something
→
Configure this Gizmo
+
+ diff --git a/css/customstyles.css b/css/customstyles.css index 5b3320f..a9553fe 100644 --- a/css/customstyles.css +++ b/css/customstyles.css @@ -1035,3 +1035,43 @@ table thead th code.highlighter-rouge { background-color: transparent; } + +.box1, .box2, .box3, .box4, .box5, .box6, .box7, .box8, .box9, .box10, .box11, .box12 { + padding: 15px; + border: 1px solid #888; + box-shadow: 2px 2px 4px #dedede; + margin: 5px 5px; + width: 100px; + height: 80px; + background-color: #f5f5f5; + font-family: Arial; + font-size: 12px; + hyphens: auto; + +} + +#userMap { + max-width: 900px; + overflow-x: scroll; + overflow-y: hidden; + padding: 20px; +} + +#userMap .active { + background-color: #d6f5d6; + border:1px solid #555; + font-weight: bold; +} + +h2.userMapTitle { + font-family: Arial; +} + +#userMap table td { + vertical-align: middle; + font-size: x-large; +} + +#userMap a:hover { + text-decoration: none; + } diff --git a/images/workflowarrow.png b/images/workflowarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..91a3e816183d8ec1c986cd042623e34845bef599 GIT binary patch literal 3595 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 1. ``` + See how Bundler retrieved version 3.0.3 of the jekyll gem, even though (as of this writing) the latest version of the jekyll gem is 3.1.2? That's because github-pages is only compatible up to jekyll 3.0.3. Bundler handles all of this dependency and version compatibility for you. Trying to keep track of which gems and versions are appropriate for your project can be a nightmare. This is the problem Bundler solves. As explained on [Bundler.io](http://bundler.io/): diff --git a/mydoc/mydoc_install_jekyll_on_mac.md b/mydoc/mydoc_install_jekyll_on_mac.md index 38681e9..a5e3e5e 100644 --- a/mydoc/mydoc_install_jekyll_on_mac.md +++ b/mydoc/mydoc_install_jekyll_on_mac.md @@ -74,9 +74,23 @@ Now Ruby and Rubygems are installed under your username, so these directories ar Note that if you don't see these paths, try restarting your computer or try installing rbenv, which is a Ruby version management tool. If you still have issues getting a writeable version of Ruby, you need to resolve them before installing Bundler. -

Install Bundler

+

Install the Jekyll gem

-At this point you should have a writeable version of Ruby on your machine. Now you need to get all the gems (or Ruby plugins) that you need for your Jekyll project. [Bundler](http://bundler.io/) is a package manager for RubyGems. +At this point you should have a writeable version of Ruby and Rubygem on your machine. + +Now use `gem` to install Jekyll: + +``` +gem install jekyll +``` + +You can now use Jekyll to create new Jekyll sites following the quick-start instructions on [Jekyllrb.com](http://jekyllrb.com). + +## Installing dependencies through Bundler + +Some Jekyll themes will require certain Ruby gem dependencies. These dependencies are stored in something called a Gemfile, which is packaged with the Jekyll theme. You can install these dependencies through Bundler. (Although you don't need to install Bundler for this Documentation theme, it's a good idea to do so.) + +[Bundler](http://bundler.io/) is a package manager for RubyGems. You can use it to get all the gems (or Ruby plugins) that you need for your Jekyll project. You install Bundler by using the gem command with RubyGems: @@ -86,37 +100,12 @@ gem install bundler If you're prompted to switch to superuser mode (`sudo`) to get the correct permissions to install Bundler in that directory, avoid doing this. All other applications that need to use Bundler will likely not have the needed permissions to run. -## Customize the Gemfile +Bundler goes out and retreives all the gems that are specified in a Jekyll project's Gemfile. If you have a gem that depends on other gems to work, Bundler will go out and retrieve all of the dependencies as well. (To learn more about Bundler, see {{site.data.urls.mydoc_about_ruby_gems_etc.link}}. -Bundler goes out and retreives all the gems that are specified in your project's Gemfile. If you have a gem that depends on other gems to work, Bundler will go out and retrieve all of the dependencies as well. (To learn more about Bundler, see {{site.data.urls.mydoc_about_ruby_gems_etc.link}}. +The vanilla Jekyll site you create through `jekyll new my-awesome-site` doesn't have a Gemfile, but many other themes (including the Documentation theme for Jekyll) do have a Gemfile. -Open the Gemfile (in any text editor) in the Jekyll doc theme project: +## Serve the Jekyll Documentation theme -``` -open Gemfile -``` - -The theme's gemfile looks as follows: - -``` -# A sample Gemfile -source "https://rubygems.org" - -# gem "rails" -gem 'github-pages' -gem 'jekyll' -``` - -If you're publishing on Github Pages, leave the `github-pages` gem there. But if not, remove `github-pages` because Github sometimes has dependencies that conflict with the latest versions of the Jekyll gem and Kramdown, which can be frustrating. - -Use Bundler to install all the needed Ruby gems: - -``` -bundle install -``` - -Now run Jekyll serve to build the theme: - -``` -jekyll serve -``` \ No newline at end of file +1. Browse to the directory where you downloaded the Documentation theme for Jekyll. +2. Type `jekyll serve` +3. Go to the preview address in the browser. (Make sure you include the `/` at the end.) \ No newline at end of file diff --git a/mydoc/mydoc_install_jekyll_on_windows.md b/mydoc/mydoc_install_jekyll_on_windows.md index 5ba8b9c..3a82a3f 100644 --- a/mydoc/mydoc_install_jekyll_on_windows.md +++ b/mydoc/mydoc_install_jekyll_on_windows.md @@ -5,7 +5,7 @@ keywords: jekyll on windows, pc, ruby, ruby dev kit sidebar: mydoc_sidebar --- -{{site.data.alerts.tip}} For a better terminal emulator on Windows, download Console. This terminal allows you to create tabs and gives you more functionality. {{site.data.alerts.end}} +{{site.data.alerts.tip}} For a better terminal emulator on Windows, use [Git Bash](https://git-for-windows.github.io/). Git Bash gives you Linux-like control on Windows. {{site.data.alerts.end}} ## Install Ruby @@ -32,26 +32,39 @@ Some extensions Jekyll uses require you to natively build the code using the Rub If you get stuck, see the [official instructions for installing Ruby Dev Kit](https://github.com/oneclick/rubyinstaller/wiki/Development-Kit). +

Install the Jekyll gem

+ +At this point you should have Ruby and Rubygem on your machine. + +Now use `gem` to install Jekyll: + +``` +gem install jekyll +``` + +You can now use Jekyll to create new Jekyll sites following the quick-start instructions on [Jekyllrb.com](http://jekyllrb.com). + +## Installing dependencies through Bundler + +Some Jekyll themes will require certain Ruby gem dependencies. These dependencies are stored in something called a Gemfile, which is packaged with the Jekyll theme. You can install these dependencies through Bundler. (Although you don't need to install Bundler for this Documentation theme, it's a good idea to do so.) + +[Bundler](http://bundler.io/) is a package manager for RubyGems. You can use it to get all the gems (or Ruby plugins) that you need for your Jekyll project. + +You install Bundler by using the gem command with RubyGems: + + ## Install Bundler -1. Using the command line, browse to the folder where you downloaded the Jekyll theme. -2. Delete the existing **Gemfile** and **Gemfile.lock** files: - - ``` - del Gemfile - del Gemfile.lock - ``` - 1. Install Bundler: `gem install bundler` -3. Initialize Bundler: `bundle init` +2. Initialize Bundler: `bundle init` This will create a new Gemfile. -4. Open the Gemfile in a text editor. +3. Open the Gemfile in a text editor. Typically you can open files from the Command Prompt by just typing the filename, but because Gemfile doesn't have a file extension, no program will automatically open it. You may need to use your File Explorer and browse to the directory, and then open the Gemfile in a text editor such as Notepad. -5. Remove the existing contents. Then paste in the following: +4. Remove the existing contents. Then paste in the following: ``` source "https://rubygems.org" @@ -61,20 +74,15 @@ If you get stuck, see the [official instructions for installing Ruby Dev Kit](ht ``` The [wdm gem](https://rubygems.org/gems/wdm/versions/0.1.1) allows for the polling of the directory and rebuilding of the Jekyll site when you make changes. This gem is needed for Windows users, not Mac users. - 6. Save and close the file. 7. Type `bundle install`. Bundle retrieves all the needed gems and gem dependencies and downloads them to your computer. At this time, Bundle also takes a snapshot of all the gems used in your project and creates a Gemfile.lock file to store this information. -## Serve the Jekyll site +## Serve the Jekyll Documentation theme -1. Browse to the jekyll theme directory. +1. Browse to the directory where you downloaded the Documentation theme for Jekyll. 2. Type `jekyll serve` 3. Go to the preview address in the browser. (Make sure you include the `/` at the end.) Unfortunately, the Command Prompt doesn't allow you to easily copy and paste the URL, so you'll have to type it manually. - -## Troubleshooting - -Bundler retrieves the latest version of the jekyll gem that is compatible with the github-pages gem. Unfortunately, in my testing, I think that version of the jekyll gem has some issues with the kramdown gem. Later versions of the jekyll gem fix the kramdown compatibility issues. If you run into this issue, let me know (especially if you solved it). diff --git a/product2/p2_sample1.md b/product2/p2_sample1.md index b2e46fc..7200800 100644 --- a/product2/p2_sample1.md +++ b/product2/p2_sample1.md @@ -6,6 +6,14 @@ sidebar: product2_sidebar permalink: /p2_sample1/ --- + + +{% include custom/usermap.md %} + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample2.md b/product2/p2_sample2.md index 864f2d0..ce16ef2 100644 --- a/product2/p2_sample2.md +++ b/product2/p2_sample2.md @@ -6,6 +6,14 @@ sidebar: product2_sidebar permalink: /p2_sample2/ --- + + +{% include custom/usermap.md %} + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample3.md b/product2/p2_sample3.md index 777c845..d637b57 100644 --- a/product2/p2_sample3.md +++ b/product2/p2_sample3.md @@ -6,6 +6,14 @@ sidebar: product2_sidebar permalink: /p2_sample3/ --- + + +{% include custom/usermap.md %} + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample4.md b/product2/p2_sample4.md index abaa782..48ea2dd 100644 --- a/product2/p2_sample4.md +++ b/product2/p2_sample4.md @@ -6,6 +6,14 @@ sidebar: product2_sidebar permalink: /p2_sample4/ --- + + +{% include custom/usermap.md %} + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample5.md b/product2/p2_sample5.md index d3d0057..99ca23a 100644 --- a/product2/p2_sample5.md +++ b/product2/p2_sample5.md @@ -6,6 +6,15 @@ sidebar: product2_sidebar permalink: /p2_sample5/ --- + + +{% include custom/usermap.md %} + + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample6.md b/product2/p2_sample6.md index a6fc58d..902dbcd 100644 --- a/product2/p2_sample6.md +++ b/product2/p2_sample6.md @@ -6,6 +6,15 @@ sidebar: product2_sidebar permalink: /p2_sample6/ --- + + +{% include custom/usermap.md %} + + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum. diff --git a/product2/p2_sample7.md b/product2/p2_sample7.md index 19dc103..b68a01f 100644 --- a/product2/p2_sample7.md +++ b/product2/p2_sample7.md @@ -6,6 +6,15 @@ sidebar: product2_sidebar permalink: /p2_sample7/ --- + + +{% include custom/usermap.md %} + + ## Sample Content Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.