diff --git a/htdocs/css/errors.css b/htdocs/css/common.css similarity index 100% rename from htdocs/css/errors.css rename to htdocs/css/common.css diff --git a/htdocs/css/home.css b/htdocs/css/home.css deleted file mode 100644 index d9849a98..00000000 --- a/htdocs/css/home.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - padding: 30px; -} diff --git a/onyx/include/team/exercice.php b/onyx/include/team/exercice.php index 84856f02..8f39277e 100644 --- a/onyx/include/team/exercice.php +++ b/onyx/include/team/exercice.php @@ -2,5 +2,9 @@ if(!defined('ONYX')) exit; +$exercice = new Exercice($EXERCICE); + +$template->assign("Exercice", $exercice); +//$template->assign("Number", $ex_number); return "teams/exercice"; diff --git a/onyx/include/team/me.php b/onyx/include/team/me.php index bf209f06..053de859 100644 --- a/onyx/include/team/me.php +++ b/onyx/include/team/me.php @@ -2,5 +2,4 @@ if(!defined('ONYX')) exit; - -return "teams/change"; +return "teams/me"; diff --git a/onyx/tpl/bootstrap/admin/import_exercices.tpl b/onyx/tpl/bootstrap/admin/import_exercices.tpl index 0cb0eb01..a06ec5ef 100644 --- a/onyx/tpl/bootstrap/admin/import_exercices.tpl +++ b/onyx/tpl/bootstrap/admin/import_exercices.tpl @@ -1,6 +1,6 @@ {extends file="layout-nav.tpl"} {block name=head} - + {/block} {block name=content}

diff --git a/onyx/tpl/bootstrap/admin/import_users.tpl b/onyx/tpl/bootstrap/admin/import_users.tpl index 1d96ee15..dece74da 100644 --- a/onyx/tpl/bootstrap/admin/import_users.tpl +++ b/onyx/tpl/bootstrap/admin/import_users.tpl @@ -1,6 +1,6 @@ {extends file="layout-nav.tpl"} {block name=head} - + {/block} {block name=content}

diff --git a/onyx/tpl/bootstrap/teams/exercice.tpl b/onyx/tpl/bootstrap/teams/exercice.tpl new file mode 100644 index 00000000..18f79635 --- /dev/null +++ b/onyx/tpl/bootstrap/teams/exercice.tpl @@ -0,0 +1,19 @@ +{extends file="layout-nav.tpl"} + +{block name=head} + +{/block} + +{block name=content} + +
+

Exercice {$Number} - X

+