merging in master

Author: rmisio

css/obBase.css

@@ -2407,7 +2407,6 @@ div.chatSearchOut .chatSearchIcon {
 
 .chatConversationMessageTimestamp {
   font-size: 11px;
-  color: #fff;
   opacity: .35;
   font-weight: 500;
   letter-spacing: 0;
@@ -3415,7 +3414,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   padding: 10px 0;
   width: 230px;
   overflow: hidden;
-  transform: translateY(-330px);
+  transform: translateY(-110%);
   transition: transform 200ms;
 }
 
@@ -4668,7 +4667,7 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1 .positionTop {
   position: absolute;
   top: 0;
-  right: 0;
+  left: 0;
 }
 
 #ov1 .positionTopRight {

js/config.js

@@ -15,15 +15,16 @@ module.exports = {
   keyShortcuts: {
     undo:            'z',
     discover:        'd',
-    myPage:          'h',
-    customizePage:   'e',
-    create:          'n',
-    purchases:       't',
-    sales:           'y',
-    cases:           'j',
-    settings:        'g',
-    addressBar:      'l',
+    myPage:          'j',
+    customizePage:   'k',
+    create:          'l',
+    purchases:       ',',
+    sales:           '.',
+    cases:           '/',
+    settings:        ';',
+    addressBar:      '[',
     save:            's',
+    refresh:         't',
     restart:         'r'
   },
 

js/languages/en-US.json

@@ -568,6 +568,7 @@
     "cases": "Cases",
     "notifications": "Notifications",
     "settings": "Settings",
+    "refresh": "Refresh Page",
     "restart": "Restart Application",
     "about": "About OpenBazaar",
     "support": "Support OpenBazaar",

js/main.js

@@ -234,10 +234,13 @@ $('body').on('keypress', 'input', function(event) {
 
 //keyboard shortucts
 $(window).bind('keydown', function(e) {
-  if ((e.ctrlKey || e.metaKey) && !e.altKey) { //test for alt key to prevent international keyboard issues
-    var route = null,
-        char = String.fromCharCode(e.which).toLowerCase();
+  var char = String.fromCharCode(e.which).toLowerCase(),
+      ctrl = (e.ctrlKey || e.metaKey) && !e.altKey, //test for alt key to prevent international keyboard issues
+      route = null;
 
+  if (e.keyCode == 116) { //on F5 press
+    Backbone.history.loadUrl();
+  }
     switch (char) {
       case config.keyShortcuts.undo:
         //run undo programmatically to avoid crash
@@ -268,6 +271,16 @@ $(window).bind('keydown', function(e) {
       case config.keyShortcuts.settings:
         route = 'settings';
         break;
+      case config.keyShortcuts.addressBar:
+        // Select all text in address bar
+        $('.js-navAddressBar').select();
+        break;
+      case config.keyShortcuts.save:
+        window.obEventBus.trigger('saveCurrentForm');
+        break;
+      case config.keyShortcuts.refresh:
+        Backbone.history.loadUrl();
+        break;
     }
 
     if (route !== null) {

js/templates/pageNav.html

@@ -123,6 +123,11 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
     <%= polyglot.t('nav.settings') %>
 	<span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.settings.toUpperCase() %></span>
   </a>
+  <a class="js-navRefresh">
+    <span class="ion-loop fontSize11 marginRight2 textOpacity1"></span>
+    <%= polyglot.t('nav.refresh') %>
+    <span class="pull-right txt-muted"><%= config.keyShortcutPrefix + config.keyShortcuts.refresh.toUpperCase() %></span>
+  </a>
   <a class="js-navRestart">
     <span class="ion-refresh fontSize11 marginRight2 textOpacity1"></span>
     <%= polyglot.t('nav.restart') %>

js/templates/transactionModal.html

@@ -991,7 +991,7 @@ <h3 class="txt-bright"><%= polyglot.t('CheckExchanges') %> </h3>
     <div class="js-main js-discussion transactionDiscussionTab" style="height:319px">
       <div class="scrollOverflowY js-discussionScroller customThemeScrollbar" style="height: 237px;">
         <div class="js-discussionWrapperEmpty textOpacity50 fontSize14 marginTop80 alignCenter"><%= polyglot.t('transactions.NoMessages') %></div>
-        <div class="js-discussionWrapper">
+        <div class="custCol-text js-discussionWrapper">
         </div>
       </div>
       <div class="flexRow pad10Top width100 positionBottom custCol-secondary js-discussionForm border2 custCol-border-secondary">