Author: jfthomps
Date: Thu Jun 2 20:45:49 2016
New Revision: 1746632
URL: http://svn.apache.org/viewvc?rev=1746632&view=rev
Log:
VCL-935 - modify layout of edit image dialog to distinguish what items are
immediately changed
image.php:
-modified addEditDialogHTML: moved revisiondiv to after editdlgbtns div so that
the image revision section is displayed below the buttons
-modified getRevisionHTML: added note that changes in the image revision
section are immediate
Modified:
vcl/trunk/web/.ht-inc/image.php
Modified: vcl/trunk/web/.ht-inc/image.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1746632&r1=1746631&r2=1746632&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Thu Jun 2 20:45:49 2016
@@ -453,11 +453,6 @@ class Image extends Resource {
$h .= "<div id=\"addeditdlgerrmsg\"
class=\"nperrormsg\"></div>\n";
- if(! $add) {
- $h .= "<div id=revisiondiv>\n";
- $h .= "</div>\n";
- }
-
$h .= "</div>\n"; # addeditdlgcontent
$h .= "<div id=\"editdlgbtns\" align=\"center\">\n";
@@ -466,6 +461,12 @@ class Image extends Resource {
$script .= " dijit.registry.filter(function(widget,
index){return widget.id.match(/^comments/);}).forEach(function(widget)
{widget.destroy();});\n";
$h .= dijitButton('', i("Cancel"), $script);
$h .= "</div>\n"; # editdlgbtns
+
+ if(! $add) {
+ $h .= "<div id=revisiondiv>\n";
+ $h .= "</div>\n";
+ }
+
$h .= "</div>\n"; # addeditdlg
$h .= "<div dojoType=dijit.Dialog\n";
@@ -1267,6 +1268,7 @@ class Image extends Resource {
$revisions = getImageRevisions($imageid);
$rt = '';
$rt .= "<h3>" . i("Revisions of this Image") . "</h3>\n";
+ $rt .= "(" . i("Changes made in this section take effect
immediately; you do <strong>not</strong> need to click \"Submit Changes\" to
submit them.") . ")<br>\n";
$rt .= "<table summary=\"\"><tr><td>\n";
if(count($revisions) > 1 && isImageBlockTimeActive($imageid)) {
$rt .= "<font color=\"red\">";
