From a89a103993c662bf987ff2c1dafb682891143aed Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 26 Jun 2015 14:54:53 +0200
Subject: [PATCH] Move search options outside of the debug panel

Adds easy batch for me to run gulp
---
 OurUmbraco.Site/Views/Search/Search.aspx | 51 +++++++++++++-----------
 build/RunGulp.bat                        | 35 ++++++++++++++++
 2 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 build/RunGulp.bat

diff --git a/OurUmbraco.Site/Views/Search/Search.aspx b/OurUmbraco.Site/Views/Search/Search.aspx
index 875f8af9..f0209da5 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx
+++ b/OurUmbraco.Site/Views/Search/Search.aspx
@@ -21,12 +21,7 @@
                         <li><a href="#" rel="nofollow"><%=Model.Results.SearchTerm %></a></li>
                     </ul>
                 </div>
-
-                <div class="search-big">
-                    <asp:TextBox runat="server" ID="SearchText"></asp:TextBox>
-                    <label for="<%=SearchText.ClientID %>">Search</label>
-                </div>
-
+                
                 <% if (Context.IsDebuggingEnabled)
                    { %>
                 <div style="border: 1px solid orange;">
@@ -36,28 +31,36 @@
                         <strong>Order by:</strong> <%= Model.Results.OrderBy %><br />
                         <strong>Time elapsed:</strong> <%= Model.Results.Totalmilliseconds %>
                     </p>
-                    <div id="search-options" class="search-options">
-                        <% if(Request.QueryString["cat"] == "forum")
-                           { %>
 
-                            <label>Options:</label>
-                            <div class="options">
-                                <span><input type="checkbox" name="solved"/> show only solved topics</span><br/>
-                                <span><input type="checkbox" name="replies"/> show only topics with replies</span><br/>
-                                <span><input type="checkbox" name="order" value="updateDate"/> show last updated first</span>
-                            </div>
-                        </div>
-                        <% } %>
+                    </div>
+                <% } %>
 
-                        <% if (Request.QueryString["cat"] == "project")
-                           { %>
-                            <span>Options:</span><br/>
-                            <span><input type="checkbox" name="order" value="updateDate"/> show last updated first</span>
-                        <% } %>
-
-                        <% } %>
+                <div class="search-big">
+                    <asp:TextBox runat="server" ID="SearchText"></asp:TextBox>
+                    <label for="<%=SearchText.ClientID %>">Search</label>
                 </div>
+
                 
+                <% if(Request.QueryString["cat"] == "forum")
+                    { %>
+                    <div id="search-options" class="search-options">
+                    <div class="options">
+                        <span><input type="checkbox" name="solved"/> show only solved topics</span><br/>
+                        <span><input type="checkbox" name="replies"/> show only topics with replies</span><br/>
+                        <span><input type="checkbox" name="order" value="updateDate"/> show last updated first</span>
+                    </div>
+                    </div>
+                <% } %>
+
+<%--                <% if (Request.QueryString["cat"] == "project")
+                    { %>
+                    <div id="search-options" class="search-options">
+                        <span><input type="checkbox" name="order" value="updateDate"/> show last updated first</span>
+                    </div>
+                <% } %>--%>
+
+                        
+                </div>
 
                 <% if (Model.Results.SearchResults.Any() == false)
                    { %>
diff --git a/build/RunGulp.bat b/build/RunGulp.bat
new file mode 100644
index 00000000..12c221c2
--- /dev/null
+++ b/build/RunGulp.bat
@@ -0,0 +1,35 @@
+@ECHO OFF
+SET release=%1
+ECHO Installing Npm NuGet Package
+
+SET nuGetFolder=%CD%\..\packages\
+ECHO Configured packages folder: %nuGetFolder%
+ECHO Current folder: %CD%
+
+%CD%\..\.nuget\NuGet.exe install Npm.js -OutputDirectory %nuGetFolder%  -Verbosity quiet
+
+for /f "delims=" %%A in ('dir %nuGetFolder%node.js.* /b') do set "nodePath=%nuGetFolder%%%A\"
+for /f "delims=" %%A in ('dir %nuGetFolder%npm.js.* /b') do set "npmPath=%nuGetFolder%%%A\tools\"
+
+ECHO Temporarily adding Npm and Node to path
+SET oldPath=%PATH%
+
+path=%npmPath%;%nodePath%;%PATH%
+
+ECHO %path%
+
+SET buildFolder=%CD%
+
+ECHO Change directory to %CD%\..\OurUmbraco.Client\
+CD %CD%\..\OurUmbraco.Client\
+
+ECHO Do npm install and the gulp build
+call npm install
+call npm install -g install gulp -g --quiet
+call gulp
+
+ECHO Reset path to what it was before
+path=%oldPath%
+
+ECHO Move back to the build folder
+CD %buildFolder% 
\ No newline at end of file