Skip to content

Commit

Permalink
Merge pull request #3 from opentechinstitute/uxgrif
Browse files Browse the repository at this point in the history 
Integrating changes into sidebar branch.
  • Loading branch information
@glamrock
glamrock committed Dec 6, 2013
2 parents 9b95c17 + 3ec5da3 commit d9f2791
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 221 deletions.
11 changes: 6 additions & 5 deletions files/htdocs/sidebar.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
box-sizing:border-box;
}

.acc-container {
.sb-container {
width: 20%;
max-width:260px;
margin:10px auto auto 10px;
overflow:hidden;
}

.acc-btn {
.sb-btn {
width:100%;
margin:0 auto;
padding:5px 5px;
Expand All @@ -20,15 +21,15 @@
border-bottom:5px solid #ffffff;
}

.acc-content {
.sb-content {
height: 0;
width:100%;
margin:0 auto;
overflow:hidden;
background:#ffffff;
}

.acc-content-inner {
.sb-content-inner {
padding:0px;
padding-left: 20px;
padding-bottom: 20px;
Expand All @@ -40,7 +41,7 @@
background: #ffffff;
}

h1 {
.sb-btn h3 {
font: 26px 'Helvetica', 'Arial', sans-serif;
color:#000000;
font-weight: bold;
Expand Down
25 changes: 14 additions & 11 deletions files/templates/drop_menu.htm
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<nav>
<ul id="navtoselect">
<div class="sb-container">
<div class="">
<%-
local util = require "luci.util"
local http = require "luci.http"
Expand All @@ -9,20 +9,20 @@
local childs = disp.node_childs(node)
if #childs > 0 then
%>
<ul class="dropdown-menu">
<!--<div class="">-->
<%-
for i, r in ipairs(childs) do
local nnode = node.nodes[r]
local href = controller .. prefix .. r ..
(nnode.query and http.build_querystring(nnode.query) or "")
%>
<li>
<div class="sb-btn">
<a href="<%=util.pcdata(href)%>"><%=util.pcdata(striptags(translate(nnode.title)))%></a>
</li>
</div>
<%-
end
%>
</ul>
<!-- </div> -->
<%-
end
end
Expand All @@ -33,23 +33,26 @@
for i, r in ipairs(childs) do
local nnode = cattree.nodes[r]
local href = controller .. "/" .. category .. "/" .. r ..
(nnode.query and http.build_querystring(k.query) or "") --Where is k defined?
(nnode.query and http.build_querystring(k.query) or "") --Where is k defined?
local grandchildren = disp.node_childs(nnode)

if #grandchildren > 0 then
%>
<li class="dropdown">
<a class="menu" href="<%=util.pcdata(href)%>"><%=util.pcdata(striptags(translate(nnode.title)))%></a>
<ul class="submenu">
<li>
<a href="<%=util.pcdata(href)%>"><%=util.pcdata(striptags(translate(nnode.title)))%></a>
<%- submenu("/" .. category .. "/" .. r .. "/", nnode) %>
</li>
</ul>
<% else %>
<ul class="submenu">
<li>
<a href="<%=util.pcdata(href)%>"><%=util.pcdata(striptags(translate(nnode.title)))%></a>
</li>
</ul>
<%
end
end
end
%>
</ul>
</nav>
<!-- end of "sb-container" is in header.htm, to allow inclusion of Advanced menu button -->
80 changes: 21 additions & 59 deletions files/templates/header.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
local sys = require "luci.sys"
local disp = require "luci.dispatcher"
local cdisp = require "luci.commotion.dispatch"
local util = require "luci.util"


-- send as HTML5
http.prepare_content("text/html")
Expand Down Expand Up @@ -64,7 +66,7 @@
<html lang="<%=luci.i18n.context.lang%>">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=yes" />
<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 9]><script src="<%=media%>/html5.js"></script><![endif]-->
<link rel="stylesheet" href="<%=media%>/cascade.css">
Expand All @@ -80,72 +82,32 @@
<header>

<%if request[2] == "commotion" then%><!--Start "Basic" Menu here -->
<h1>COMMOTION MENU HERE</h1>
<%else%> <!--End "Basic" menu here -->
<%include("themes/commotion/drop_menu", {controller=controller, cattree=cattree, category=category})%>

<%include("themes/commotion/toggle_header", {hostname=hostname})%>

<!--Name: <%include("themes/commotion/toggle_header", {hostname=hostname})%> -->

<!-- <div class="nodeinfo"><h2>Node name: <%=hostname%></h2> <h2> Mesh IP: </h2></div> -->
<%else%> <!--End "Basic" menu here -->

</header>

<%include("themes/commotion/unsaved_changes", {tree=tree, controller=controller, category=category})%>
<!--<%include("themes/commotion/unsaved_changes", {tree=tree, controller=controller, category=category})%>-->

<%end%> <!--End Regular Menu-->
<div class="navbar-inners"><div class="color0"></div><div class="color1"></div><div class="color2"></div><div class="color3"></div><div class="color4"></div></div> <!--Do we want the pretty colors in the new UI? If not move into the last lua statment above.-->

<% if request[2] == "commotion" then%><!--Start "Basic" SIDEBAR here -->
<%end%> <!--End Regular Menu--> <!-- ??? Regular vs Basic ??? -->

<div class="navbar-inners"><div class="color0"></div><div class="color1"></div><div class="color2"></div><div class="color3"></div><div class="color4"></div></div>
<!--Do we want the pretty colors in the new UI? If not move into the last lua statment above.-->

<div class="sb-container">
<div class="sb-btn"><h1>Status</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p class="submenutitle">This is the submenu title</p>
<ul class="submenu">
<li>Cats</li>
<li>Cats</li>
<li>Cats</li>
<li>Meow</li>
</ul>
</div>
</div>

<div class="sb-btn"><h1>Basic Config</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p>Nulla facilisi. Proin sodales dolor</p>
</div>
</div>

<div class="sb-btn"><h1>Client Controls</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p>Praesent ultricies risus quis magna convallis, ac condimentum tellus laoreet. Donec dictum velit enim, nec hendrerit leo mattis sit amet.</p>
</div>
</div>

<div class="sb-btn"><h1>Applications</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p>Fusce eget ultricies ante. In augue urna, rhoncus ac tellus non, porta malesuada magna. Nulla tincidunt orci in metus rhoncus, at malesuada quam varius. Mauris sed tincidunt massa, ut cursus magna. Pellentesque cursus sapien turpis, id blandit magna tempus at.</p>
</div>
</div>
<div class="sb-btn"><h1>Security</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p>Fusce eget ultricies ante. In augue urna, rhoncus ac tellus non, porta malesuada magna. Nulla tincidunt orci in metus rhoncus, at malesuada quam varius.</p>
</div>
</div>

<div class="sb-btn"><h1>Advanced</h1></div>
<div class="sb-content">
<div class="sb-content-inner">
<p>Fusce eget ultricies ante. In augue urna, rhoncus ac tellus non, porta malesuada magna. Nulla tincidunt orci in metus rhoncus, at malesuada quam varius. Mauris sed tincidunt massa, ut cursus magna. Pellentesque cursus sapien turpis, id blandit magna tempus at.</p>
</div>
</div>
</div>
<% if request[2] == "commotion" then%><!--Start "Basic" SIDEBAR here -->

<%include("themes/commotion/drop_menu", {controller=controller, cattree=cattree, category=category})%>


<%end%> <!--End "Basic" SIDEBAR here -->


<div class="sb-btn"><h3><a href="">Advanced</a></h3></div>

</div> <!-- End of "sb-container" div. Place "Advanced" button above this end or there will be layout badness -->

<section id="maincontent">
<%include("themes/commotion/subtree", {controller=controller, category=category, cattree=cattree})%>
146 changes: 0 additions & 146 deletions files/templates/header.htm~
View file

This file was deleted.

0 comments on commit d9f2791

Please sign in to comment.