Skip to content

Commit

Permalink
reviewed content and updated formatting on two CCK pages.
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Ritzo committed Apr 4, 2014
1 parent 0c24a23 commit d09d0e6
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 26 deletions.
24 changes: 15 additions & 9 deletions commotionwireless.net/about/press/index.md
View file
Expand Up @@ -8,16 +8,24 @@ changed: 2013-09-21
post_author: admin
lang: en
---
<h2>Images and Media</h2>

<h3>Press Releases &amp; News</h3>

<h2>Media Contacts</h2>
<p>To interview one of our policy experts, or learn more about the New America Foundation, please contact:<br />
<blockquote>
Jenny Lu Mallamo<br />
Media Relations Associate<br />
<a href="mailto:mallamo@newamerica.org">mallamo@newamerica.org</a><br />
</blockquote>
</p>
<h2>Press Releases &amp; News</h2>
<ul>
<li><a href="http://newamerica.org/pressroom/2013/release_oti_launches_new_version_of_commotion_free_open_source_wireless_networking_so">Commotion Developer Release 2</a> (9/17/2013)</li>
<li><a href="http://newamerica.org/pressroom/2013/press_release_agenda_released_for_international_summit_for_community_wireless_network">Agenda for International Summit for Community Wireless Networks Released</a> (9/11/2013)</li>
<li><a href="http://oti.newamerica.net/pressroom/2013/release_oti_launches_commotion_beta_free_wireless_mesh_network_software">Commotion Developer Release 1.1 </a>(3/20/2013)</li>
<li><a href="#">Commotion 1.1 Released</a></li>
<li><a href="http://oti.newamerica.net/node/99668">Open Technology Institute Releases Commotion 1.0 Mesh Networking Toolkit</a></li>
<li><a href="http://newamerica.org/pressroom/2013/release_oti_launches_new_version_of_commotion_free_open_source_wireless_networking_so">Commotion Developer Release 2</a> (9/17/2013)</li>
<li><a href="http://newamerica.org/pressroom/2013/press_release_agenda_released_for_international_summit_for_community_wireless_network">Agenda for International Summit for Community Wireless Networks Released</a> (9/11/2013)</li>
<li><a href="http://oti.newamerica.net/pressroom/2013/release_oti_launches_commotion_beta_free_wireless_mesh_network_software">Commotion Developer Release 1.1 </a>(3/20/2013)</li>
</ul>

<h2>Images &amp; Media</h2>
<h3>Logos &amp; Images</h3>

<ul>
Expand All @@ -29,8 +37,6 @@ lang: en

<p><strong>Commotion Development Visualization</strong></p>

<div style="float:right;">&nbsp;</div>

<p>Commotion is being developed on multiple platforms and through a variety of interacting packages on each platform. The video below visualizes the development process over time. The core Commotion project is at the center, with sub-projects exploding out over time as development ebbs and flows. Branches and leaves represent files and code being added to sub-projects like Android, Tidepools, Linux, and OpenWRT. <a href="/blog/commotion-development-progress-visualized">Read the full blog post.</a><br />
<a href="http://vimeo.com/70121378">Commotion Development Progress</a> from <a href="http://vimeo.com/user19473297">OTI Web Team</a> on <a href="https://vimeo.com">Vimeo</a>.</p>

