From 5532907a12e22adf8d5058c7bd230adfbb8686b2 Mon Sep 17 00:00:00 2001
From: Richard <rm.sylvester@gmail.com>
Date: Tue, 29 Jul 2014 10:27:59 +0200
Subject: [PATCH] WIP styling comments buttons but broken quoting.

---
 .../components/activity-comment-directive.js  |  6 ++++-
 .../components/activity_comment.html          | 10 +++++--
 .../work_packages/tabs/_user_activity.html    | 27 ++++++++++++-------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/angular/directives/components/activity-comment-directive.js b/app/assets/javascripts/angular/directives/components/activity-comment-directive.js
index e6a28b0bc5..5b8163707f 100644
--- a/app/assets/javascripts/angular/directives/components/activity-comment-directive.js
+++ b/app/assets/javascripts/angular/directives/components/activity-comment-directive.js
@@ -52,7 +52,11 @@ angular.module('openproject.uiComponents')
             scope.$emit('workPackageRefreshRequired', '');
             return response;
           });
-      }
+      };
+
+      scope.clearComment = function() {
+        scope.activity.comment = '';
+      };
     }
   };
 }]);
diff --git a/public/templates/components/activity_comment.html b/public/templates/components/activity_comment.html
index d86fe8128d..fcaf8ad3d2 100644
--- a/public/templates/components/activity_comment.html
+++ b/public/templates/components/activity_comment.html
@@ -3,12 +3,18 @@
     <label>
       <h3>{{ title }}</h3>
       <textarea id="add-comment-text"
+                class="add-comment-text"
                 name="add_comment_text"
                 ng-model="activity.comment"
-                required></textarea>
+                required
+                placeholder="Add your comments here">
+      </textarea>
       <button class="button"
               ng-click="createComment()"
-              ng-disabled="commentForm.$invalid">{{ buttonTitle }}</button>
+              ng-disabled="commentForm.$invalid"><i class="icon-yes icon-left"></i>{{ buttonTitle }}
+      </button>
+      <button class="button" ng-disabled="commentForm.$invalid" ng-click="clearComment()">
+        <i class="icon-close icon-left"></i>Cancel</button>
     </label>
   </form>
 </div>
diff --git a/public/templates/work_packages/tabs/_user_activity.html b/public/templates/work_packages/tabs/_user_activity.html
index da45b4236a..b5868970ab 100644
--- a/public/templates/work_packages/tabs/_user_activity.html
+++ b/public/templates/work_packages/tabs/_user_activity.html
@@ -15,15 +15,24 @@
   <span class="date">{{ I18n.t('js.label_commented_on') }} <date-time date-time-value="activity.props.createdAt"/></date-time>
   <span class="comment wiki">
     <div ng-if="inEdit">
-      <div>
-        <textarea id="edit-comment-text"
-                  ng-bind-html="activity.props.rawComment"
-                  rows="5"></textarea>
-      </div>
-      <div>
-        <button class="button" ng-click="updateComment()">{{ I18n.t('js.button_update') }}</button>
-        <span><a href="" ng-click="cancelEdit()">cancel</a></span>
-      </div>
+      <form name="editCommentForm">
+        <div>
+          <textarea id="edit-comment-text"
+                    name="edit_comment_text"
+                    class="add-comment-text"
+                    ng-model="activity.props.rawComment"
+                    ng-bind-html="activity.props.rawComment"
+                    rows="4"
+                    required></textarea>
+        </div>
+        <div>
+          <button class="button"
+                  ng-click="updateComment()"
+                  ng-disabled="editCommentForm.$invalid"><i class="icon-yes icon-left"></i>{{ I18n.t('js.button_update') }}
+          </button>
+          <button class="button" ng-disabled="commentForm.$invalid" ng-click="cancelEdit()"><i class="icon-close icon-left"></i>Cancel</button>
+        </div>
+      </form>
     </div>
     <span ng-if="!inEdit"
           class="message"