Fixed field values sorting for extended search

This reverts commit 6498d194cd.

home/src/main/resources/rdf/display/everytime/customSearchDataGetters.n3

@@ -35,7 +35,8 @@ display:customSearchFiltersDataGetter
       ?searchFilter search:id ?id .
       ?searchFilter search:filterFiled ?searchField .
       ?searchField search:indexField ?field .
+      BIND (replace ( ?name, "«", "" ) AS ?sortName)
      
-    } ORDER BY ?field ?name
+    } ORDER BY ?field ?sortName
      """ .
 

webapp/src/main/webapp/templates/freemarker/elenphAritcle.ftl

@@ -98,7 +98,7 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
   </label>
 </div>
 <#assign firstPub = propertyGroups.pullProperty("https://litvinovg.pro/text_structures#firstPublication")!>
-  <#if firstPub.statements?has_content && firstPub.type == "data">
+  <#if firstPub.statements?has_content || editable >
     <div class="firstPub" style="list-style:none;">
       <div class="label">Первая публикация статьи
       </div>
@@ -211,7 +211,7 @@ ${scripts.add('<script async type="text/javascript" src="//cdn.plu.mx/widget-pop
   <#assign no_authors = true>
   <#list authors as author>
     <#if no_authors>
-      <div class="authors" style="display:block;float:right; margin:15px;">
+      <div class="authors" style="display:block;text-align:right; margin:15px;">
       <#assign no_authors = false>
     <#else>
       ", "
@@ -265,10 +265,9 @@ for (i = 0; i < coll.length; i++) {
 </#if>
 
 <script>
-  console.log(localStorage.getItem('switchExpand'));
   if (localStorage.getItem('switchExpand') === true || localStorage.getItem('switchExpand') === 'true') {
-    console.log("show html excerpts");
     $('.htmlExcerpt').show();
+    document.getElementById("expandlCB").checked = true;
   }
   function switchExpand(){
     var checkBox = document.getElementById("expandlCB");

webapp/src/main/webapp/themes/iph/templates/page-home.ftl

@@ -80,7 +80,7 @@
     </table></div>
         </section> <!-- #intro -->
 
-        <@widget name="login" />
+        
 
         <!-- List of research classes: e.g., articles, books, collections, conference papers -->
        <#-- <@lh.researchClasses /> -->

webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl

@@ -90,6 +90,7 @@
     $('#btn-get-standard-searchform').on('click', function() {
       $('#querybuilder-container').hide();    
       $('#simple-search-container').show();
+      localStorage.setItem('extendedSearchOpen',false);
     });
 
 
@@ -140,7 +141,7 @@
         if ('operator' in json_query && json_query.operator.startsWith("not_")){
           string_query +=  "NOT ";
         }
-        string_query += json_query.field + ":\"" + json_query.value.toString().replace(/['"]+/g,'').replace(/#/g,'%23') + "\"";
+        string_query += json_query.field + ":" + json_query.value.toString().replace(/[']+/g,'').replace(/#/g,'%23') ;
       }
 	  return string_query;
 	}
@@ -163,7 +164,7 @@
 	values: {
       <#list searchFilters as filter>
         <#if filter.field == field.field>
-          '${filter.id}':'${filter.name}',
+          '&quot;${filter.id}&quot;':'${filter.name}',
         </#if>
       </#list>
 		

webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl

@@ -8,8 +8,9 @@
  $('#switch-to-extended-searchform').on('click', function() {
    $('#simple-search-container').hide();   
    $('#querybuilder-container').show();   
+   localStorage.setItem('extendedSearchOpen',true);
  });
- if ( "${querytext!?html}".includes(":"") ){
+ if (localStorage.getItem('extendedSearchOpen') === true || localStorage.getItem('extendedSearchOpen') === 'true') {
    $('#simple-search-container').hide();
    $('#querybuilder-container').show();
  }