various small file management UI improvements

- saving multiple files - success message indicates how many were saved

- saving one file - success message indicates what file was saved

- if the file is missing from the file system, display an alert

diff --git a/MANIFEST b/MANIFEST
index 4b26fd7175f309e265b4f031768616b9a8a191ea..dcdbfc2be211a02cf23e80689efa6d3239535000 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -424,6 +424,7 @@ site/htdocs/css/sadmin.css
 site/htdocs/css/style-main.css
 site/htdocs/favicon.ico
 site/htdocs/images/50.png
+site/htdocs/images/admin/alert.png
 site/htdocs/images/admin/busy.gif
 site/htdocs/images/admin/checked.gif
 site/htdocs/images/admin/error.gif

diff --git a/site/cgi-bin/modules/BSE/Edit/Article.pm b/site/cgi-bin/modules/BSE/Edit/Article.pm
index f59f685bd231389a386394b2e9668e22d6ad53fd..42ce0298ac3d47227417a8c5ffdf23c047d81868 100644 (file)
--- a/site/cgi-bin/modules/BSE/Edit/Article.pm
+++ b/site/cgi-bin/modules/BSE/Edit/Article.pm
@@ -15,7 +15,7 @@ use DevHelp::Date qw(dh_parse_date dh_parse_sql_date);
 use List::Util qw(first);
 use constant MAX_FILE_DISPLAYNAME_LENGTH => 255;
 
-our $VERSION = "1.012";
+our $VERSION = "1.013";
 
 =head1 NAME
 
@@ -1273,6 +1273,12 @@ sub low_edit_tags {
       single => "file_meta",
       nocache => 1,
      ),
+     ifFileExists => sub {
+       @files && $file_index >= 0 && $file_index < @files
+        or return 0;
+
+       return -f ($files[$file_index]->full_filename($cfg));
+     },
      file_display => [ tag_file_display => $self, \@files, \$file_index ],
      DevHelp::Tags->make_iterator2
      (\&iter_admin_users, 'iadminuser', 'adminusers'),
@@ -3961,9 +3967,11 @@ sub filesave {
   my @old_files;
   my @new_files;
   my %store_anyway;
+  my $change_count = 0;
   my @content_changed;
   for my $file (@files) {
     my $id = $file->{id};
+    my $orig = $file->data_only;
     my $desc = $cgi->param("description_$id");
     defined $desc and $file->{description} = $desc;
     my $type = $cgi->param("contentType_$id");
@@ -4054,6 +4062,15 @@ sub filesave {
        $errors{"file_$id"} = "Filename too long";
       }
     }
+
+    my $new = $file->data_only;
+  COLUMN:
+    for my $col ($file->columns) {
+      if ($new->{$col} ne $orig->{$col}) {
+       ++$change_count;
+       last COLUMN;
+      }
+    }
   }
   for my $name (keys %names) {
     if (@{$names{$name}} > 1) {
@@ -4068,7 +4085,12 @@ sub filesave {
 
     return $self->edit_form($req, $article, $articles, undef, \%errors);
   }
-  $req->flash('File information saved');
+  if ($change_count) {
+    $req->flash("msg:bse/admin/edit/file/save/success_count", [ $change_count ]);
+  }
+  else {
+    $req->flash("msg:bse/admin/edit/file/save/success_none");
+  }
   my $mgr = $self->_file_manager($self->cfg);
   for my $file (@files) {
     $file->save;
@@ -4516,7 +4538,7 @@ sub req_save_file {
   $file->set_handler($self->cfg);
   $file->save;
 
-  $req->flash('File information saved');
+  $req->flash("msg:bse/admin/edit/file/save/success", [ $file->displayName ]);
   my $mgr = $self->_file_manager($self->cfg);
 
   my $storage = $cgi->param('storage');

diff --git a/site/data/db/bse_msg_base.data b/site/data/db/bse_msg_base.data
index 525fb66bd3b9b7028af906791c03fee923d8ae78..9565003006af08cbbee51ec98f7df240db312a31 100644 (file)
--- a/site/data/db/bse_msg_base.data
+++ b/site/data/db/bse_msg_base.data
@@ -95,6 +95,15 @@ description: Article file manipulation
 id: bse/admin/edit/file/save/
 description: Saving an article file
 
+id: bse/admin/edit/file/save/success_count
+description: Successfully saved changes to several files (%1 is the count)
+
+id: bse/admin/edit/file/save/success_none
+description: Successfully saved changes, but there were no changes
+
+id: bse/admin/edit/file/save/success
+description: Successfully saved changes to a single file (%1 is the new display name)
+
 id: bse/admin/edit/file/save/savetostore
 description: If the file couldn't saved to an external store ($1 - the back end error message)
 

diff --git a/site/data/db/bse_msg_defaults.data b/site/data/db/bse_msg_defaults.data
index 31bd916283bf90b105b18e36e7b4cb61ebd50ef4..79276ab18af55f77859510e83b5247a05a6188cd 100644 (file)
--- a/site/data/db/bse_msg_defaults.data
+++ b/site/data/db/bse_msg_defaults.data
@@ -49,6 +49,15 @@ message: Could not save image to external store: %1:s
 id: bse/admin/edit/image/save/delfromstore
 message: Could not delete image from external store: %1:s
 
+id: bse/admin/edit/file/save/success_count
+message: Saved changes to %1:d files
+
+id: bse/admin/edit/file/save/success_none
+message: No changes found to save
+
+id: bse/admin/edit/file/save/success
+message: Saved changes to file '%1:s'
+
 id: bse/admin/edit/file/save/savetostore
 message: Could not save file to external store: %1:s
 

diff --git a/site/htdocs/css/admin.css b/site/htdocs/css/admin.css
index 138f1372907461e76357ba6446978a98c1087c17..22a1709ddc9a385183f9228712721d7919f7b7ea 100644 (file)
--- a/site/htdocs/css/admin.css
+++ b/site/htdocs/css/admin.css
@@ -347,6 +347,13 @@ img.bse_image_thumb {
   color: red;
 }
 
+span.alert {
+  padding-left: 18px;
+  background: url(/images/admin/alert.png) center left no-repeat;
+  color: red;
+  font-weight: bold;
+}
+
 .wind
 {
   border: 1px solid #888;

diff --git a/site/htdocs/images/admin/alert.png b/site/htdocs/images/admin/alert.png
new file mode 100644 (file)
index 0000000..82e9c80
Binary files /dev/null and b/site/htdocs/images/admin/alert.png differ

diff --git a/site/templates/admin/filelist.tmpl b/site/templates/admin/filelist.tmpl
index c677ab451806d6b1cc03f441cc087b25ccc88dce..c9548db481c66058462dd192fcdd64598195e8c9 100644 (file)
--- a/site/templates/admin/filelist.tmpl
+++ b/site/templates/admin/filelist.tmpl
@@ -123,6 +123,7 @@
             <td class="col_filename" rowspan="2"> <:file displayName:><:ifUserCan edit_files_save:article:>
             <br /><input type="file" name="file_<:file id:>" /><:error_img [concatenate file_ [file id]:>
 <:or:><:eif:>
+<:ifFileExists:><:or:><br /><span class="alert">This file is missing!</span><:eif:>
 </td>
             <td class="col_description"> 
               <:ifUserCan edit_files_save:article:><input name="description_<:file id:>" type="text" value="<: oldi [concatenate description_ [file id]] 0 file description :>" size="35" />