Merge pull request #850 from achamely/master

Update sidecar names
OmniLayer · Aug 25, 2014 · 610d5c8 · 610d5c8
2 parents 8944ad7 + c57f07b
commit 610d5c8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/www/js/app.js b/www/js/app.js
@@ -37,7 +37,7 @@ var app = angular.module('omniwallet', [
   $routeProvider.when('/wallet/:page?', {
       templateUrl: function(route) {
         //new views added here
-        var availableViews = ['overview', 'addresses', 'trade', 'history', 'send', 'pending'];
+        var availableViews = ['overview', 'addresses', 'trade', 'history', 'send', 'myoffers'];
 
         var viewFound = availableViews.indexOf(route.page);
         if (viewFound == -1)

diff --git a/www/partials/wallet_pending.html → www/partials/wallet_myoffers.html b/www/partials/wallet_pending.html → www/partials/wallet_myoffers.html
@@ -4,7 +4,7 @@
 
   <div class="col-xs-10" ng-controller="WalletTradePendingController" ng-init="getData(selectedTimeframe)">
   <div class="panel-default">
-    <div class="text-left panel-body om-title">Pending Offers</div>
+    <div class="text-left panel-body om-title">My Offers</div>
   </div>
 
   <div ng-show="pendingThinking">

diff --git a/www/partials/wallet_sc.html b/www/partials/wallet_sc.html
@@ -9,7 +9,7 @@
 <br ng-show="hasAddressesWithPrivkey">
 <li ng-show="hasAddressesWithPrivkey"><a class="" ng-click="goToTradePage($event)" href="javascript:void(0);"><span class="glyphicon glyphicon-globe"></span> Trade </a></li>
 <br ng-show="hasAddressesWithPrivkey">
-<li ng-show="hasAddressesWithPrivkey"><a class="" href="/wallet/pending"><span class="glyphicon glyphicon-flag"></span> Pending </a> </li>
+<li ng-show="hasAddressesWithPrivkey"><a class="" href="/wallet/myoffers"><span class="glyphicon glyphicon-flag"></span> My Offers </a> </li>
 <br ng-show="hasAddressesWithPrivkey">
 <li ng-show="hasAddressesWithPrivkey"><a href="/explorer/assets"><span class="glyphicon glyphicon-folder-open"></span> Assets </a> </li>
 <br>