后台管理系统UI调整

server/controllers/admin/page.js

@@ -46,7 +46,6 @@ exports.index = function(req, res, next) {
         return next(err);
       }
 
-      req.breadcrumbs('页面列表');
       res.render('admin/page/index', {
         pages: pages,
         pagination: pagination
@@ -60,8 +59,6 @@ exports.create = function(req, res, next) {
   var method = req.method.toLowerCase();
 
   if ('get' === method) {
-    req.breadcrumbs('页面列表', '/admin/pages');
-    req.breadcrumbs('创建页面');
     res.render('admin/page/edit', _.extend({
       page: req.flash('body'),
       err: req.flash('err')
@@ -93,8 +90,6 @@ exports.edit = function(req, res, next) {
         return next(new NotFoundError('该页面不存在!'));
       }
 
-      req.breadcrumbs('页面列表', '/admin/pages');
-      req.breadcrumbs('编辑页面');
       res.render('admin/page/edit', {
         page: _.extend(page, req.flash('body')),
         err: req.flash('err')
@@ -110,4 +105,4 @@ exports.edit = function(req, res, next) {
       res.redirect('/admin/pages');
     });
   }
-};
+};

server/controllers/admin/topic.js

@@ -29,7 +29,6 @@ exports.index = function(req, res, next) {
     }
 
     pagination.totalCount = count;
-    req.breadcrumbs('话题列表');
     res.render('admin/topic/index', {
       topics: topics,
       pagination: pagination
@@ -71,8 +70,7 @@ exports.edit = function(req, res, next) {
       if (err) {
         return next(err);
       }
-      req.breadcrumbs('话题列表', '/admin/topics');
-      req.breadcrumbs('编辑话题');
+
       res.render('admin/topic/edit', {
         topic: _.extend(results.topic, req.flash('body')),
         tags: results.tags,
@@ -87,4 +85,4 @@ exports.edit = function(req, res, next) {
       res.redirect('/admin/topics');
     });
   }
-};
+};

server/controllers/admin/user.js

@@ -24,11 +24,10 @@ exports.index = function(req, res, next) {
       return next(err);
     }
 
-    req.breadcrumbs('用户列表');
     pagination.totalCount = count;
     res.render('admin/user/index', {
       users: users,
       pagination: pagination
     });
   });
-};
+};

server/views/admin/page/edit.jade

@@ -1,38 +1,37 @@
 extends ../layout
-block container
-  div.panel.panel-default
-    div.panel-heading
-      include ../../shared/breadcrumb
-    div.panel-body
-      include ../../shared/error_alert
+block main
+  div.admin.panel
+    div.content
       - var url = '/admin/pages/create'
       if page && page._id
         - url = '/admin/pages/' + page._id + '/edit'
-      form(role="form", method="POST", action="#{url}")#page-edit-form.form-horizontal
-        div.form-group
-          label(for="slug").col-sm-1.control-label 地址
-          div.col-sm-11.input-group
-            span.input-group-addon #{site.domain}/
-            input(type="text",
-                  name="slug",
-                  value=page ? page.slug : '')#slug.form-control
-        div.form-group
-          label(for="title").col-sm-1.control-label 标题
-          div.col-sm-11
-            input(type="text",
-                  name="title",
-                  value=page ? page.title : '')#title.form-control
-        div.form-group
-          label(for="content-editor").col-sm-1.control-label 内容
-          div.col-sm-11
-            textarea(name="content", rows="16")#content-editor.form-control
-              | !{page ? page.content : ''}
-        div.form-group
-          div.col-sm-offset-1.col-sm-11
-            input(type="hidden", name="_csrf", value="#{csrfToken}")
-            if page
-              input(type="hidden", name="id", value="#{page._id}")
-            button(type="submit", data-loading-text="正在发布...")#submit-btn.btn.btn-primary 发布
+      form(role="form", method="POST", action="#{url}")#page-edit-form.pure-form.pure-form-stacked
+        legend= page ? '编辑页面' : '新建页面'
+        if err && err.errors
+          ul
+            each error in err.errors
+              li(class=['alert', 'alert-' + (err.level || 'danger')]) #{error.message}
+        div.pure-control-group
+          label(for="slug") slug
+          input(type="text",
+                name="slug",
+                placeholder="请填写页面 slug",
+                value=page ? page.slug : '')#slug.pure-input-1-2
+          p: small #{site.domain}/页面slug
+        div.pure-control-group
+          label(for="title") 标题
+          input(type="text",
+                name="title",
+                value=page ? page.title : '')#title.pure-input-1-2
+        div.pure-control-group
+          label(for="content-editor") 内容
+          textarea(name="content", rows="13")#content-editor !{page ? page.content : ''}
+        p
+        div.pure-controls
+          input(type="hidden", name="_csrf", value="#{csrfToken}")
+          if page
+            input(type="hidden", name="id", value="#{page._id}")
+          button(type="submit", data-loading-text="正在发布...")#submit-btn.pure-button.pure-button-primary 发布
 block script
   script(type="text/javascript").
     ND.moduleTree.push({
@@ -45,4 +44,4 @@ block script
           id: 'submitButton'
         }
       ]
-    });
+    });

