hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

tag 3.1.14

Browse Source
This commit is contained in:
Alchemy
2011-05-23 15:50:08 +02:00
parent 967a9b339e
commit ff8cd59afb
5 changed files with 674 additions and 606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/version.inc
View File

@@ -1,2 +1,2 @@
<?php <?php
define('GV_version','3.1.13'); define('GV_version','3.1.14');

1109
www/admin/demand.php
View File

File diff suppressed because it is too large Load Diff

6
www/lightbox/jquery.lightbox.ie6.js
View File

@@ -429,14 +429,14 @@ function display_basket_element(compare, sselcont_id)
{ {
if(compare) if(compare)
{ {
$('.agreement_selector').show(); // $('.agreement_selector').show();
$('#record_infos, #right_column').hide(); $('#record_infos, #right_column').hide();
$('#record_wrapper').stop().css({width:'100%'}); $('#record_wrapper').stop().css({width:'100%'});
display_record(compare); display_record(compare);
} }
else else
{ {
$('.agreement_selector').hide(); // $('.agreement_selector').hide();
$('#record_wrapper').css({width:($('#innerWrapper').width() - $('#record_infos').outerWidth() - $('#right_column').outerWidth() - 2)}); $('#record_wrapper').css({width:($('#innerWrapper').width() - $('#record_infos').outerWidth() - $('#right_column').outerWidth() - 2)});
display_record(compare); display_record(compare);
$('#record_infos, #right_column').show(); $('#record_infos, #right_column').show();
@@ -558,6 +558,7 @@ function display_record(compare)
if(compare) if(compare)
{ {
$('.agreement_selector').show();
main_container.addClass('comparison'); main_container.addClass('comparison');
var double_portrait_width = main_container_innerwidth / 2; var double_portrait_width = main_container_innerwidth / 2;
@@ -673,6 +674,7 @@ function display_record(compare)
} }
else else
{ {
$('.agreement_selector').hide();
main_container.removeClass('comparison'); main_container.removeClass('comparison');
if(compare_box.is(':visible')) if(compare_box.is(':visible'))

6
www/lightbox/jquery.lightbox.js
View File

@@ -520,7 +520,7 @@ function display_basket_element(compare, sselcont_id)
{ {
if(compare) if(compare)
{ {
$('.agreement_selector').show(); // $('.agreement_selector').show();
// $('#record_wrapper').stop().animate({right:0},100,function(){display_record(compare);}); // $('#record_wrapper').stop().animate({right:0},100,function(){display_record(compare);});
$('#record_wrapper').css({right:0}); $('#record_wrapper').css({right:0});
display_record(compare); display_record(compare);
@@ -528,7 +528,7 @@ function display_basket_element(compare, sselcont_id)
} }
else else
{ {
$('.agreement_selector').hide(); // $('.agreement_selector').hide();
$('#record_wrapper').css({right:250}); $('#record_wrapper').css({right:250});
display_record(compare); display_record(compare);
$('#right_column').show(); $('#right_column').show();
@@ -810,6 +810,7 @@ function display_record(compare)
if(compare) if(compare)
{ {
$('.agreement_selector').show();
main_container.addClass('comparison'); main_container.addClass('comparison');
var double_portrait_width = main_container_innerwidth / 2; var double_portrait_width = main_container_innerwidth / 2;
@@ -926,6 +927,7 @@ function display_record(compare)
} }
else else
{ {
$('.agreement_selector').hide();
main_container.removeClass('comparison'); main_container.removeClass('comparison');
if(compare_box.is(':visible')) if(compare_box.is(':visible'))

157
www/login/register.php
View File

@@ -73,7 +73,7 @@ if($request->has_post_datas())
foreach($parm as $field=>$value) foreach($parm as $field=>$value)
{ {
if(is_string($value) && isset($arrayVerif[$field])) if(is_string($value) && isset($arrayVerif[$field]) && $arrayVerif[$field] === true)
{ {
if(trim($value) == '' ) if(trim($value) == '' )
$needed[$field] = _('forms::ce champ est requis'); $needed[$field] = _('forms::ce champ est requis');
@@ -340,6 +340,9 @@ phrasea::headers();
$first = true; $first = true;
$sep = $msg = $rules = ''; $sep = $msg = $rules = '';
foreach($arrayVerif as $ar=>$ver) foreach($arrayVerif as $ar=>$ver)
{
if($ver === false)
continue;
if($ar != 'form_password') if($ar != 'form_password')
{ {
if(!$first) if(!$first)
@@ -361,6 +364,7 @@ phrasea::headers();
$msg .= '}'; $msg .= '}';
} }
}
?> ?>
@@ -445,7 +449,7 @@ phrasea::headers();
<tr> <tr>
<td class="form_label"> <td class="form_label">
<label for="form_login"> <label for="form_login">
<?php echo (isset($arrayVerif['form_login']) && $arrayVerif['form_login']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur identifiant')?> <br/><span style="font-size:9px;"><?php echo sprintf(_('forms:: %d caracteres minimum'),5)?></span> : <?php echo (isset($arrayVerif['form_login']) && $arrayVerif['form_login']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur identifiant')?> <br/><span style="font-size:9px;"><?php echo sprintf(_('forms:: %d caracteres minimum'),5)?></span> :
</label> </label>
</td> </td>
<td class="form_input"> <td class="form_input">
@@ -458,7 +462,7 @@ phrasea::headers();
<tr> <tr>
<td class="form_label"> <td class="form_label">
<label for="form_password"> <label for="form_password">
<?php echo (isset($arrayVerif['form_password']) && $arrayVerif['form_password']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur mot de passe')?> <br/><span style="font-size:9px;"><?php echo sprintf(_('forms:: %d caracteres minimum'),5)?></span> : <?php echo (isset($arrayVerif['form_password']) && $arrayVerif['form_password']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur mot de passe')?> <br/><span style="font-size:9px;"><?php echo sprintf(_('forms:: %d caracteres minimum'),5)?></span> :
</label> </label>
</td> </td>
<td class="form_input"> <td class="form_input">
@@ -507,19 +511,6 @@ phrasea::headers();
</td> </td>
</tr> </tr>
<tr><td colspan="3">&nbsp;</td></tr> <tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_city">
<?php echo (isset($arrayVerif['form_geonameid']) && $arrayVerif['form_geonameid']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur ville')?> :
</label>
</td>
<td class="form_input">
<input id="form_geonameid" type="text" geonameid="<?php echo $parm["form_geonameid"]?>" value="<?php echo geonames::name_from_id($parm["form_geonameid"])?>" class="input_element geoname_field" name="form_geonameid">
</td>
<td class="form_alert">
<?php echo isset($needed['form_geonameid'])?$needed['form_geonameid']:''?>
</td>
</tr>
<tr> <tr>
<td class="form_label"> <td class="form_label">
<?php echo _('admin::compte-utilisateur sexe')?> : <?php echo _('admin::compte-utilisateur sexe')?> :
@@ -533,6 +524,19 @@ phrasea::headers();
<?php echo isset($needed['form_gender'])?$needed['form_gender']:''?> <?php echo isset($needed['form_gender'])?$needed['form_gender']:''?>
</td> </td>
</tr> </tr>
<tr>
<td class="form_label">
<label for="form_firstname">
<?php echo (isset($arrayVerif['form_firstname']) && $arrayVerif['form_firstname']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur prenom')?> :
</label>
</td>
<td class="form_input">
<input id="form_firstname" autocomplete="off" type="text" value="<?php echo $parm["form_firstname"]?>" class="input_element" name="form_firstname">
</td>
<td class="form_alert">
<?php echo isset($needed['form_firstname'])?$needed['form_firstname']:''?>
</td>
</tr>
<tr> <tr>
<td class="form_label"> <td class="form_label">
<label for="form_lastname"> <label for="form_lastname">
@@ -546,17 +550,73 @@ phrasea::headers();
<?php echo isset($needed['form_lastname'])?$needed['form_lastname']:''?> <?php echo isset($needed['form_lastname'])?$needed['form_lastname']:''?>
</td> </td>
</tr> </tr>
<tr> <tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label"> <td class="form_label">
<label for="form_firstname"> <label for="form_address">
<?php echo (isset($arrayVerif['form_firstname']) && $arrayVerif['form_firstname']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur prenom')?> : <?php echo (isset($arrayVerif['form_address']) && $arrayVerif['form_address']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur adresse')?> :
</label> </label>
</td> </td>
<td class="form_input"> <td class="form_input">
<input id="form_firstname" autocomplete="off" type="text" value="<?php echo $parm["form_firstname"]?>" class="input_element" name="form_firstname"> <input id="form_address" autocomplete="off" type="text" value="<?php echo $parm["form_address"]?>" class="input_element" name="form_address">
</td> </td>
<td class="form_alert"> <td class="form_alert">
<?php echo isset($needed['form_firstname'])?$needed['form_firstname']:''?> <?php echo isset($needed['form_address'])?$needed['form_address']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_zip">
<?php echo (isset($arrayVerif['form_zip']) && $arrayVerif['form_zip']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur code postal')?> :
</label>
</td>
<td class="form_input">
<input id="form_zip" autocomplete="off" type="text" value="<?php echo $parm["form_zip"]?>" class="input_element" name="form_zip">
</td>
<td class="form_alert">
<?php echo isset($needed['form_zip'])?$needed['form_zip']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_city">
<?php echo (isset($arrayVerif['form_geonameid']) && $arrayVerif['form_geonameid']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur ville')?> :
</label>
</td>
<td class="form_input">
<input id="form_geonameid" type="text" geonameid="<?php echo $parm["form_geonameid"]?>" value="<?php echo geonames::name_from_id($parm["form_geonameid"])?>" class="input_element geoname_field" name="form_geonameid">
</td>
<td class="form_alert">
<?php echo isset($needed['form_geonameid'])?$needed['form_geonameid']:''?>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_phone">
<?php echo (isset($arrayVerif['form_phone']) && $arrayVerif['form_phone']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur telephone')?> :
</label>
</td>
<td class="form_input">
<input id="form_phone" autocomplete="off" type="text" value="<?php echo $parm["form_phone"]?>" class="input_element" name="form_phone">
</td>
<td class="form_alert">
<?php echo isset($needed['form_phone'])?$needed['form_phone']:''?>
</td>
</tr>
<tr><td colspan="3">&nbsp;</td></tr>
<tr>
<td class="form_label">
<label for="form_company">
<?php echo (isset($arrayVerif['form_company']) && $arrayVerif['form_company']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur societe')?> :
</label>
</td>
<td class="form_input">
<input id="form_company" autocomplete="off" type="text" value="<?php echo $parm["form_company"]?>" class="input_element" name="form_company">
</td>
<td class="form_alert">
<?php echo isset($needed['form_company'])?$needed['form_company']:''?>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -585,19 +645,6 @@ phrasea::headers();
<?php echo isset($needed['form_activity'])?$needed['form_activity']:''?> <?php echo isset($needed['form_activity'])?$needed['form_activity']:''?>
</td> </td>
</tr> </tr>
<tr>
<td class="form_label">
<label for="form_phone">
<?php echo (isset($arrayVerif['form_phone']) && $arrayVerif['form_phone']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur telephone')?> :
</label>
</td>
<td class="form_input">
<input id="form_phone" autocomplete="off" type="text" value="<?php echo $parm["form_phone"]?>" class="input_element" name="form_phone">
</td>
<td class="form_alert">
<?php echo isset($needed['form_phone'])?$needed['form_phone']:''?>
</td>
</tr>
<tr> <tr>
<td class="form_label"> <td class="form_label">
<label for="form_fax"> <label for="form_fax">
@@ -611,46 +658,6 @@ phrasea::headers();
<?php echo isset($needed['form_fax'])?$needed['form_fax']:''?> <?php echo isset($needed['form_fax'])?$needed['form_fax']:''?>
</td> </td>
</tr> </tr>
<tr>
<td class="form_label">
<label for="form_company">
<?php echo (isset($arrayVerif['form_company']) && $arrayVerif['form_company']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur societe')?> :
</label>
</td>
<td class="form_input">
<input id="form_company" autocomplete="off" type="text" value="<?php echo $parm["form_company"]?>" class="input_element" name="form_company">
</td>
<td class="form_alert">
<?php echo isset($needed['form_company'])?$needed['form_company']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_address">
<?php echo (isset($arrayVerif['form_address']) && $arrayVerif['form_address']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur adresse')?> :
</label>
</td>
<td class="form_input">
<input id="form_address" autocomplete="off" type="text" value="<?php echo $parm["form_address"]?>" class="input_element" name="form_address">
</td>
<td class="form_alert">
<?php echo isset($needed['form_address'])?$needed['form_address']:''?>
</td>
</tr>
<tr>
<td class="form_label">
<label for="form_zip">
<?php echo (isset($arrayVerif['form_zip']) && $arrayVerif['form_zip']===true)?'<span class="requiredField">*</span>':''?> <?php echo _('admin::compte-utilisateur code postal')?> :
</label>
</td>
<td class="form_input">
<input id="form_zip" autocomplete="off" type="text" value="<?php echo $parm["form_zip"]?>" class="input_element" name="form_zip">
</td>
<td class="form_alert">
<?php echo isset($needed['form_zip'])?$needed['form_zip']:''?>
</td>
</tr>
<tr> <tr>