Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge remote-tracking branch 'origin/master'
# Conflicts: # TeamDBAwesome/TeamDBAwesome/js/adminController.js
- Loading branch information
Showing
7 changed files
with
135 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
<div ng-controller="adminController"> | ||
<div ng-controller="adminController" data-ng-init="initPortal()"> | ||
<div class="text-center"> | ||
<div class='jumbotron text-center'> | ||
<h2>Welcome Admin</h2> | ||
<h3>Display Orders to move to invoice</h3> | ||
<h2>Welcome {{name}}</h2> | ||
<br><br> | ||
Active Order Screen - where clicking an order from the dashboard goes to another screen to | ||
show the status and content of each order. This should have a similar content and structure | ||
to the “Pending/Completed Orders and Status Screen” of the Customer. This will also | ||
involve additional capabilities for processing the order and interacting with customers on | ||
screen that is enabled from the click. | ||
</div> | ||
</div> | ||
<div ui-view></div> | ||
<table> | ||
<tr><th><center><h2>Current Orders</h2><br />Click an order to see details</center></th></tr> | ||
<td><center>Invoice Number</center></td> | ||
<tr ng-repeat="x in currInvoices"> | ||
<td> <center><text ng-click="openOrder(x)"><b>{{x.invoiceId}}</b></text></center> </td> | ||
</tr> | ||
</table> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,40 @@ | ||
|
||
<div ng-controller='homeController'> | ||
|
||
<div class="text-center"> | ||
<div class="vid_img" style="background-image: url('http://i42.tinypic.com/124bst0.jpg');"></div> | ||
<div class=''> | ||
|
||
<div class='jumbotron'> | ||
<h2 class=''>~Home Page ~</h2> | ||
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. </div> | ||
<table class="table table-striped"> | ||
<tr>Duis pellentesque, erat ut imperdiet sollicitudin, neque sapien tristique nibh, ac luctus ante augue a nulla.</tr> | ||
<tr> Phasellus in purus augue. Fusce ac lectus euismod, maximus elit ac, eleifend nulla. </tr> | ||
<tr>Donec ultrices ut enim at suscipit. Aenean ac pharetra sem, nec convallis dolor.</tr> | ||
<tr>Duis non nibh pharetra, dapibus diam sagittis, dictum urna. Duis aliquet vitae eros quis vestibulum.</tr> | ||
</table> | ||
</div> | ||
<h2>Links Maybe Eventually</h2> | ||
<div> | ||
<table class="table table-striped"> | ||
<td>Donec nisi lorem, maximus at augue eu, efficitur blandit justo. </td> | ||
<td>Praesent placerat lacus non pretium blandit. </td> | ||
<td>Praesent mauris nibh, facilisis in est non, aliquam accumsan mi.</td> | ||
</table> | ||
</div> | ||
</div> | ||
<div class="text-center"> | ||
<div class="vid_img" style="background-image: url('http://i42.tinypic.com/124bst0.jpg');"></div> | ||
<div class=''> | ||
|
||
<div class='jumbotron'> | ||
<h2 class=''>~Home Page ~</h2> | ||
<div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. </div> | ||
<table class="table table-striped"> | ||
<tr>Duis pellentesque, erat ut imperdiet sollicitudin, neque sapien tristique nibh, ac luctus ante augue a nulla.</tr> | ||
<tr> Phasellus in purus augue. Fusce ac lectus euismod, maximus elit ac, eleifend nulla. </tr> | ||
<tr>Donec ultrices ut enim at suscipit. Aenean ac pharetra sem, nec convallis dolor.</tr> | ||
<tr>Duis non nibh pharetra, dapibus diam sagittis, dictum urna. Duis aliquet vitae eros quis vestibulum.</tr> | ||
<tr>Duis pellentesque, erat ut imperdiet sollicitudin, neque sapien tristique nibh, ac luctus ante augue a nulla.</tr> | ||
<tr> Phasellus in purus augue. Fusce ac lectus euismod, maximus elit ac, eleifend nulla. </tr> | ||
<tr>Donec ultrices ut enim at suscipit. Aenean ac pharetra sem, nec convallis dolor.</tr> | ||
<tr>Duis non nibh pharetra, dapibus diam sagittis, dictum urna. Duis aliquet vitae eros quis vestibulum.</tr> | ||
<tr>Duis pellentesque, erat ut imperdiet sollicitudin, neque sapien tristique nibh, ac luctus ante augue a nulla.</tr> | ||
<tr> Phasellus in purus augue. Fusce ac lectus euismod, maximus elit ac, eleifend nulla. </tr> | ||
<tr>Donec ultrices ut enim at suscipit. Aenean ac pharetra sem, nec convallis dolor.</tr> | ||
<tr>Duis non nibh pharetra, dapibus diam sagittis, dictum urna. Duis aliquet vitae eros quis.</tr> | ||
</table> | ||
</div> | ||
|
||
<h2 class='blink'>HOT SINGLES IN YOUR AREA</h2> | ||
<div> | ||
<table class="table table-striped"> | ||
<td>Start: Jan 2015</td> | ||
<td>End: April 2015</td> | ||
</table> | ||
</div> | ||
</div> | ||
|
||
</div> | ||
<h2 class='blink'>HOT SINGLES IN YOUR AREA</h2> | ||
<div> | ||
<table class="table table-striped"> | ||
<td>Like us on Facebook</td> | ||
<td>Follow us on twitter</td> | ||
</table> | ||
</div> | ||
|
||
</div> | ||
|
||
<div ui-view></div> | ||
<div ui-view></div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters