From 7141c2818ab3ed1bbec68d4e6ac34e614932ceb5 Mon Sep 17 00:00:00 2001
From: slhale <sarah.hale@nasa.gov>
Date: Thu, 6 Aug 2015 16:59:09 -0700
Subject: [PATCH] [Search] Search icon near input

Added a search icon next to the search bar
input.
---
 platform/commonUI/general/res/css/tree.css    | 44 ++++++++++++-------
 .../general/res/sass/search/_search.scss      | 14 +++++-
 platform/search/res/templates/search.html     | 26 +++++++++--
 3 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index 97109f37a7..3cc9fb088a 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -277,13 +277,23 @@ ul.tree {
   top: 23px;
   margin-top: 10px; }
   /* line 36, ../sass/search/_search.scss */
-  .search-holder .search .search-input {
+  .search-holder .search .search-bar {
     width: 100%; }
-  /* line 40, ../sass/search/_search.scss */
+    /* line 39, ../sass/search/_search.scss */
+    .search-holder .search .search-bar .search-icon {
+      color: #0099cc;
+      float: left;
+      font-size: 20px;
+      margin-right: 2px; }
+    /* line 46, ../sass/search/_search.scss */
+    .search-holder .search .search-bar .search-input {
+      width: 120px;
+      float: left; }
+  /* line 52, ../sass/search/_search.scss */
   .search-holder .search .search-scroll {
     top: 25px;
     overflow-y: auto; }
-    /* line 47, ../sass/search/_search.scss */
+    /* line 59, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .results .search-result-item {
       -moz-transition: background-color 0.25s;
       -o-transition: background-color 0.25s;
@@ -293,10 +303,10 @@ ul.tree {
       border-radius: 2px;
       padding-top: 4px;
       padding-bottom: 2px; }
-      /* line 61, ../sass/search/_search.scss */
+      /* line 73, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item .label {
         margin-left: 6px; }
-        /* line 65, ../sass/search/_search.scss */
+        /* line 77, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item .label .title-label {
           display: inline-block;
           position: absolute;
@@ -308,47 +318,47 @@ ul.tree {
           overflow: hidden;
           text-overflow: ellipsis;
           white-space: nowrap; }
-      /* line 87, ../sass/search/_search.scss */
+      /* line 99, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item.selected {
         background: #005177;
         color: #fff; }
-        /* line 91, ../sass/search/_search.scss */
+        /* line 103, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
           color: #0099cc; }
-        /* line 94, ../sass/search/_search.scss */
+        /* line 106, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
           color: #fff; }
-      /* line 101, ../sass/search/_search.scss */
+      /* line 113, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
         background: #404040;
         color: #cccccc; }
-        /* line 104, ../sass/search/_search.scss */
+        /* line 116, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
           display: block; }
-        /* line 107, ../sass/search/_search.scss */
+        /* line 119, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
           color: #33ccff; }
-    /* line 115, ../sass/search/_search.scss */
+    /* line 127, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-icon {
       position: relative; }
-      /* line 117, ../sass/search/_search.scss */
+      /* line 129, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon.loading {
         pointer-events: none;
         margin-left: 6px; }
-        /* line 121, ../sass/search/_search.scss */
+        /* line 133, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .title-label {
           font-style: italic;
           font-size: .9em;
           opacity: 0.5;
           margin-left: 26px;
           line-height: 24px; }
-        /* line 131, ../sass/search/_search.scss */
+        /* line 143, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
           margin-left: 6px; }
-      /* line 136, ../sass/search/_search.scss */
+      /* line 148, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon:not(.loading) {
         cursor: pointer; }
-    /* line 141, ../sass/search/_search.scss */
+    /* line 153, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-more-button {
       margin-top: 5px;
       margin-bottom: 5px;
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index d97562d318..2575235ad5 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -33,8 +33,20 @@
     
     .search {
         
-        .search-input {
+        .search-bar {
             width: 100%;
+            
+            .search-icon {
+                color: $colorItemTreeIcon;
+                float: left;
+                font-size: $iconWidth;
+                margin-right: 2px;
+            }
+            
+            .search-input {
+                width: 120px;
+                float: left;
+            }
         }
         
         .search-scroll {
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html
index a2ac8e8ac9..a2a676ee43 100644
--- a/platform/search/res/templates/search.html
+++ b/platform/search/res/templates/search.html
@@ -23,15 +23,33 @@
      ng-controller="SearchController as controller">
     
     <!-- Search bar input -->
-    <div>
+    <!-- ui symbols for search are 'd' and 'M' -->
+    <div class="search-bar">
+        <div class="search-icon ui-symbol">
+            d
+        </div>
         <input class="search-input"
-               type="text" 
-               value=""
+               type="text"
                ng-model="ngModel.input"
                ng-keyup="controller.search()" />
+        
         <!--mct-control key="textfield"
+                     class="search-input"
+                     ng-model="ngModel.input">
+        </mct-control>
+        <!--input type="text"
+                  ng-required="false"
+                  ng-model="ngModel.index"
+                  name="mctControl" /-->
+        <!--mct-form structure="{sections: [rows: {control: 'textfield'}]}" ng-model="ngModle.input">
+        </mct-form>
+        <!--mct-control key="row.control"
                      ng-model="ngModel"
-                     structure="{cssclass: 'search-input', size: '50px'}">
+                     ng-required="row.required"
+                     ng-pattern="getRegExp(row.pattern)"
+                     options="row.options"
+                     structure="row"
+                     field="row.key">
         </mct-control-->
     </div>