6 files changed, 22 insertions, 31 deletions
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 3e2a01e10..4299ab220 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -107,7 +107,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
       print $this->locale_xhtml('intro');
 
-      ptln('<div class="acladmin">');
+      ptln('<div id="acl__manager">');
       ptln('<table class="inline">');
 
       //new
@@ -315,7 +315,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
 
       ptln(     $this->admin_acl_html_checkboxes(0,false),8);
 
-      ptln('    <input type="submit" class="edit" value="'.$lang['btn_save'].'" />',4);
+      ptln('    <input type="submit" class="button" value="'.$lang['btn_save'].'" />',4);
       ptln('  </div></form>');
       ptln('</td>',4);
       ptln('</tr>',2);
@@ -379,7 +379,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         ptln('    <input type="hidden" name="acl_type" value="'.$type.'" />',4);
         ptln('    <input type="hidden" name="acl_user"  value="'.formtext($name).'" />',4);
         ptln(     $this->admin_acl_html_checkboxes($conf['perm'],$ispage),8);
-        ptln('    <input type="submit" class="edit" value="'.$lang['btn_update'].'" />',4);
+        ptln('    <input type="submit" class="button" value="'.$lang['btn_update'].'" />',4);
         ptln('  </div></form>');
         ptln('</td>',4);
 
@@ -396,7 +396,7 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
         ptln('    <input type="hidden" name="acl_scope" value="'.formtext($id).'" />',4);
         ptln('    <input type="hidden" name="acl_type" value="'.$type.'" />',4);
         ptln('    <input type="hidden" name="acl_user"  value="'.formtext($name).'" />',4);
-        ptln('    <input type="submit" class="edit" value="'.$lang['btn_delete'].'" />',4);
+        ptln('    <input type="submit" class="button" value="'.$lang['btn_delete'].'" />',4);
         ptln('  </div></form>',4);
         ptln('</td>',4);
 
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index 3b5f00b33..b9972718b 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -1,10 +1,9 @@
-div.dokuwiki div.acladmin label {
+#acl__manager label {
   text-align: left;
   font-weight: normal;
   display: inline;
 }
-
-div.dokuwiki div.acladmin table{
+#acl__manager table {
   margin-left: 10%;
   width: 80%;
 }
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 5ed402682..5e5645feb 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -158,7 +158,8 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         print $this->locale_xhtml('intro');
         print $this->locale_xhtml('list');
 
-        ptln("<div class=\"level2\" style=\"margin-bottom: 2em;\">");
+        ptln("<div id=\"user__manager\">");
+        ptln("<div class=\"level2\">");
         
         if ($this->_user_total > 0) {
           ptln("<p>".sprintf($this->lang['summary'],$this->_start+1,$this->_last,$this->_user_total,$this->_auth->getUserCount())."</p>");
@@ -241,6 +242,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
           ptln("  </div>");
           ptln("</div>");
         }
+        ptln("</div>");
     }
 
 
diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index 76d4f918a..ce4542d86 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -1,16 +1,17 @@
 /* User Manager specific styles */
-tr.disabled {
+#user__manager tr.disabled {
   color: #6f6f6f;
   background: #e4e4e4;
 }
-tr.user_info {
+#user__manager tr.user_info {
   vertical-align: top;
 }
-div.edit_user {
+#user__manager div.edit_user {
   width: 46%;
   float: left;
+  margin-top: 2em;
 }
-input.button[disabled] { 
+#user__manager input.button[disabled] {
   color: #ccc!important;
   border-color: #ccc!important;
 }
diff --git a/lib/styles/style.css b/lib/styles/style.css
index 283fee14d..16530a1aa 100644
--- a/lib/styles/style.css
+++ b/lib/styles/style.css
@@ -39,22 +39,23 @@ div.success{
 }
 
 /* image alignment */
-
-div.dokuwiki .medialeft {
+.medialeft {
   float: left;
 }
-
-div.dokuwiki .mediaright {
+.mediaright {
   float: right;
 }
-
-div.dokuwiki .mediacenter {
+.mediacenter {
   display: block;
   margin-left: auto;
   margin-right: auto;
 }
 
-div.dokuwiki em.u {
+.leftalign {text-align: left;}
+.centeralign {text-align: center;}
+.rightalign {text-align: right;}
+
+em.u {
   font-style: normal;
   text-decoration: underline;
 }
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 32e0987e1..4b98c8152 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -479,18 +479,6 @@ div.dokuwiki table.inline td {
   border: 1px solid __dark__;
 }
 
-div.dokuwiki .leftalign{
-  text-align: left;
-}
-
-div.dokuwiki .centeralign{
-  text-align: center;
-}
-
-div.dokuwiki .rightalign{
-  text-align: right;
-}
-
 /* ---------- table of contents ------------------- */
 
 div.dokuwiki div.toc {