From 1162b2020d5f74db4ee87d903b0bcb398b3b3a14 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 24 Jun 2013 17:18:58 -0400 Subject: [PATCH] categories admin basic features completed - name, description, icon selector + background color --- public/css/admin.less | 12 +++---- public/templates/admin/categories.tpl | 47 +++++++++++++++++---------- src/admin/categories.js | 41 +++++++++++++++++++++-- src/websockets.js | 9 ++++- 4 files changed, 81 insertions(+), 28 deletions(-) diff --git a/public/css/admin.less b/public/css/admin.less index c44abae0ef..61ed7755e1 100644 --- a/public/css/admin.less +++ b/public/css/admin.less @@ -9,18 +9,12 @@ width: 800px; } - .admin-categories { - form { - margin: 0 0 0px; - } - } - .entry-row { border-radius: 10px; margin-bottom: 10px; padding: 10px; cursor: move; - width: 555px; + width: 695px; } input.description { @@ -41,6 +35,10 @@ border-radius: 5px; margin-top: -8px; } + + .category_description { + width: 300px; + } select { border: 0; diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl index 9762ec6b33..0699a6d1a7 100644 --- a/public/templates/admin/categories.tpl +++ b/public/templates/admin/categories.tpl @@ -15,23 +15,17 @@
  • - +
    - - + - - - - - +
  • @@ -45,10 +39,18 @@