projects
/
platal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0c966f
)
Update AX website.
author
Thomas Minvielle
<thomas.minvielle@polytechnique.org>
Fri, 21 Feb 2014 22:50:44 +0000
(23:50 +0100)
committer
Thomas Minvielle
<thomas.minvielle@polytechnique.org>
Fri, 21 Feb 2014 22:50:44 +0000
(23:50 +0100)
configs/platal.ini
patch
|
blob
|
blame
|
history
modules/profile.php
patch
|
blob
|
blame
|
history
templates/fusionax/listFusion.tpl
patch
|
blob
|
blame
|
history
templates/platal/index.tpl
patch
|
blob
|
blame
|
history
templates/skin/common.bandeau.tpl
patch
|
blob
|
blame
|
history
templates/skin/common.header.tpl
patch
|
blob
|
blame
|
history
templates/xnet/skin.tpl
patch
|
blob
|
blame
|
history
diff --git
a/configs/platal.ini
b/configs/platal.ini
index
343a502
..
4f94bea
100644
(file)
--- a/
configs/platal.ini
+++ b/
configs/platal.ini
@@
-436,7
+436,7
@@
pass_ax = ""
; $globals->webservice->hsot_ax
; Host of the webservice of the AX
; $globals->webservice->hsot_ax
; Host of the webservice of the AX
-host_ax = "http
s://www.polytechniciens.com
/"
+host_ax = "http
://www.ax.polytechnique.edu
/"
; $globals->webservice->private_key_ax
; Path to the private key used for authentication with the webservice of the AX
; $globals->webservice->private_key_ax
; Path to the private key used for authentication with the webservice of the AX
diff --git
a/modules/profile.php
b/modules/profile.php
index
34bb4a6
..
42c93ed
100644
(file)
--- a/
modules/profile.php
+++ b/
modules/profile.php
@@
-294,7
+294,7
@@
class ProfileModule extends PLModule
if (!$user->ax_id) {
$page->kill("Le matricule AX de {$user->hrid()} est inconnu");
}
if (!$user->ax_id) {
$page->kill("Le matricule AX de {$user->hrid()} est inconnu");
}
- http_redirect("http://
www
.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
+ http_redirect("http://
kx
.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
}
function handler_p_edit($page, $hrpid = null, $opened_tab = null, $mode = null, $success = null)
}
function handler_p_edit($page, $hrpid = null, $opened_tab = null, $mode = null, $success = null)
diff --git
a/templates/fusionax/listFusion.tpl
b/templates/fusionax/listFusion.tpl
index
52b7337
..
1b61c9e
100644
(file)
--- a/
templates/fusionax/listFusion.tpl
+++ b/
templates/fusionax/listFusion.tpl
@@
-46,7
+46,7
@@
<td>{$c.private_name} ({$c.promo})</td>
<td style="text-align:center">
{if t($c.pid)}<a href="admin/user/{$c.pid}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
<td>{$c.private_name} ({$c.promo})</td>
<td style="text-align:center">
{if t($c.pid)}<a href="admin/user/{$c.pid}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
- {if t($c.ax_id)}<a href="http://
www.polytechniciens.com/?page=AX_FICHE_ANCIEN&an
c_id={$c.ax_id}" class="popup2">{icon name="user_gray" title="fiche AX"}</a>{/if}
+ {if t($c.ax_id)}<a href="http://
kx.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc
c_id={$c.ax_id}" class="popup2">{icon name="user_gray" title="fiche AX"}</a>{/if}
</td>
{if t($field1)}
<td>{$c.$field1}</td>
</td>
{if t($field1)}
<td>{$c.$field1}</td>
diff --git
a/templates/platal/index.tpl
b/templates/platal/index.tpl
index
1065e55
..
1aa5cee
100644
(file)
--- a/
templates/platal/index.tpl
+++ b/
templates/platal/index.tpl
@@
-80,7
+80,7
@@
<a href="http://www.polytechnique.edu">polytechnique.edu</a>, le portail
des X sur le web est <a href="http://www.polytechnique.org/">polytechnique.org</a>,
et le site de l'amicale des Anciens Eleves (AX) est
<a href="http://www.polytechnique.edu">polytechnique.edu</a>, le portail
des X sur le web est <a href="http://www.polytechnique.org/">polytechnique.org</a>,
et le site de l'amicale des Anciens Eleves (AX) est
- <a href="http://www.
polytechniciens.com/">polytechniciens.com
</a>.</li>
+ <a href="http://www.
ax.polytechnique.edu/">ax.polytechnique.edu
</a>.</li>
</ul>
<p>
</ul>
<p>
diff --git
a/templates/skin/common.bandeau.tpl
b/templates/skin/common.bandeau.tpl
index
3f92170
..
e9636c4
100644
(file)
--- a/
templates/skin/common.bandeau.tpl
+++ b/
templates/skin/common.bandeau.tpl
@@
-50,7
+50,7
@@
<a href="http://www.polytechnique.edu/">Institutional site</a>
˜˜
<a href="http://www.fondationx.org/">FX</a> ·
<a href="http://www.polytechnique.edu/">Institutional site</a>
˜˜
<a href="http://www.fondationx.org/">FX</a> ·
- <a href="http://www.
polytechniciens.com
/">AX</a>
+ <a href="http://www.
ax.polytechnique.edu
/">AX</a>
˜˜
<a href="https://www.polytechnique.org">Polytechnique.org</a> ·
<a href="http://www.polytechnique.net{if t($login)}/login{/if}">Associations polytechniciennes</a> ·
˜˜
<a href="https://www.polytechnique.org">Polytechnique.org</a> ·
<a href="http://www.polytechnique.net{if t($login)}/login{/if}">Associations polytechniciennes</a> ·
diff --git
a/templates/skin/common.header.tpl
b/templates/skin/common.header.tpl
index
4900837
..
61bdf0b
100644
(file)
--- a/
templates/skin/common.header.tpl
+++ b/
templates/skin/common.header.tpl
@@
-41,7
+41,7
@@
<link rel="bookmark" href="http://www.polytechnique.fr/" title="| École polytechnique" />
<link rel="bookmark" href="http://www.polytechnique.edu/" title="| Institutionnal site" />
<link rel="bookmark" href="http://www.fondationx.org/" title="| FX" />
<link rel="bookmark" href="http://www.polytechnique.fr/" title="| École polytechnique" />
<link rel="bookmark" href="http://www.polytechnique.edu/" title="| Institutionnal site" />
<link rel="bookmark" href="http://www.fondationx.org/" title="| FX" />
- <link rel="bookmark" href="http://www.
polytechniciens.com/"
title="| AX" />
+ <link rel="bookmark" href="http://www.
ax.polytechnique.edu/"
title="| AX" />
<link rel="bookmark" href="http://www.polytechnique.org/" title="| Polytechnique.org" />
<link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
<link rel="bookmark" href="http://www.polytechnique.org/" title="| Polytechnique.org" />
<link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
diff --git
a/templates/xnet/skin.tpl
b/templates/xnet/skin.tpl
index
ccf2554
..
7c776e6
100644
(file)
--- a/
templates/xnet/skin.tpl
+++ b/
templates/xnet/skin.tpl
@@
-36,7
+36,7
@@
<link rel="bookmark" href="http://www.polytechnique.fr/" title="| École polytechnique" />
<link rel="bookmark" href="http://www.polytechnique.edu/" title="| Institutionnal site" />
<link rel="bookmark" href="http://www.fondationx.org/" title="| FX" />
<link rel="bookmark" href="http://www.polytechnique.fr/" title="| École polytechnique" />
<link rel="bookmark" href="http://www.polytechnique.edu/" title="| Institutionnal site" />
<link rel="bookmark" href="http://www.fondationx.org/" title="| FX" />
- <link rel="bookmark" href="http://www.
polytechniciens.com/"
title="| AX" />
+ <link rel="bookmark" href="http://www.
ax.polytechnique.edu/"
title="| AX" />
<link rel="bookmark" href="http://www.polytechnique.org/" title="| Polytechnique.org" />
<link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
<link rel="bookmark" href="http://www.polytechnique.org/" title="| Polytechnique.org" />
<link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />