From ef0a6ce5ff5e1f32f819b6ebab07de01427e0179 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 17:39:08 +0100 Subject: [PATCH 01/11] Remove top-border --- src/static/css/admin.css | 7 ------- src/templates/admin/index.html | 1 - src/templates/admin/plugins-info.html | 1 - src/templates/admin/plugins.html | 1 - src/templates/admin/settings.html | 2 -- 5 files changed, 12 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 9ea02744..db4def2d 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -9,13 +9,6 @@ body { background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed; } -#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); diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 0e5c16ed..f8ec0e89 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -19,6 +19,5 @@ -
diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 648e7d6d..8152209c 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -38,6 +38,5 @@ -
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index bfe535e7..2306eff6 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -92,6 +92,5 @@ -
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 0fb1c9ae..650c0bef 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -42,7 +42,5 @@
- -
From dd29096ad71e70c3b2c15d807a4ff6872d572320 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 17:47:52 +0100 Subject: [PATCH 02/11] Normalize view-ports --- src/templates/admin/index.html | 2 +- src/templates/admin/plugins-info.html | 2 +- src/templates/admin/plugins.html | 2 +- src/templates/admin/settings.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index f8ec0e89..8412ca1c 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -1,7 +1,7 @@ Admin Dashboard - Etherpad lite - + diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 8152209c..b833063d 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -5,7 +5,7 @@ Plugin information - Etherpad lite - + diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 2306eff6..27cd9ca5 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,7 +1,7 @@ Plugin manager - Etherpad lite - + diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 650c0bef..9c195df5 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -1,7 +1,7 @@ Settings - Etherpad lite - + From b04e99bddc9384d3683075a39309fab817e16065 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 17:54:39 +0100 Subject: [PATCH 03/11] Tweak admin-UI --- src/static/css/admin.css | 141 ++++++++++++++++++++++++++++++--------- 1 file changed, 108 insertions(+), 33 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index db4def2d..c35aca31 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -1,59 +1,59 @@ +html, body { + height: 100%; + box-sizing: border-box; +} + body { margin: 0; color: #333; font: 14px helvetica, sans-serif; - background: #ddd; - background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed; - 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; + background: #eee; } 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; + height: 100%; + padding: 15px; + width: 220px; + border-right: 1px solid #ccc; + position: fixed; +} + +div.menu ul { + padding: 0; } div.menu li { list-style: none; margin-left: 3px; - line-height: 1.6 + line-height: 3; + border-top: 1px solid #ccc; +} + +div.menu li:last-child { + border-bottom: 1px solid #ccc; } div.innerwrapper { - display: block; - float: right; - opacity: 0.9; padding: 15px; - max-width: 860px; - border-radius: 0 0 7px 7px; - margin-left:250px; - min-width:400px; - width:100%; + padding-left: 265px; } #wrapper { background: none repeat scroll 0px 0px #FFFFFF; - box-shadow: 0px 1px 8px rgba(0, 0, 0, 0.3); + box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2); margin: auto; max-width: 1150px; min-height: 100%; - overflow: auto; - padding-left: 15px; - opacity: .9; } + h1 { font-size: 29px; } + h2 { font-size: 24px; } + .separator { margin: 10px 0; height: 1px; @@ -63,37 +63,45 @@ h2 { background: -ms-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff); background: -o-linear-gradient(left, #fff, #aaa 20%, #aaa 80%, #fff); } + form { margin-bottom: 0; } + #inner { width: 300px; margin: 0 auto; } + input { font-weight: bold; font-size: 15px; } + input[type="button"] { padding: 4px 6px; margin: 0; } + table input[type="button"] { float: right; width: 100px; } + input[type="text"] { border-radius: 3px; box-sizing: border-box; -moz-box-sizing: border-box; padding: 10px; - *padding: 0; /* IE7 hack */ + *padding: 0; + /* IE7 hack */ width: 100%; outline: none; border: 1px solid #ddd; margin: 0 0 5px 0; max-width: 500px; } + table { border: 1px solid #ddd; border-radius: 3px; @@ -101,34 +109,101 @@ table { width: 100%; margin: 20px 0; } + table thead tr { background: #eee; } + td, th { padding: 5px; } + .template { display: none; } + #progress { position: absolute; bottom: 50px; } + .settings { - margin-top:10px; - width:100%; - min-height:600px; + outline: none; + width: 100%; + min-height: 500px; } -#response{ - display:inline; + +#response { + display: inline; } a:link, a:visited, a:hover, a:focus { color: #333333; text-decoration: none; - border-bottom: #333333 1px dotted; } a:focus, a:hover { border-bottom: #333333 1px solid; } + +@media (max-width: 720px) { + div.innerwrapper { + padding: 0 15px 15px 15px; + } + + div.menu { + padding: 1px 15px 0 15px; + position: static; + height: auto; + border-right: none; + width: auto; + } + + table { + border: none; + } + + table, thead, tbody, td, tr { + display: block; + } + + thead tr { + display: none; + } + + tr { + border: 1px solid #ccc; + margin-bottom: 5px; + border-radius: 3px; + } + + td { + border: none; + border-bottom: 1px solid #eee; + position: relative; + padding-left: 50%; + white-space: normal; + text-align: left; + } + + td.name { + word-wrap: break-word; + } + + td:before { + padding-right: 10px; + white-space: nowrap; + float: left; + margin-left: -100%; + font-weight: bold; + content: attr(data-label); + } + + td:last-child { + border-bottom: none; + } + + table input[type="button"] { + float: none; + } +} \ No newline at end of file From 34fd7726bda0df6cc84774558e26b58d60a25fcd Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 17:55:11 +0100 Subject: [PATCH 04/11] Fix :admin/index links --- src/templates/admin/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 8412ca1c..77d18263 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -12,9 +12,9 @@

Etherpad lite

From d2409288be75b3027de3210be92dc8e5f0c52ef1 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 20:15:41 +0100 Subject: [PATCH 05/11] Add data-title for responsive tables --- src/templates/admin/plugins.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 27cd9ca5..92ec0a16 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -43,9 +43,9 @@ - - - + + + @@ -74,9 +74,9 @@ - - - + + + From 52ff28dea03a342c13d408d1c588ccdc38b56b68 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 20:34:12 +0100 Subject: [PATCH 06/11] Fix data attribute --- src/templates/admin/plugins.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 92ec0a16..51cebafb 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -43,9 +43,9 @@ - - - + + + @@ -74,9 +74,9 @@ - - - + + + From 21e1422be6632f2cf407dba916f05a30110dc532 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 20:42:47 +0100 Subject: [PATCH 07/11] Drop 'lite' occurrences in /admin/* --- src/templates/admin/index.html | 4 ++-- src/templates/admin/plugins-info.html | 4 ++-- src/templates/admin/plugins.html | 4 ++-- src/templates/admin/settings.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 77d18263..f1a74afa 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -1,6 +1,6 @@ - Admin Dashboard - Etherpad lite + Admin Dashboard - Etherpad @@ -9,7 +9,7 @@
-

Etherpad lite

+

Etherpad

    <% e.begin_block("adminMenu"); %>
  • Plugin manager
    • diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index b833063d..96d2fa60 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -4,14 +4,14 @@ - Plugin information - Etherpad lite + Plugin information - Etherpad
    -

    Etherpad lite

    +

    Etherpad

      <% e.begin_block("adminMenu"); %>
    • Plugin manager
      • diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 51cebafb..3c0df585 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,6 +1,6 @@ - Plugin manager - Etherpad lite + Plugin manager - Etherpad @@ -19,7 +19,7 @@ <% } %>
      -

      Etherpad lite

      +

      Etherpad

        <% e.begin_block("adminMenu"); %>
      • Plugin manager
        • diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 9c195df5..d7f13e3a 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -1,6 +1,6 @@ - Settings - Etherpad lite + Settings - Etherpad @@ -23,7 +23,7 @@
        -

        Etherpad lite

        +

        Etherpad

          <% e.begin_block("adminMenu"); %>
        • Plugin manager
          • From ad54369bf14beb776a462aec19eb1d7b06f29b5c Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 20:57:41 +0100 Subject: [PATCH 08/11] Add doctype --- src/templates/admin/index.html | 1 + src/templates/admin/plugins-info.html | 2 +- src/templates/admin/plugins.html | 1 + src/templates/admin/settings.html | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index f1a74afa..48776515 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -1,3 +1,4 @@ + Admin Dashboard - Etherpad diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 96d2fa60..d1ca9a11 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -1,7 +1,7 @@ <% var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins"); %> - + Plugin information - Etherpad diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 3c0df585..f384cb1b 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,3 +1,4 @@ + Plugin manager - Etherpad diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index d7f13e3a..759752ea 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -1,3 +1,4 @@ + Settings - Etherpad From 40734e677616a18cc9bc126755822fe7d1be6b9b Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 20:58:57 +0100 Subject: [PATCH 09/11] Fix table CSS --- src/static/css/admin.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index c35aca31..33ec5710 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -191,10 +191,12 @@ a:focus, a:hover { } td:before { + position: absolute; + top: 6px; + left: 6px; + text-align: left; padding-right: 10px; white-space: nowrap; - float: left; - margin-left: -100%; font-weight: bold; content: attr(data-label); } From 8fb8f0d3b6ee310dada34bc957e019e5f48f9629 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 21:22:23 +0100 Subject: [PATCH 10/11] Change settings layout --- src/static/css/admin.css | 5 +++++ src/templates/admin/settings.html | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 33ec5710..f60548fc 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -146,6 +146,11 @@ a:focus, a:hover { border-bottom: #333333 1px solid; } +pre { + white-space: pre-wrap; + word-wrap: break-word; +} + @media (max-width: 720px) { div.innerwrapper { padding: 0 15px 15px 15px; diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index 759752ea..4476b733 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -35,12 +35,14 @@
        - Example production settings template - Example development settings template +

        Current configuration

        +
        + Example production settings template + Example development settings template
      From 8a6b3c90e2844ece13c7920673a1355fe25cc8f1 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 9 Feb 2013 21:29:11 +0100 Subject: [PATCH 11/11] Fix loader styling --- src/static/css/admin.css | 4 ++++ src/templates/admin/plugins.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index f60548fc..b6823842 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -127,6 +127,10 @@ td, th { bottom: 50px; } +#progress img { + vertical-align: top; +} + .settings { outline: none; width: 100%; diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index f384cb1b..7c2a7abf 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -28,7 +28,7 @@
    • Troubleshooting information
      • <% e.end_block(); %>
    -
      
    +