Bug 1571298: Adjust edit page info to be clearer for preview

Make it clearer that changes are saved automatically
and shorten 2nd sentence.

behatnotneeded

Change-Id: I875afae34d950e77e43bf3b4ece895d42c23e1ec

htdocs/js/views.js

@@ -1037,7 +1037,7 @@
      * This function is called before the modal is opened. In theory it could be used to make changes
      * to the display of elements before the modal opens (for things that might interfere with the
      * modal.
-     * 
+     *
      * It's currently empty because everything works fine without it.
      */
     function hideMediaPlayers() {
@@ -1046,7 +1046,7 @@
     /**
      * This function is called after the modal is closed. If you have deactivated things using
      * hideMediaPlayers, this can be a good place to re-open them.
-     * 
+     *
      * It is also used as a hacky place to hold other things that should be triggered after the
      * modal closes.
      */
@@ -1304,7 +1304,7 @@
         /**
          * changes the intructions so they are for ajax
          */
-        $('#blocksinstruction').html(strings['blocksinstructionajax']);
+        $('#blocksinstruction').html(strings['blocksinstructionajaxlive']);
     });
 
 }( window.ViewManager = window.ViewManager || {}, jQuery ));

htdocs/lang/en.utf8/view.php

@@ -258,7 +258,7 @@ $string['blockinstanceconfiguredsuccessfully'] = 'Block configured successfully'
 $string['blockconfigurationrenderingerror'] = 'Configuration failed because the block could not be rendered.';
 
 $string['blocksintructionnoajax'] = 'Select a block and choose where to add it to your page. You can position a block using the arrow buttons in its titlebar.';
-$string['blocksinstructionajax'] = 'This area shows a preview of what your page will look like.<br>Drag blocks below this line to add them to your page layout. You can drag blocks around your page layout to position them.';
+$string['blocksinstructionajaxlive'] = 'This area shows a preview of what your page looks like. Changes are saved automatically.<br>Drag blocks onto the page to add them. You can then also drag them around the page to change their position.';
 
 $string['addblock'] = 'Add block: %s';
 $string['blockcell'] = 'Cell';

htdocs/lib/web.php

@@ -1331,7 +1331,7 @@ function jsstrings() {
         'views' => array(
             'view' => array(
                 'confirmdeleteblockinstance',
-                'blocksinstructionajax',
+                'blocksinstructionajaxlive',
             ),
         ),
     );

test/behat/features/admin/edit_default_portfolio_page.feature

@@ -16,7 +16,7 @@ I can create a new page from the site default portfolio page
     When I go to "admin/site/views.php"
     And I should see "Page template"
     And I click on "Edit content and layout" in "Page template" row
-    And I should see "Drag blocks below this line to add them to your page layout. You can drag blocks around your page layout to position them."
+    And I should see "Drag blocks onto the page to add them. You can then also drag them around the page to change their position."
     # Add a text block
     And I follow "Text"
     And I press "Add"