projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UTF-8 fixes
[platal.git]
/
include
/
xnet
/
page.inc.php
diff --git
a/include/xnet/page.inc.php
b/include/xnet/page.inc.php
index
7bb8971
..
8e19fa2
100644
(file)
--- a/
include/xnet/page.inc.php
+++ b/
include/xnet/page.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
6
Polytechnique.org *
+ * Copyright (C) 2003-200
7
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-19,10
+19,10
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
-require_once dirname(__FILE__).'/../../classes/Page.php';
-
class XnetPage extends PlatalPage
{
class XnetPage extends PlatalPage
{
+ var $nomenu = false;
+
// {{{ function XnetPage()
function XnetPage($tpl, $type=SKINNED)
// {{{ function XnetPage()
function XnetPage($tpl, $type=SKINNED)
@@
-43,6
+43,9
@@
class XnetPage extends PlatalPage
function run()
{
function run()
{
+ if (!$this->nomenu) {
+ $this->useMenu();
+ }
$this->_run('xnet/skin.tpl');
}
$this->_run('xnet/skin.tpl');
}
@@
-63,32
+66,29
@@
class XnetPage extends PlatalPage
$menu = array();
$menu = array();
- if (S::logged()) {
- $sub = array();
- $sub['déconnexion'] = 'exit';
- $menu['no_title'] = $sub;
- }
-
$sub = array();
$sub = array();
- $sub['accueil'] = '';
$sub['liste des groupes'] = 'plan';
$sub['liste des groupes'] = 'plan';
- $menu["Menu Principal"] = $sub;
-
- if (S::logged() && (is_member() || may_update())) {
+ $sub['documentation'] = 'Xnet';
+ $sub['signaler un bug'] = array('href' => 'send_bug', 'class' => 'popup_840x600');
+ $menu["no_title"] = $sub;
+
+ if (S::logged() && $globals->asso()) {
$sub = array();
$dim = $globals->asso('diminutif');
$sub = array();
$dim = $globals->asso('diminutif');
- $sub['présentation'] = "$dim/";
- if (may_update() || $globals->asso('pub') == 'public') {
+ $sub['présentation'] = "login/$dim/";
+ if (may_update() || (is_member() && $globals->asso('pub') == 'public')
+ || $globals->asso('cat') == 'Promotions') {
$sub['annuaire du groupe'] = "$dim/annuaire";
$sub['annuaire du groupe'] = "$dim/annuaire";
- if ($globals->xnet->geoloc)
-
$sub['carte'] = "$dim/geoloc.php
";
+ $sub['trombinoscope'] = "$dim/trombi";
+
$sub['carte'] = "$dim/geoloc
";
}
}
- if ($globals->asso('mail_domain')) {
+ if (
(is_member() || may_update()) &&
$globals->asso('mail_domain')) {
$sub['listes de diffusion'] = "$dim/lists";
$sub['listes de diffusion'] = "$dim/lists";
- $sub['envoyer un mail'] = "$dim/mail";
}
}
- $sub['événement'] = "$dim/events";
- $sub['télépaiement'] = "$dim/paiement";
+ $sub['événement'] = "$dim/events";
+ if (may_update() || is_member()) {
+ $sub['télépaiement'] = "$dim/payment";
+ }
$menu[$globals->asso('nom')] = $sub;
}
$menu[$globals->asso('nom')] = $sub;
}
@@
-96,14
+96,22
@@
class XnetPage extends PlatalPage
if (S::logged() && may_update()) {
$sub = array();
$sub['modifier l\'accueil'] = "$dim/edit";
if (S::logged() && may_update()) {
$sub = array();
$sub['modifier l\'accueil'] = "$dim/edit";
+ $sub['gérer les annonces'] = "$dim/admin/announces";
if ($globals->asso('mail_domain')) {
if ($globals->asso('mail_domain')) {
- $sub['créer une liste'] = "$dim/lists/create";
- $sub['créer un alias'] = "$dim/alias/create";
+ $sub['envoyer un mail'] = "$dim/mail";
+ $sub['créer une liste'] = "$dim/lists/create";
+ $sub['créer un alias'] = "$dim/alias/create";
}
if (S::has_perms()) {
}
if (S::has_perms()) {
- $sub['gérer les groupes'] = 'admin';
+ $sub['gérer les groupes'] = array('href' => 'admin', 'style' => 'color: gray;');
+ $sub['clear cache'] = array('href' => 'purge_cache', 'style' => 'color: gray;');
}
$menu['Administrer'] = $sub;
}
$menu['Administrer'] = $sub;
+ } elseif (S::has_perms()) {
+ $sub = array();
+ $sub['gérer les groupes'] = 'admin';
+ $sub['clear cache'] = 'purge_cache';
+ $menu['Administrer'] = $sub;
}
$this->assign('menu', $menu);
}
$this->assign('menu', $menu);
@@
-124,9
+132,10
@@
function list_all_my_groups($params)
FROM groupex.asso AS a
INNER JOIN groupex.membres AS m ON m.asso_id = a.id
WHERE m.uid={?}", S::v('uid'));
FROM groupex.asso AS a
INNER JOIN groupex.membres AS m ON m.asso_id = a.id
WHERE m.uid={?}", S::v('uid'));
- $html = '<div>Mes groupes :</div>';
+ $links = '<a href="exit">déconnexion</a>';
+ $html = '<div>Mes groupes (' . $links . ') :</div>';
while (list($nom, $mini) = $res->next()) {
while (list($nom, $mini) = $res->next()) {
- $html .= "<
a class='gp' href='$mini/'>• $nom</a
>";
+ $html .= "<
span class='gp'>• <a href='login/$mini'>$nom</a></span
>";
}
return $html;
}
}
return $html;
}
@@
-148,5
+157,5
@@
function cat_pp($cat)
// }}}
// }}}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
enc=utf-8
:
?>
?>