Get resource page save message to display, a=chris
Get resource page save message to display, a=chris
diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php
index 24f59a6fc..3961f2bf2 100644
--- a/src/controllers/components/SocialComponent.php
+++ b/src/controllers/components/SocialComponent.php
@@ -1817,7 +1817,9 @@ class SocialComponent extends Component implements CrawlConstants
}
$data['current_page_type'] = $data["page_type"];
$this->initializeWikiPageToggle($data);
- $this->initializeWikiEditor($data);
+ if (empty($data['RESOURCE_NAME'])) {
+ $this->initializeWikiEditor($data);
+ }
}
}
return $data;
@@ -2297,6 +2299,14 @@ EOD;
*/
private function initializeWikiPageToggle(&$data)
{
+ $init_toggle_settings = (empty($data['RESOURCE_NAME'])) ?
+ 'setDisplay("toggle-settings", !is_page_alias, "inline");': '';
+ $toggle_settings_on = (empty($data['RESOURCE_NAME'])) ?
+ 'setDisplay("toggle-settings", true);': '';
+ $toggle_settings_false = (empty($data['RESOURCE_NAME'])) ?
+ 'setDisplay("toggle-settings", false);': '';
+ $toggle_settings_inline = (empty($data['RESOURCE_NAME'])) ?
+ 'setDisplay("toggle-settings", true, "inline");': '';
$data['SCRIPT'] .= <<< EOD
setDisplay('page-settings', {$data['settings']});
mode = '{$data['MODE']}';
@@ -2330,14 +2340,14 @@ EOD;
setDisplay('save-container', !is_media_list || is_settings);
setDisplay("resource-upload-form", is_media_list);
}
- setDisplay("toggle-settings", !is_page_alias, "inline");
+ $init_toggle_settings
setDisplay("page-resources", !is_page_alias);
ptype.onchange = function() {
var cur_type = ptype.options[ptype.selectedIndex].value;
if (cur_type == "media_list") {
setDisplay("media-list-page", true, "inline");
setDisplay("page-container", false);
- setDisplay("toggle-settings", true);
+ $toggle_settings_on
setDisplay("non-alias-type", true);
setDisplay("alias-type", false);
setDisplay("page-resources", true);
@@ -2345,7 +2355,7 @@ EOD;
setDisplay("resource-upload-form", true);
}
} else if (cur_type == "page_alias") {
- setDisplay("toggle-settings", false);
+ $toggle_settings_false
setDisplay("media-list-page", false);
setDisplay("page-container", false);
setDisplay("non-alias-type", false);
@@ -2354,7 +2364,7 @@ EOD;
} else {
setDisplay("page-container", true);
setDisplay("media-list-page", false);
- setDisplay("toggle-settings", true, "inline");
+ $toggle_settings_inline
setDisplay("non-alias-type", true);
setDisplay("alias-type", false);
setDisplay("page-resources", true);