Skip to content

Commit

Permalink
versione v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@IstitutoCentraleCatalogoUnicoBiblio
IstitutoCentraleCatalogoUnicoBiblio committed Jun 6, 2019
1 parent 671ad3d commit 905d743
Show file tree
Hide file tree
Showing 44 changed files with 11,429 additions and 925 deletions.
6 changes: 3 additions & 3 deletions SbnwebIndexer/src/it/almaviva/sbnweb/Indexer/SbnwebIndexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ public List<String> getNoveSette(Record record) {
// logger.info(record.toString());
}

// Developed by mary per il titolo
// Developed by almaviva6 per il titolo

/**
* 200 $acefg sintassi: " ; a . c : e / f ; g"
Expand Down Expand Up @@ -1631,8 +1631,8 @@ public Set<String> getFormatoElettronico899(final Record record) {
subfields = dataField.getSubfields('u');
for (Iterator<Subfield> iterator2 = subfields.iterator(); iterator2.hasNext();) {
Subfield subfield = (Subfield) iterator2.next();
// fix per multipli url separati da pipe Luca Ferraro Viscardi e
// Mary Calogiuri
// fix per multipli url separati da pipe almaviva3 e
// almaviva4
resultU.add(subfield.getData().replace(" | ", Constants.separatore_url_899_no_pipe));
}
Character ind2 = dataField.getIndicator2();
Expand Down
3 changes: 2 additions & 1 deletion opac/WebContent/opac.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<script type="text/javascript" src="lib/angular/angular-sanitize.min.js"></script>
<script type="text/javascript" src="lib/angular/angular-cookies.min.js"></script>
<script type="text/javascript" src="lib/angular/angular-filter.js"></script>
<script type="text/javascript" src="lib/angular/angular-route.min.js"></script>
<script type="text/javascript" src="lib/angular/angular-route.js"></script>
<script type="text/javascript"
src="lib/angular-translate/angular-translate.min.js"></script>
<script src="lib/jquery/jquery-3.3.1.min.js"></script>
Expand Down Expand Up @@ -105,6 +105,7 @@ var poloApp = ${response};
var searchResult = ${searchResult};
var opac_version = ${opac_version};
var base_url = "${pageContext.request.contextPath}";
var isOCNSearch = ${isOCNSearch};
</script>
</head>
<body ng-app="opac2">
Expand Down
7 changes: 4 additions & 3 deletions opac/WebContent/resources/codes/lang/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@
"bni": "BNI",
"isbn": "ISBN",
"issn": "ISSN",
"numeri_tip_ocn": "OCN",
"abstract": "Abstract",
"biblioteche": "Libraries",
"dataa": "Data to",
Expand Down Expand Up @@ -406,7 +407,7 @@
"isrn": "ISRN",
"leg": "Deposit legal number",
"gov": "Government publish",
"ocn": "Other control system",
"ocn_text": "Other control system",
"visualizzaAnagrafe": "Show library registry",
"specmusica": "Music",
"specgrafica": "Graphics",
Expand Down Expand Up @@ -460,7 +461,7 @@
"email": "Email",
"mailSintetica": "Send syntetic via mail",
"mailerrata": "Wrong mail format ",
"mailservererrato": "There was an error sending mail",
"mailservererrato": "An error occurred while sending the email",
"mailsuccess": "Mail sent successfully",
"maildatierrati": "Insered data is not correct. All fields are requierd.",
"inviaMail": "Send email",
Expand Down Expand Up @@ -2469,7 +2470,7 @@
"desc_gest_biblio": "Allows the insertion, modification and display of library data that are part of the pole",
"filtra_nome_cod": "Filter cod. bib. or name",
"rimuovi_filtro": "Remove filter",
"altre_biblioteche": "Libraries do not belong to groups",
"altre_biblioteche": "Other libraries",
"isil": "Registration code",
"conferma_elimina": "Confirm delete of",
"ok_success_panel": "Change done",
Expand Down
7 changes: 4 additions & 3 deletions opac/WebContent/resources/codes/lang/it.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@
"bni": "BNI",
"isbn": "ISBN",
"issn": "ISSN",
"numeri_tip_ocn": "OCN",
"abstract": "Abstract",
"biblioteche": "biblioteche",
"dataa": "Data a",
Expand Down Expand Up @@ -409,7 +410,7 @@
"isrn": "ISRN",
"leg": "Numero deposito legale",
"gov": "Pubblicazione governativa",
"ocn": "Altri sistemi di controllo",
"ocn_text": "Altri sistemi di controllo",
"visualizzaAnagrafe": "Visualizza la pagina di Anagrafe Biblioteca",
"specmusica": "Musica",
"specgrafica": "Grafica",
Expand Down Expand Up @@ -459,7 +460,7 @@
"email": "Email",
"mailSintetica": "Invia sintetica per email",
"mailerrata": "Formato mail non corretto",
"mailservererrato": "Si è verificato un errore con la spedizione della mail",
"mailservererrato": "Errore nella spedizione della mail",
"maildatierrati": "Dati non compilati correttamente. Tutti i campi sono obbligatori.",
"mailsuccess": "Email inviata correttamente",
"inviaMail": "Invia email",
Expand Down Expand Up @@ -2473,7 +2474,7 @@
"desc_gest_biblio": "Permette l'inserimento, la modifica e la visualizzazione dei dati delle biblioteche che fanno parte del polo",
"filtra_nome_cod": "Filtra per cod. bib. oppure nome",
"rimuovi_filtro": "Rimuovi filtro",
"altre_biblioteche": "Biblioteche non appartenenti a gruppi",
"altre_biblioteche": "Altre biblioteche",
"isil": "Cod. Anagrafe",
"conferma_elimina": "Conferma eliminazione di",
"ok_success_panel": "La modifica e' stata effettuata",
Expand Down
2 changes: 1 addition & 1 deletion opac/WebContent/resources/htmlView/opac/biblio/labelDetailSingleDocument.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
</div>
<div ng-if="dettagli[$index].numbers_tip.numeri_tip_ocn">
<span ng-repeat="ocnSingle in dettagli[$index].numbers_tip.numeri_tip_ocn">
<i class="colour">{{'ocn' | translate}}</i>{{" - "}}{{ocnSingle | indexed}}</br ng-if="dettagli[$index].numbers_tip.numeri_tip_ocn[$index+1]">
<i class="colour">{{'ocn_text' | translate}}</i>{{" - "}}{{ocnSingle | indexed}}</br ng-if="dettagli[$index].numbers_tip.numeri_tip_ocn[$index+1]">
</span>
</div>
<!--numeri tip Q -->
Expand Down
20 changes: 5 additions & 15 deletions opac/WebContent/resources/htmlView/opac/biblio/tabLocalizzazioni.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
&& !check8xx(dettagli[$index])">{{'no_950'
| translate }}</li>
</ul>

<!-- <span ng-show="check4xx(dettagli[$index])"><span class="glyphicon glyphicon-certificate"></span>{{('msg_controlla_titoli_contenuti'
| translate) | trust}}</span></br>
<span ng-show="check8xx(dettagli[$index])"><span class="glyphicon glyphicon-certificate"></span>{{'msg_controlla_risorsa_elettronica'
| translate | trust}}</span></br>
<span ng-show="!check4xx(dettagli[$index])
&& !check8xx(dettagli[$index])">{{'no_950' | translate }}</span> -->
</div>

<div class="panel text-right" ng-show="dettagli[$index].tag950 && !checkNoCollXOpacBib(dettagli[$index].tag950)">
Expand Down Expand Up @@ -258,8 +250,10 @@
</td>

<td ng-attr-id="{{'inventarioDisp_' + $index}}">
<!-- ng-if="!((inventario.documento.bid != undefined) && (documento.id != inventario.documento.bid))" -->
<button id="disponibileXRichiesta" type="button"
<span ng-show="!documento.tag950[$parent.$parent.$index].webservice.useOnlineService"
class="disabled">{{((inventario.codFrui !=
undefined) ? (inventario.codFrui| decodeCodFrui |
translate) : '')}}</span> <button id="disponibileXRichiesta" type="button"
class="btn btn-success btn-xs"
ng-show="inventario.disponibilita.disponibile && documento.tag950[$parent.$parent.$index].webservice.useOnlineService"
ng-click="$parent.$parent.prenota((documento.level == 'm' && documento.id != inventario.documento.bid) ? inventario.documento.isbd : null, inventario, collocazione, inventario.bib, documento, $parent.$parent.$index, (documento.level == 's'))"
Expand Down Expand Up @@ -298,11 +292,7 @@
ng-click="openCopiaDigitale(inventario.url)"
title="{{'tooltip_disp_digitale' | translate}}">{{'copiaDigitale'
| translate }}</button>
</span> <span
ng-show="!documento.tag950[$parent.$parent.$index].webservice.useOnlineService"
class="disabled">{{((inventario.codFrui !=
undefined) ? (inventario.codFrui| decodeCodFrui |
translate) : '')}}</span>
</span>
</td>
</tr>
</tbody>
Expand Down
6 changes: 3 additions & 3 deletions opac/WebContent/resources/htmlView/opac/resultView.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h4>{{'not_found_suggerimenti' | translate}}</h4>
</div>
<center>
<div class="px-top-15 col-sm-12 col-lg-12" ng-show="resultFlag == false">
<button type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)" data-toggle="tooltip" data-placement="left"
<button ng-show="isOCNSearch == false" type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)" data-toggle="tooltip" data-placement="left"
title="{{'raffina' | translate}}">{{'raffina' | translate}}</button>

</div>
Expand Down Expand Up @@ -99,7 +99,7 @@ <h4 style="margin-top: 0px; margin-bottom: 0px;">

<span class="col-sm-8 col-lg-8">
<ng-include ng-show="resultFlag == true && search.solrDocs.documenti.length > 1" src=" 'htmlView/opac/biblio/buttonMassiveAction.htm' "></ng-include>
<button ng-if="!showIngFavorites && resultFlag == true " type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)"
<button ng-show="isOCNSearch == false" ng-if="!showIngFavorites && resultFlag == true " type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)"
data-toggle="tooltip" data-placement="left" title="{{'raffina' | translate}}">{{'raffina' | translate}}</button>
<ng-include src=" 'htmlView/opac/biblio/exportButtonsList.htm' "></ng-include>
</span>
Expand Down Expand Up @@ -312,7 +312,7 @@ <h4 style="margin-top: 0px; margin-bottom: 0px;">

<span class="col-sm-8 col-lg-8 px-top-5">
<ng-include ng-show="resultFlag == true && search.solrDocs.documenti.length > 1" src=" 'htmlView/opac/biblio/buttonMassiveAction.htm' "></ng-include>
<button ng-if="!showIngFavorites && resultFlag == true " type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)"
<button ng-show="isOCNSearch == false" ng-if="!showIngFavorites && resultFlag == true " type="submit" class="btn btn-outline-primary btn-xs" ng-click="modifySearch(true)"
data-toggle="tooltip" data-placement="left" title="{{'raffina' | translate}}">{{'raffina' | translate}}</button>
<ng-include src=" 'htmlView/opac/biblio/exportButtonsList.htm' "></ng-include>
<button ng-show="resultFlag == true && search.solrDocs.documenti.length > 1" type="submit" class="btn btn-default btn-xs"
Expand Down
2 changes: 1 addition & 1 deletion opac/WebContent/resources/htmlView/opac/ricercaSempliceView.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h2 class="padd_L_ico">
<div class="rAvanz padding-lateral">
<a class="a link rAvanz" ng-click="ricercaAvanzata(false)" title="{{'tooltip_paginaRAvanz' | translate}}">{{ 'rAvanz' | translate }}</a>
<br ng-if="polo.useAuthority" />
<a ng-if="polo.useAuthority" class="a link rAvanz" ng-href="{{polo.code}}/authority" title="{{'tooltip_paginaAuthAut' | translate}}">{{ 'authority' | translate }}</a>
<a ng-if="polo.useAuthority" class="a link rAvanz" ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/authority" title="{{'tooltip_paginaAuthAut' | translate}}">{{ 'authority' | translate }}</a>
</div>


Expand Down
16 changes: 8 additions & 8 deletions opac/WebContent/resources/htmlView/templates/page/navbarView.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Nome del Polo -->
<div class="col-md-5" id="poloTitle" style="padding-left: 0px">
<div class="col-md-12" style="padding-left: 0px">
<a ng-href="{{(polo.code && !isAdministration) ? polo.code + '/ricercaSemplice' : '#'}} " title="{{(!isAdministration) ? 'tooltip_paginaRSempl' : '' | translate}}">
<a ng-href="{{(polo.code && !isAdministration) ? ((!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo) + '/ricercaSemplice' : '#'}} " title="{{(!isAdministration) ? 'tooltip_paginaRSempl' : '' | translate}}">
<img ng-if="polo.code" class="img-responsive"
ng-src="img/get/logo_polo_scritta/{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}"
on-error-src="images/sbnweb.png" style="max-height: 65px;">
Expand Down Expand Up @@ -59,7 +59,7 @@
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav menu padd_L_nav">
<li ng-if="flagVisualizza" ng-show="(controller != 'rSemplice') && !user && flagVisualizza"><a
ng-href="{{polo.code}}/ricercaSemplice"
ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/ricercaSemplice"
title="{{'tooltip_paginaRSempl' | translate}}" class="a logout link"
> <span class="glyphicon glyphicon-home"></span>
{{ 'Home' | translate }}
Expand All @@ -72,7 +72,7 @@
</a></li>
<li ng-if="flagVisualizza"><a
title="{{'tooltip_guida_utente' | translate }}"
class="a logout link" href="meta/Guida_utente-opac2-1.1.0.pdf"
class="a logout link" href="meta/Guida_utente-opac2-1.1.1.pdf"
target="_blank"> <span class="glyphicon glyphicon-book"></span>
{{ 'guidaUtente' | translate }}
</a></li>
Expand All @@ -93,7 +93,7 @@
<li ng-if="flagVisualizza"><a
title="{{'tooltip_invia_mail_contatto' | translate}}"
ng-if="polo.code && !user" class="a logout link"
ng-href="{{polo.code}}/contatti"> <span
ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/contatti"> <span
class="glyphicon glyphicon-envelope"></span> {{ 'contatti' |
translate }}
</a></li>
Expand All @@ -107,15 +107,15 @@
<li ng-if="flagVisualizza"><a
ng-if="!polo.bibliotecaAsPolo && polo.code && !user"
title="{{'tooltip_info_polo' | translate}}" class="a logout link"
ng-href="{{polo.code}}/info/polo"> <span
ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/info/polo"> <span
class="glyphicon glyphicon-info-sign"></span> {{
'InfoPoloController' | translate }}
</a></li>

<li ng-if="flagVisualizza"><a ng-if="polo.code && !user"
title="{{(polo.bibliotecaAsPolo)? 'tooltip_info_biblioteca': 'tooltip_lista_biblioteche'
| translate }}"
class="a logout link" ng-href="{{polo.code}}/info/biblioteche">
class="a logout link" ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code + '/info/biblioteche' : polo.code +'/' + polo.codBibliotecaAsPolo + '/info/biblioteca'}}">
<span class="glyphicon glyphicon-info-sign"></span> {{
(polo.bibliotecaAsPolo)? 'info_biblioteca': 'InfoBibPoloController'
| translate }}
Expand Down Expand Up @@ -192,15 +192,15 @@
<!-- Almaviva3 evo BVE 09/05/2019 rimossa breadcumb spostata qui la searchBar -->
<div class="searchBar" ng-if="polo != undefined || poloList != undefined" ng-show="(controller != 'rSemplice') && !user && flagVisualizza">
<span class="col-md-4 px-top-5">
<a ng-href="{{polo.code}}/ricercaSemplice" title="{{'tooltip_paginaRSempl' | translate}}">{{'rSemplice' | translate }}</a>
<a ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/ricercaSemplice" title="{{'tooltip_paginaRSempl' | translate}}">{{'rSemplice' | translate }}</a>
-
<a ng-class="['a','link', {'disabled': (controller == 'rAvanz') }]"
ng-click="ricercaAvanzata(false)"
title="{{'tooltip_paginaRAvanz' | translate}}">{{ 'rAvanz' |
translate }}</a> <!-- class rimosso rAvanz ng-show="(controller != 'rAvanz')" -->

- <a ng-if="polo.useAuthority"
ng-class="['a','link', {'disabled': (controller == 'authority') }]" ng-href="{{polo.code}}/authority"
ng-class="['a','link', {'disabled': (controller == 'authority') }]" ng-href="{{(!polo.bibliotecaAsPolo) ? polo.code : polo.code +'/' + polo.codBibliotecaAsPolo}}/authority"
title="{{'tooltip_paginaAuthAut' | translate}}">{{ 'authority' |
translate }}</a> <!-- class rimosso rAuth ng-show="(controller != 'authority')"-->
</span>
Expand Down
Loading

0 comments on commit 905d743

Please sign in to comment.