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
003237a
..
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 *
@@
-69,13
+69,13
@@
class XnetPage extends PlatalPage
$sub = array();
$sub['liste des groupes'] = 'plan';
$sub['documentation'] = 'Xnet';
$sub = array();
$sub['liste des groupes'] = 'plan';
$sub['documentation'] = 'Xnet';
- $sub['
Signaler un bug'] = array('link' => 'send_bug', 'onclick' => 'send_bug();return false
');
+ $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');
$menu["no_title"] = $sub;
if (S::logged() && $globals->asso()) {
$sub = array();
$dim = $globals->asso('diminutif');
- $sub['pr
é
sentation'] = "login/$dim/";
+ $sub['pr
é
sentation'] = "login/$dim/";
if (may_update() || (is_member() && $globals->asso('pub') == 'public')
|| $globals->asso('cat') == 'Promotions') {
$sub['annuaire du groupe'] = "$dim/annuaire";
if (may_update() || (is_member() && $globals->asso('pub') == 'public')
|| $globals->asso('cat') == 'Promotions') {
$sub['annuaire du groupe'] = "$dim/annuaire";
@@
-85,9
+85,9
@@
class XnetPage extends PlatalPage
if ((is_member() || may_update()) && $globals->asso('mail_domain')) {
$sub['listes de diffusion'] = "$dim/lists";
}
if ((is_member() || may_update()) && $globals->asso('mail_domain')) {
$sub['listes de diffusion'] = "$dim/lists";
}
- $sub['
évé
nement'] = "$dim/events";
+ $sub['
évé
nement'] = "$dim/events";
if (may_update() || is_member()) {
if (may_update() || is_member()) {
- $sub['t
élé
paiement'] = "$dim/payment";
+ $sub['t
élé
paiement'] = "$dim/payment";
}
$menu[$globals->asso('nom')] = $sub;
}
$menu[$globals->asso('nom')] = $sub;
@@
-96,19
+96,21
@@
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";
+ $sub['g
é
rer les annonces'] = "$dim/admin/announces";
if ($globals->asso('mail_domain')) {
$sub['envoyer un mail'] = "$dim/mail";
if ($globals->asso('mail_domain')) {
$sub['envoyer un mail'] = "$dim/mail";
- $sub['cr
é
er une liste'] = "$dim/lists/create";
- $sub['cr
é
er un alias'] = "$dim/alias/create";
+ $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;
} elseif (S::has_perms()) {
$sub = array();
}
$menu['Administrer'] = $sub;
} elseif (S::has_perms()) {
$sub = array();
- $sub['gérer les groupes'] = 'admin';
+ $sub['gérer les groupes'] = 'admin';
+ $sub['clear cache'] = 'purge_cache';
$menu['Administrer'] = $sub;
}
$menu['Administrer'] = $sub;
}
@@
-130,7
+132,8
@@
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 (<a href="exit">déconnexion</a>) :</div>';
+ $links = '<a href="exit">déconnexion</a>';
+ $html = '<div>Mes groupes (' . $links . ') :</div>';
while (list($nom, $mini) = $res->next()) {
$html .= "<span class='gp'>• <a href='login/$mini'>$nom</a></span>";
}
while (list($nom, $mini) = $res->next()) {
$html .= "<span class='gp'>• <a href='login/$mini'>$nom</a></span>";
}
@@
-154,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
:
?>
?>