viithiisys / Acufuel

Download as
Browse Code ยป

Commit 8fc0ea8f4f28de82e9c3272a15c6a892f28b8133

Authored by Kuldeep Arora
1 parent bcd6c1025f
Exists in master

update menu items

Showing 15 changed files with 42 additions and 32 deletions   Show diff stats
app/partials/ContactView/ContactView.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5 </style>
... ...
app/partials/FuelVendors/FuelVendors.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5  
... ...
app/partials/account/account.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5 </style>
... ...
app/partials/analytics/analytics.html
Diff comments   View file @8fc0ea8
... ... @@ -11,7 +11,7 @@
11 11 margin-right: 2em;
12 12 margin-left: 2em;
13 13 }
14   - .subnavbar .mainnav > li:nth-child(5) > a{
  14 + .subnavbar .mainnav > li:nth-child(6) > a{
15 15 color: #ca5c6a;
16 16 }
17 17 .table {
... ...
app/partials/customers/customers.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5  
... ...
app/partials/enterFuelOrder/enterFuelOrder.html
Diff comments   View file @8fc0ea8
1 1 <style type="text/css">
2   - .subnavbar .mainnav > li:nth-child(2) > a{
  2 + .subnavbar .mainnav > li:nth-child(4) > a{
3 3 color: #c44646;
4 4 }
5 5 .customInputWrap{
... ...
app/partials/flightDepOrders/flightDepOrders.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5  
... ...
app/partials/flightTracking/flightTracking.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(6) > a{
  2 + .subnavbar .mainnav > li:nth-child(7) > a{
3 3 color: #ca5c6a;
4 4 }
5 5  
... ...
app/partials/fuelManager/fuelManager.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(2) > a{
  2 + .subnavbar .mainnav > li:nth-child(3) > a{
3 3 color: #c44646;
4 4 }
5 5 button > i{
... ...
app/partials/fuelOrders/fuelOrders.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(2) > a{
  2 + .subnavbar .mainnav > li:nth-child(4) > a{
3 3 color: #c44646;
4 4 }
5 5  
... ...
app/partials/main/main.html
Diff comments   View file @8fc0ea8
... ... @@ -49,18 +49,31 @@
49 49 <span>Home</span>
50 50 </a>
51 51 </li>
  52 +
52 53 <li class="dropdown" ng-if="isAuthenticated">
53 54 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
54   - <i class="fa fa-tint"></i>
  55 + <i class="fa fa-user"></i>
  56 + <span>Accounts</span>
  57 + <b class="caret"></b>
  58 + </a>
  59 + <ul class="dropdown-menu">
  60 + <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> -->
  61 + <li><a ui-sref="app.customers">View Customers</a></li>
  62 + <li><a ui-sref="app.account">View Fuel Vendors</a></li>
  63 + <!-- <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li> -->
  64 + </ul>
  65 + </li>
  66 +
  67 +
  68 + <li class="dropdown" ng-if="isAuthenticated">
  69 + <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
  70 + <i class="fa fa-book"></i>
55 71 <span>Fuel Manager</span>
56 72 <b class="caret"></b>
57 73 </a>
58 74 <ul class="dropdown-menu">
59   - <li ng-show = 'isShowFMA'><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Manager</a></li>
60   - <li>
61   - <a ui-sref="app.enterFuelOrder">Enter Fuel Order</a>
62   - </li>
63   - <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Fee Manager</a></li>
  75 + <li ng-show = 'isShowFMA'><a ui-sref="app.updateFuelManager" href="#/updateFuelManager">Update Fuel Pricing</a></li>
  76 + <li><a ui-sref="app.fuelManager" href="#/fuelManager">Update Ramp Fees</a></li>
64 77 <li class="dropdown-submenu">
65 78 <a tabindex="-1" >Tax Manager</a>
66 79 <ul class="dropdown-menu">
... ... @@ -69,26 +82,23 @@
69 82 <li><a ui-sref="app.taxes" href="#/taxes">Airport Taxes</a></li>
70 83 </ul>
71 84 </li>
72   - <li ng-if="isAuthenticated">
73   - <a ui-sref="app.fuelOrders" href="#/fuelOrders">
74   - Fuel Orders
75   - </a>
76   - </li>
77 85 </ul>
78 86 </li>
  87 +
79 88 <li class="dropdown" ng-if="isAuthenticated">
80 89 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
81   - <i class="fa fa-user"></i>
82   - <span>Accounts</span>
  90 + <i class="fa fa-tint"></i>
  91 + <span>Fuel Orders</span>
83 92 <b class="caret"></b>
84   - </a>
  93 + </a>
85 94 <ul class="dropdown-menu">
86   - <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> -->
87   - <li><a ui-sref="app.customers">View Customers</a></li>
88   - <li><a ui-sref="app.account">View Fuel Vendors</a></li>
89   - <!-- <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li> -->
  95 + <li ng-show = 'isShowFMA'><a ui-sref="app.enterFuelOrder" href="#/fuelOrders">Create Fuel Order</a></li>
  96 + <li>
  97 + <a ui-sref="app.fuelOrders">Fuel Transactions</a>
  98 + </li>
90 99 </ul>
91 100 </li>
  101 +
92 102 <li ng-if="isAuthenticated">
93 103 <a ui-sref="app.scheduler">
94 104 <i class="fa fa-calendar"></i>
... ...
app/partials/scheduler/scheduler.html
Diff comments   View file @8fc0ea8
... ... @@ -3,7 +3,7 @@
3 3 padding: 5px;
4 4 margin: 3px;
5 5 }
6   - .subnavbar .mainnav > li:nth-child(4) > a{
  6 + .subnavbar .mainnav > li:nth-child(5) > a{
7 7 color: #ca5c6a;
8 8 }
9 9 .fc button, .fc-button-group, .fc-time-grid .fc-event .fc-time span{
... ...
app/partials/updateFuelManager/updateFuelManager.html
Diff comments   View file @8fc0ea8
1 1  
2 2  
3 3 <style>
4   - .subnavbar .mainnav > li:nth-child(2) > a{
  4 + .subnavbar .mainnav > li:nth-child(3) > a{
5 5 color: #c44646;
6 6 }
7 7 .extraClasToMerge{
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5 .widget-content{
... ...
app/partials/viewFuelVendor/viewFuelVendor.html
Diff comments   View file @8fc0ea8
1 1 <style>
2   - .subnavbar .mainnav > li:nth-child(3) > a{
  2 + .subnavbar .mainnav > li:nth-child(2) > a{
3 3 color: #ca5c6a;
4 4 }
5 5 .widget-content{
... ...