diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 75fc02622cf423980c249263656805e902237521..b988589504988d029ff1eb03ca456f85e2d859a3 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -179,22 +179,11 @@ html.rtl div.copynotice {
text-align:left;
}
-p.seperator {
-border-style:solid;
-border-color:#AAA;
+hr {
width:100%;
-border-top-width:0;
-border-bottom-width:1px;
-border-left-width:0;
-border-right-width:0;
-padding-top:0;
-padding-bottom:0;
-margin-top:0;
-margin-bottom:0;
-text-align:left;
-}
-html.rtl p.seperator {
-text-align:right;
+border:none;
+background-color:#AAA;
+height:1px;
}
.must {
diff --git a/ihtml/themes/default/acl.tpl b/ihtml/themes/default/acl.tpl
index 05048bd4d9699e9b7448eeddcabb0108765d5efe..473fc121765e52bbc5fb144f3353c52f20ae71a2 100644
--- a/ihtml/themes/default/acl.tpl
+++ b/ihtml/themes/default/acl.tpl
@@ -28,7 +28,7 @@
{/if}
</h1>
- <p class="seperator"> </p>
+ <hr/>
<div style='padding:3px;'>
{t}Additional filter options{/t}
{if !$acl_writeable}
@@ -96,7 +96,7 @@
{if $aclType ne 'reset'}
{if $aclType ne 'role'}
{if $aclType ne 'base'}
- <p class="seperator"> </p>
+ <hr/>
<h1>{t}List of available ACL categories{/t}</h1>
{$aclList}
@@ -105,18 +105,18 @@
{/if}
{if $aclType eq 'base'}
- <p class="seperator"> </p>
+ <hr/>
<h1>{t}ACL for this object{/t}</h1>
{$aclSelector}
{/if}
{if $aclType eq 'role'}
- <p class="seperator"> </p>
+ <hr/>
<h1>{t}Available roles{/t}</h1>
{$roleSelector}
{/if}
- <p class="seperator"> </p>
+ <hr/>
<div style='text-align:right;margin-top:5px'>
{if $acl_writeable}
<input type="submit" name="submit_new_acl" value="{t}Apply{/t}">
@@ -132,7 +132,7 @@
{$aclSelector}
- <p class="seperator"> </p>
+ <hr/>
<div style='text-align:right;margin-top:5px'>
<input type="submit" name="submit_edit_acl" value="{t}Apply{/t}">
diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl
index 769e3c3a66dffe0b05a7ecb2fbb250ecfc40a1c8..fe36f22cda2bb7d6451656dcab0a4f6fdc9bf744 100644
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -9,7 +9,7 @@
{t}Remember that some properties like taken snapshots will not be copied!{/t}
{t}Or if you copy or cut an entry within FusionDirectory and delete the source object, you may get errors while pasting this object again!{/t}
- <p class='seperator'> </p>
+ <hr/>
<br>
{$AttributesToFix}
{if $SubDialog == false}
@@ -25,7 +25,7 @@
</div>
{/if}
{else}
- <p class="seperator"> </p>
+ <hr/>
<br>
<h2>{t}Operation complete{/t}</h2>
<div style="text-align:right;width:100%;">
diff --git a/ihtml/themes/default/snapshotdialog.tpl b/ihtml/themes/default/snapshotdialog.tpl
index 1160818aaada0e322fc7ae1157f6ec92895a149a..5a93672399504bed81b567e658342364b56eab0b 100644
--- a/ihtml/themes/default/snapshotdialog.tpl
+++ b/ihtml/themes/default/snapshotdialog.tpl
@@ -1,7 +1,7 @@
{if $RestoreMode}
<h2>{t}Restoring object snapshots{/t}</h2>
-<p class="seperator"> </p>
+<hr/>
<br>
{t}This procedure will restore a snapshot of the selected object. It will replace the existing object after pressing the folder icon.{/t}
<br>
@@ -11,7 +11,7 @@
<br>
{t}Don't forget to check references to other objects, for example does the selected printer still exists ?{/t}
<br>
-<p class="seperator"> </p>
+<hr/>
<br>
<table style="width:100%">
{if !$restore_deleted}
@@ -39,7 +39,7 @@
</tr>
</table>
-<p class="seperator"> </p>
+<hr/>
<div style="width:100%; text-align:right;">
<input type="submit" name="CancelSnapshot" value="{t}Cancel{/t}">
</div>
@@ -47,14 +47,14 @@
{else}
<h2>{t}Creating object snapshots{/t}</h2>
-<p class="seperator"> </p>
+<hr/>
<br>
{t}This procedure will create a snapshot of the selected object. It will be stored inside a special branch of your directory system and can be restored later on.{/t}
<br>
<br>
{t}Remember that database entries, DNS configurations and possibly created zones in server extensions will not be stored in the snapshot.{/t}
<br>
-<p class="seperator"> </p>
+<hr/>
<br>
<table style="width:100%">
<tr>
@@ -82,7 +82,7 @@
</tr>
</table>
-<p class="seperator"> </p>
+<hr/>
<div style="width:100%; text-align:right;">
<input type="submit" name="CreateSnapshot" value="{t}Continue{/t}">
diff --git a/plugins/admin/aclrole/acl_role.tpl b/plugins/admin/aclrole/acl_role.tpl
index 315599e11bd195ef0aadbfd27adafba37641641b..62315accc074931ce32cf29f9ae1b41315d958c2 100644
--- a/plugins/admin/aclrole/acl_role.tpl
+++ b/plugins/admin/aclrole/acl_role.tpl
@@ -2,7 +2,7 @@
<h1>{t}List of available ACL categories{/t}</h1>
{$aclList}
- <p class="seperator"> </p>
+ <hr/>
<div style="text-align:right;margin-top:5px">
{render acl=$gosaAclEntryACL}
<input type="submit" name="submit_new_acl" value="{msgPool type=applyButton}"/>
@@ -19,7 +19,7 @@
{$aclSelector}
{/render}
- <p class="seperator"> </p>
+ <hr/>
<div style="text-align:right;margin-top:5px">
{render acl=$gosaAclEntryACL}
<input type="submit" name="submit_edit_acl" value="{msgPool type=applyButton}"/>
diff --git a/plugins/admin/users/template.tpl b/plugins/admin/users/template.tpl
index c8ae0eb0f720a9217956b43cbc660ba005c7b1d7..b5cbdf7a17402a9f0c549c01c8ae1b0de38fc762 100644
--- a/plugins/admin/users/template.tpl
+++ b/plugins/admin/users/template.tpl
@@ -6,7 +6,7 @@
{t}Creating a new user can be assisted by using templates. Many database records will be filled automatically. Choose 'none' to skip the usage of templates.{/t}
</p>
-<p class="seperator"> </p>
+<hr/>
<br>
diff --git a/plugins/admin/users/templatize.tpl b/plugins/admin/users/templatize.tpl
index 811152a18857cb9447ded60f0853cc19ff7bf53c..1702ca12796b8ba90725918d222bd1e3aa8940fb 100644
--- a/plugins/admin/users/templatize.tpl
+++ b/plugins/admin/users/templatize.tpl
@@ -6,7 +6,7 @@
{t}Applying a template to several users will replace all user attributes defined in the template.{/t}
</p>
-<p class="seperator"> </p>
+<hr/>
<br>
{if $templates}
diff --git a/setup/setup_finish.tpl b/setup/setup_finish.tpl
index 925e31669708d4c055af33c78678fc281fbf334d..556a6dc3593339b7c79e088a9d062ab63864a83d 100644
--- a/setup/setup_finish.tpl
+++ b/setup/setup_finish.tpl
@@ -12,8 +12,8 @@
<input type='submit' name='getconf' value='{t}Download configuration{/t}'>
</p>
{if $err_msg != ""}
- <p class="seperator"> </p>
- <br>
+ <hr/>
+ <br/>
{t}Status: {/t}
<a style='color:red ; font-weight:bold '>{$err_msg}</a>
{/if}
diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 9397b46f613be88cc935e66647db83d58a17ea35..cd19c0b32ad565d06e8be39b3f9d6ce6208a953e 100644
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -55,7 +55,7 @@
</p>
- <p class='seperator'> </p>
+ <hr/>
<div style='width:100%; text-align:right; padding:5px;'>
<input type='submit' name='rootOC_dialog_cancel' value='{t}Close{/t}'>
</div>
@@ -108,7 +108,7 @@
{/if}
</p>
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding:5px;'>
<input type='submit' name='outside_groups_dialog_perform' value='{t}Apply{/t}'>
@@ -159,7 +159,7 @@
<input type='submit' name='outside_users_dialog_whats_done' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding:5px;'>
<input type='submit' name='outside_users_dialog_perform' value='{t}Apply{/t}'>
@@ -207,7 +207,7 @@
{/if}
<input type='submit' value="{t}Reload{/t}">
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding:5px;'>
<input type='submit' name='migrate_admin_user' value='{t}Apply{/t}'>
<input type='submit' name='migrate_acls_cancel' value='{t}Cancel{/t}'>
@@ -272,7 +272,7 @@
-->
</script>
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding:5px;'>
<input type='submit' name='create_admin_user' value='{t}Apply{/t}'>
<input type='submit' name='create_acls_cancel' value='{t}Cancel{/t}'>
@@ -326,7 +326,7 @@ dn: {$deps_to_migrate.$key.dn}
<input type='submit' name='deps_visible_migrate_whatsdone' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding:5px;'>
<input type='submit' name='deps_visible_migrate_migrate' value='{t}Apply{/t}'>
@@ -379,7 +379,7 @@ dn: {$users_to_migrate.$key.dn}
<input type='submit' name='users_visible_migrate_whatsdone' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding-top:5px;'>
<input type='submit' name='users_visible_migrate_migrate' value='{t}Apply{/t}'>
@@ -424,7 +424,7 @@ dn: {$users_to_migrate.$key.dn}
<input type='submit' name='device_dialog_whats_done' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding-top:5px;'>
<input type='submit' name='migrate_devices' value='{t}Apply{/t}'>
@@ -467,7 +467,7 @@ dn: {$users_to_migrate.$key.dn}
<input type='submit' name='service_dialog_whats_done' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding-top:5px;'>
<input type='submit' name='migrate_services' value='{t}Apply{/t}'>
@@ -511,7 +511,7 @@ dn: {$users_to_migrate.$key.dn}
<input type='submit' name='menu_dialog_whats_done' value='{t}Show changes{/t}'>
{/if}
- <p class='seperator'> </p>
+ <hr/>
<div style='width:99%; text-align:right; padding-top:5px;'>
<input type='submit' name='migrate_menus' value='{t}Apply{/t}'>
diff --git a/setup/setup_welcome.tpl b/setup/setup_welcome.tpl
index ba02d21db086f3684bcb711dcde604f73f4eaac9..51c7fe4f61ad5a0f24eb8a01463ebec4d276a53e 100644
--- a/setup/setup_welcome.tpl
+++ b/setup/setup_welcome.tpl
@@ -4,8 +4,9 @@
{t}This seems to be the first time you start FusionDirectory - we didn't find any configuration right now. This simple wizard intends to help you while setting it up.{/t}
</p>
- <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
- <b>{t}What will the wizard do for you?{/t}</b>
+ <hr/>
+ <p>
+ <b>{t}What will the wizard do for you?{/t}</b>
</p>
<ul>
<li>{t}Create a basic, single site configuration{/t}</li>
@@ -21,8 +22,9 @@
<li>{t}Migrate every possible LDAP setup - create backup dumps!{/t}</li>
</ul>
- <p style='border-top:1px solid #AAAAAA; padding-top:10px;'>
- <b>{t}To continue...{/t}</b>
+ <hr/>
+ <p>
+ <b>{t}To continue:{/t}</b>
</p>
<p>
{t 1=$path}For security reasons you need to authenticate for the installation by creating the file '%1', containing the current session ID on the servers local filesystem. This can be done by executing the following command:{/t}