Changeset 5741

Timestamp:

Apr 9, 2010, 8:17:50 PM (14 years ago)

Author:

plg

Message:

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

Location:

trunk

Files:

• admin/photos_add_direct.php (modified) (1 diff)
• admin/themes/default/template/photos_add_direct.tpl (modified) (2 diffs)
• install/config.sql (modified) (1 diff)
• tools/convert_language_to_2.1.pl (modified) (1 diff)
• tools/missing_keys.pl (modified) (2 diffs)

trunk/admin/photos_add_direct.php

@@ -356 +356 @@
   '<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']))
 {

trunk/admin/themes/default/template/photos_add_direct.tpl

@@ -149 +149 @@
   <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">
@@ -242 +241 @@
 {/if}
 </form>
-{/if} {* empty($thumbnails) *}
-{/if} {* $setup_errors *}
+{/if}
 
 </div> <!-- photosAddContent -->

trunk/install/config.sql

@@ -19 +19 @@
 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');

trunk/tools/convert_language_to_2.1.pl

@@ -93 +93 @@
         'The next step of the installation is now possible' => '',
         'next step' => '',
-        'install_end_message' => '',
     }
 );

trunk/tools/missing_keys.pl

@@ -15 +15 @@
 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 = (
@@ -75 +75 @@
 
 
-# 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 {