diff --git a/base/librealire.php b/base/librealire.php index 152a9b3..d5da4e7 100644 --- a/base/librealire.php +++ b/base/librealire.php @@ -29,7 +29,7 @@ function librealire_declarer_champs_extras($champs = array()) { 'sql' => "text NOT NULL DEFAULT ''", 'rechercher' => true, 'label' => _T('librealire:source'), - 'explication' => _T('librealire:origine_explications'), + 'explication' => _T('librealire:source_explications'), 'obligatoire' => false ) ), diff --git a/lang/librealire_fr.php b/lang/librealire_fr.php new file mode 100644 index 0000000..9f72dc8 --- /dev/null +++ b/lang/librealire_fr.php @@ -0,0 +1,13 @@ + 'Média d’origine', + +); diff --git a/lang/paquet-librealire_fr.php b/lang/paquet-librealire_fr.php new file mode 100644 index 0000000..6c2f366 --- /dev/null +++ b/lang/paquet-librealire_fr.php @@ -0,0 +1,17 @@ + 'Libre à lire', + + // T + 'titre_page_configurer' => 'Configuration', + + +); diff --git a/librealire_administrations.php b/librealire_administrations.php index 0b0d809..d10fdc6 100644 --- a/librealire_administrations.php +++ b/librealire_administrations.php @@ -35,6 +35,7 @@ function librealire_upgrade($nom_meta_base_version, $version_cible) { cextras_api_upgrade(librealire_declarer_champs_extras(), $maj['0.1.0']); cextras_api_upgrade(librealire_declarer_champs_extras(), $maj['0.2.0']); cextras_api_upgrade(librealire_declarer_champs_extras(), $maj['0.3.0']); + cextras_api_upgrade(librealire_declarer_champs_extras(), $maj['0.3.1']); // $maj['1.1.4'] = array( // array('maj_tables', array('spip_roles_documents')), // ); diff --git a/paquet.xml b/paquet.xml index d988e8b..706706e 100755 --- a/paquet.xml +++ b/paquet.xml @@ -2,7 +2,7 @@ prefix="librealire" categorie="squelette" version="0.2.0" - schema="0.3.0" + schema="0.3.1" etat="dev" compatibilite="[3.2.7;3.3.*]" > diff --git a/prive/squelettes/contenu/configurer_librealire.html b/prive/squelettes/contenu/configurer_librealire.html index 2d41595..05c9218 100644 --- a/prive/squelettes/contenu/configurer_librealire.html +++ b/prive/squelettes/contenu/configurer_librealire.html @@ -1,6 +1,6 @@ [(#AUTORISER{configurer,_librealire}|sinon_interdire_acces)] -

<:librealire:titre_page_configurer_librealire:/>

+

<:librealire:titre_page_configurer:/>

#FORMULAIRE_CONFIGURER_LIBREALIRE diff --git a/squelettes/content/article-transcriptions.html b/squelettes/content/article-transcriptions.html index 3d0ec21..f5d886f 100644 --- a/squelettes/content/article-transcriptions.html +++ b/squelettes/content/article-transcriptions.html @@ -51,6 +51,32 @@ [
(#NOTES)
] + [(#TITRE_T|ou{#SOURCE}|ou{#LIEU}|ou{#DATE_T}|ou{#DUREE}|ou{#LIENS}|ou{#EVENEMENT}|ou{#LICENCE}|ou{#CREDITSVISUELS}|oui) +
+

<:librealire:media_d_origine:>

+
+ [
Titre
+
(#TITRE_T|propre)
] + [
Source
+
(#SOURCE|propre)
] + [
Lieu
+
(#LIEU|propre)
] + [
Date
+ ] + [
Durée
+
(#DUREE|propre)
] + [
Autres liens
+
(#LIENS|propre)
] + [
Évènement
+
(#EVENEMENT|propre)
] + [
License
+
(#LICENCE|=={verbatim}|oui)Verbatim
] + [
License
+
(#LICENCE|=={autrelicence}|oui)Autre licence
] + [
Crédits des visuels
+
(#CREDITSVISUELS|propre)
] +
] + diff --git a/squelettes/scss/styles/_perso.scss b/squelettes/scss/styles/_perso.scss index 6e75028..0ac8fa0 100644 --- a/squelettes/scss/styles/_perso.scss +++ b/squelettes/scss/styles/_perso.scss @@ -69,7 +69,7 @@ .article-resume { display:block; border-left:solid $couleurConnexplus ($spacer/3); - background-color:$couleurBkgTranscription; + background-color:$couleurBkgT; padding:($spacer*3) $spacer $spacer ($spacer*1.5); &, a { color:#0a4756; @@ -106,7 +106,32 @@ margin-right:0; article { padding:($spacer*2); - background-color:$couleurBkgTranscription; + background-color:$couleurBkgT; + @include media($bp-medium-up) { + padding:$spacer ($spacer*4); + } + } + } +} +.article__transcription_origine { +/* width:100%; */ + margin:$spacer -($spacer*2); + padding:$spacer ($spacer*2); + background:$couleurBkgTOrigine; + color:$couleurTDetails; + @include media($bp-medium-up) { + margin:$spacer -($spacer*4); + padding:$spacer ($spacer*4); + } + dt { + float:left; + margin-right:($spacer/2); + } + dd { + margin:0; + border-bottom:1px solid $couleurBkgT; + &:last-child { + border:0; } } } @@ -115,4 +140,3 @@ - diff --git a/squelettes/scss/utils/_variables-perso.scss b/squelettes/scss/utils/_variables-perso.scss index 05cc787..b69cdb4 100644 --- a/squelettes/scss/utils/_variables-perso.scss +++ b/squelettes/scss/utils/_variables-perso.scss @@ -9,4 +9,6 @@ $couleurBackgroundTexte: #fcf7f2; $couleurConnex: #0099a8; $couleurConnexplus: #62c0c9; -$couleurBkgTranscription: #fdf7f2; +$couleurBkgT: #fdf7f2; +$couleurBkgTOrigine: #b8d9dd; +$couleurTDetails: #1f6b7c;