aboutsummaryrefslogtreecommitdiff
path: root/mod/ecml
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-05 19:14:48 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-05 19:14:48 +0000
commitff31226fdeb972aac2f37f0098240cb366a9bb26 (patch)
tree1f0caa75c9a340cf28ce9a81a4cbe3230d13abf3 /mod/ecml
parent81ffac29fabc175eebdbf95578da046f4f00611b (diff)
downloadelgg-ff31226fdeb972aac2f37f0098240cb366a9bb26.tar.gz
elgg-ff31226fdeb972aac2f37f0098240cb366a9bb26.tar.bz2
Merged 18_new_admin branch to trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/ecml')
-rw-r--r--mod/ecml/manifest.xml2
-rw-r--r--mod/ecml/start.php4
-rw-r--r--mod/ecml/views/default/settings/ecml/edit.php (renamed from mod/ecml/views/default/ecml/admin/ecml_admin.php)8
3 files changed, 5 insertions, 9 deletions
diff --git a/mod/ecml/manifest.xml b/mod/ecml/manifest.xml
index f74c78de0..77ece69de 100644
--- a/mod/ecml/manifest.xml
+++ b/mod/ecml/manifest.xml
@@ -11,4 +11,6 @@
<field key="copyright" value="(C) Curverider 2008-2010" />
<field key="licence" value="GNU Public License version 2" />
<field key="elgg_version" value="2009030702" />
+ <field key="elgg_install_state" value="enabled" />
+ <field key="admin_interface" value="advanced" />
</plugin_manifest>
diff --git a/mod/ecml/start.php b/mod/ecml/start.php
index 4ea50766e..c0ce1d4d6 100644
--- a/mod/ecml/start.php
+++ b/mod/ecml/start.php
@@ -36,7 +36,7 @@ function ecml_init() {
elgg_extend_view('css', 'ecml/admin/css');
// admin action to save permissions
- register_action('ecml/save_permissions', FALSE, dirname(__FILE__) . '/actions/save_permissions.php', TRUE);
+ register_action('settings/ecml/save', FALSE, dirname(__FILE__) . '/actions/save_permissions.php', TRUE);
// show ECML-enabled icon on free-text input areas
elgg_extend_view('input/longtext', 'ecml/input_ext', 0);
@@ -78,7 +78,7 @@ function ecml_init() {
function ecml_pagesetup(){
if (get_context() == 'admin' && isadminloggedin()) {
global $CONFIG;
- add_submenu_item(elgg_echo('ecml'), $CONFIG->wwwroot . 'pg/ecml_admin');
+
}
}
diff --git a/mod/ecml/views/default/ecml/admin/ecml_admin.php b/mod/ecml/views/default/settings/ecml/edit.php
index b7038b54c..1ad88aa9b 100644
--- a/mod/ecml/views/default/ecml/admin/ecml_admin.php
+++ b/mod/ecml/views/default/settings/ecml/edit.php
@@ -16,7 +16,6 @@ $perms = $vars['config']->ecml_permissions;
ksort($views);
ksort($keywords);
-echo elgg_view_title(elgg_echo('ecml:admin'));
echo '<p class="margin_top">' . elgg_echo('ecml:admin:instruction') . '</p>';
// yes I'm using a table because this is table.
@@ -67,13 +66,8 @@ foreach ($keywords as $keyword => $keyword_info) {
}
$form_body .= '</table>';
-$form_body .= elgg_view('input/submit', array('value' => elgg_echo('submit')));
-$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'cancel_button'));
-echo elgg_view('input/form', array(
- 'body' => $form_body,
- 'action' => $vars['url'] . 'action/ecml/save_permissions'
-));
+echo $form_body;
?>
<script type="text/javascript">