server/views/admin/page/index.jade

@@ -1,41 +1,40 @@
 extends ../layout
-block container
-  div#pages-page.panel.panel-default
-    div.panel-heading
-      div.pull-right
-        a(href="/admin/pages/create").btn.btn-default.btn-xs 创建页面
-      include ../../shared/breadcrumb
-    table.table.table-bordered.table-striped
-      thead
-        tr
-          th 页面地址
-          th 标题
-          th 编辑者
-          th 版本
-          th 最后编辑时间
-          th
-      tbody
-        each page in pages
+block main
+  div#pages-page.admin.panel
+    div.heading
+      a(href="/admin/pages/create").pure-button.pure-button-primary.add-button 创建页面
+      h3 页面管理
+    div.content
+      table.pure-table.pure-table-striped
+        thead
           tr
-            td #{page.slug}
-            td #{page.title}
-            td=_.pluck(page.authors, 'username').join(', ')
-            td #{page.version}
-            td=moment(page.updatedAt).format('YYYY-MM-DD HH:mm')
-            td
-              div.btn-group
-                a(href="/admin/pages/#{page._id}/edit").btn.btn-default.btn-xs
+            th 页面地址
+            th 标题
+            th 编辑者
+            th 版本
+            th 最后编辑时间
+            th
+        tbody
+          each page in pages
+            tr
+              td #{page.slug}
+              td #{page.title}
+              td=_.pluck(page.authors, 'username').join(', ')
+              td #{page.version}
+              td=moment(page.updatedAt).format('YYYY-MM-DD HH:mm')
+              td
+                a(href="/admin/pages/#{page._id}/edit")
                   i.fa.fa-pencil
-                  |  编辑
-                button(type="button",
-                       data-id="#{page._id}").remove-btn.btn.btn-danger.btn-xs
+                  small  编辑
+                |  | 
+                a(href="javascript:;", data-id="#{page._id}").remove-btn
                   i.fa.fa-trash-o
-                  |  删除
-    div.panel-footer
-      include ../../shared/pagination
+                  small  删除
+    div.footer
+      include ../../paginator
 block script
   script(type="text/javascript").
     ND.moduleTree.push({
       name: 'PagesPage',
       el: '#pages-page'
-    });
+    });

server/views/admin/section/index.jade

@@ -3,6 +3,7 @@ block main
   div#sections-page.admin.panel
     div.heading
       a(href="/admin/sections/create").pure-button.pure-button-primary.add-button 创建节点组
+      h3 节点组管理
     div.content
       table.pure-table.pure-table-striped
         thead

server/views/admin/tag/index.jade

