diff --git a/src/main/webapp/WEB-INF/view/common/searchOptions.jsp b/src/main/webapp/WEB-INF/view/common/searchOptions.jsp new file mode 100755 index 0000000000000000000000000000000000000000..8985e27492e8e180e767925a3ad89f00e51a0419 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/common/searchOptions.jsp @@ -0,0 +1,94 @@ +<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> +

+ +

+
+
+ + + + 10 + 20 + 30 + 40 + 50 + 100 + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + ${f:h(item.label)} + + +
+ +
+ + + + ${f:h(item.label)} + + +
+ +
diff --git a/src/main/webapp/WEB-INF/view/header.jsp b/src/main/webapp/WEB-INF/view/header.jsp index 2a090e758fc7f2fd967a00fd88782d0ec0460235..cf6f4aa7f80dece685842c1d3977ceb7a31e60fb 100755 --- a/src/main/webapp/WEB-INF/view/header.jsp +++ b/src/main/webapp/WEB-INF/view/header.jsp @@ -73,121 +73,22 @@ ${fe:facetForm()}${fe:geoForm()}
-

- -

+
-
- - - - 10 - 20 - 30 - 40 - 50 - 100 - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - ${f:h(item.label)} - - - -
- -
- - - - - ${f:h(item.label)} - - - -
- -
-
- - -
- diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp index 47833e7e0d5981edb0b2e07ce7e282f487726ae7..5a97926439446db0e66f3f34caed01eecee0f958 100644 --- a/src/main/webapp/WEB-INF/view/index.jsp +++ b/src/main/webapp/WEB-INF/view/index.jsp @@ -18,71 +18,71 @@ type="text/css" /> - -
-
-
-

- <la:message key=" /> -

-
${notification}
-
- -
${msg}
- - -
- - ${fe:facetForm()}${fe:geoForm()} + + + +
    • +     + +
  • + + +
    • + +
    + +
    +
    +
    +

    + <la:message key=" /> +

    +
    ${notification}
    +
    + +
    ${msg}
    +     + +
    @@ -115,147 +115,34 @@
    - - +
    +
    + +
    +
    +
    + +
    + +
    -
    + diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp index 9a3ac3b398fc99a9c3631875d33b54f2646c0565..ecfd7c8c9f20c5716a0657b9c65b9f7d1011ea6c 100644 --- a/src/main/webapp/WEB-INF/view/search.jsp +++ b/src/main/webapp/WEB-INF/view/search.jsp @@ -20,7 +20,7 @@ -
    +
      diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index d89d14bd7190b50c1e51f068968f66c09d4b44a2..8f911f3c943564e524832df395a4c0afddab330d 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -198,20 +198,31 @@ ul.searchOptionLabels li { vertical-align: middle; } -body.search #searchOptions, body.help #searchOptions, body.error #searchOptions { +#searchOptions { + position: fixed; + top: 0; + z-index: 10; +} + +#searchOptions .container { + width: 500px; + overflow: hidden; position: fixed; top: 0; + right: -500px; padding-top: 72px; padding-bottom: 20px; - z-index: 1000; - right: -500px; - background: #eceeef; - width: 500px; + color: #fff; + background-color: rgba(60, 60, 60, 0.93); transition: all .4s ease 0s; } -body.search #searchOptions.active, body.help #searchOptions.active, body.error #searchOptions.active { +#searchOptions.active .container { + height: auto; + overflow-y: scroll; + top: 0; right: 0; + bottom: 0; } .centered { @@ -291,11 +302,11 @@ body.search #searchOptions.active, body.help #searchOptions.active, body.error #result .info { display: none; } - body.search #searchOptions, body.help #searchOptions, body.error #searchOptions { + #searchOptions .container { width: 100%; right: -100%; } - body.search #searchOptions.active, body.help #searchOptions.active, body.error #searchOptions.active { + #searchOptions.active { right: 0; } .description { @@ -357,14 +368,14 @@ body.search #searchOptions.active, body.help #searchOptions.active, body.error } @media ( max-height : 480px) { - #searchOptions { + #searchOptions .container { max-height: 450px; overflow-y: scroll; } } @media ( max-height : 390px) { - #searchOptions { + #searchOptions .container { max-height: 300px; overflow-y: scroll; } diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js index ea8d3139031b986e5bfae06a93e198b17e56b82d..3816f9fef442a25e384cc3e3b750dc61f3ea29a3 100644 --- a/src/main/webapp/js/index.js +++ b/src/main/webapp/js/index.js @@ -12,6 +12,19 @@ $(function() { return true; }); + $(document).on('click touchend', function(e) { + if (!$(e.target).closest('#searchOptions, #searchOptionsButton').length) { + $('#searchOptions').removeClass('active'); + } + }); + + $("[data-toggle='control-options']").click(function(e) { + var target = $(this).attr('data-target') || $(this).attr('href'); + if (target) { + $(target).toggleClass("active"); + } + }); + $('#searchOptionsClearButton').on('click', function(e) { $('#labelTypeSearchOption').prop('selectedIndex', -1); $('#langSearchOption').prop('selectedIndex', 0); diff --git a/src/main/webapp/js/search.js b/src/main/webapp/js/search.js index 2ccd43164443f70ec28b42f5fce1e75b07702479..b399ef95e67020150a179d197e57cbd03cc62e4b 100644 --- a/src/main/webapp/js/search.js +++ b/src/main/webapp/js/search.js @@ -13,6 +13,12 @@ $(function() { return true; }); + $('#content').on('click touchend', function(e) { + if (!$(e.target).closest("#searchOptions, [data-toggle='control-options']").length) { + $('#searchOptions').removeClass('active'); + } + }); + $("[data-toggle='control-options']").click(function(e) { e.preventDefault(); var target = $(this).attr('data-target') || $(this).attr('href');