Changeset 5741


Ignore:
Timestamp:
04/09/10 20:17:50 (10 years ago)
Author:
plg
Message:

merge back r5740, I should have commited only the galleries directory

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/photos_add_direct.php

    r5740 r5741  
    356356  '<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n" 
    357357  ); 
    358  
    359 // $page['thumbnails'] = array( 
    360 //   array( 
    361 //     'src' => 'http://localhost/piwigo/dev/trunk/upload/2006/08/16/thumbnail/TN-20060816234638-f9bebf5a.jpg', 
    362 //     ), 
    363 //   array( 
    364 //     'src' => 'http://localhost/piwigo/dev/trunk/upload/2005/10/04/thumbnail/TN-20051004000000-864a003c.jpg', 
    365 //     ), 
    366 //   ); 
    367 // $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch=1460,3307'; 
    368  
     358  
    369359if (isset($page['thumbnails'])) 
    370360{ 
  • trunk/admin/themes/default/template/photos_add_direct.tpl

    r5740 r5741  
    149149  <p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p> 
    150150</fieldset> 
    151 <p><a href="">Add another set of photos</a></p> 
    152 {else} 
     151{/if} 
    153152 
    154153<div id="formErrors" class="errors" style="display:none"> 
     
    242241{/if} 
    243242</form> 
    244 {/if} {* empty($thumbnails) *} 
    245 {/if} {* $setup_errors *} 
     243{/if} 
    246244 
    247245</div> <!-- photosAddContent --> 
  • trunk/install/config.sql

    r5740 r5741  
    1919INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?'); 
    2020INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_customization','true','allow users to customize their gallery?'); 
    21 INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','false','Send mail on HTML format for notification by mail'); 
     21INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail'); 
    2222INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail'); 
    2323INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail'); 
  • trunk/tools/convert_language_to_2.1.pl

    r5740 r5741  
    9393        'The next step of the installation is now possible' => '', 
    9494        'next step' => '', 
    95         'install_end_message' => '', 
    9695    } 
    9796); 
  • trunk/tools/missing_keys.pl

    r5740 r5741  
    1515load_registered_keys($type); 
    1616 
    17 foreach my $key (sort keys %used_keys) { 
    18     # print "{".$key."}", ' is used', "\n"; 
     17# foreach my $key (sort keys %used_keys) { 
     18#     # print "{".$key."}", ' is used', "\n"; 
    1919 
    20     if (not defined $registered_keys{$key}) { 
    21         # print "{".$key."}", ' is missing', "\n"; 
    22         print '$lang[\''.$key.'\'] = \''.$key.'\';', "\n"; 
    23     } 
    24 } 
     20#     if (not defined $registered_keys{$key}) { 
     21#         # print "{".$key."}", ' is missing', "\n"; 
     22#         print '$lang[\''.$key.'\'] = \''.$key.'\';', "\n"; 
     23#     } 
     24# } 
    2525 
    2626my %ignore_keys = ( 
     
    7575 
    7676 
    77 # foreach my $key (sort keys %registered_keys) { 
    78 #     if (not defined $used_keys{$key} and not defined $ignore_keys{$key}) { 
    79 #         print "{".$key."}", ' is not used anywhere', "\n"; 
    80 #     } 
    81 # } 
     77foreach my $key (sort keys %registered_keys) { 
     78    if (not defined $used_keys{$key} and not defined $ignore_keys{$key}) { 
     79        print "{".$key."}", ' is not used anywhere', "\n"; 
     80    } 
     81} 
    8282 
    8383sub used_keys { 
Note: See TracChangeset for help on using the changeset viewer.