crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

on ne laisse que ce qui est utilisable (ce qui est fini)

Browse source 
darcs-hash:20060915171304-f46e9-daf88641e00e4e33543a2f1523e221ec519f1429.gz
This commit is contained in:
gdetrez 2006-09-15 19:13:04 +02:00
parent 159999c06d
commit 58c7254f7f
9 changed files with 38 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

16
intranet/Root.py
View file

@ -10,7 +10,8 @@ sys.path.append('/usr/scripts/gestion/')
# ######################################################## #
def serverSidePath(self, path):
# les template se trouve dans le dossier template
if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
if os.path.isfile(os.getcwd()+'/templates/'+path+".dev"): return os.getcwd()+'/templates/'+path+".dev" # les template se trouve dans le dossier template
return os.getcwd()+'/templates/'+path
# on surcharge cette fonction dans la classe Template
@ -154,8 +155,11 @@ class Intranet:
# liste des modules disponibles
self.monCompte = monCompte.monCompte()
self.impression = impression.root()
self.sous = factures.root()
self.sous = factures.root()
# liste des modules en developpement
if (cherrypy.config.configMap["global"]["server.environment"] == "development"):
self.impression = impression.root()
_cpFilterList = [templatesEngine(), DOMFilter(), verifDroits()]
@ -232,9 +236,9 @@ def verifLogin(login = '', password = ''):
#
# mise en place de cherrypy + conf
#
cherrypy.config.update(file="/home/gdetrez/intranet/dev.cfg")
#cherrypy.config.update(file="/home/gdetrez/intranet/prod.cfg")
cherrypy.config.update(file="/home/gdetrez/intranet/intranet.cfg")
#cherrypy.config.update(file="/usr/scripts/intranet/dev.cfg")
cherrypy.config.update(file="/usr/scripts/intranet/prod.cfg")
cherrypy.config.update(file="/usr/scripts/intranet/intranet.cfg")
settings={'/': {
'sessionAuthenticateFilter.checkLoginAndPassword': verifLogin,
'sessionAuthenticateFilter.loginScreen': login

2
intranet/dev.cfg
View file

@ -1,6 +1,6 @@
# The configuration file called myconfigfile.conf
[global]
server.socketPort=8080
server.socketPort=8083
server.socketHost=""
server.socketFile=""
server.socketQueueSize=5

20
intranet/monCompte.py
View file

@ -103,15 +103,15 @@ class monCompte:
############## info mail ##############
mailInfos = {}
#try:
mailConfig = MailConfig(cherrypy.session['uid'])
mailInfos['forwarding_address'] = mailConfig['forward']
mailInfos['spam'] = {}
mailInfos['spam']['no'] = mailConfig['spam'] == 'accepte'
mailInfos['spam']['mark'] = mailConfig['spam'] == 'marque'
mailInfos['spam']['drop'] = mailConfig['spam'] == 'supprime'
#except Exception, e:
# t['mailError'] = u"Erreur:fichiers de configuration mail incompréhensibles"
try:
mailConfig = MailConfig(cherrypy.session['uid'])
mailInfos['forwarding_address'] = mailConfig['forward']
mailInfos['spam'] = {}
mailInfos['spam']['no'] = mailConfig['spam'] == 'accepte'
mailInfos['spam']['mark'] = mailConfig['spam'] == 'marque'
mailInfos['spam']['drop'] = mailConfig['spam'] == 'supprime'
except Exception, e:
t['mailError'] = u"Erreur:fichiers de configuration mail incompréhensibles"
mailInfos['alias'] = adh.alias()
mailInfos['contourneGreylist'] = adh.contourneGreylist()
@ -380,6 +380,8 @@ class monCompte:
##########################
def creerMachine(self, nomNouvelleMachine, MACNouvelleMachine, estMachineWifi='0'):
adh = self.__ldap.search('uid=' + cherrypy.session['uid'])['adherent'][0]
if adh.droits() == [] and adh.machines_fixes() != []:
return {'error':'Vous avez deja une machine fixe. Vous ne pouvez ajouter que des machines WiFi.'}
try:
if estMachineWifi=='true':
m = MachineWifi(adh)

4
intranet/templates/accueil.tmpl
View file

@ -6,10 +6,6 @@
<img src="/static/images/icon_monCompte.png" alt="icon" />
<span>Mon Compte</span>
</a></li>
<li><a href="/impression">
<img src="/static/images/icon_impression.png" alt="icon" />
<span>Impression</span>
</a></li>
<li><a href="/sous">
<img src="/static/images/icon_factures.png" alt="icon" />
<span>Mes Factures</span>

6
intranet/templates/factures-historique.tmpl
View file

@ -31,7 +31,7 @@
<!-- ********************** Menu ********************** -->
</div>
<ul id="actionMenu">
<li><a href="index">Mes factures</a></li>
<li><a href="historique">Historique</a></li>
<li><a href="index">Mes factures PayPal</a></li>
<li><a href="historique">Historique des transactions</a></li>
</ul>
</div>
</div>

8
intranet/templates/factures.tmpl
View file

@ -30,7 +30,7 @@ function hideDetail(id){
<div id="globalDiv">
<div id="factureListDiv">
<h2>Mes factures</h2>
<h2>Mes factures PayPal</h2>
<!-- <table id="listeFactures" cellspacing="0" border="0"> -->
#for f in $listeFactures
#if $f.payee
@ -88,13 +88,13 @@ function hideDetail(id){
#if $listeFactures == []
<div class="factureRow tdNoFactures">
VIDE
AUCUNE TRANSACTION PAYPAL ENREGISTR&Eacute;E
</div>
#end if
</div>
<ul id="actionMenu">
<li><a href="index">Mes factures</a></li>
<li><a href="historique">Historique</a></li>
<li><a href="index">Mes factures PayPal</a></li>
<li><a href="historique">Historique des transactions</a></li>
</ul>
</div>

2
intranet/templates/login.tmpl
View file

@ -10,7 +10,7 @@
padding:20px;
background:#eee;
border:3px solid #ddd;
margin:30px;
margin:auto auto;
}
.liens {
text-align:right;

12
intranet/templates/main.tmpl
View file

@ -30,13 +30,17 @@ $page
<!-- +++++++++++++++++++++++++++ end page +++++++++++++++++++++++++++ -->
</div>
<div id="topContent">
<a href="/"><img id="logo" src="/static/images/logointranet.png" alt="logocr@ns" /></a>
<ul id="topMenu">
<a href="/"><img id="main_topContentLogo" src="/static/images/logointranet.png" alt="logocr@ns" /></a>
<ul id="main_topContentMenu">
<li>$login</li>
<li class="last"><a href="do_logout">logout</a></li>
</ul>
</ul>
</div>
<div id="mainFooter"><hr /><a href="http://www.crans.org/">Site du cr@ns</a> <a href="http://wiki.crans.org/">wiki</a><br /><a href="http://wiki/ContactsCrans">Contact Cr@ns</a></div>
<div id="mainFooter"><hr /><a href="http://www.crans.org/">Site du cr@ns</a> <a href="http://wiki.crans.org/">wiki</a><br /><a href="http://wiki/ContactsCrans">Contact Cr@ns</a><br />
<div id="topContentMessage" style="font-style:italic;text-align:center;">
L'intranet est en version beta, aidez-nous &agrave; l'am&eacute;liorer en nous envoyant vos remarques et en nous signalant tout probl&egrave;me &agrave; <a href="mailto:nounous@crans.org">nounous@crans.org</a>
</div>
</div>
#if $environment == 'development'
<script type="text/javascript">
createLoggingPane(true);

21
intranet/templates/monCompte.tmpl
View file

@ -20,7 +20,6 @@
<li><a href="#mainTab">G&eacute;n&eacute;ral</a></li>
<li><a href="#machinesTab">Machines</a></li>
<li><a href="#mailTab">Mails</a></li>
<li><a href="#variousTab">Divers</a></li>
</ul>
<!-- +++++++++++++++++++ Infos Utilisateur +++++++++++++++++++ -->
<div>
@ -240,26 +239,6 @@
<!-- +++++++++++++++++++ divers +++++++++++++++++++ -->
<div>
<h2 class="mark"><a name="variousTab" id="variousTab"></a></h2>
<form action="saveVariousPrefs#variousTab" method="POST">
<dl class="tabbed_page">
<dt>Bittorent:</dt>
<dd>
<label for="bittorent" class="labelCheckbox"><input type="checkbox" name="bittorent" id="bittorent" class="inputCheckbox" value="1" /> Utiliser Bittorent</label> <a class="textInputNote" href="#">Plus d'infos</a><br />
</dd>
</dl>
<ul class="tabbed_page">
<li class="last centrer">
<input type="reset" value="Reset">
<input type="submit" nom="variousSubmit" value="Soumettre">
</li>
</ul>
</form>
</div>
</div>
</div>