X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comment-add.component.html;h=3ee818c8b5db5e25cffe7f231180a8401a6a4a75;hb=fa12eacc014aae8094d108634371640f2695bf9f;hp=b4f8bda5e30a10126196a46a7feea10ecc03304d;hpb=0672dc769b6ee42b4357748c62aaeabf8801c472;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
index b4f8bda5e..3ee818c8b 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
@@ -1,30 +1,42 @@
 <form novalidate [formGroup]="form" (ngSubmit)="formValidated()">
   <div class="avatar-and-textarea">
-    <img [src]="getAvatarUrl()" alt="Avatar" />
+    <my-actor-avatar [account]="user?.account" size="25"></my-actor-avatar>
 
     <div class="form-group">
-      <my-help class="markdown-guide" helpType="custom" iconName="markdown" i18n-title title="Markdown compatible">
-        <ng-template ptTemplate="customHtml">
-          <div i18n>
-            Markdown compatible that supports:
-
-            <ul>
-              <li>Emphasis: <strong>**bold**</strong>, <i>_italic_</i></li>
-              <li>Links</li>
-              <li>Break lines</li>
-              <li>Lists</li>
-              <li>Emojis</li>
-            </ul>
-          </div>
-        </ng-template>
-      </my-help>
       <textarea i18n-placeholder placeholder="Add comment..." myAutoResize
                 [readonly]="(user === null) ? true : false"
                 (click)="openVisitorModal($event)"
                 formControlName="text" [ngClass]="{ 'input-error': formErrors['text'] }"
                 (keyup.control.enter)="onValidKey()" (keyup.meta.enter)="onValidKey()" #textarea>
-
       </textarea>
+
+      <my-help
+        [ngClass]="{ 'is-rtl': isRTL() }" class="markdown-guide" helpType="custom" iconName="markdown"
+        tooltipPlacement="left auto" autoClose="true" i18n-title title="Markdown compatible"
+      >
+        <ng-template ptTemplate="customHtml">
+          <span i18n>Markdown compatible that supports:</span>
+
+          <ul>
+            <li><span i18n>Auto generated links</span></li>
+            <li><span i18n>Break lines</span></li>
+            <li><span i18n>Lists</span></li>
+            <li>
+              <span i18n>Emphasis</span>
+              <code>**<strong i18n>bold</strong>** _<i i18n>italic</i>_</code>
+            </li>
+            <li>
+              <span i18n>Emoji shortcuts</span>
+              <code>:) &lt;3</code>
+            </li>
+            <li>
+              <span i18n>Emoji markup</span>
+              <code>:smile:</code>
+              <div><a href="" (click)="openEmojiModal($event)" i18n>See complete list</a></div>
+            </li>
+          </ul>
+        </ng-template>
+      </my-help>
       <div *ngIf="formErrors.text" class="form-error">
         {{ formErrors.text }}
       </div>
@@ -32,10 +44,11 @@
   </div>
 
   <div class="comment-buttons">
-    <button *ngIf="isAddButtonDisplayed()" class="cancel-button" (click)="cancelCommentReply()" type="button" i18n>
+    <button *ngIf="isAddButtonDisplayed()" class="peertube-button tertiary-button cancel-button" (click)="cancelCommentReply()" type="button" i18n>
       Cancel
     </button>
-    <button *ngIf="isAddButtonDisplayed()" [ngClass]="{ disabled: !form.valid || addingComment }">
+
+    <button *ngIf="isAddButtonDisplayed()" class="peertube-button orange-button" [ngClass]="{ disabled: !form.valid || addingComment }">
       {{ addingCommentButtonValue }}
     </button>
   </div>
@@ -44,28 +57,40 @@
 <ng-template #visitorModal let-modal>
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title" i18n>You are one step away from commenting</h4>
-    <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideVisitorModal()"></my-global-icon>
+    <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideModals()"></my-global-icon>
   </div>
+
   <div class="modal-body">
     <span i18n>
-      You can comment using an account on any ActivityPub-compatible instance.
-      On most platforms, you can find the video by typing its URL in the search bar and then comment it
-      from within the software's interface.
-    </span>
-    <span i18n>
-      If you have an account on Mastodon or Pleroma, you can open it directly in their interface:
+      You can comment using an account on any ActivityPub-compatible instance (PeerTube/Mastodon/Pleroma account for example).
     </span>
+
     <my-remote-subscribe [interact]="true" [uri]="getUri()"></my-remote-subscribe>
   </div>
+
   <div class="modal-footer inputs">
     <input
-      type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
-      (click)="hideVisitorModal()" (key.enter)="hideVisitorModal()"
+      type="button" role="button" i18n-value value="Cancel" class="peertube-button grey-button"
+      (click)="hideModals()" (key.enter)="hideModals()"
     >
 
     <input
-      type="submit" i18n-value value="Login to comment" class="action-button-submit"
+      type="submit" i18n-value value="Login to comment" class="peertube-button orange-button"
       (click)="gotoLogin()"
     >
   </div>
 </ng-template>
+
+<ng-template #emojiModal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="modal-basic-title" i18n>Markdown Emoji List</h4>
+    <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideModals()"></my-global-icon>
+  </div>
+  <div class="modal-body">
+    <div class="emoji-flex">
+      <div class="emoji-flex-item" *ngFor="let emojiMarkup of emojiMarkupList">
+        {{ emojiMarkup[0] }} <code>:{{ emojiMarkup[1] }}:</code>
+      </div>
+    </div>
+  </div>
+</ng-template>