From 37875ae23f33b487bfb406c39400cea71dc1d662 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Sat, 7 Jul 2012 05:52:48 +0200
Subject: Fixes #4008. Sets a vertical align for admin icons consistent with
 the text, and set it as before (baseline) for heads.

---
 views/default/css/admin.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'views')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 0f5c1f677..aca8ee3de 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1239,6 +1239,10 @@ a.elgg-widget-collapsed:before {
 	height: 16px;
 	display: inline-block;
 	margin: 0 2px;
+	vertical-align: text-bottom;
+}
+.elgg-head .elgg-icon {
+	vertical-align: baseline;
 }
 .elgg-icon-delete:hover,
 .elgg-icon-delete-alt:hover {
-- 
cgit v1.2.3


From d1efed149b0ae8b137617978d46ea5841b3d5044 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Sun, 29 Jul 2012 00:30:56 +0200
Subject: Refs #4008. Modified CSS selector to be more specific.

---
 views/default/css/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index aca8ee3de..ae22df691 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1241,7 +1241,7 @@ a.elgg-widget-collapsed:before {
 	margin: 0 2px;
 	vertical-align: text-bottom;
 }
-.elgg-head .elgg-icon {
+.elgg-module .elgg-head .elgg-icon {
 	vertical-align: baseline;
 }
 .elgg-icon-delete:hover,
-- 
cgit v1.2.3


From 6c4e75b19ddadaadac9bc78423a837045fa90b15 Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Mon, 26 Nov 2012 21:16:04 +0100
Subject: Fixes #4927 - Removes obsolete commas in JS code for IE7
 compatibility

---
 js/lib/ui.js                       | 2 +-
 js/tests/ElggLibTest.js            | 2 +-
 views/default/js/walled_garden.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'views')

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 616e71d54..2a4d269d6 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -283,7 +283,7 @@ elgg.ui.initDatePicker = function() {
 			dataType: "script",
 			cache: true,
 			success: loadDatePicker,
-			error: loadDatePicker, // english language is already loaded.
+			error: loadDatePicker // english language is already loaded.
 		});
 	}
 };
diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js
index a29ebf743..2a676e22a 100644
--- a/js/tests/ElggLibTest.js
+++ b/js/tests/ElggLibTest.js
@@ -99,7 +99,7 @@ ElggLibTest.prototype.testNormalizeUrl = function() {
 		['/mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php'],
 		['/mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2'],
 		['/rootfile.php', elgg.config.wwwroot + 'rootfile.php'],
-		['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2'],
+		['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2']
 
 	].forEach(function(args) {
 		assertEquals(args[1], elgg.normalize_url(args[0]));
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 13ec83c04..99d050505 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -47,10 +47,10 @@ elgg.walled_garden.load = function(view) {
 				$(id).find('input.elgg-button-submit').after('<?php echo $cancel_button; ?>');
 				$('#elgg-walledgarden-login').fadeToggle();
 				$(id).fadeToggle();
-			},
+			}
 		});
 		event.preventDefault();
-    };
+	};
 };
 
 elgg.register_hook_handler('init', 'system', elgg.walled_garden.init);
\ No newline at end of file
-- 
cgit v1.2.3


From 1965e4d3642e3e8bcf53c83a85aa79765541a50e Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Mon, 26 Nov 2012 16:28:07 -0500
Subject: JS views: enable syntax highlighting and add missing semicolons

---
 views/default/js/admin.php           | 11 ++++++-----
 views/default/js/elgg.php            |  1 +
 views/default/js/initialize_elgg.php |  1 +
 views/default/js/lightbox.php        |  1 +
 views/default/js/walled_garden.php   |  1 +
 5 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'views')

diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index 5cefba512..e8aa0d2ed 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -4,8 +4,9 @@
  *
  * @since 1.8
  */
+
+if (0) { ?><script><?php }
 ?>
