Merge pull request #3324 from TomMalbran/tom/find-in-files-p1

[OPEN] Find in Files Improvements (Part 1: Templates)

Author: dangoor

src/htmlContent/search-dialog.html

@@ -0,0 +1,7 @@
+{{CMD_FIND}}: 
+<input type="text" id="searchInput" value="{{value}}" style="width: 10em" />
+<div class="message">
+    <span id="searchlabel">{{{label}}}</span>
+    <span style="color: #888">({{SEARCH_REGEXP_INFO}})</span>
+</div>
+<div class="error"></div>

src/htmlContent/search-panel.html

@@ -0,0 +1,8 @@
+<div id="search-results" class="bottom-panel vert-resizable top-resizer no-focus">
+    <div class="toolbar simple-toolbar-layout">
+        <div class="title">{{SEARCH_RESULTS}}</div>
+        <div class="title" id="search-result-summary"></div>
+        <a href="#" class="close">&times;</a>
+    </div>
+    <div class="table-container resizable-content"></div>
+</div>

src/htmlContent/search-results.html

@@ -1,8 +1,16 @@
-<div id="search-results" class="bottom-panel vert-resizable top-resizer no-focus">
-    <div class="toolbar simple-toolbar-layout">
-        <div class="title">{{SEARCH_RESULTS}}</div>
-        <div class="title" id="search-result-summary"></div>
-        <a href="#" class="close">&times;</a>
-    </div>
-    <div class="table-container resizable-content"></div>
-</div>
+<table class="table table-striped table-condensed row-highlight">
+    <tbody>
+        {{#searchList}}
+        <tr class="file-section" data-file="{{file}}">
+            <td colspan="3"><span class="disclosure-triangle expanded"></span>{{{filename}}}</td>
+        </tr>
+        {{#items}}
+        <tr data-file="{{file}}" data-item="{{item}}">
+            <td></td>
+            <td style="white-space: nowrap">{{line}}</td>
+            <td>{{pre}}<span class="highlight">{{highlight}}</span>{{post}}</td>
+        </tr>
+        {{/items}}
+        {{/searchList}}
+    </tbody>
+</table>

src/nls/root/strings.js

@@ -130,7 +130,7 @@ define({
     "FIND_IN_FILES_MORE_THAN"           : "More than ",
     "FIND_IN_FILES_MAX"                 : " (showing the first {0} matches)",
     "FIND_IN_FILES_FILE_PATH"           : "File: <span class='dialog-filename'>{0}</span>",
-    "FIND_IN_FILES_LINE"                : "line:&nbsp;{0}",
+    "FIND_IN_FILES_LINE"                : "line: {0}",
 
     "ERROR_FETCHING_UPDATE_INFO_TITLE"  : "Error getting update info",
     "ERROR_FETCHING_UPDATE_INFO_MSG"    : "There was a problem getting the latest update information from the server. Please make sure you are connected to the internet and try again.",