Merge branch 'master' into xep0333

9 files changed, 20 insertions, 9 deletions

diff --git a/template/chat-window-message.hbs b/template/chat-window-message.hbs
index 20a95f87..b2161b2b 100644
--- a/template/chat-window-message.hbs
+++ b/template/chat-window-message.hbs
@@ -1,5 +1,8 @@
 <div class="jsxc-chatmessage jsxc-{{direction}}" id="{{id}}">
    <div class="jsxc-content">{{content}}</div>
    <div class="jsxc-error-content"></div>
-   <div class="jsxc-timestamp"></div>
+   <div class="jsxc-chatmessage__footer">
+      <div class="jsxc-sender"></div>
+      <div class="jsxc-timestamp"></div>
+   </div>
 </div>
diff --git a/template/chatWindow.hbs b/template/chatWindow.hbs
index e7b86979..8226cb28 100644
--- a/template/chatWindow.hbs
+++ b/template/chatWindow.hbs
@@ -13,10 +13,11 @@
             button-classes="jsxc-menu__more--light jsxc-icon jsxc-icon--more-light jsxc-icon--clickable"}}
             <li class="jsxc-clear">{{t "clear_history"}}</li>
             <li class="jsxc-share-screen">{{t "Share_screen"}}</li>
+            <li class="jsxc-send-location">{{t "Send_location"}}</li>
          {{/menu}}
 
-         <div class="jsxc-bar__action-entry jsxc-bar__action-entry--disabled jsxc-audio"></div>
-         <div class="jsxc-bar__action-entry jsxc-bar__action-entry--disabled jsxc-video"></div>
+         <div class="jsxc-bar__action-entry jsxc-disabled jsxc-audio"></div>
+         <div class="jsxc-bar__action-entry jsxc-disabled jsxc-video"></div>
          <div class="jsxc-bar__action-entry jsxc-icon jsxc-icon--close-light jsxc-icon--clickable jsxc-js-close"></div>
       </div>
       <div class="jsxc-window-fade">
@@ -32,7 +33,7 @@
              {{> menu
                     classes="jsxc-menu--emoticons jsxc-shrink--no jsxc-menu--dark jsxc-menu--drop-bottom-left"
                     button-classes="jsxc-icon jsxc-icon--emoticon jsxc-icon--clickable"}}
-            <textarea class="jsxc-message-input" placeholder="{{t "Message"}}"></textarea>
+            <textarea class="jsxc-message-input" placeholder="{{t "Message"}}" dir="auto"></textarea>
             <div class="jsxc-file-transfer" title="{{t "Send_file"}}">
                <label><input type="file" name="files" /><label>
             </div>
diff --git a/template/confirm.hbs b/template/confirm.hbs
index 7cb660c1..514e7510 100644
--- a/template/confirm.hbs
+++ b/template/confirm.hbs
@@ -1,6 +1,6 @@
 <h3>{{t "Are_you_sure"}}</h3>
 
-<p>{{question}}</p>
+<p>{{{question}}}</p>
 
 <button class="jsxc-button jsxc-button--primary jsxc-confirm jsxc-js-close" type="button">{{t "Confirm"}}</button>
 <button class="jsxc-button jsxc-button--default jsxc-dismiss jsxc-js-close" type="button">{{t "Dismiss"}}</button>
diff --git a/template/debugLog.hbs b/template/debugLog.hbs
index 53b7859e..0b316d50 100644
--- a/template/debugLog.hbs
+++ b/template/debugLog.hbs
@@ -8,5 +8,10 @@
 </dl>
 </div>
 
+<h3>{{t "Webcam"}}</h3>
+<div class="jsxc-webcam">
+   <button type="button" class="jsxc-button jsxc-button--default">{{t "Test"}}</button>
+</div>
+
 <h3>{{t "Log"}}</h3>
 <div class="jsxc-log"></div>
