From ff31226fdeb972aac2f37f0098240cb366a9bb26 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 5 May 2010 19:14:48 +0000
Subject: Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/ecml/manifest.xml                            |   2 +
 mod/ecml/start.php                               |   4 +-
 mod/ecml/views/default/ecml/admin/ecml_admin.php | 143 -----------------------
 mod/ecml/views/default/settings/ecml/edit.php    | 137 ++++++++++++++++++++++
 4 files changed, 141 insertions(+), 145 deletions(-)
 delete mode 100644 mod/ecml/views/default/ecml/admin/ecml_admin.php
 create mode 100644 mod/ecml/views/default/settings/ecml/edit.php

(limited to 'mod/ecml')

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/ecml/admin/ecml_admin.php
deleted file mode 100644
index b7038b54c..000000000
--- a/mod/ecml/views/default/ecml/admin/ecml_admin.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * Configs granular access
- *
- * @package ECML
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-$views = $vars['config']->ecml_parse_views;
-$keywords = $vars['config']->ecml_keywords;
-$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.
-$form_body = <<<___END
-<table class="ecml_admin_table">
-	<tr>
-		<th>&nbsp</th>
-___END;
-
-foreach ($views as $view => $view_desc) {
-	$form_body .= "<th><acronym class=\"ecml_view ecml_check_all\" title=\"$view\">$view_desc</acronym></th>";
-	$n++;
-}
-$form_body .= '</tr>';
-
-$odd = 'odd';
-foreach ($keywords as $keyword => $keyword_info) {
-	$keyword_desc = $keyword_info['description'];
-	if (isset($keyword_info['restricted'])) {
-		$restricted = elgg_echo('ecml:admin:restricted');
-		$form_body .= "
-		<tr class=\"ecml_row_$odd\">
-			<td class=\"ecml_keyword_desc\"><acronym class=\"ecml_keyword ecml_restricted\" title=\"$keyword_desc\">$keyword ($restricted)</acronym></td>
-		";
-	} else {
-		$form_body .= "
-		<tr class=\"ecml_row_$odd\">
-			<td class=\"ecml_keyword_desc\"><acronym class=\"ecml_keyword ecml_check_all\" title=\"$keyword_desc\">$keyword</acronym></td>
-		";
-	}
-	foreach ($views as $view => $view_info) {
-		// if this is restricted and we're not on the specified view don't allow changes
-		// since we don't save this, no need to pass a name
-		if (isset($keyword_info['restricted'])) {
-			$checked = (in_array($view, $keyword_info['restricted'])) ? 'checked="checked"' : '';
-			$form_body .= "<td><input type=\"checkbox\" $checked name=\"whitelist[$view][]\" value=\"$keyword\" disabled=\"disabled\"/></td>";
-		} else {
-			$checked = (!in_array($keyword, $perms[$view])) ? 'checked="checked"' : '';
-
-			// ooook. input/checkboxes isn't overly useful.
-			// do it ourself.
-			$form_body .= "<td><input type=\"checkbox\" name=\"whitelist[$view][]\" value=\"$keyword\" $checked /></td>";
-		}
-	}
-	$form_body .= '</tr>';
-
-	$odd = ($odd == 'odd') ? 'even' : 'odd';
-}
-
-$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'
-));
-
-?>
-<script type="text/javascript">
-
-$(document).ready(function() {
-	// append check all link
-	$('.ecml_check_all').before('<input type="checkbox" checked="checked" class="check_all">');
-
-	// determin initial state of checkall checkbox.
-	$('.ecml_check_all').each(function() {
-		var keyword = $(this).hasClass('ecml_keyword');
-		var checkbox = $(this).parent().find('input[type=checkbox]');
-		var checked;
-
-		// no keywords checked, checkall unchecked
-		// any keyword checked, checkall unchecked
-		// all keywords checked, checkall checked
-
-		// if keyword, check the TR
-		if (keyword) {
-			checked = true;
-			$(this).parent().parent().find('input').each(function() {
-				if (!$(this).hasClass('check_all') && !$(this).attr('disabled')) {
-					checked = (checked && $(this).attr('checked'));
-					// can't break...
-				}
-			});
-			checkbox.attr('checked', checked);
-		} else {
-			checked = true;
-			var rowIndex = $(this).parent().parent().children().index($(this).parent());
-
-			$('.ecml_admin_table > tbody > tr td:nth-child(' + (rowIndex + 1) + ') input[type=checkbox]').each(function() {
-				if (!$(this).hasClass('check_all') && !$(this).attr('disabled')) {
-					checked = (checked && $(this).attr('checked'));
-					// can't break...
-				}
-			});
-			checkbox.attr('checked', checked);
-		}
-	});
-
-	// handle checkall boxes
-	$('input.check_all').click(function() {
-		// yoinked from
-		// http://stackoverflow.com/questions/788225/table-row-and-column-number-in-jquery
-		var rowIndex = $(this).parent().parent().children().index($(this).parent());
-		var check = $(this).attr('checked');
-
-		// clicked on a keyword on the left, check all boxes in the tr
-		if (rowIndex == 0) {
-			$(this).parent().parent().find('input').each(function() {
-				if (!$(this).attr('disabled')) {
-					$(this).attr('checked', check);
-				}
-			});
-		} else {
-			boxes = $('.ecml_admin_table > tbody > tr td:nth-child(' + (rowIndex + 1) + ') input[type=checkbox]');
-			boxes.each(function() {
-				if (!$(this).attr('disabled')) {
-					$(this).attr('checked', check);
-				}
-			});
-		}
-	});
-});
-</script>
diff --git a/mod/ecml/views/default/settings/ecml/edit.php b/mod/ecml/views/default/settings/ecml/edit.php
new file mode 100644
index 000000000..1ad88aa9b
--- /dev/null
+++ b/mod/ecml/views/default/settings/ecml/edit.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Configs granular access
+ *
+ * @package ECML
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.org/
+ */
+
+$views = $vars['config']->ecml_parse_views;
+$keywords = $vars['config']->ecml_keywords;
+$perms = $vars['config']->ecml_permissions;
+
+ksort($views);
+ksort($keywords);
+
+echo '<p class="margin_top">' . elgg_echo('ecml:admin:instruction') . '</p>';
+
+// yes I'm using a table because this is table.
+$form_body = <<<___END
+<table class="ecml_admin_table">
+	<tr>
+		<th>&nbsp</th>
+___END;
+
+foreach ($views as $view => $view_desc) {
+	$form_body .= "<th><acronym class=\"ecml_view ecml_check_all\" title=\"$view\">$view_desc</acronym></th>";
+	$n++;
+}
+$form_body .= '</tr>';
+
+$odd = 'odd';
+foreach ($keywords as $keyword => $keyword_info) {
+	$keyword_desc = $keyword_info['description'];
+	if (isset($keyword_info['restricted'])) {
+		$restricted = elgg_echo('ecml:admin:restricted');
+		$form_body .= "
+		<tr class=\"ecml_row_$odd\">
+			<td class=\"ecml_keyword_desc\"><acronym class=\"ecml_keyword ecml_restricted\" title=\"$keyword_desc\">$keyword ($restricted)</acronym></td>
+		";
+	} else {
+		$form_body .= "
+		<tr class=\"ecml_row_$odd\">
+			<td class=\"ecml_keyword_desc\"><acronym class=\"ecml_keyword ecml_check_all\" title=\"$keyword_desc\">$keyword</acronym></td>
+		";
+	}
+	foreach ($views as $view => $view_info) {
+		// if this is restricted and we're not on the specified view don't allow changes
+		// since we don't save this, no need to pass a name
+		if (isset($keyword_info['restricted'])) {
+			$checked = (in_array($view, $keyword_info['restricted'])) ? 'checked="checked"' : '';
+			$form_body .= "<td><input type=\"checkbox\" $checked name=\"whitelist[$view][]\" value=\"$keyword\" disabled=\"disabled\"/></td>";
+		} else {
+			$checked = (!in_array($keyword, $perms[$view])) ? 'checked="checked"' : '';
+
+			// ooook. input/checkboxes isn't overly useful.
+			// do it ourself.
+			$form_body .= "<td><input type=\"checkbox\" name=\"whitelist[$view][]\" value=\"$keyword\" $checked /></td>";
+		}
+	}
+	$form_body .= '</tr>';
+
+	$odd = ($odd == 'odd') ? 'even' : 'odd';
+}
+
+$form_body .= '</table>';
+
+echo $form_body;
+
+?>
+<script type="text/javascript">
+
+$(document).ready(function() {
+	// append check all link
+	$('.ecml_check_all').before('<input type="checkbox" checked="checked" class="check_all">');
+
+	// determin initial state of checkall checkbox.
+	$('.ecml_check_all').each(function() {
+		var keyword = $(this).hasClass('ecml_keyword');
+		var checkbox = $(this).parent().find('input[type=checkbox]');
+		var checked;
+
+		// no keywords checked, checkall unchecked
+		// any keyword checked, checkall unchecked
+		// all keywords checked, checkall checked
+
+		// if keyword, check the TR
+		if (keyword) {
+			checked = true;
+			$(this).parent().parent().find('input').each(function() {
+				if (!$(this).hasClass('check_all') && !$(this).attr('disabled')) {
+					checked = (checked && $(this).attr('checked'));
+					// can't break...
+				}
+			});
+			checkbox.attr('checked', checked);
+		} else {
+			checked = true;
+			var rowIndex = $(this).parent().parent().children().index($(this).parent());
+
+			$('.ecml_admin_table > tbody > tr td:nth-child(' + (rowIndex + 1) + ') input[type=checkbox]').each(function() {
+				if (!$(this).hasClass('check_all') && !$(this).attr('disabled')) {
+					checked = (checked && $(this).attr('checked'));
+					// can't break...
+				}
+			});
+			checkbox.attr('checked', checked);
+		}
+	});
+
+	// handle checkall boxes
+	$('input.check_all').click(function() {
+		// yoinked from
+		// http://stackoverflow.com/questions/788225/table-row-and-column-number-in-jquery
+		var rowIndex = $(this).parent().parent().children().index($(this).parent());
+		var check = $(this).attr('checked');
+
+		// clicked on a keyword on the left, check all boxes in the tr
+		if (rowIndex == 0) {
+			$(this).parent().parent().find('input').each(function() {
+				if (!$(this).attr('disabled')) {
+					$(this).attr('checked', check);
+				}
+			});
+		} else {
+			boxes = $('.ecml_admin_table > tbody > tr td:nth-child(' + (rowIndex + 1) + ') input[type=checkbox]');
+			boxes.each(function() {
+				if (!$(this).attr('disabled')) {
+					$(this).attr('checked', check);
+				}
+			});
+		}
+	});
+});
+</script>
-- 
cgit v1.2.3