Subversion Repositories c2i-annu

Compare Revisions

Ignore whitespace Rev 74 → Rev 75

/web/include/admin.inc.php
189,7 → 189,7
$pupils[$pupil->uid]=(array) $pupil;
 
$smarty->assign('header_title','Réinitialisation du mot de passe');
$smarty->error($error);
if ($error !='') $smarty->error($error);
$smarty->assign('pupils',$pupils);
$smarty->display('admin_reset_pupil_password.tpl');
 
375,7 → 375,7
global $smarty;
 
$smarty->assign('header_title','Importation des élèves');
$smarty->error($msg);
if ($error !='') $smarty->error($msg);
$smarty->display('admin_import_pupils.tpl');
 
}
388,7 → 388,9
if ($pupil_can_import) {
 
$smarty->assign('header_title','Importation des élèves à partir de SCONET');
$smarty->error($msg);
if ($msg != '') {
$smarty->error($msg);
}
$smarty->display('admin_import_sconet_pupils.tpl');
} else {
$smarty->assign('header_title','Gestion des classes');
706,7 → 708,7
}
$smarty->assign('header_title',"Import des eleves");
$smarty->error($error_msg);
if ($error !='') $smarty->error($error_msg);
$smarty->assign('password_list',$password_list);
$smarty->assign('modified_list',$modified_list);
$smarty->display('admin_password_list.tpl');
1092,7 → 1094,7
}
$smarty->assign('header_title',"Import des enseignants");
$smarty->error($error);
if ($error !='') $smarty->error($error);
$smarty->assign('teachers',$new_teachers);
$smarty->display('admin_reset_teacher_password.tpl');
1127,7 → 1129,7
$teachers[$teacher->uid]=(array) $teacher;
 
$smarty->assign('header_title','Réinitialisation du mot de passe');
$smarty->error($error);
if ($error !='') $smarty->error($error);
$smarty->assign('teachers',$teachers);
$smarty->display('admin_reset_teacher_password.tpl');
 
/web/include/admins.inc.php
115,7 → 115,7
$admins[$admin->uid]=(array) $admin;
 
$smarty->assign('header_title','Réinitialisation du mot de passe');
$smarty->error($error);
if ($error != '') $smarty->error($error);
$smarty->assign('admins',$admins);
$smarty->display('sadmin_reset_admin_password.tpl');
 
/web/include/sadmin.inc.php
271,7 → 271,7
global $smarty;
 
$smarty->assign('header_title','Recuperation des INE');
$smarty->error($msg);
if ($msg != '') $smarty->error($msg);
$smarty->display('sadmin_ldap_recover_lost_ine.tpl');
 
exit;
294,7 → 294,7
$smarty->assign('cancel_link',menu_link('confirform','config','ldap_recover_lost_ine'));
 
$smarty->assign('header_title','Recuperation des INE');
$smarty->error($msg);
if ($msg != '') $smarty->error($msg);
$smarty->display('sadmin_confirm_ldap_recover_lost_ine.tpl');
 
}
/web/templates/admin_import_pupils.tpl
68,7 → 68,7
Fichier des établissement &agrave importer :
<input name="pupils_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/sadmin_import_admins.tpl
60,7 → 60,7
Fichier des &eacute;tablissement &agrave importer :
<input name="admins_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/admin_import_teachers.tpl
60,7 → 60,7
Fichier des enseignants &agrave importer :
<input name="teachers_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/sadmin_config.tpl
38,7 → 38,7
 
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Modifier les paramètres." />
</div>
</div>
/web/templates/import_schools.tpl
80,7 → 80,7
Fichier des &eacute;tablissement &agrave importer :
<input name="schools_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/admin_import_sconet_pupils.tpl
24,7 → 24,7
Fichier des &eacute;l&egrave;ves &agrave importer :
<input name="sconet_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/sadmin_ldap_synchronize.tpl
27,7 → 27,7
Fichier des &eacute;tablissement &agrave importer :
<input name="ine_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/web/templates/admin_list_sections.tpl
22,9 → 22,8
<td>
<img src='images/magnify_24.png' width='24' height='24' title='&eacute;l&egrave;ves' {$section.list_link} />
<img src='images/look_24.png' width='24' height='24' title='d&eacute;tails' {$section.edit_link} />
{* Commentaire pour l'inscription finie
<img src='images/bin_24.png' width='24' height='24' title='supprimer' {$section.delete_link} />
*}
{* Commentaire pour l'inscription finie *}
<img src='images/bin_24.png' width='24' height='24' title='supprimer' {$section.delete_link} />
<img src='images/stylo.png' width='24' height='24' title='noter' {$section.note_link} />
</td>
</tr>
/web/templates/sadmin_ldap_recover_lost_ine.tpl
27,7 → 27,7
Fichier des &eacute;tablissement &agrave importer :
<input name="ine_import_file" type="file" />
</div>
<div class="formbuttons"
<div class="formbuttons">
<input type="submit" value="Envoyer le fichier" />
</div>
</div>
/debian/changelog
1,10 → 1,10
c2i-annu (0.99~2) unstable; urgency=low
c2i-annu (0.99~3) unstable; urgency=low
 
* Added SQL synchro for teachers.
* Added a smarty abstract class with error, warning and info functions
* Corrected a bug in template files (missing closing tag)
 
-- Laurent COOPER <laurent@ac-grenoble.fr> Mon, 19 Sep 2011 14:40:52 +0200
-- Laurent COOPER <laurent@ac-grenoble.fr> Thu, 13 Oct 2011 21:19:50 +0200
 
c2i-annu (0.98) unstable; urgency=low