diff --git a/src/static/css/admin.css b/src/static/css/admin.css index d82da6aa..cc3e4934 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -7,18 +7,51 @@ body { background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed; background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed; background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed; - border-top: 8px solid rgba(51,51,51,.8); } -#wrapper { - margin-top: 160px; + +#topborder { + border-top: 8px solid rgba(51, 51, 51, 0.8); + position: fixed; + top: 0px; + width: 100%; +} + +div.menu { + background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.75); + box-shadow: 0px -4px 4px rgba(0, 0, 0, 0.3); + display: block; + float: left; + height: 100%; + padding: 15px; + position: fixed; + width: 220px; +} + +div.menu li { + list-style: none; + margin-left: 3px; + line-height: 1.6 +} + +div.innerwrapper { + display: block; + float: right; + opacity: 0.9; padding: 15px; - background: #fff; - opacity: .9; - box-shadow: 0px 1px 8px rgba(0,0,0,0.3); - max-width: 700px; - margin: auto; + width: 860px; border-radius: 0 0 7px 7px; } + +#wrapper { + background: none repeat scroll 0px 0px #FFFFFF; + box-shadow: 0px 1px 8px rgba(0, 0, 0, 0.3); + margin: auto; + max-width: 1150px; + min-height: 100%; + overflow: auto; + padding-left: 15px; + opacity: .9; +} h1 { font-size: 29px; } diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 5f1d0188..00e147c9 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -8,13 +8,14 @@
-

Etherpad Lite Admin Dashboard

-
- Install and Uninstall plugins -
-
- Modify Server and Plugin Settings + +
+
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 94f94e2a..94a20220 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -10,21 +10,30 @@
-

Etherpad Lite

-
+ -

Installed plugins

-
<%- plugins.formatPlugins().replace(", ","\n") %>
+
-

Installed parts

-
<%= plugins.formatParts() %>
+

Installed plugins

+
<%- plugins.formatPlugins().replace(", ","\n") %>
-

Installed hooks

-

Server side hooks

-
<%- plugins.formatHooks() %>
+

Installed parts

+
<%= plugins.formatParts() %>
-

Client side hooks

-
<%- plugins.formatHooks("client_hooks") %>
+

Installed hooks

+

Server side hooks

+
<%- plugins.formatHooks() %>
+ +

Client side hooks

+
<%- plugins.formatHooks("client_hooks") %>
+ +
+
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 394cf0e0..cb19977d 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -19,11 +19,14 @@ <% } %> -

Etherpad Lite

+ - Technical information on installed plugins - -
+

Installed plugins

@@ -81,6 +84,8 @@ .. of . + +

@@ -90,5 +95,7 @@

+ +
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index c4f50578..098e0aea 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -22,13 +22,23 @@ <% } %> -

Etherpad Lite Settings

- Example production settings template - Example development settings template - - - -
+ + + + +