<p>This will merge in the usability based changes to the theme.</p>
<hr>
<h4>You can merge this Pull Request by running</h4>
<pre> git pull https://github.com/opentechinstitute/luci-theme-commotion usability</pre>
<p>Or view, comment on, or merge it at:</p>
<p> <a href='https://github.com/opentechinstitute/luci-theme-commotion/pull/13'>https://github.com/opentechinstitute/luci-theme-commotion/pull/13</a></p>
<h4>Commit Summary</h4>
<ul>
<li>removed depreciated password warning</li>
<li>cleaned up header, including a few extra templates in our theme to support theme switching of basic menu</li>
<li>roughed out the positioning for commotion basic menu swapping in the header</li>
<li>intial sidebar</li>
<li>test</li>
<li>sidebar update</li>
<li>removed extraneous files</li>
<li>stray class</li>
<li>added links to footer.htm per https://github.com/opentechinstitute/luci-commotion/issues/104</li>
<li>Merge pull request #3 from opentechinstitute/uxgrif</li>
<li>updated default advanced link to redirect to status overview</li>
<li>Merge branch 'sidebar' of https://github.com/opentechinstitute/luci-theme-commotion into sidebar</li>
<li>removed luci.util for comparison testing.</li>
<li>updated footer links with appropriate css container.</li>
<li>Merge pull request #4 from opentechinstitute/sidebar</li>
<li>Merge pull request #5 from opentechinstitute/usability-footerlinks</li>
<li>added calls to bring in sidebar css and js</li>
<li>swapped css values to properly place headers as divs and menu items as list items</li>
<li>got basic menu sorting added for basic menu... One of these days I am going to find a partron so I can clean up and modularize all this code for the LuCI.</li>
<li>have highlighting and sidebar positioning working</li>
<li>some final cleaning up of the basic menu including removal global css rules in teh sidebar template that were causing all sorts of weirdness with the global cascase css template.</li>
<li>fixed various styling issues with logo, tabs, etc.</li>
<li>got commotion menu's to only show commotion child menu's</li>
<li>cleaned up repo</li>
<li>removed unneeded toggle.</li>
<li>Updated footer images to include the help, about, and license pages.... with pretty pretty pictures.</li>
<li>added back in https redirect</li>
<li>added in sidebar button for items with no sub-menu's</li>
<li>added in classes for help text for the clients list status page.</li>
<li>updated some basic menu structures to... work with new organizational hierarchy.</li>
<li>re-added functionality for status bar to show up... I don't think I actually did anything so it may have been a build issue. Getting a bit loopy over here, so I am going home and going to bed.</li>
<li>fixed that top level save button</li>
<li>modified header to allow for dispatcher special submenu.</li>
<li>added working menu's to the setup wizard and confimation sections.</li>
<li>made the admin page go to the correct basic menu page</li>
<li>just modifying some spacing</li>
<li>added images for welcome page startup buttons</li>
<li>Added all icons for buttons and modified css accordingly to add them to the basic menu only</li>
<li>made startup buttons show</li>
<li>made help text just a little more clearly demarcated.</li>
<li>added mesh-ip, which I can't test until we have commotiond, etc. working. And formatted header info items.</li>
<li>added some theme based icon switching to uci-defaults</li>
<li>modified width to be percent instead of a set size</li>
<li>added mobile theme and corrected stylesheet order</li>
<li>added mobile theme and corrected stylesheet order</li>
<li>Merge branch 'responsive' of https://github.com/opentechinstitute/luci-theme-commotion into responsive</li>
<li>updated mobile styling</li>
<li>error styling fixes 😄</li>
<li>trimming excess</li>
<li>test</li>
<li>test</li>
<li>cbi error def</li>
<li>comment on reload.gif issue</li>
<li>button comment</li>
<li>nodeinfo / statusbar differentiation</li>
<li>finished some accentuation for alerts and buttons that needed more pizaz</li>
<li>Centered .body-content</li>
<li>Centered #welcome icons</li>
<li>Centered footer icons</li>
<li>merge conflict</li>
<li>Resized submit icons in css and removed extra image files</li>
<li>file corruption in tinycombo.css</li>
<li>Fixed topbar display for small screens</li>
<li>Merged uxgrif pull request. Resolved merge conflicts and added small screen styling tweaks.</li>
<li>Merged responsive branch pull request. Resolved merge conflicts and added small screen styling tweaks.</li>
<li>Merge branch 'usability' of https://github.com/opentechinstitute/luci-theme-commotion into usability</li>
<li>CSS changes- adjusted size of node name header area, spacing on confim page cbi buttons.</li>
<li>Merged minor styling tweaks</li>
<li>added a none option when a mesh interface does not exist.</li>
<li>Merge branch 'usability' of http://github.com/opentechinstitute/luci-theme-commotion into usability</li>
<li>Fixed #welcome .setup .upload .advanced for small screens</li>
<li>updated some css styles for new UI.</li>
<li>fixed missing item for mesh network ip in header</li>
<li>added welcomepage class for formatting the welcome page</li>
<li>moved warning text off of icon</li>
<li>Fixed icon/text spacing on .errorbox</li>
<li>Merge pull request #8 from opentechinstitute/ux-updates</li>
<li>Merge pull request #7 from opentechinstitute/usability-addons</li>
<li>fixed the mesh ip address in the header bar</li>
<li>Merge branch 'usability' of http://github.com/opentechinstitute/luci-theme-commotion into usability</li>
<li>added a check for ip address in ifaces found for mesh ip address header. When restarting a node and quickly going to the UI the ip is not found yet, and will cause errors.</li>
<li>updated favicon.ico to remove extra unused layers.</li>
<li>added margin-left 1em to class submenutitle</li>
<li>Fixed text alignment in olsr neighbors table</li>
<li>Merge pull request #12 from opentechinstitute/usability-issue10</li>
</ul>
<h4>File Changes</h4>
<ul>
<li>
<strong>D</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-0">Screenshots.txt</a>
(7)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-1">files/etc/uci-defaults/icon-settings</a>
(5)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-2">files/htdocs/about_point.png</a>
(0)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-3">files/htdocs/advanced.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-4">files/htdocs/advanced_button.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-5">files/htdocs/advanced_point.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-6">files/htdocs/approve_app_button.png</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-7">files/htdocs/cascade.css</a>
(343)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-8">files/htdocs/commotion_add_icon.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-9">files/htdocs/commotion_ban_icon.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-10">files/htdocs/commotion_delete_icon.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-11">files/htdocs/drop_menu.png</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-12">files/htdocs/favicon.ico</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-13">files/htdocs/help_point.png</a>
(0)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-14">files/htdocs/html5.js</a>
(304)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-15">files/htdocs/left_arrow_button.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-16">files/htdocs/license_point.png</a>
(0)
</li>
<li>
<strong>D</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-17">files/htdocs/quickstart.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-18">files/htdocs/right_arrow_button.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-19">files/htdocs/setupwiz_button.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-20">files/htdocs/sidebar.css</a>
(108)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-21">files/htdocs/status_message_smile.png</a>
(0)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-22">files/htdocs/tinycombo.css</a>
(1414)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-23">files/templates/adv_menu.htm</a>
(78)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-24">files/templates/basic_menu.htm</a>
(84)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-25">files/templates/drop_menu.htm</a>
(54)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-26">files/templates/footer.htm</a>
(10)
</li>
<li>
<strong>M</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-27">files/templates/header.htm</a>
(282)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-28">files/templates/setup_wiz_sidebar.htm</a>
(22)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-29">files/templates/subtree.htm</a>
(48)
</li>
<li>
<strong>A</strong>
<a href="https://github.com/opentechinstitute/luci-theme-commotion/pull/13/files#diff-30">files/templates/unsaved_changes.htm</a>
(28)
</li>
</ul>
<h4>Patch Links:</h4>
<ul>
<li><a href='https://github.com/opentechinstitute/luci-theme-commotion/pull/13.patch'>https://github.com/opentechinstitute/luci-theme-commotion/pull/13.patch</a></li>
<li><a href='https://github.com/opentechinstitute/luci-theme-commotion/pull/13.diff'>https://github.com/opentechinstitute/luci-theme-commotion/pull/13.diff</a></li>
</ul>