Commit d73c36dc authored by Pierre-Yves Buard's avatar Pierre-Yves Buard
Browse files

Merge branch 'dev' into pyb/mirador

parents 3801d1ef 899a9abb
Loading
Loading
Loading
Loading
+4
Changes for plugins/search/search.css: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ div.hit {
    width:70%;
    margin: auto;
}
#searchWrap h3{
    margin-bottom : 30px;
    text-align: center;
}
#searchForm{
  text-align:center;
}
+1
Changes for plugins/search/search.xqm: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ function max.plugin.search:searchPage($project){
               $project,
               "search",
               <div id="searchWrap">
                 <h3>{max.i18n:getText($project,'search.label')}</h3>
                 <div id='searchForm'>
                     <div id='modeWrap'>
                      <input type="radio" onchange="window.search.searchModeChanged()" value="{$max.plugin.search:ALL_TXT}" name="searchMode" checked="checked"/>Dans tous les textes
+5 −1
Changes for rxq/html.xqm: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -344,7 +344,11 @@ declare %private function max.html:buildMetas($projectId, $xmlFragment){
            'content' : $xmlFragment
            })
        else (
            <title>{max.html:cleanValue(string-join(($xmlFragment//*[@id='text']//(*:h1 | *:h2 | *:h3))[1]//text(), ''))}</title>,
            let $textTitle := if($xmlFragment//*[@id='text'])
                              then string-join(($xmlFragment//*[@id='text']//(*:h1 | *:h2 | *:h3))[1]//text(), '')
                              else string-join(($xmlFragment//(*:h1 | *:h2 | *:h3))[1]//text(), '')
            return
            <title>{max.config:getProjectPrettyName($projectId) || ' - ' || max.html:cleanValue($textTitle)}</title>,
            <meta name="author" content="{max.config:getProjectAuthor($projectId)}"/>,

            <meta property="dc:description" content="{max.config:getProjectDescription($projectId)}"/>,
+6 −5
Changes for tools/max.sh: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@ DIRECTORY=$(cd `dirname $0` && pwd)
MAX_PLUGINS_DIR=$DIRECTORY/../plugins
BASEX_CLIENT_BIN="basexclient"
BASEX_BIN="basex"
DEMO_RELEASE_URL="https://git.unicaen.fr/chauveau/max-tei-demo/-/archive/v1.0/max-tei-demo-v1.0.zip"
MAX_DEMO_VERION_NUMBER="v1.1"
MAX_DEMO_VERSION="max-tei-demo-"$MAX_DEMO_VERION_NUMBER
DEMO_RELEASE_URL="https://git.unicaen.fr/pdn-certic/max-tei-demo/-/archive/v1.1/"$MAX_DEMO_VERSION".zip"

dependency_test(){
  result=$(command -v $1)
@@ -214,16 +216,15 @@ demo_edition_build(){
     echo 'MaX demo install error : Cannot fetch '$DEMO_RELEASE_URL
     exit -1
    fi
    unzip max-tei-demo-v1.0.zip
    mv max-tei-demo-v1.0 max_tei_demo
    rm max-tei-demo-v1.0.zip
    unzip $MAX_DEMO_VERSION.zip
    mv $MAX_DEMO_VERSION max_tei_demo
    rm $MAX_DEMO_VERSION.zip
    cd $DIRECTORY

    #    enable project plugins
    enable_plugin apparat_critique max_tei_demo
    enable_plugin breadcrumb max_tei_demo
    enable_plugin correction max_tei_demo
    enable_plugin equations max_tei_demo
    enable_plugin img_viewer max_tei_demo
    enable_plugin search max_tei_demo
    enable_plugin tei_pdf max_tei_demo
−97

File deleted.

Loading