forked from FortAwesome/Font-Awesome
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'c8e329f7189387e3afa8922a7f0d67e58e557e1f' into develop
pull après merge pull request FortAwesome#24
- Loading branch information
Showing
306 changed files
with
63 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...lugins/sidWidgetBePlugin/modules/objectPartials/templates/_articleBySectionContextuel.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<?php | ||
|
||
$html = ""; | ||
$html .= _open('li.element'); | ||
$html.= _open('span.wrapper'); | ||
$html.= _tag('span.title itemprop="name"', $article->getTitle()); | ||
//on ajoute le chapeau dans tous les cas | ||
$html.= _tag('span.teaser itemprop="description"', stringTools::str_truncate($article->getChapeau(), $textLength, $textEnd, true)); | ||
|
||
$html.= _close('span.wrapper'); | ||
|
||
//On englobe l'ensemble du contenu dans un lien que l'on affiche | ||
echo _link($article) | ||
->set('.link_box') | ||
->title($article->getTitle()) | ||
->text($html); | ||
$html .= _close('li'); | ||
?> |
File renamed without changes.
67 changes: 14 additions & 53 deletions
67
...dgetBePlugin/modules/specifiquesBaseEditoriale/templates/_articlesBySectionContextuel.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,24 @@ | ||
<?php | ||
// vars : $articles, $lien, $titreBloc, $longueurTexte, $rubrique, $section | ||
//if (count($articles)) { // si nous avons des actu articles | ||
// if($nbArticles == 1){ | ||
// if ($titreBloc != true) { | ||
// echo _tag('h4.title', $rubrique); | ||
// } | ||
// else echo _tag('h4.title', $titreBloc); | ||
// } | ||
// echo _tag('h4.title', $titreBloc); | ||
// echo _open('ul.elements'); | ||
// foreach ($articles as $i=>$article) { | ||
// echo "<h4 class='title'>".$article->getTitle().'</h4>'; | ||
// echo "<span class='teaser'>".$article->getChapeau().'</span>'; | ||
// echo _link($article); | ||
// if($lien[$i] != null){ | ||
// echo "<a class='link' href=".$article.'>'.$lien[$i].'</a>'; | ||
// } | ||
// echo '<hr/>'; | ||
// | ||
// include_partial("objectPartials/articleContextuel", array("lien" => $lien,"articles" => $articles,"textLength" => $longueurTexte,"textEnd" => '(...)',"photoArticle" => $photo,'titreBloc' => $titreBloc)); | ||
//// | ||
// } | ||
// echo _close('ul'); | ||
// | ||
// echo _open('div.navigation.navigationBottom'); | ||
// echo _open('ul.elements'); | ||
// echo _open('li.element'); | ||
// echo _link('sidActuArticle/list')->text($titreLien); | ||
// echo _close('li'); | ||
// echo _close('ul'); | ||
// echo _close('div'); | ||
//} // sinon on affiche rien | ||
//<?php | ||
// vars : $section, $titreBloc, $titreLien, $longueurTexte, $articles, $arrayRubrique, $photo | ||
|
||
// vars : $articles, $titreBloc, $titreLien, $longueurTexte, $articles, $rubrique, $section | ||
if (count($articles)) { // si nous avons des actu articles | ||
|
||
echo _tag('h4.title', $titreBloc); | ||
echo _open('ul.elements'); | ||
foreach ($articles as $article){ | ||
$html =""; | ||
echo _open('li.element'); | ||
if ($titreBloc != true) { | ||
$html.= _tag('h4.title', $rubrique); | ||
} | ||
else $html.= _tag('h4.title', $titreBloc); | ||
|
||
$html .= _open('span.wrapper'); | ||
$html .= _tag('span.title', '' . $article) ; | ||
$html .= _tag('span.teaser itemprop="description"', stringTools::str_truncate($article->getChapeau(), $longueurTexte, '(...)', true)); | ||
$html .= _close('span.wrapper'); | ||
|
||
echo _link($article)->text($html)->set('.link_box'); | ||
echo _open('div.navigation.navigationBottom'); | ||
//echo _link($article->Section)->text($section.' - '.$rubrique); | ||
// echo _close('ul'); | ||
echo _close('div'); | ||
echo _close('li'); | ||
// include_partial("objectPartials/filActualite", array("article" => $article,"textLength" => $longueurTexte,"textEnd" => '(...)','titreBloc' => $titreBloc, "titreLien" => $titreLien,"arrayRubrique" => $arrayRubrique,"photo" => $photo)); | ||
|
||
include_partial("objectPartials/articleBySectionContextuel", array("article" => $article,"textLength" => $longueurTexte,"textEnd" => '(...)')); | ||
|
||
} | ||
echo _close('ul'); | ||
|
||
echo _open('div.navigation.navigationBottom'); | ||
echo _open ('ul.elements'); | ||
echo _open ('li.element'); | ||
if($titreLien){$text = $titreLien;} | ||
else $text = $section->name.' en '. $rubrique->name; | ||
echo _link($article->Section)->text($text); | ||
echo _close('li'); | ||
echo _close('ul'); | ||
echo _close('div'); | ||
} |
14 changes: 7 additions & 7 deletions
14
...tes/BaseTheme/Externals/db/ec.sitev3.dump → ...eTheme/Externals/db/ec.sitev3_equipe.dump
Large diffs are not rendered by default.
Oops, something went wrong.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Oops, something went wrong.