diff --git a/GuestUserPlugin.php b/GuestUserPlugin.php index e750c4a..dcd0cf5 100644 --- a/GuestUserPlugin.php +++ b/GuestUserPlugin.php @@ -10,7 +10,6 @@ class GuestUserPlugin extends Omeka_Plugin_AbstractPlugin 'install', 'uninstall', 'define_acl', - 'public_header', 'public_head', 'admin_theme_header', 'config', @@ -120,21 +119,6 @@ public function hookAdminThemeHeader($args) public function hookPublicHead($args) { queue_css_file('guest-user'); - queue_js_file('guest-user'); - } - - public function hookPublicHeader($args) - { - $html = "
"; - $user = current_user(); - if(!$user) { - $shortCapabilities = get_option('guest_user_short_capabilities'); - if($shortCapabilities != '') { - $html .= $shortCapabilities; - } - } - $html .= "
"; - echo $html; } public function hookBeforeSaveUser($args) diff --git a/config_form.php b/config_form.php index 517eba1..67bad91 100644 --- a/config_form.php +++ b/config_form.php @@ -2,7 +2,7 @@
- +

-
- -
-
-

-

-
- -
+
-
- -
-
- -

-
- +
+
- -
+ +

-
- +
+
- +
- -
+ +

-
- +
+
@@ -68,11 +54,11 @@
- +

-
+
formCheckbox('guest_user_open', null, $options); + echo $view->formCheckbox('guest_user_open', null, $options); ?>
- - + +
- +

-
+
'checked'); } else { $options = array(); - } + } echo $view->formCheckbox('guest_user_instant_access', null, $options); ?>
@@ -110,11 +96,11 @@
- +

-
+
formCheckbox('guest_user_recaptcha', null, $options); - ?> + ?>
diff --git a/views/public/css/guest-user.css b/views/public/css/guest-user.css index 0378eb6..732630c 100644 --- a/views/public/css/guest-user.css +++ b/views/public/css/guest-user.css @@ -17,13 +17,13 @@ border-radius: 3px; font-size: 14px; margin-bottom: 20px; - padding: .5em; + padding: .5em; } .success { color: #729108; } - + .error, .alert { color: #914E33; } @@ -61,19 +61,6 @@ h2.guest-user-widget-label { text-transform: uppercase; } -div#guest-user-register-info { - background: rgba(0,0,0,0.75); - color: #fff; - position:absolute; - right: 0; - top: 40px; - font-family:Arvo, serif !important; - font-size: 12px; - width: 250px; - display: none; - padding: 3px; -} - div.guest-user-widget { border: 1px solid rgba(0,0,0,.3); margin: 0 1.5em 1.5em 0; @@ -95,5 +82,4 @@ div.guest-user-widget-odd { p.explanation { margin-top: 0px; - } \ No newline at end of file diff --git a/views/public/javascripts/guest-user.js b/views/public/javascripts/guest-user.js deleted file mode 100644 index f385df9..0000000 --- a/views/public/javascripts/guest-user.js +++ /dev/null @@ -1,4 +0,0 @@ -jQuery('document').ready(function() { - var adminBarHeight = jQuery('#admin-bar'); - jQuery('#guest-user-register-info').css('top', adminBarHeight + 'px'); -}); \ No newline at end of file