Skip to content

Commit

Permalink
Merge pull request FortAwesome#276 from stephanemeron/develop
Browse files Browse the repository at this point in the history 
suppression de la classe .btn pour style v2
  • Loading branch information
@stephanemeron
stephanemeron committed Aug 28, 2012
2 parents 1b05683 + c3240cc commit fcc536f
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion dmCorePlugin/plugins/dmGoogleMapPlugin/lib/view/html/dmGoogleMapTag.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public function render() {
</span><br />
</div>';
// vérif si adresse mail existe
($adresseRequest->getEmail() != NULL) ? $cabinet .= _link('mailto:'.$adresseRequest->getEmail())->set('.btn')->text(_tag('i', array('class' => 'icon-envelope'), '').__('Email')) : $cabinet= '';
($adresseRequest->getEmail() != NULL) ? $cabinet .= _link('mailto:'.$adresseRequest->getEmail())->text(_tag('i', array('class' => 'icon-envelope'), '').__('Email')) : $cabinet= '';
// vérif si tél existe
($adresseRequest->getTel() != NULL) ? $cabinet .= '<br />'._tag('i', array('class' => 'icon-phone value', 'itemprop' => 'telephone'), '&nbsp;').$adresseRequest->getTel() : $cabinet .= '';
// vérif si fax existe
Expand Down
4 changes: 2 additions & 2 deletions ...ePlugin/plugins/sidWidgetActuPlugin/modules/actusDuCabinet/templates/_actuArticleShow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
echo _open('footer', array('class' => 'contentFooter'));
echo _tag('h5', __('Download file, click the link below'));
if($article->getTitleFile() != NULL){
echo _link($article->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$article->getTitleFile())->set('.btn');
echo _link($article->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$article->getTitleFile());
}
else echo _link($article->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$article->getFiles()->getFile())->set('.btn');
else echo _link($article->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$article->getFiles()->getFile());
echo _close('footer');
echo _tag('hr');
}
Expand Down
2 changes: 1 addition & 1 deletion ...gin/plugins/sidWidgetCabinetPlugin/modules/equipeCabinet/templates/_equipesContextuel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
if ($equipe->email != NULL && $mailTo == true) {
//$html.= _tag('br');
$html.= _open('span', array('class' => 'itemprop email'));
$html.= _link('/contact?dest=' . $equipe->id)->set('.btn itemprop="email"')->text(_tag('i', array('class' => 'icon-envelope'), '').'Contact');
$html.= _link('/contact?dest=' . $equipe->id)->set('itemprop="email"')->text(_tag('i', array('class' => 'icon-envelope'), '').'Contact');
$html.= _close('span');
};
if ($equipe->tel != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions ...plugins/sidWidgetCabinetPlugin/modules/recrutementsCabinet/templates/_recrutementShow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
echo _open('footer', array('class' => 'contentFooter'));
echo _tag('h5', __('Download file, click the link below'));
if($recrutements->getTitleFile() != NULL){
echo _link($recrutements->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$recrutements->getTitleFile())->set('.btn');
echo _link($recrutements->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$recrutements->getTitleFile());
}
else echo _link($recrutements->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$recrutements->getFiles()->getFile())->set('.btn');
else echo _link($recrutements->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$recrutements->getFiles()->getFile());
echo _close('footer');
echo _tag('hr');
}
Expand Down
4 changes: 2 additions & 2 deletions ...n/plugins/sidWidgetCabinetPlugin/modules/selectionPlacements/templates/_selectionShow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
echo _open('footer', array('class' => 'contentFooter'));
echo _tag('h5', __('Download file, click the link below'));
if($selections->getTitleFile() != NULL){
echo _link($selections->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$selections->getTitleFile())->set('.btn');
echo _link($selections->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$selections->getTitleFile());
}
else echo _link($selections->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$selections->getFiles()->getFile())->set('.btn');
else echo _link($selections->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$selections->getFiles()->getFile());
echo _close('footer');
echo _tag('hr');
}
Expand Down
2 changes: 1 addition & 1 deletion ...Plugin/plugins/sidWidgetCoordonneesExpertPlugin/modules/adresses/templates/_multiples.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
$emailSpan = '';
if ($adresse->getEmail()){
$emailSpan .= _open('span', array('class' => "itemprop mail"));
$emailSpan .=_link("mailto:".$adresse->getEmail())->text(_tag('i', array('class' => 'icon-envelope'), '').$adresse->getEmail())->set('.btn value itemprop="email"');
$emailSpan .=_link("mailto:".$adresse->getEmail())->text(_tag('i', array('class' => 'icon-envelope'), '').$adresse->getEmail())->set('.value itemprop="email"');
$emailSpan .=_close('span').'<br />';
}

Expand Down
2 changes: 1 addition & 1 deletion .../sidWidgetCoordonneesExpertPlugin/modules/implantationCabinet/templates/_implantation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
};
if ($equipe->email != NULL) {
echo '<br />'._open('span', array('class' => 'itemprop email'));
echo _link('/contact?dest=' . $equipe->id)->set('.btn itemprop="email"')->text(_tag('i', array('class' => 'icon-envelope'), '').'Contact');
echo _link('/contact?dest=' . $equipe->id)->set('itemprop="email"')->text(_tag('i', array('class' => 'icon-envelope'), '').'Contact');
echo _close('span');
};
if ($equipe->tel != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions dmCorePlugin/plugins/sidWidgetSitesUtilesPlugin/modules/indexSitesUtiles/templates/_show.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
echo _open('footer', array('class' => 'contentFooter'));
echo _tag('h5', __('Download file, click the link below'));
if($indexSitesUtiles->getTitleFile() != NULL){
echo _link($indexSitesUtiles->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$indexSitesUtiles->getTitleFile())->set('.btn');
echo _link($indexSitesUtiles->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$indexSitesUtiles->getTitleFile());
}
else echo _link($indexSitesUtiles->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$indexSitesUtiles->getFiles()->getFile())->set('.btn');
else echo _link($indexSitesUtiles->getFiles())->text('<i class="icon-large icon-download-alt"></i>&nbsp;'.$indexSitesUtiles->getFiles()->getFile());
echo _close('footer');
echo _tag('hr');
}
Expand Down
2 changes: 1 addition & 1 deletion symfony
Submodule symfony updated from 85234c to b04756

0 comments on commit fcc536f

Please sign in to comment.