-//<script>
 elgg.provide('elgg.admin');
 
 elgg.admin.init = function () {
@@ -47,7 +48,7 @@ elgg.admin.init = function () {
 
 	// admin notices delete ajax
 	$('a.elgg-admin-notice').click(elgg.admin.deleteNotice);
-}
+};
 
 /**
  * Save the plugin order after a move event.
@@ -88,7 +89,7 @@ elgg.admin.editProfileField = function(value, settings) {
 
 	elgg.action('profile/fields/edit', data);
 	return value;
-}
+};
 
 /**
  * Save the plugin profile order after a move event.
@@ -104,7 +105,7 @@ elgg.admin.moveProfileField = function(e, ui) {
 	elgg.action('profile/fields/reorder', {
 		fieldorder: orderStr
 	});
-}
+};
 
 /**
  * Fires the ajax action to delete the admin notice then hides the notice.
@@ -120,6 +121,6 @@ elgg.admin.deleteNotice = function(e) {
 			$container.slideUp('medium');
 		}
 	});
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.admin.init, 1000);
\ No newline at end of file
diff --git a/views/default/js/elgg.php b/views/default/js/elgg.php
index 6460e93d6..b82d98ce4 100644
--- a/views/default/js/elgg.php
+++ b/views/default/js/elgg.php
@@ -50,6 +50,7 @@ foreach ($libs as $file) {
 /**
  * Set some values that are cacheable
  */
+if (0) { ?><script><?php }
 ?>
 
 elgg.version = '<?php echo get_version(); ?>';
diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index f8234f84f..b45c33463 100644
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -3,6 +3,7 @@
  * Initialize Elgg's js lib with the uncacheable data
  */
 
+if (0) { ?><script><?php }
 ?>
 /**
  * Don't want to cache these -- they could change for every request
diff --git a/views/default/js/lightbox.php b/views/default/js/lightbox.php
index c45d46098..d2bceaf90 100644
--- a/views/default/js/lightbox.php
+++ b/views/default/js/lightbox.php
@@ -16,6 +16,7 @@
  * @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
  */
 
+if (0) { ?><script><?php }
 ?>
 
 /**
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 99d050505..7a482fe23 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -12,6 +12,7 @@ $cancel_button = elgg_view('input/button', array(
 ));
 $cancel_button = trim($cancel_button);
 
+if (0) { ?><script><?php }
 ?>
 
 elgg.provide('elgg.walled_garden');
-- 
cgit v1.2.3


From 04e73aa6428eb792bedbbd616891de52eed3dcbf Mon Sep 17 00:00:00 2001
From: Krzysztof Różalski <cristo.rabani@gmail.com>
Date: Wed, 28 Nov 2012 00:09:05 +0100
Subject: Fixes #4935 - Adds admin listing in admin panel

---
 engine/lib/admin.php                 |  5 +++--
 languages/en.php                     |  2 ++
 views/default/admin/users/admins.php | 12 ++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 views/default/admin/users/admins.php

(limited to 'views')

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index b65d98c95..3f23f079c 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -268,8 +268,9 @@ function admin_init() {
 	// users
 	elgg_register_admin_menu_item('administer', 'users', null, 20);
 	elgg_register_admin_menu_item('administer', 'online', 'users', 10);
-	elgg_register_admin_menu_item('administer', 'newest', 'users', 20);
-	elgg_register_admin_menu_item('administer', 'add', 'users', 30);
+	elgg_register_admin_menu_item('administer', 'admins', 'users', 20);
+	elgg_register_admin_menu_item('administer', 'newest', 'users', 30);
+	elgg_register_admin_menu_item('administer', 'add', 'users', 40);
 
 	// configure
 	// plugins
diff --git a/languages/en.php b/languages/en.php
index 62b35dd81..2b5ba00fd 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -582,6 +582,7 @@ $english = array(
 	'admin:users' => "Users",
 	'admin:users:online' => 'Currently Online',
 	'admin:users:newest' => 'Newest',
+	'admin:users:admins' => 'Administrators',
 	'admin:users:add' => 'Add New User',
 	'admin:users:description' => "This admin panel allows you to control user settings for your site. Choose an option below to get started.",
 	'admin:users:adduser:label' => "Click here to add a new user...",
@@ -733,6 +734,7 @@ $english = array(
 	'admin:statistics:label:numusers' => "Number of users",
 	'admin:statistics:label:numonline' => "Number of users online",
 	'admin:statistics:label:onlineusers' => "Users online now",
+	'admin:statistics:label:admins'=>"Admins",
 	'admin:statistics:label:version' => "Elgg version",
 	'admin:statistics:label:version:release' => "Release",
 	'admin:statistics:label:version:version' => "Version",
diff --git a/views/default/admin/users/admins.php b/views/default/admin/users/admins.php
new file mode 100644
index 000000000..9b175d437
--- /dev/null
+++ b/views/default/admin/users/admins.php
@@ -0,0 +1,12 @@
+<?php
+$admins = elgg_list_entities(array(), 'elgg_get_admins');
+	
+?>
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:statistics:label:admins'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $admins; ?>
+	</div>
+</div>
-- 
cgit v1.2.3