Fixes #3809 updated admin buttons css

diff --git a/mod/logbrowser/views/default/forms/logbrowser/refine.php b/mod/logbrowser/views/default/forms/logbrowser/refine.php
new file mode 100644 (file)
index 0000000..ff3f48b
--- /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 6bcbf6e5d7747426acd6fd70d1eda4bb4b199482..b0176c11f1146a1bfab9f3f182a4e6da09dd2385 100644 (file)
--- 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 2eba964a1f45259be073fc6eb6dd49ca541f3b39..1ed240f3bb8bad0de64d22cfe3a8e352fcb78208 100644 (file)
--- 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 d6f058eef88e51d71c4571122162d3f492c52b4f..e9e489fcb55d8d5d3f4c38645df49df425433e4c 100644 (file)
--- 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 ba5d873e720450e8e81e9cd8afef44ffbb008e91..730c8ff32b52cec36f4ed505412e4b89240afff2 100644 (file)
--- 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 d00906e6a9ad2d1d6084c5beb2eb213a3c2ae234..fd1b618bc0b3e9b91153aeae5d6173a06a169107 100644 (file)
--- 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 284e085e6a2d0bdcf2e677e54b14688b982ccab2..7f2246bada01593897dc085ba1c06a9299d978d3 100644 (file)
--- 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>';