Expand Down
4 changes: 4 additions & 0 deletions commotionwireless.net/css/commotion.css
View file
Expand Up @@ -481,6 +481,10 @@ div#download-button-block .download-button a.button {
background: #EAE8E8;
padding: 0.5em;
}
.cck-content-container {
float: left;
width: 100%;
}
.cck-content h2 {
display: block;
width: 100%;
Expand Down
22 changes: 6 additions & 16 deletions commotionwireless.net/docs/cck/installing-configuring/configure-commotion/index.md
View file
Expand Up @@ -103,24 +103,16 @@ Note: Clicking the Advanced button will disable the Commotion Setup Wizard and a

<p>2. Use the information you gathered or decided on to fill in the fields in the Commotion Setup Wizard. The Setup Wizard has four required pages and one optional page. The values you enter are saved as you navigate between pages, and are applied on the Configuration Confirmation page.</p>

<p><a href="/files/2-SetupWizard_Page1-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page1-fullpage.png" /></a><strong>Setup Wizard, page 1 - Node Settings</strong><br />
<p class="cck-content-container"><a href="/files/2-SetupWizard_Page1-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page1-fullpage.png" style="width: 100px; height: auto; float: left; margin: .5em;" /></a><strong>Setup Wizard, page 1 - Node Settings</strong><br />
Enter the Node Name and Administration Password.</p>

<p>&nbsp;</p>

<p>&nbsp;</p>

<p><a href="/files/2-SetupWizard_Page2-fullpage.png"><img alt="" class="media-image attr__typeof__foaf:Image img__fid__720 img__view_mode__media_original attr__format__media_original" src="/files/2-SetupWizard_Page2-fullpage.png" style="width: 75px; height: 82px; margin: 5px; float: left; border-width: 2px; border-style: solid;" typeof="foaf:Image" /></a><strong>Setup Wizard, page 2 - Mesh Network</strong><br />
<p class="cck-content-container"><a href="/files/2-SetupWizard_Page2-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page2-fullpage.png" style="width: 75px; height: 82px; margin: 5px; float: left; border-width: 2px; border-style: solid;" /></a><strong>Setup Wizard, page 2 - Mesh Network</strong><br />
Enter the Mesh Network Name and select the Channel. If your mesh network should encrypt traffic between mesh devices, check the appropriate box and enter the Mesh Encryption Password.</p>

<p>&nbsp;</p>

<p><a href="/files/2-SetupWizard_Page3-fullpage.png"><img alt="" class="media-image attr__typeof__foaf:Image img__fid__721 img__view_mode__media_original attr__format__media_original" src="/files/2-SetupWizard_Page3-fullpage.png" style="width: 75px; height: 82px; border-width: 2px; border-style: solid; margin: 5px; float: left;" typeof="foaf:Image" /></a><strong>Setup Wizard, page 3 - Wireless Network</strong><br />
<p class="cck-content-container"><a href="/files/2-SetupWizard_Page3-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page3-fullpage.png" style="width: 75px; height: 82px; border-width: 2px; border-style: solid; margin: 5px; float: left;" /></a><strong>Setup Wizard, page 3 - Wireless Network</strong><br />
If desired, configure an Access Point to provide wireless network access through this node. Enter the Access Point Name, select the Channel to use, and provide a Password that people should be required to use to connect.</p>

<p>&nbsp;</p>

<p><a href="/files/2-SetupWizard_Page4-fullpage.png"><img alt="" class="media-image attr__typeof__foaf:Image img__fid__722 img__view_mode__media_original attr__format__media_original" src="/files/2-SetupWizard_Page4-fullpage.png" style="width: 76px; height: 35px; border-width: 2px; border-style: solid; margin: 5px; float: left;" typeof="foaf:Image" /></a><strong>Setup Wizard, page 4 - Configuration Complete</strong><br />
<p class="cck-content-container"><a href="/files/2-SetupWizard_Page4-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page4-fullpage.png" style="width: 76px; height: 35px; border-width: 2px; border-style: solid; margin: 5px; float: left;" /></a><strong>Setup Wizard, page 4 - Configuration Complete</strong><br />
You have now completed all the required steps to configure your mesh node.</p>

<ul>
Expand All @@ -129,7 +121,7 @@ You have now completed all the required steps to configure your mesh node.</p>
<li>If you want to start over, click Reset.</li>
</ul>

<p><a href="/files/2-SetupWizard_Page5-fullpage.png"><img alt="" class="media-image attr__typeof__foaf:Image img__fid__723 img__view_mode__media_original attr__format__media_original" src="/files/2-SetupWizard_Page5-fullpage.png" style="width: 76px; height: 35px; border-width: 2px; border-style: solid; margin: 5px; float: left;" typeof="foaf:Image" /></a><strong>Setup Wizard, page 5 - Additional Network Interfaces</strong><br />
<p class="cck-content-container"><a href="/files/2-SetupWizard_Page5-fullpage.png"><img alt="" src="/files/2-SetupWizard_Page5-fullpage.png" style="width: 76px; height: 35px; border-width: 2px; border-style: solid; margin: 5px; float: left;" /></a><strong>Setup Wizard, page 5 - Additional Network Interfaces</strong><br />
This page provides option settings to configure your node's wired interface, if desired. When you are done, click Finish</p>

<ul>
Expand All @@ -139,9 +131,7 @@ This page provides option settings to configure your node's wired interface, if
<li>If the node should not receive or provide DHCP leases, select <em>This device should not do anything with DHCP</em></li>
</ul>

<p>3. When you finish the Commotion Setup Wizard, the node will reset. This will take a couple minutes—be patient.<strong> </strong>When the node starts up again, it will automatically connect to other mesh nodes in the area with matching mesh link information.</p>

<p><img alt="" class="media-image attr__typeof__foaf:Image img__fid__725 img__view_mode__media_original attr__format__media_original" height="264" src="/files/12-system_redirecting.png" typeof="foaf:Image" width="600" /></p>
<p>3. When you finish the Commotion Setup Wizard, the node will reset. This will take a couple minutes—be patient.<strong> </strong>When the node starts up again, it will automatically connect to other mesh nodes in the area with matching mesh link information. <img alt="" height="264" src="/files/12-system_redirecting.png" /></p>
</section>

<section id="Access-Administration-interface">
Expand Down
2 changes: 1 addition & 1 deletion ...onwireless.net/docs/cck/installing-configuring/install-ubiquiti-router/index.md
View file
Expand Up @@ -202,7 +202,7 @@ DNS:</br />(blank)</code></p>
<section class="related-information" id="section-related-information">
<h2>Related Information</h2>

<p>For more help, or if this guide doesn't work for you, take a look at the <a href="/docs/cck/installing-configuring/install-and-recover-tftp">Install and Recover with TFTP</a> module. After the software has been installed, you can proceed to the <a href="/docs/cck/installing-configuring/configure-commotion">Configure Routers</a> module.</p>
<p>For more help, or if this guide doesn't work for you, take a look at the <a href="/docs/cck/installing-configuring/install-and-recover-tftp">Install and Recover with TFTP</a> module. After the software has been installed, you can proceed to the <a href="/docs/cck/installing-configuring/configure-commotion">Configure Commotion</a> module.</p>
</section>

<section class="external-resources" id="section-external-resources">
Expand Down

0 comments on commit d09d0e6

Please sign in to comment.