Upgraded to Meteor 1.6.0.1 and NodeJS 8.9.3. Added weekly/daily property to venues to support graphing and tracking of actual income from farmers markets (they don't usually match with expected income). Added workers objects to help illustrate who did what work (who was at the market on a specific week for example, or who prep'd and who canned a batch of jam). Fixed some bugs in the venue page. Re-design of the menu to allow for more menu options.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<template name="Body">
|
||||
{{> sAlert}}
|
||||
<div id="mainBody" class="mainBody">
|
||||
<nav class="leftSidebarContainer">
|
||||
<a href="javascript:" class="fa fa-bars leftSidebarMenuButton" aria-hidden="true"></a>
|
||||
<nav class="leftSidebarContainer generalSidebar">
|
||||
<a href="javascript:" class="fa fa-balance-scale leftSidebarMenuButton generalMenuButton" aria-hidden="true"></a>
|
||||
<div class="leftSidebar">
|
||||
<div class="logoArea">
|
||||
<i class="fa fa-sign-out fa-2x signOut" aria-hidden="true"></i>
|
||||
@@ -10,7 +10,63 @@
|
||||
<img src="/images/PetitTetonLogo_v2.png"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="menuArea">
|
||||
<div class="menuArea generalMenu">
|
||||
<ul>
|
||||
<li class="{{isActiveRoute 'Sales'}}">
|
||||
<a href="{{pathFor 'Sales'}}">
|
||||
Sales<!-- <a class="subMenu {{isActiveRoute 'SalesSheets'}}" href="{{pathFor 'SalesSheets'}}">Sales Sheets</a>-->
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{isActiveRoute 'SalesSheets'}}">
|
||||
<a href="{{pathFor 'SalesSheets'}}">
|
||||
Sales Sheets
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{isActiveRoute 'Production'}}">
|
||||
<a href="{{pathFor 'Production'}}">
|
||||
Production<!-- <span class="tag">sample</span>-->
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="footer">
|
||||
© Petit Teton LLC 2017
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<nav class="leftSidebarContainer graphsSidebar">
|
||||
<a href="javascript:" class="fa fa-line-chart leftSidebarMenuButton graphsMenuButton" aria-hidden="true"></a>
|
||||
<div class="leftSidebar">
|
||||
<div class="logoArea">
|
||||
<i class="fa fa-sign-out fa-2x signOut" aria-hidden="true"></i>
|
||||
<div class="logo">
|
||||
<img src="/images/PetitTetonLogo_v2.png"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="menuArea graphsMenu">
|
||||
<ul>
|
||||
<li class="{{isActiveRoute 'Graphs'}}">
|
||||
<a href="{{pathFor 'Graphs'}}">
|
||||
Graphs
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="footer">
|
||||
© Petit Teton LLC 2017
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<nav class="leftSidebarContainer settingsSidebar">
|
||||
<a href="javascript:" class="fa fa-cogs leftSidebarMenuButton settingsMenuButton" aria-hidden="true"></a>
|
||||
<div class="leftSidebar">
|
||||
<div class="logoArea">
|
||||
<i class="fa fa-sign-out fa-2x signOut" aria-hidden="true"></i>
|
||||
<div class="logo">
|
||||
<img src="/images/PetitTetonLogo_v2.png"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="menuArea settingsMenu">
|
||||
<ul>
|
||||
{{#if isInRole 'manage'}}
|
||||
<li class="{{isActiveRoute 'UserManagement'}}">
|
||||
@@ -24,21 +80,6 @@
|
||||
</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
<li class="{{isActiveRoute 'Sales'}}">
|
||||
<a href="{{pathFor 'Sales'}}">
|
||||
Sales <a class="subMenu {{isActiveRoute 'SalesSheets'}}" href="{{pathFor 'SalesSheets'}}">Sales Sheets</a>
|
||||
</a>
|
||||
</li>
|
||||
<!--<li class="{{isActiveRoute 'SalesSheets'}}">-->
|
||||
<!--<a href="{{pathFor 'SalesSheets'}}">-->
|
||||
<!--Sales Sheets-->
|
||||
<!--</a>-->
|
||||
<!--</li>-->
|
||||
<li class="{{isActiveRoute 'Production'}}">
|
||||
<a href="{{pathFor 'Production'}}">
|
||||
Production<!-- <span class="tag">sample</span>-->
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{isActiveRoute 'Products'}}">
|
||||
<a href="{{pathFor 'Products'}}">
|
||||
Products
|
||||
@@ -64,9 +105,9 @@
|
||||
Venues
|
||||
</a>
|
||||
</li>
|
||||
<li class="{{isActiveRoute 'Graphs'}}">
|
||||
<a href="{{pathFor 'Graphs'}}">
|
||||
Graphs
|
||||
<li class="{{isActiveRoute 'Workers'}}">
|
||||
<a href="{{pathFor 'Workers'}}">
|
||||
Workers
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user