Merge pull request #1 from benabri/master

 modif de la dl du fichier druid.card et suppression d'un des 2 </div…

views/card.inline.display.php

@@ -11,26 +11,32 @@ echo "<style>.lacarte{margin-bottom:1em;padding:3px; position:relative;backgroun
 	   .thethemes div{font-weight:bold}
 	   .lacarte header{font-weight:normal;font-size:small;text-align:left;}
 	   .auteur{background-color:white; text-align:left;}</style>";
-$res =   "<div  class='lacarte'><div>
-	<div class='niveauMin'>".$card->get_level()."</div>
-	<div class='lalangue'>ID&nbsp;: ".$card->get_id()." (".$card->get_lang().")</div>
-	<!--div class='categoriecat'>".$card->get_cat()."</div-->
-	<div class='thethemes'><header>".$lang['theme']."&nbsp;:</header>";
-	foreach($card->get_themes() as $theme){
-		$res .= "<div>$theme</div>";
-	}
-	$res.="</div>			
-</div>
-<div>
-	<div class='motCleCle motVedette'><header>".$lang['word_to_find']."&nbsp;:</header>".$card->get_word()."</div>
-	<div class='tabous'><header>".$lang["wordForbid"]."&nbsp;:</header>";
-	foreach($card->get_forbidden_words() as $word){
-		$res .= "<div class='motCleCle'>$word</div>\n";
-	}
-	$res .= "</div>
-</div>
-<!--div>TODO
-	<div class='auteur'>".$card->get_author()." (".$card->get_time().")</div>
-</div-->
-</div></div>";
+$res =   "<div  class='lacarte'>
+			<div>
+				<div class='niveauMin'>".$card->get_level()."</div>
+				<div class='lalangue'>ID&nbsp;: ".$card->get_id()." (".$card->get_lang().")</div>
+				<!--div class='categoriecat'>".$card->get_cat()."</div-->
+				<div class='thethemes'>
+					<header>".$lang['theme']."&nbsp;:</header>";
+					foreach($card->get_themes() as $theme){
+						$res .= "<div>$theme</div>";
+					}
+				$res.="</div>			
+			</div>
+
+			<div>
+				<div class='motCleCle motVedette'>
+					<header>".$lang['word_to_find']."&nbsp;:</header>".$card->get_word().
+				"</div>
+				<div class='tabous'>
+					<header>".$lang["wordForbid"]."&nbsp;:</header>";
+					foreach($card->get_forbidden_words() as $word){
+						$res .= "<div class='motCleCle'>$word</div>\n";
+					}
+				$res .= "</div>
+			</div>
+			<!--div>TODO
+				<div class='auteur'>".$card->get_author()." (".$card->get_time().")</div>
+			</div-->
+		</div>";
 ?>
\ No newline at end of file

views/druid.card.display.html

@@ -11,28 +11,30 @@ include('./views/page.header.html');
 				<legend>Erreurs</legend>
 					<ul>
 
-					<?php foreach ( $this->errors as $error ) { ?>
-						<li>
-							<?php echo $lang[$error]; ?>
-						</li>
-					<?php } ?>
-				</ul>
+						<?php foreach ( $this->errors as $error ) { ?>
+							<li>
+								<?php echo $lang[$error]; ?>
+							</li>
+						<?php } ?>
+					</ul>
 				</fieldset>
+
 				<?php } ?>
 				<fieldset>
 					<legend class="form-jr-heading"><?php echo $lang['card_preview']; ?></legend>
 					<dl>
 						<dt><label for="consigne"><?php echo $lang['id_describe'];?></label></dt>
+						<dd>
+							<?php echo $this->card; ?>
+						</dd>
 					</dl>
-					<dl>
-						<?php echo $this->card; ?>
-					</dl>
-					<div id="form-cmd">
-						<input class="btn btn-lg btn-primary btn-block" type="submit" id="submit_form" name="submit_form" value="<?php echo $lang['return']; ?>" class="submit_buttons" />
-					</div>
 				</fieldset>
-			</form>
-	</div>
+				
+				<div id="form-cmd">
+					<input class="btn btn-lg btn-primary btn-block" type="submit" id="submit_form" name="submit_form" value="<?php echo $lang['return']; ?>" class="submit_buttons" />
+				</div>
+	</form>
+	</div>	
 <!--
 	ici rajouter un message d'erreur quand aucune carte n'existe dans la langue de l'utilisateur
 -->