[HippoCMS-scm] [Git][cms-community/hippo-repository][release/3.2] 3 commits: REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input

[Jeroen Hoffman]

Jeroen Hoffman pushed to branch release/3.2 at cms-community / hippo-repository


Commits:
eddb985a by Marijan Milicevic at 2016-06-01T14:16:42+02:00
REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input

- - - - -
255851ee by Bert Leunis at 2016-06-03T15:07:11+02:00
REPO-1485 keep the input div inside the html body

- - - - -
a3106c2e by Jeroen Hoffman at 2016-06-21T16:29:55+02:00
REPO-1485 Reintegrate branch bugfix/REPO-1485 into release/3.2

- - - - -


1 changed file:

- servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl


Changes:

=====================================
servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
=====================================
--- 
a/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
+++ 
b/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
@@ -44,7 +44,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
         .logout { float: right; padding: 4px 10px 0 0;}
         .logout a { color: white; font-size: small;}
 
-        .query-input {width: 100%; height: 75px;}
+        .query-input {width: 100%;box-sizing: border-box;}
 
         .search-params {padding: 20px 0 10px 0;}
         .search-params input { margin-bottom: 4px}
@@ -121,14 +121,14 @@ ${response.setContentType("text/html;charset=UTF-8")}
             <#--XPATH-->
             <div class="xpath-tab">
               <noscript><div>&nbsp;</div>XPath:</noscript>
-              <textarea class="query-input" name="xpath" placeholder="XPath 
query">${request.getParameter('xpath')!}</textarea><br/>
+              <input class="query-input" type="text"  name="xpath" 
placeholder="XPath query" value="${request.getParameter('xpath')!}"/><br/>
               Limit<noscript> (XPath query)</noscript>: <input 
name="xpath-limit" type="text" size="5" 
value="${request.getParameter('xpath-limit')!1000?c}"/>
             </div>
 
             <#--SQL-->
             <div class="sql-tab">
               <noscript><div>&nbsp;</div>SQL:&nbsp;&nbsp;</noscript>
-              <textarea class="query-input" name="sql" placeholder="SQL 
query">${request.getParameter('sql')!}</textarea><br/>
+              <input class="query-input" type="text"  name="sql" 
placeholder="SQL query" value="${request.getParameter('sql')!}"/><br/>
               Limit<noscript> (SQL query)</noscript>: <input name="sql-limit" 
type="text" size="5" value="${request.getParameter('sql-limit')!1000?c}"/>
             </div>
           </div>



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/compare/0275bf48026c990523b8cb0963d6777092281ec7...a3106c2e2d9932806268605c177ae43fca51f19b

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn