diff options
| -rw-r--r-- | admin/photos_add_direct.php | 10 | ||||
| -rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 6 | ||||
| -rw-r--r-- | galleries/.cvsignore | 1 | ||||
| -rw-r--r-- | install/config.sql | 2 | ||||
| -rw-r--r-- | tools/convert_language_to_2.1.pl | 1 | ||||
| -rw-r--r-- | tools/missing_keys.pl | 24 |
6 files changed, 28 insertions, 16 deletions
diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php index 0c24fc6ef..0376ca181 100644 --- a/admin/photos_add_direct.php +++ b/admin/photos_add_direct.php @@ -356,6 +356,16 @@ $template->append( '<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n" ); +// $page['thumbnails'] = array( +// array( +// 'src' => 'http://localhost/piwigo/dev/trunk/upload/2006/08/16/thumbnail/TN-20060816234638-f9bebf5a.jpg', +// ), +// array( +// 'src' => 'http://localhost/piwigo/dev/trunk/upload/2005/10/04/thumbnail/TN-20051004000000-864a003c.jpg', +// ), +// ); +// $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch=1460,3307'; + if (isset($page['thumbnails'])) { $template->assign( diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 1c15b922a..8002fd195 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -148,7 +148,8 @@ var buttonText = 'Browse'; </div> <p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p> </fieldset> -{/if} +<p><a href="">Add another set of photos</a></p> +{else} <div id="formErrors" class="errors" style="display:none"> <ul> @@ -240,6 +241,7 @@ var buttonText = 'Browse'; </p> {/if} </form> -{/if} +{/if} {* empty($thumbnails) *} +{/if} {* $setup_errors *} </div> <!-- photosAddContent -->
\ No newline at end of file diff --git a/galleries/.cvsignore b/galleries/.cvsignore deleted file mode 100644 index 72e8ffc0d..000000000 --- a/galleries/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -* diff --git a/install/config.sql b/install/config.sql index 6847c340b..1f7a973d1 100644 --- a/install/config.sql +++ b/install/config.sql @@ -18,7 +18,7 @@ INSERT INTO piwigo_config (param,value,comment) VALUES ('history_admin','false', INSERT INTO piwigo_config (param,value,comment) VALUES ('history_guest','true','keep a history of guest visits on your website'); INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_registration','true','allow visitors to register?'); INSERT INTO piwigo_config (param,value,comment) VALUES ('allow_user_customization','true','allow users to customize their gallery?'); -INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','true','Send mail on HTML format for notification by mail'); +INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_html_mail','false','Send mail on HTML format for notification by mail'); INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_mail_as','','Send mail as param value for notification by mail'); INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_send_detailed_content','true','Send detailed content for notification by mail'); INSERT INTO piwigo_config (param,value,comment) VALUES ('nbm_complementary_mail_content','','Complementary mail content for notification by mail'); diff --git a/tools/convert_language_to_2.1.pl b/tools/convert_language_to_2.1.pl index b78547a33..3b206be65 100644 --- a/tools/convert_language_to_2.1.pl +++ b/tools/convert_language_to_2.1.pl @@ -92,6 +92,7 @@ my %remove_keys = ( 'Installation finished' => '', 'The next step of the installation is now possible' => '', 'next step' => '', + 'install_end_message' => '', } ); diff --git a/tools/missing_keys.pl b/tools/missing_keys.pl index 7f657a41d..1b83dacb1 100644 --- a/tools/missing_keys.pl +++ b/tools/missing_keys.pl @@ -14,14 +14,14 @@ my $type = $ARGV[1]; # common, admin, install, upgrade find(\&used_keys, $piwigo_dir); load_registered_keys($type); -# foreach my $key (sort keys %used_keys) { -# # print "{".$key."}", ' is used', "\n"; +foreach my $key (sort keys %used_keys) { + # print "{".$key."}", ' is used', "\n"; -# if (not defined $registered_keys{$key}) { -# # print "{".$key."}", ' is missing', "\n"; -# print '$lang[\''.$key.'\'] = \''.$key.'\';', "\n"; -# } -# } + if (not defined $registered_keys{$key}) { + # print "{".$key."}", ' is missing', "\n"; + print '$lang[\''.$key.'\'] = \''.$key.'\';', "\n"; + } +} my %ignore_keys = ( '%d new image' => 1, @@ -74,11 +74,11 @@ my %ignore_keys = ( ); -foreach my $key (sort keys %registered_keys) { - if (not defined $used_keys{$key} and not defined $ignore_keys{$key}) { - print "{".$key."}", ' is not used anywhere', "\n"; - } -} +# foreach my $key (sort keys %registered_keys) { +# if (not defined $used_keys{$key} and not defined $ignore_keys{$key}) { +# print "{".$key."}", ' is not used anywhere', "\n"; +# } +# } sub used_keys { if ($File::Find::name !~ m/(tpl|php)$/) { |