continued cleaning up admin plugin settings

git-svn-id: http://code.elgg.org/elgg/trunk@8150 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 8179728edb65dca4d912889494885312c9ec8b17..30cf3d21af9537a47d6602f1bb60b4cc26f564ab 100644 (file)
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -11,7 +11,7 @@
 $plugin = $vars['plugin'];
 $plugin_id = $plugin->getID();
 
-if (elgg_view("settings/$plugin_id/edit")) {
+if (elgg_view_exists("settings/$plugin_id/edit")) {
 ?>
 
 <div class="elgg-module elgg-module-info">
@@ -19,15 +19,10 @@ if (elgg_view("settings/$plugin_id/edit")) {
                <h3><?php echo $plugin->manifest->getName(); ?></h3>
        </div>
        <div class="elgg-body">
-               <div id="<?php echo $plugin_id; ?>_settings">
-                       <?php echo elgg_view("object/plugin", array(
-                               'plugin' => $plugin,
-                               // in for backward compatibility
-                               'entity' => $plugin,
-                               'type' => 'admin'
-                       ));
-                       ?>
-               </div>
+               <?php
+                       $params = array('internalid' => "$plugin_id-settings");
+                       echo elgg_view_form("plugins/settings/save", $params, $vars);
+               ?>
        </div>
 </div>
 <?php

diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index b2d818e876bf0290aaba1bd53cd544138f770ed5..68c6b1f52530de034340f0b32d4aeb464cd0a663 100644 (file)
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -17,11 +17,10 @@ if ($type != 'user') {
        $type = '';
 }
 
-echo elgg_view("{$type}settings/{$plugin_id}/edit", $vars);
+echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
 
 echo "<p>";
 echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id));
 echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid));
 echo elgg_view('input/submit', array('value' => elgg_echo('save'))); 
 echo "</p>";
-