mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@5741 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-04-09 18:17:50 +00:00
parent 384108dd89
commit 5096c1292c
5 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/photos_add_direct.php
View file

@ -355,17 +355,7 @@ $template->append(
'head_elements',
'<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(

6
admin/themes/default/template/photos_add_direct.tpl
View file

@ -148,8 +148,7 @@ var buttonText = 'Browse';
</div>
<p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
</fieldset>
<p><a href="">Add another set of photos</a></p>
{else}
{/if}
<div id="formErrors" class="errors" style="display:none">
<ul>
@ -241,7 +240,6 @@ var buttonText = 'Browse';
</p>
{/if}
</form>
{/if} {* empty($thumbnails) *}
{/if} {* $setup_errors *}
{/if}
</div> <!-- photosAddContent -->

2
install/config.sql
View file

@ -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','false','Send mail on HTML format for notification by mail');
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_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');

1
tools/convert_language_to_2.1.pl
View file

@ -92,7 +92,6 @@ my %remove_keys = (
'Installation finished' => '',
'The next step of the installation is now possible' => '',
'next step' => '',
'install_end_message' => '',
}
);

24
tools/missing_keys.pl
View file

@ -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)$/) {