From 4b101ef4b2f0e39865ee10b2fbae0808764c8cc6 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Thu, 12 Dec 2013 19:33:18 +0100
Subject: [PATCH] Modify public theme

---
 onyx/tpl/bootstrap/public/home.tpl    | 5 ++---
 onyx/tpl/bootstrap/public/layout.tpl  | 1 -
 onyx/tpl/bootstrap/summary.tpl        | 6 +++---
 onyx/tpl/bootstrap/teams/exercice.tpl | 4 ++--
 onyx/tpl/bootstrap/teams/theme.tpl    | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/onyx/tpl/bootstrap/public/home.tpl b/onyx/tpl/bootstrap/public/home.tpl
index 6f0d757e..73af278d 100644
--- a/onyx/tpl/bootstrap/public/home.tpl
+++ b/onyx/tpl/bootstrap/public/home.tpl
@@ -1,9 +1,9 @@
 {extends file="public/layout.tpl"}
 
 {block name=main}
-      <div class="jumbotron">
+       <div class="well">
         
-	<table class="table">
+	<table class="table" style="font-size: 12px;">
   <thead>
     <tr>
       <th></th>
@@ -33,7 +33,6 @@
 {/foreach}
   </tbody>
 </table>
-	
 
       </div>
 {/block}
diff --git a/onyx/tpl/bootstrap/public/layout.tpl b/onyx/tpl/bootstrap/public/layout.tpl
index 1ce60ca4..d6022bdc 100644
--- a/onyx/tpl/bootstrap/public/layout.tpl
+++ b/onyx/tpl/bootstrap/public/layout.tpl
@@ -36,7 +36,6 @@
     {foreach from=$teams item=my_team key=k}
       <div class="item{if $k == 0} active{/if}">
         <div class="well">
-          <h1>{$my_team->get_name()}</h1>
 	  {include file="summary.tpl"}
         </div>
       </div>
diff --git a/onyx/tpl/bootstrap/summary.tpl b/onyx/tpl/bootstrap/summary.tpl
index 6c2572de..71b33b7c 100644
--- a/onyx/tpl/bootstrap/summary.tpl
+++ b/onyx/tpl/bootstrap/summary.tpl
@@ -1,7 +1,7 @@
-<table class="table">
+<table class="table" style="font-size: 12px; padding: 10px; margin-bottom: 10px;">
   <thead>
     <tr>
-      <th></th>
+      <th style="font-size: 15px">{$my_team->get_name()}</th>
 {for $i=1 to $nbExoMax}
       <th class="text-center">Exercice {$i}</th>
 {/for}
@@ -47,4 +47,4 @@
       <th class="active text-center">{$total}</th>
     </tr>
   </tfoot>
-</table>
\ No newline at end of file
+</table>
diff --git a/onyx/tpl/bootstrap/teams/exercice.tpl b/onyx/tpl/bootstrap/teams/exercice.tpl
index 387c43f8..f9151160 100644
--- a/onyx/tpl/bootstrap/teams/exercice.tpl
+++ b/onyx/tpl/bootstrap/teams/exercice.tpl
@@ -33,7 +33,7 @@
       {if file_exists($file['path'])}
       <tr>
         <td>
-	  <a href="/{$file['path']}">
+	  <a href="/files/{$file['path_orig']}">
 	    <span class="glyphicon glyphicon-download"></span>
 	  </a>
 	</td>
@@ -56,7 +56,7 @@
 {if $cur_exercice->has_solved($my_team)}
     Déjà résolu à {$cur_exercice->has_solved($my_team)|date_format:"%H:%M:%S"} :)
 {else}
-    <form role="form" method="post" action="/{$SALT_USER}/{$my_team->get_id()}/{$cur_theme->get_id()}-{$cur_theme->get_name()}/{$cur_exercice->id}/submission">
+    <form role="form" method="post" action="/{$SALT_USER}/{$my_team->get_id()}/{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$cur_exercice->id}/submission">
       <div class="form-group">
         <label for="solution">Soumettre la solution :</label>
 	<input type="text" class="form-control" id="solution" name="solution">
diff --git a/onyx/tpl/bootstrap/teams/theme.tpl b/onyx/tpl/bootstrap/teams/theme.tpl
index 4b043282..14b4052f 100644
--- a/onyx/tpl/bootstrap/teams/theme.tpl
+++ b/onyx/tpl/bootstrap/teams/theme.tpl
@@ -6,9 +6,9 @@
   <p>
   {foreach from=$cur_theme->get_exercices_ordered() item=exercice}
     {if $exercice->has_solved($my_team)}
-        {link class="btn btn-success" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name()}/{$exercice->get_id()}" label="{$exercice->get_name()}"}
+        {link class="btn btn-success" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}" label="{$exercice->get_name()}"}
     {elseif $exercice->is_unlocked($my_team)}
-        {link class="btn btn-primary" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name()}/{$exercice->get_id()}" label="{$exercice->get_name()}"}
+        {link class="btn btn-primary" role="button" href_prefix="/{$SALT_USER}/{$my_team->get_id()}/" href="{$cur_theme->get_id()}-{$cur_theme->get_name_url()}/{$exercice->get_id()}" label="{$exercice->get_name()}"}
     {else}
         <a class="btn btn-danger" disabled="disabled">{$exercice->get_name()}</a>
     {/if}