diff --git a/src/main/webapp/WEB-INF/view/advance.jsp b/src/main/webapp/WEB-INF/view/advance.jsp index 62fd5e542..0c05adfd9 100644 --- a/src/main/webapp/WEB-INF/view/advance.jsp +++ b/src/main/webapp/WEB-INF/view/advance.jsp @@ -11,328 +11,337 @@ title="" /> - + ${fe:facetForm()}${fe:geoForm()} - -
-
-
-

- -

-
${notification}
-
- -
${msg}
- - -
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- - - 10 - 20 - 30 - 40 - 50 - 100 - -
-
- -
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
- -
- - - ${f:h(item.label)} - - -
-
- -
-
- -
- -
- - - ${f:h(item.label)} - - -
-
- -
-
- -
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
- -
-
- -
- +
+ +
+ +
+

+ +

+
${notification}
+
+ +
${msg}
+ +
- -
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ + + 10 + 20 + 30 + 40 + 50 + 100 + +
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
+ +
+ + + ${f:h(item.label)} + + +
+
+ +
+
+ +
+ +
+ + + ${f:h(item.label)} + + +
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+ + - + diff --git a/src/main/webapp/WEB-INF/view/error/badRequest.jsp b/src/main/webapp/WEB-INF/view/error/badRequest.jsp index 650e410fd..25456dee8 100644 --- a/src/main/webapp/WEB-INF/view/error/badRequest.jsp +++ b/src/main/webapp/WEB-INF/view/error/badRequest.jsp @@ -7,7 +7,7 @@ <la:message key="labels.system_error_title" /> - @@ -16,23 +16,19 @@ -
-
-
-
-

- -

-
-
-
+
+
+

+ +

+
- -
+ + - + diff --git a/src/main/webapp/WEB-INF/view/error/error.jsp b/src/main/webapp/WEB-INF/view/error/error.jsp index 687ac8d80..acfe5a49d 100644 --- a/src/main/webapp/WEB-INF/view/error/error.jsp +++ b/src/main/webapp/WEB-INF/view/error/error.jsp @@ -6,7 +6,7 @@ <la:message key="labels.system_error_title" /> - @@ -15,28 +15,24 @@ -
-
-
-
-

- -

-
- -
${msg}
- - -
-
+
+
+

+ +

+
+ +
${msg}
+ +
- -
+ + - + diff --git a/src/main/webapp/WEB-INF/view/error/notFound.jsp b/src/main/webapp/WEB-INF/view/error/notFound.jsp index 8ddbf6bd5..2bd61656c 100644 --- a/src/main/webapp/WEB-INF/view/error/notFound.jsp +++ b/src/main/webapp/WEB-INF/view/error/notFound.jsp @@ -6,7 +6,7 @@ <la:message key="labels.system_error_title" /> - @@ -15,26 +15,22 @@ -
-
-
-
-

- -

-
- -
${f:h(url)} -
-
+
+
+

+ +

+
+ +
${f:h(url)}
- -
+ + - + diff --git a/src/main/webapp/WEB-INF/view/error/system.jsp b/src/main/webapp/WEB-INF/view/error/system.jsp index 796d709e5..a38f19f4e 100644 --- a/src/main/webapp/WEB-INF/view/error/system.jsp +++ b/src/main/webapp/WEB-INF/view/error/system.jsp @@ -7,7 +7,7 @@ <la:message key="labels.system_error_title" /> - @@ -16,23 +16,19 @@ -
-
-
-
-

- -

-
-
-
+
+
+

+ +

+
- -
+ + - + diff --git a/src/main/webapp/WEB-INF/view/footer.jsp b/src/main/webapp/WEB-INF/view/footer.jsp index a865de2cd..42787482c 100755 --- a/src/main/webapp/WEB-INF/view/footer.jsp +++ b/src/main/webapp/WEB-INF/view/footer.jsp @@ -1,7 +1,7 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> -
- + +
- + +
+ + +
+
+ +
+ + + + + + +
- -
-
-
+
+
+
+

<la:message key=" /> @@ -85,7 +114,7 @@

-
+
@@ -93,7 +122,7 @@
-

+

@@ -101,7 +130,7 @@ href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)} - ${f:h(item)} @@ -114,7 +143,7 @@ -