diff --git a/template/dialogOmemoDeviceItem.hbs b/template/dialogOmemoDeviceItem.hbs
index ff511cf6..0657fa33 100644
--- a/template/dialogOmemoDeviceItem.hbs
+++ b/template/dialogOmemoDeviceItem.hbs
@@ -2,7 +2,7 @@
     {{#unless isCurrentDevice}}
     <div class="jsxc-omemo-device-last-used"></div>
     {{/unless}}
-    <div class="jsxc-omemo-device-id">{{id}}{{#if isCurrentDevice}} (this device){{/if}}</div>
+    <div class="jsxc-omemo-device-id">{{id}}{{#if isCurrentDevice}} ({{t "this_device"}}){{/if}}</div>
     <div class="jsxc-omemo-device-fingerprint jsxc-fingerprint">{{fingerprint}}</div>
     <div class="jsxc-omemo-device-trust" data-trust="{{trust}}">{{trust}}</div>
     <div class="jsxc-omemo-device-action">
diff --git a/template/loginBox.hbs b/template/loginBox.hbs
index 17361533..1372ed96 100644
--- a/template/loginBox.hbs
+++ b/template/loginBox.hbs
@@ -24,7 +24,7 @@
    <div class="jsxc-alert jsxc-alert--warning jsxc-hidden">{{t "Sorry_we_cant_authentikate_"}}</div>
    <div class="form-group">
       <div class="col-sm-offset-4 col-sm-9">
-         <button type="submit" class="jsxc-button jsxc-button--primary" name="commit" data-jsxc-loading-text="{{t "Connecting..."}}">{{t "Connect"}}</button>
+         <button type="submit" class="jsxc-button jsxc-button--primary" name="commit" data-jsxc-loading-text="{{t "Connecting"}}...">{{t "Connect"}}</button>
          <button type="reset" class="jsxc-button jsxc-button--default jsxc-js-close" name="clear">{{t "Cancel"}}</button>
       </div>
    </div>
diff --git a/template/roster-form.hbs b/template/roster-form.hbs
index 76b49d59..a3dcd007 100644
--- a/template/roster-form.hbs
+++ b/template/roster-form.hbs
@@ -5,5 +5,5 @@
 
    <div class="jsxc-alert jsxc-alert--warning jsxc-hidden">{{t "Sorry_we_cant_authentikate_"}}</div>
 
-   <button type="submit" class="jsxc-button jsxc-button--primary" name="commit" data-jsxc-loading-text="{{t "Connecting..."}}">{{t "Connect"}}</button>
+   <button type="submit" class="jsxc-button jsxc-button--primary" name="commit" data-jsxc-loading-text="{{t "Connecting"}}...">{{t "Connect"}}</button>
 </form>
diff --git a/template/roster-item.hbs b/template/roster-item.hbs
index 06b044be..2faef72f 100644
--- a/template/roster-item.hbs
+++ b/template/roster-item.hbs
@@ -6,7 +6,7 @@
       <div title="{{lastMessage}}" class="jsxc-bar__caption__secondary">{{lastMessage}}</div>
    </div>
 
-   {{#> menu classes="jsxc-bar__action-entry jsxc-menu--drop-top-right jsxc-menu--light" button-classes="jsxc-icon jsxc-icon--more-dark jsxc-icon--clickable"}}
+   {{#> menu classes="jsxc-bar__action-entry jsxc-menu--vertical-left jsxc-menu--light" button-classes="jsxc-icon jsxc-icon--more-dark jsxc-icon--clickable"}}
         <li class="jsxc-rename" title="{{t "rename_buddy"}}"><span class="jsxc-icon jsxc-icon--edit"></span></li>
         <li class="jsxc-vcard" title="{{t "get_info"}}"><span class="jsxc-icon jsxc-icon--info"></span></li>
         <li class="jsxc-delete" title="{{t "delete_buddy"}}"><span class="jsxc-icon jsxc-icon--delete"></span></li>
diff --git a/template/videoDialog.hbs b/template/videoDialog.hbs
index 757f21f6..564c012c 100644
--- a/template/videoDialog.hbs
+++ b/template/videoDialog.hbs
@@ -18,6 +18,8 @@
       <div class="jsxc-controlbar jsxc-visible">
          <div>
             <div class="jsxc-hang-up jsxc-video-control"></div>
+            <div class="jsxc-microphone jsxc-video-control"></div>
+            <div class="jsxc-video jsxc-video-control"></div>
             <div class="jsxc-fullscreen jsxc-video-control"></div>
          </div>
       </div>