Added icons to action buttons.

kiswa · Oct 25, 2014 · bc4ba9f · bc4ba9f
1 parent 919ee0d
commit bc4ba9f
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/css/styles.css b/css/styles.css
@@ -311,8 +311,8 @@ a:hover.fa {
     border-radius: 5px;
     margin: 5px;
 }
-a > span.fa-plus {
-    margin-left: 5px;
+span.fa {
+    margin-right: 5px;
 }
 .lane-placeholder {
     width: 100%;

diff --git a/partials/boardItemModal.html b/partials/boardItemModal.html
@@ -71,8 +71,8 @@ <h5>Points</h5>
                 <button type="submit" class="btn btn-info"
                  data-ng-click="submitItem(itemFormData)"
                  data-ng-disabled="itemFormData.isSaving">
-                 <span data-ng-if="itemFormData.isAdd">Add</span>
-                 <span data-ng-if="!itemFormData.isAdd">Save</span>
+                 <span data-ng-if="itemFormData.isAdd"><span class="fa fa-plus"></span> Add</span>
+                 <span data-ng-if="!itemFormData.isAdd"><span class="fa fa-save"></span> Save</span>
                   Item</button>
                 <a class="btn btn-default" data-ng-click="itemFormData.cancel()"
                  data-ng-disabled="itemFormData.isSaving">Cancel</a>

diff --git a/partials/boardItemViewModal.html b/partials/boardItemViewModal.html
@@ -68,9 +68,9 @@ <h4>Add Attachment</h4>
                         <input type="file" name="file" class="form-control"
                                data-file-upload="itemUpload" data-reset-flag="fileReset"
                                data-ng-disabled="viewItem.disabled">
-                        <button type="submit" id="upload-attachment" class="btn btn-primary"
+                        <button type="submit" id="upload-attachment" class="btn btn-info"
                                 data-ng-class="{'disabled': viewItem.disabled}"
-                                data-ng-click="addItemAttachment()">Upload</button>
+                                data-ng-click="addItemAttachment()"><span class="fa fa-upload"></span> Upload</button>
                     </div>
                 </div>
                 <div class="view-item-comments" data-ng-if="viewItem.ownComment.length">
@@ -100,9 +100,9 @@ <h4>Comments
                     <h4>Add Comment</h4>
                     <div class="form-group">
                         <textarea id="itemComment" class="form-control" rows="4" data-ng-model="comment.text"></textarea>
-                        <button type="submit" id="add-comment" class="btn btn-primary pull-right"
+                        <button type="submit" id="add-comment" class="btn btn-info pull-right"
                                 data-ng-class="{ 'disabled': viewItem.disabled }"
-                                data-ng-click="addItemComment(comment.text)">Submit Comment</button>
+                                data-ng-click="addItemComment(comment.text)"><span class="fa fa-comment-o"></span> Submit Comment</button>
                     </div>
                 </div>
             </div>

diff --git a/partials/settingsAutoActions.html b/partials/settingsAutoActions.html
@@ -93,7 +93,7 @@ <h4>Add Action</h4>
                 <p>
                     <a role="button" id="addAction" class="btn btn-info pull-right"
                        data-ng-click="addAction()" data-ng-disabled="null === actionData.board" title="Add Action">
-                        Add Action <span class="fa fa-plus"></span>
+                       <span class="fa fa-plus"></span> Add Action
                     </a>
                 </p>
             </div>

diff --git a/partials/settingsBoardModal.html b/partials/settingsBoardModal.html
@@ -76,9 +76,15 @@ <h5>Select Users</h5>
                 </div>
                 <div class="modal-footer">
                     <button type="submit" id="modalAddBoard" class="btn btn-info" data-ng-click="addBoard(boardFormData)"
-                            data-ng-if="boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving">Add Board</button>
+                            data-ng-if="boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving">
+                        <span class="fa fa-plus"></span>
+                        Add Board
+                    </button>
                     <button type="submit" id="modalEditBoard" class="btn btn-info" data-ng-click="editBoard(boardFormData)"
-                            data-ng-if="!boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving">Save Board</button>
+                            data-ng-if="!boardFormData.isAdd" data-ng-disabled="boardFormData.isSaving">
+                        <span class="fa fa-save"></span>
+                        Save Board
+                    </button>
                     <a class="btn btn-default" data-ng-click="boardFormData.cancel()"
                        data-ng-disabled="boardFormData.isSaving">Cancel</a>
                 </div>

diff --git a/partials/settingsBoardTable.html b/partials/settingsBoardTable.html
@@ -48,7 +48,7 @@ <h4>Current Boards</h4>
             </tbody>
         </table>
         <div data-ng-if="currentUser.isAdmin == '1'">
-            <p><a role="button" id="addBoard" class="btn btn-info" data-toggle="modal" data-target=".boardModal" data-ng-click="boardFormData.reset()" title="Add Board">Add Board <span class="fa fa-plus"> </span></a></p>
+            <p><a role="button" id="addBoard" class="btn btn-info" data-toggle="modal" data-target=".boardModal" data-ng-click="boardFormData.reset()" title="Add Board"><span class="fa fa-plus"></span> Add Board</a></p>
         </div>
     </div>
 </div>
diff --git a/partials/settingsUserModal.html b/partials/settingsUserModal.html
@@ -42,8 +42,8 @@ <h5><span data-ng-if="!userFormData.isAdd">Select </span>Default Board
                             </label>
                         </div>
                         <div class="modal-footer">
-                            <button type="submit" id="modalAddUser" class="btn btn-info" data-ng-click="addUser(userFormData)" data-ng-if="userFormData.isAdd">Add User</button>
-                            <button type="submit" id="modalEditUser" class="btn btn-info" data-ng-click="editUser(userFormData)" data-ng-if="!userFormData.isAdd">Save User</button>
+                            <button type="submit" id="modalAddUser" class="btn btn-info" data-ng-click="addUser(userFormData)" data-ng-if="userFormData.isAdd"><span class="fa fa-plus"></span> Add User</button>
+                            <button type="submit" id="modalEditUser" class="btn btn-info" data-ng-click="editUser(userFormData)" data-ng-if="!userFormData.isAdd"><span class="fa fa-save"></span> Save User</button>
                             <a class="btn btn-default" data-ng-click="userFormData.cancel()">Cancel</a>
                         </div>
                     </fieldset>

diff --git a/partials/settingsUserTable.html b/partials/settingsUserTable.html
@@ -35,6 +35,6 @@ <h4>TaskBoard Users</h4>
         </tbody>
     </table>
     <div data-ng-if="currentUser.isAdmin == '1'">
-        <p><a role="button" id="addUser" class="btn btn-info" data-toggle="modal" data-target=".userModal" data-ng-click="userFormData.reset()" title="Add User">Add User <span class="fa fa-plus"> </span></a></p>
+        <p><a role="button" id="addUser" class="btn btn-info" data-toggle="modal" data-target=".userModal" data-ng-click="userFormData.reset()" title="Add User"><span class="fa fa-plus"></span> Add User</a></p>
     </div>
 </div>