From 710b17aa37dd5c90db695219defdfef7a889f29a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 14 Sep 2011 21:09:48 -0400
Subject: Fixes #3681 fixed Utilities menu collisions in admin section and
 added documentation about registering more than one menu item with the same
 name to a menu

---
 mod/reportedcontent/languages/en.php                        |  2 +-
 mod/reportedcontent/start.php                               |  2 +-
 .../default/admin/administer_utilities/reportedcontent.php  | 13 +++++++++++++
 .../views/default/admin/utilities/reportedcontent.php       | 13 -------------
 4 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
 delete mode 100644 mod/reportedcontent/views/default/admin/utilities/reportedcontent.php

(limited to 'mod/reportedcontent')

diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index c047644e3..c2e197879 100644
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -8,7 +8,7 @@
 $english = array(
 
 	'item:object:reported_content' => 'Reported items',
-	'admin:utilities:reportedcontent' => 'Reported content',
+	'admin:administer_utilities:reportedcontent' => 'Reported content',
 	'reportedcontent' => 'Reported content',
 	'reportedcontent:this' => 'Report this',
 	'reportedcontent:this:tooltip' => 'Report this page to an administrator',
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index 87b4b3c7b..66a1248d9 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -39,7 +39,7 @@ function reportedcontent_init() {
 
 	// Add admin menu item
 	// @todo Might want to move this to a 'feedback' section. something other than utils
-	elgg_register_admin_menu_item('administer', 'reportedcontent', 'utilities');
+	elgg_register_admin_menu_item('administer', 'reportedcontent', 'administer_utilities');
 
 	elgg_register_widget_type(
 			'reportedcontent',
diff --git a/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
new file mode 100644
index 000000000..32f108312
--- /dev/null
+++ b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Elgg Reported content admin page
+ *
+ * @package ElggReportedContent
+ */
+
+$list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
+if (!$list) {
+	$list = '<p class="mtm">' . elgg_echo('reportedcontent:none') . '</p>';
+}
+
+echo $list;
\ No newline at end of file
diff --git a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php
deleted file mode 100644
index 32f108312..000000000
--- a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg Reported content admin page
- *
- * @package ElggReportedContent
- */
-
-$list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
-if (!$list) {
-	$list = '<p class="mtm">' . elgg_echo('reportedcontent:none') . '</p>';
-}
-
-echo $list;
\ No newline at end of file
-- 
cgit v1.2.3


From 6074142b6fbcf8834e4a9b1fccdbdb13ede7ab00 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 18:39:27 -0400
Subject: Fixes #3809 updated admin buttons css

---
 .../views/default/forms/logbrowser/refine.php      | 53 ++++++++++++++++++++++
 .../views/default/object/reported_content.php      |  2 +-
 .../views/default/reportedcontent/admin_css.php    |  2 +-
 views/default/css/admin.php                        | 35 ++++++++------
 views/default/forms/admin/plugins/change_state.php |  4 +-
 views/default/forms/admin/plugins/filter.php       |  2 +
 views/default/forms/admin/plugins/sort.php         |  2 +
 7 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 mod/logbrowser/views/default/forms/logbrowser/refine.php

(limited to 'mod/reportedcontent')

diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
new file mode 100644
index 000000000..ff3f48b03
--- /dev/null
+++ b/mod/logbrowser/views/default/forms/logbrowser/refine.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Form body for refining the log browser search.
+ * Look for a particular person or in a time window.
+ *
+ * @uses $vars['user_guid']
+ * @uses $vars['timelower']
+ * @uses $vars['timeupper']
+ */
+
+if (isset($vars['timelower'])) {
+	$lowerval = date('r',$vars['timelower']);
+} else {
+	$lowerval = "";
+}
+if (isset($vars['timeupper'])) {
+	$upperval = date('r',$vars['timeupper']);
+} else {
+	$upperval = "";
+}
+if (isset($vars['user_guid'])) {
+	if ($user = get_entity($vars['user_guid'])) {
+		$userval = $user->username;
+	}
+} else {
+	$userval = "";
+}
+
+
+$form = "<div>" . elgg_echo('logbrowser:user');
+$form .= elgg_view('input/text', array(
+	'name' => 'search_username',
+	'value' => $userval,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:starttime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timelower',
+	'value' => $lowerval,
+)) . "</div>";
+
+$form .= "<div>" . elgg_echo('logbrowser:endtime');
+$form .= elgg_view('input/text', array(
+	'name' => 'timeupper',
+	'value' => $upperval,
+))  . "</div>";
+$form .= '<div class="elgg-foot">';
+$form .= elgg_view('input/submit', array(
+	'value' => elgg_echo('search'),
+));
+$form .= '</div>';
+
+echo $form;
diff --git a/mod/reportedcontent/views/default/object/reported_content.php b/mod/reportedcontent/views/default/object/reported_content.php
index 6bcbf6e5d..b0176c11f 100644
--- a/mod/reportedcontent/views/default/object/reported_content.php
+++ b/mod/reportedcontent/views/default/object/reported_content.php
@@ -29,7 +29,7 @@ if ($report->state == 'archived') {
 			'href' => $archive_url,
 			'text' => elgg_echo('reportedcontent:archive'),
 			'is_action' => true,
-			'class' => 'elgg-button elgg-button-action',
+			'class' => 'elgg-button elgg-button-action mrm',
 		);
 		echo elgg_view('output/url', $params);
 	}
diff --git a/mod/reportedcontent/views/default/reportedcontent/admin_css.php b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
index 2eba964a1..1ed240f3b 100644
--- a/mod/reportedcontent/views/default/reportedcontent/admin_css.php
+++ b/mod/reportedcontent/views/default/reportedcontent/admin_css.php
@@ -28,7 +28,7 @@
 }
 .reported-content .controls {
 	float: right;
-	margin: 0 0 0 10px;
+	margin: 5px 0 0 10px;
 }
 .report-details {
 	background-color: white;
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index d6f058eef..e9e489fcb 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -448,45 +448,54 @@ textarea {
 .elgg-input-thin {
 	width: 400px;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
+
+.elgg-button {
 	font-size: 14px;
 	font-weight: bold;
-	color: white;
 	text-decoration: none;
-	background-color: #333;
-	border-color: #333;
-	
+
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 
-	display: inline-block;
 	width: auto;
 	padding: 2px 4px;
-	margin: 10px 5px 10px 0;
 	cursor: pointer;
 	outline: none;
 }
-input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover {
+a.elgg-button {
+	padding: 3px 6px;
+}
+
+.elgg-button-submit,
+.elgg-button-action {
+	color: white;
+	border: 1px solid #333;
+	background-color: #333;
+	text-shadow: 1px 1px 0px black;
+}
+.elgg-button-submit:hover,
+.elgg-button-action:hover {
 	color: white;
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
-	padding: 4px 8px;
+.elgg-button-submit.elgg-state-disabled,
+.elgg-button-action.elgg-state-disabled {
+	color: #999;
+	cursor: default;
 }
+
 .elgg-button-cancel {
 	color: #333;
 	background-color: #999;
+	border: 1px solid #999;
 }
 .elgg-button-cancel:hover {
 	color: #222;
 	background-color: #666;
 	text-decoration: none;
 }
-.elgg-button-action.elgg-state-disabled {
-	background-color: #aaa;
-}
 
 /* **************************************
      DATE PICKER
diff --git a/views/default/forms/admin/plugins/change_state.php b/views/default/forms/admin/plugins/change_state.php
index ba5d873e7..730c8ff32 100644
--- a/views/default/forms/admin/plugins/change_state.php
+++ b/views/default/forms/admin/plugins/change_state.php
@@ -9,6 +9,7 @@
 $guids = elgg_extract('guids', $vars, array());
 $guids = implode(',', $guids);
 
+echo '<div>';
 echo elgg_view('input/hidden', array(
 	'name' => 'guids',
 	'value' => $guids,
@@ -16,5 +17,6 @@ echo elgg_view('input/hidden', array(
 
 echo elgg_view('input/submit', array(
 	'value' => elgg_echo("admin:plugins:{$vars['action']}_all"),
-	'class' => 'elgg-button elgg-button-action'
+	'class' => 'elgg-button elgg-button-action mrm'
 ));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/filter.php b/views/default/forms/admin/plugins/filter.php
index d00906e6a..fd1b618bc 100644
--- a/views/default/forms/admin/plugins/filter.php
+++ b/views/default/forms/admin/plugins/filter.php
@@ -7,6 +7,7 @@
  * @uses $vvars['sort']
  */
 
+echo '<div>';
 echo elgg_view('input/dropdown', array(
 	'name' => 'category',
 	'options_values' => $vars['category_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
 	'value' => elgg_echo('filter'),
 	'class' => 'elgg-button elgg-button-action',
 ));
+echo '</div>';
diff --git a/views/default/forms/admin/plugins/sort.php b/views/default/forms/admin/plugins/sort.php
index 284e085e6..7f2246bad 100644
--- a/views/default/forms/admin/plugins/sort.php
+++ b/views/default/forms/admin/plugins/sort.php
@@ -7,6 +7,7 @@
  * @uses $vars['category']
  */
 
+echo '<div class="mtm">';
 echo elgg_view('input/dropdown', array(
 	'name' => 'sort',
 	'options_values' => $vars['sort_options'],
@@ -22,3 +23,4 @@ echo elgg_view('input/submit', array(
 	'value' => elgg_echo('sort'),
 	'class' => 'elgg-button elgg-button-action'
 ));
+echo '</div>';
-- 
cgit v1.2.3