Skip to content

Commit

Permalink
Merge branch '3.0.1-devel' of https://github.com/rism-ch/muscat into …
Browse files Browse the repository at this point in the history 
…3.0.1-devel
  • Loading branch information
@xhero
xhero committed Jul 13, 2015
2 parents 28a6773 + fc64607 commit 048142c
Show file tree
Hide file tree
Showing 23 changed files with 394 additions and 376 deletions.
9 changes: 8 additions & 1 deletion app/assets/stylesheets/rism_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ h2 {
border-color: $gray100;
}

// Welcome
// Welcome and advanced search
h3.welcome {
margin-bottom: 25px;
}
Expand All @@ -176,6 +176,13 @@ p.welcome-tip {
background: image-url("/images/list.png") no-repeat;
}

p.search-tip {
margin-left: 5px;
padding-left: 25px;
padding-bottom: 2px;
background: image-url("/images/list.png") no-repeat;
}

// Facets //
.facets > div > h4 {
@media (max-width: $screen-sm-min) {
Expand Down
43 changes: 25 additions & 18 deletions app/views/advanced/_advanced_search_help.de.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,30 @@
Suchtipps
</div>
<div class="panel-body">
<ul class="advanced-help">
<li>Wählen Sie "alle Eigenschaften", um in allen Feldern zu suchen.
</li>
<li>Wählen Sie "irgendeine Eigenschaft", um in mindestens einem Feld zu suchen.
</li>
<li>Kombinieren Sie Suchbegriffe und Eigenschaften, um bestimmte Einträge zu finden.
</li>
<li>Benutzen Sie Anführungszeichen, um ganze Sätze oder Phrasen zu suchen.
</li>
<li>Geben Sie ein "+" vor einem erforderlichen Begriff ein. (Ansonsten werden Treffer eingezeigt, die nur einige Ihrer Suchbegriffe beinhalten).
</li>
<li>Geben Sie ein "-" vor einem Wort oder Phrase, um sie auszuschliessen.
</li>
<li>Benutzen Sie die Booleschen Operatoren "OR", "AND" und "NOT", um komplexe Verknüpfungen darzustellen. Sie können Klammern in Ihrer Sucheingabe benutzen.
</li>
<li>Trunkierung und Platzhalter werden nicht unterstützt, die Trunkierung ist automatisiert.
</li>
</ul>
<p class="search-tip">
Wählen Sie "alle Eigenschaften", um in allen Feldern zu suchen.
</p>
<p class="search-tip">
Wählen Sie "irgendeine Eigenschaft", um in mindestens einem Feld zu suchen.
</p>
<p class="search-tip">
Kombinieren Sie Suchbegriffe und Eigenschaften, um bestimmte Einträge zu finden.
</p>
<p class="search-tip">
Benutzen Sie Anführungszeichen, um ganze Sätze oder Phrasen zu suchen.
</p>
<p class="search-tip">
Geben Sie ein "+" vor einem erforderlichen Begriff ein. (Ansonsten werden Treffer eingezeigt, die nur einige Ihrer Suchbegriffe beinhalten).
</p>
<p class="search-tip">
Geben Sie ein "-" vor einem Wort oder Phrase, um sie auszuschliessen.
</p>
<p class="search-tip">
Benutzen Sie die Booleschen Operatoren "OR", "AND" und "NOT", um komplexe Verknüpfungen darzustellen. Sie können Klammern in Ihrer Sucheingabe benutzen.
</p>
<p class="search-tip">
Trunkierung und Platzhalter werden nicht unterstützt, die Trunkierung ist automatisiert.
</p>
</div>
</div>

42 changes: 24 additions & 18 deletions app/views/advanced/_advanced_search_help.fr.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@
Conseils pour la recherche
</div>
<div class="panel-body">
<ul class="advanced-help">
<li>Choisir "à tous" pour rendre tous les critères obligatoires.
</li>
<li>Choisir "au moins un des" pour les résultats correspondant à un critère au moins.
</li>
<li>Combiner mots clé et attributs pour rechercher des éléments spécifiques.
</li>
<li>Utiliser des guillemets pour des phrases.
</li>
<li>Ajouter un "+" devant un terme pour le rendre obligatoire. (Sinon les résultats correspondant à au moins un critère seront retournés).
</li>
<li>Ajouter un "-" devant un terme pour l'exclure.
</li>
<li>Utiliser "OR", "AND", et "NOT" pour une recherche booléenne complexe. Des parenthèses peuvent être utilisées si nécessaire.
</li>
<li>Les troncatures et de les caractères génériques ne sont pas supportés - le mot découlant est pris en compte automatiquement.
</li>
</ul>
<p class="search-tip">
Choisir "à tous" pour rendre tous les critères obligatoires.
</p>
<p class="search-tip">
Choisir "au moins un des" pour les résultats correspondant à un critère au moins.
</p>
<p class="search-tip">
Combiner mots clé et attributs pour rechercher des éléments spécifiques.
</p>
<p class="search-tip">
Utiliser des guillemets pour des phrases.
</p>
<p class="search-tip">
Ajouter un "+" devant un terme pour le rendre obligatoire. (Sinon les résultats correspondant à au moins un critère seront retournés).
</p>
<p class="search-tip">
Ajouter un "-" devant un terme pour l'exclure.
</p>
<p class="search-tip">
Utiliser "OR", "AND", et "NOT" pour une recherche booléenne complexe. Des parenthèses peuvent être utilisées si nécessaire.
</p>
<p class="search-tip">
Les troncatures et de les caractères génériques ne sont pas supportés - le mot découlant est pris en compte automatiquement.
</p>
</div>
</div>
42 changes: 24 additions & 18 deletions app/views/advanced/_advanced_search_help.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@
Search Tips
</div>
<div class="panel-body">
<ul class="advanced-help">
<li>Select "match all" to require all fields.
</li>
<li>Select "match any" to find at least one field.
</li>
<li>Combine keywords and attributes to find specific items.
</li>
<li>Use quotation marks to search as a phrase.
</li>
<li>Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).
</li>
<li>Use "-" before a word or phrase to exclude.
</li>
<li>Use "OR", "AND", and "NOT" to create complex boolean logic. You can use parentheses in your complex expressions.
</li>
<li>Truncation and wildcards are not supported - word-stemming is done automatically.
</li>
</ul>
<p class="search-tip">
Select "match all" to require all fields.
</p>
<p class="search-tip">
Select "match any" to find at least one field.
</p>
<p class="search-tip">
Combine keywords and attributes to find specific items.
</p>
<p class="search-tip">
Use quotation marks to search as a phrase.
</p>
<p class="search-tip">
Use "+" before a term to make it required. (Otherwise results matching only some of your terms may be included).
</p>
<p class="search-tip">
Use "-" before a word or phrase to exclude.
</p>
<p class="search-tip">
Use "OR", "AND", and "NOT" to create complex boolean logic. You can use parentheses in your complex expressions.
</p>
<p class="search-tip">
Truncation and wildcards are not supported - word-stemming is done automatically.
</p>
</div>
</div>
42 changes: 24 additions & 18 deletions app/views/advanced/_advanced_search_help.it.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,29 @@
Consigli per la ricerca
</div>
<div class="panel-body">
<ul class="advanced-help">
<li>Selezionare "tutti i campi" per rendere tutti i campi obbligatori.
</li>
<li>Selezionare "qualsiasi campo" in modo che almeno un campo sia presente.
</li>
<li>Combinare parole chiave ed attributi per cercare elementi specifici.
</li>
<li>Racchiudere frasi da cercare intere tra doppi apici.
</li>
<li>Aggiungere "+" davanti ad un termine per renderlo obbligatorio (altrimenti saranno inclusi risultati che corrispondono ad almeno uno dei termini inclusi).
</li>
<li>Aggiungere "-" davanti a una parola o frase per escluderla.
</li>
<li>Usare "OR", "AND" e "NOT" per creare ricerche booleane complesse. Sono accettate parentesi per racchiudere le espressioni.
</li>
<li>Troncamento e caratteri jolly non sono supportati, il troncamento è eseguito automaticamente.
</li>
</ul>
<p class="search-tip">
Selezionare "tutti i campi" per rendere tutti i campi obbligatori.
</p>
<p class="search-tip">
Selezionare "qualsiasi campo" in modo che almeno un campo sia presente.
</p>
<p class="search-tip">
Combinare parole chiave ed attributi per cercare elementi specifici.
</p>
<p class="search-tip">
Racchiudere frasi da cercare intere tra doppi apici.
</p>
<p class="search-tip">
Aggiungere "+" davanti ad un termine per renderlo obbligatorio (altrimenti saranno inclusi risultati che corrispondono ad almeno uno dei termini inclusi).
</p>
<p class="search-tip">
Aggiungere "-" davanti a una parola o frase per escluderla.
</p>
<p class="search-tip">
Usare "OR", "AND" e "NOT" per creare ricerche booleane complesse. Sono accettate parentesi per racchiudere le espressioni.
</p>
<p class="search-tip">
Troncamento e caratteri jolly non sono supportati, il troncamento è eseguito automaticamente.
</p>
</div>
</div>
120 changes: 57 additions & 63 deletions app/views/catalog/mei.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,67 @@
<script type="text/javascript" language="javascript" src="/javascripts/Saxonce/Saxonce.nocache.js"></script>
<script type="text/javascript" language="javascript" src="/javascripts/verovio-toolkit.js"></script>

<div class="container" id="mei-toplevel">

<div class="page-header">
<h2><%= t('mei.title', :source => @item.id)%></h2>
</div>

<div class="col-sm-12 col-md-3 sidebar-offcanvas" id="sidebar" role="navigation">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><%= t('mei.parameters')%></h3>
</div>
<div class="panel-body">

<label for="sel1"><%= t('mei.format')%></label>
<select class="form-control" id="mei-output-format" onclick="setRegenerateMei();">
<option value="mei"><%= t('mei.format_mei')%></option>
<option value="pae"><%= t('mei.format_pae')%></option>
</select>

<hr>
<div class="col-md-9">
<h3><%= t('mei.title', :source => @item.id)%></h3>

<hr/>

<h4 id="mei-preview-text"><%= t('mei.banner')%></h4>
<div id="mei-html-output">
</div>
<pre id="mei-output" class="prettyprint">
</pre>
</div>

<div class="col-sm-12 col-md-3 sidebar-offcanvas" id="sidebar" role="navigation">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><%= t('mei.parameters')%></h3>
</div>
<div class="panel-body">

<label for="sel1"><%= t('mei.format')%></label>
<select class="form-control" id="mei-output-format" onclick="setRegenerateMei();">
<option value="mei"><%= t('mei.format_mei')%></option>
<option value="pae"><%= t('mei.format_pae')%></option>
</select>

<hr/>

<label for="exampleInputFile"><%= t('mei.stylesheet')%></label>
<div class="radio">
<label><input type="radio" name="radio-xsls" checked="checked" onclick="setUseDefaultStylesheet();"><%= t('mei.default_stylesheet')%></label>
</div>
<div class="radio">
<label><input type="radio" name="radio-xsls" onclick="setUseCustomStylesheet();"><%= t('mei.custom_stylesheet')%></label>
</div>
<input type="file" id="mei-select-file" disabled="disabled" accept=".xsl,.xml"/>

<hr/>

<label for="exampleInputFile"><%= t('mei.stylesheet')%></label>
<div class="radio">
<label><input type="radio" name="radio-xsls" checked="checked" onclick="setUseDefaultStylesheet();"><%= t('mei.default_stylesheet')%></label>
</div>
<div class="radio">
<label><input type="radio" name="radio-xsls" onclick="setUseCustomStylesheet();"><%= t('mei.custom_stylesheet')%></label>
</div>
<input type="file" id="mei-select-file" disabled="disabled" accept=".xsl,.xml">

<hr>

<p/>
<div style="text-align: right">
<button onclick="previewMeiFile(<%=@item.id%>)" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-search"></span><%= t('mei.preview')%>
</button>
<button onclick="downloadMeiFile(<%=@item.id%>)" class="btn btn-default btn-sm" id="form-reset">
<span class="glyphicon glyphicon-remove"></span><%= t('mei.download')%>
</button>
</div>
</div>
</div>


<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><%= t('mei.more')%></h3>
</div>
<div class="panel-body">
<%= render "mei_more" %>
</div>
</div>

</div>
<div style="text-align: right">
<button onclick="previewMeiFile(<%=@item.id%>)" class="btn btn-default btn-sm">
<span class="glyphicon glyphicon-search"></span> <%= t('mei.preview')%>
</button>
<button onclick="downloadMeiFile(<%=@item.id%>)" class="btn btn-default btn-sm" id="form-reset">
<span class="glyphicon glyphicon-download"></span> <%= t('mei.download')%>
</button>
</div>
</div>
</div>

<div class="col-md-9">
<h4 id="mei-preview-text"><%= t('mei.banner')%></h4>
<div id="mei-html-output">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><%= t('mei.more')%></h3>
</div>
<div class="panel-body">
<%= render "mei_more" %>
</div>
</div>

</div>
<pre id="mei-output" class="prettyprint">
</pre>
</div>


</div>

<script type="text/javascript">
document.getElementById('mei-select-file').addEventListener('change', readSingleFile, false);
document.getElementById('mei-select-file').addEventListener('change', readSingleFile, false);
</script>
2 changes: 1 addition & 1 deletion app/views/shared/_header_navbar.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>
</div>
<% if request.path != "/advanced" %>
<div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
<div id="search-navbar" class="navbar navbar-default navbar-static-top" role="navigation">
<div class="container">
<div class="col-md-3 hidden-sm hidden-xs search-navbar-logo">
<img src="/images/logo-large-ch.png">
Expand Down
4 changes: 2 additions & 2 deletions config/editor_profiles/ch/configurations/BasicLabels.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ doc_templates: !map:ActiveSupport::HashWithIndifferentAccess
a: !map:ActiveSupport::HashWithIndifferentAccess
label: !map:ActiveSupport::HashWithIndifferentAccess
it: Agenzia catalografica originale
fr: Orgranisme du catalogage original
fr: Organisme du catalogage original
de: Original-Katalogisierungsstelle
en: Original cataloguing agency
b: !map:ActiveSupport::HashWithIndifferentAccess
Expand Down Expand Up @@ -1525,7 +1525,7 @@ doc_templates: !map:ActiveSupport::HashWithIndifferentAccess
"690": !map:ActiveSupport::HashWithIndifferentAccess
label: !map:ActiveSupport::HashWithIndifferentAccess
it: Catalogo tematico
fr: Nome de catalgue
fr: Nom de catalogue
de: Werkverzeichnis
en: Catalogue name
fields: !map:ActiveSupport::HashWithIndifferentAccess
Expand Down
2 changes: 1 addition & 1 deletion config/editor_profiles/ch/configurations/PersonBasicLabels.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ doc_templates: !map:ActiveSupport::HashWithIndifferentAccess
a: !map:ActiveSupport::HashWithIndifferentAccess
label: !map:ActiveSupport::HashWithIndifferentAccess
it: Agenzia catalografica originale
fr: Orgranisme du catalogage original
fr: Organisme du catalogage original
de: Original-Katalogisierungsstelle
en: Original cataloguing agency
b: !map:ActiveSupport::HashWithIndifferentAccess
Expand Down
Loading

0 comments on commit 048142c

Please sign in to comment.