- -
-
-
- -
- - - - - - -
-
-
+ + - + diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp index 25e46cd97..de63ba802 100644 --- a/src/main/webapp/WEB-INF/view/login/index.jsp +++ b/src/main/webapp/WEB-INF/view/login/index.jsp @@ -6,17 +6,11 @@ <la:message key="labels.login.title" /> - - - - - - + + + + + -
- -
- -
- +
+
- - + src="${fe:url('/js/admin/jquery-3.2.1.min.js')}"> + diff --git a/src/main/webapp/WEB-INF/view/profile/index.jsp b/src/main/webapp/WEB-INF/view/profile/index.jsp index 675670797..8d0198aaa 100644 --- a/src/main/webapp/WEB-INF/view/profile/index.jsp +++ b/src/main/webapp/WEB-INF/view/profile/index.jsp @@ -6,17 +6,11 @@ <la:message key="labels.profile.title" /> - - - - - - + + + + + -
- - - - - -
- -
- +
+ + + + +
- - + src="${fe:url('/js/admin/jquery-3.2.1.min.js')}"> + diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp index 4eb159311..9799499ed 100644 --- a/src/main/webapp/WEB-INF/view/search.jsp +++ b/src/main/webapp/WEB-INF/view/search.jsp @@ -12,7 +12,7 @@ href="${fe:url('/osdd')}" title="" /> - -
-
-
-
-
+ +
  • +
    • +
  • + + + + + ${f:h(item.label)} + + + +
    • + +
  • + + + + + ${f:h(item.label)} + + + +
    • +     +
    -
    -

    +

    +

    @@ -104,7 +100,7 @@ href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)} - ${f:h(item)} @@ -114,8 +110,8 @@

    -
    -

    +

    +

    @@ -123,7 +119,7 @@ href="/search?q=${f:u(item)}${fe:facetQuery()}${fe:geoQuery()}">${f:h(item)} - ${f:h(item)} @@ -133,7 +129,7 @@

    -
    +
    ${item}
    @@ -141,20 +137,20 @@ -

    +

    -

    +
    - -
    + + - + diff --git a/src/main/webapp/WEB-INF/view/searchResults.jsp b/src/main/webapp/WEB-INF/view/searchResults.jsp index be917cf18..372b76862 100644 --- a/src/main/webapp/WEB-INF/view/searchResults.jsp +++ b/src/main/webapp/WEB-INF/view/searchResults.jsp @@ -1,7 +1,7 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> <%-- query matched some document --%>
    -
    +

    -
    +
    -
    -
      - -
    1. -
      -
      -

      - ${doc.content_title} -

      -
      -
      - -
      - - -
      -       -
      ${doc.content_description}
      -
      -
      - ${f:h(doc.site_path)} - - - - - - - - - - - - -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - (${f:h(doc.favorite_count)}) - (${f:h(doc.favorite_count)}) - - -
      -
      -
      -
      -
      2. -       -
    -
    -
    -
    -
    '}),He=h({},Nn.DefaultType,{content:"(string|element|function)"}),We="fade",xe=".popover-header",Ue=".popover-body",Ke={HIDE:"hide"+ke,HIDDEN:"hidden"+ke,SHOW:(Me="show")+ke,SHOWN:"shown"+ke,INSERTED:"inserted"+ke,CLICK:"click"+ke,FOCUSIN:"focusin"+ke,FOCUSOUT:"focusout"+ke,MOUSEENTER:"mouseenter"+ke,MOUSELEAVE:"mouseleave"+ke},Fe=function(t){var e,n;function i(){return t.apply(this,arguments)||this}n=t,(e=i).prototype=Object.create(n.prototype),(e.prototype.constructor=e).__proto__=n;var r=i.prototype;return r.isWithContent=function(){return this.getTitle()||this._getContent()},r.addAttachmentClass=function(t){we(this.getTipElement()).addClass(Le+"-"+t)},r.getTipElement=function(){return this.tip=this.tip||we(this.config.template)[0],this.tip},r.setContent=function(){var t=we(this.getTipElement());this.setElementContent(t.find(xe),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(Ue),e),t.removeClass(We+" "+Me)},r._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},r._cleanTipClass=function(){var t=we(this.getTipElement()),e=t.attr("class").match(je);null!==e&&0=this._offsets[r]&&("undefined"==typeof this._offsets[r+1]||t