@@ -3,6 +3,7 @@ block main
   div#tags-page.admin.panel
     div.heading
       a(href="/admin/tags/create").pure-button.pure-button-primary.add-button 创建节点
+      h3 节点管理
     div.content
       table.pure-table.pure-table-striped
         thead

server/views/admin/topic/edit.jade

@@ -1,43 +1,44 @@
 extends ../layout
-block container
-  div.panel.panel-default
-    div.panel-heading
-      include ../../shared/breadcrumb
-    div.panel-body
-      include ../../shared/error_alert
+block main
+  div.admin.panel
+    div.content
       form(role="form",
            method="POST",
-           action="/admin/topics/" + topic._id + '/edit')#topic-edit-form.form-horizontal
-        div.form-group
-          div.col-xs-12.col-sm-3
-            select(name="tag[id]").form-control
-              option(value="") 请选择节点
-              each tagList, sectionName in tags
-                optgroup(label="#{sectionName}")
-                  each tag in tagList
-                    if currentTag && currentTag._id.toString() == tag._id.toString()
-                      option(value="#{tag._id}", selected) #{tag.name}
-                    else if topic && topic.tag.id === tag._id.toString()
-                      option(value="#{tag._id}", selected) #{tag.name}
-                    else
-                      option(value="#{tag._id}") #{tag.name}
-          div.col-xs-12.visible-xs.mobile-sep  
-          div.col-xs-12.col-sm-9
-            input(type="text", name="title", 
-              maxlength="100", placeholder="请输入标题，字数在10到100个之间", 
-              value=topic ? topic.title : '',
-              required)#title.form-control
-        div.form-group
-          div.col-sm-12
-            textarea(name="content", rows="16")#content-editor.form-control
-              !{topic ? topic.content : ''}
-        div.form-group
-          div.col-sm-12
-            input(type="hidden", name="_csrf", value="#{csrfToken}")
-            if topic
-              input(type="hidden", name="id", value="#{topic._id}")
-            button(type="submit",
-                   data-loading-text="正在发布...")#submit-topic-btn.btn.btn-primary 发布
+           action="/admin/topics/" + topic._id + '/edit')#topic-edit-form.pure-form.pure-form-stacked
+        legend= topic ? '编辑话题' : '发布新话题'
+        if err && err.errors
+          ul
+            each error in err.errors
+              li(class=['alert', 'alert-' + (err.level || 'danger')]) #{error.message}
+        div.pure-control-group
+          label(for="tag") 节点
+          select(name="tag[id]")#tag.pure-input-1-2
+            option(value="") 请选择节点
+            each tagList, sectionName in tags
+              optgroup(label="#{sectionName}")
+                each tag in tagList
+                  if currentTag && currentTag._id.toString() == tag._id.toString()
+                    option(value="#{tag._id}", selected) #{tag.name}
+                  else if topic && topic.tag.id === tag._id.toString()
+                    option(value="#{tag._id}", selected) #{tag.name}
+                  else
+                    option(value="#{tag._id}") #{tag.name}
+        div.pure-control-group
+          label(for="title") 标题
+          input(type="text", name="title",
+            maxlength="100", placeholder="请输入标题，字数在10到100个之间",
+            value=topic ? topic.title : '',
+            required)#title.pure-input-1-2
+        div.pure-control-group
+          label(for="content-editor") 内容
+          textarea(name="content", rows="16")#content-editor !{topic ? topic.content : ''}
+        p
+        div.pure-controls
+          input(type="hidden", name="_csrf", value="#{csrfToken}")
+          if topic
+            input(type="hidden", name="id", value="#{topic._id}")
+          button(type="submit",
+                 data-loading-text="正在发布...")#submit-topic-btn.pure-button.pure-button-primary 发布
 block script
   script(type="text/javascript").
     ND.moduleTree.push({
@@ -50,4 +51,4 @@ block script
           id: 'submitTopicButton'
         }
       ]
-    });
+    });