dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15880
committer: Abyot Asalefew Gizaw abyota@xxxxxxxxx
branch nick: dhis2
timestamp: Fri 2014-06-27 13:14:08 +0200
message:
  minor
modified:
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2014-06-27 11:14:08 +0000
@@ -1,9 +1,6 @@
 <div class="panel panel-default" ng-controller="NotesController">
     <div class="panel-heading">
-        {{notesWidget.title| translate}}
-        <span class="nav-pills" ng-show="selectedEnrollment.notes.length > 5">
-            | <a href ng-click="searchNote()" title="{{'search_note'| translate}}">{{'search'| translate}}</a>
-        </span>
+        {{notesWidget.title| translate}}        
         <span class="nav-pills" ng-show="selectedEnrollment">
             | <span><a href ng-click="showAddNote()" title="{{'add_note'| translate}}">{{'add'| translate}}</a></span>            
         </span>
@@ -16,34 +13,22 @@
         </span>        
     </div>
     <div ng-show="notesWidget.expand" class="panel-body dashboard-widget-container">
-        
-
-            <div ng-show="searchNoteField">
-                <div class="list-group">
-                    <input class="form-control" ng-model="noteSearchText" ng-blur="searchNote()" placeholder="{{'search'| translate}}">            
-                </div>
-            </div>
-            <div ng-show="addNoteField">
-                <div class="list-group">
-                    <textarea class="form-control" rows="3" ng-model="note" placeholder="{{'add_your_note_here'| translate}}"></textarea>                          
-                </div>
-
-                <div class='vertical-spacing'>
-                    <button type="button" 
-                            class="btn btn-default small-horizonal-spacing"
-                            ng-click="addNote()">
-                        {{'save'| translate}}
-                    </button>        
-                    <button type="button" 
-                            class="btn btn-default small-horizonal-spacing" 
-                            ng-click="closeAddNote()">
-                        {{'cancel'| translate}}
-                    </button>
-                </div>
-            </div>
-
-        
-        <div ng-show='selectedEnrollment' class='vertical-spacing remove-default-padding'>
+            
+        <div class="add-note" ng-show="addNoteField">
+            <textarea class="form-control" rows="3" ng-model="note" placeholder="{{'add_your_note_here'| translate}}"></textarea> 
+            <button type="button" 
+                    class="btn btn-default"
+                    ng-click="addNote()">
+                {{'save'| translate}}
+            </button>        
+            <button type="button" 
+                    class="btn btn-default small-horizonal-spacing" 
+                    ng-click="closeAddNote()">
+                {{'cancel'| translate}}
+            </button>
+        </div>
+        
+        <div ng-show='selectedEnrollment' class='remove-default-padding'>
 
             <table class="table table-with-fixed-layout">
                 <tr ng-repeat="note in selectedEnrollment.notes| filter:noteSearchText">

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-06-27 10:57:20 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2014-06-27 11:14:08 +0000
@@ -603,6 +603,11 @@
     margin: -15px !important;    
 }
 
+.add-note {
+    margin-bottom: 30px;
+    margin-left: -5px;
+}
+
 .over-flow-hidden {
     white-space: nowrap;
     overflow: hidden;