From 96b7b5e8d0c32aa09cc8d1b9fec66c68d239f92d Mon Sep 17 00:00:00 2001 From: Swen Date: Mon, 14 Jan 2013 21:12:40 +0100 Subject: [PATCH 1/4] Removed unnecessary return statement --- src/node/db/PadManager.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js index 8cd69a83..76b2db84 100644 --- a/src/node/db/PadManager.js +++ b/src/node/db/PadManager.js @@ -56,7 +56,6 @@ var padList = { }); } }); - return this; }, /** * Returns all pads in alphabetical order as array. From 80333d8e0a60017b5625ac885ff66a41d5ef01b8 Mon Sep 17 00:00:00 2001 From: spcsser Date: Sun, 27 Jan 2013 23:02:27 +0100 Subject: [PATCH 2/4] Added ability to add menu entries for admin pages. --- src/static/css/admin.css | 1 + src/templates/admin/index.html | 5 +++-- src/templates/admin/plugins-info.html | 10 +++++++--- src/templates/admin/plugins.html | 13 ++++++++----- src/templates/admin/settings.html | 10 +++++++--- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 3a729151..9ea02744 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -42,6 +42,7 @@ div.innerwrapper { border-radius: 0 0 7px 7px; margin-left:250px; min-width:400px; + width:100%; } #wrapper { diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 16ea8427..8827f195 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -9,12 +9,13 @@
-

Etherpad lite

+

Etherpad lite

+ <% e.begin_block("adminMenu"); %>
  • Plugin manager
  • Settings
  • Troubleshooting information
    • + <% e.end_block(); %>
    -
    diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 605b23d3..648e7d6d 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -12,9 +12,13 @@

    Etherpad lite

    -
  • Plugin manager
    • -
  • Settings
    • -
  • Troubleshooting information
    • +
    diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index a85db557..bfe535e7 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -19,11 +19,14 @@ <% } %>
    -

    Etherpad lite

    -
  • Plugin manager
    • -
  • Settings
    • -
  • Troubleshooting information
    • - +

    Etherpad lite

    +
      
    diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html index be262f24..0fb1c9ae 100644 --- a/src/templates/admin/settings.html +++ b/src/templates/admin/settings.html @@ -24,9 +24,13 @@

    Etherpad lite

    -
  • Plugin manager
    • -
  • Settings
    • -
  • Troubleshooting information
    • +
    From 7f5579c2ed069d502af8b6c2e7ef2fff479417bf Mon Sep 17 00:00:00 2001 From: Swen Date: Wed, 30 Jan 2013 20:21:21 +0100 Subject: [PATCH 3/4] Reverted change --- src/node/db/PadManager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js index c3d86224..5e0af464 100644 --- a/src/node/db/PadManager.js +++ b/src/node/db/PadManager.js @@ -56,6 +56,7 @@ var padList = { }); } }); + return this; }, /** * Returns all pads in alphabetical order as array. From 360d5c150be96f8532d15eada1a49392dd2c0dbb Mon Sep 17 00:00:00 2001 From: Swen Date: Wed, 30 Jan 2013 20:24:48 +0100 Subject: [PATCH 4/4] Update html code to proper validate --- src/templates/admin/index.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html index 8827f195..0e5c16ed 100644 --- a/src/templates/admin/index.html +++ b/src/templates/admin/index.html @@ -10,11 +10,13 @@

    Etherpad lite

    +