From 7d0f835f1da22ae6a0afcbae0db2bebe72ec1426 Mon Sep 17 00:00:00 2001 From: Paul Duncan Date: Fri, 29 Jul 2016 17:45:17 -0400 Subject: make upload a dropdown, add consistent button divider --- data/assets/js/admin/tabs/files.js | 20 ++++++++++++++++---- src/guff/views/panes/admin/pane.cr | 12 +++++++++++- src/views/panes/admin/files.ecr | 31 ++++++++++++++++++++++++++++--- src/views/panes/admin/posts.ecr | 4 +--- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/data/assets/js/admin/tabs/files.js b/data/assets/js/admin/tabs/files.js index 1c01476..d378b46 100644 --- a/data/assets/js/admin/tabs/files.js +++ b/data/assets/js/admin/tabs/files.js @@ -96,8 +96,18 @@ jQuery(function($) { "", "", ], + + divider: [ + "
", + "  ", + "
", + ], }); + // cache templates + var NO_FILES = TEMPLATES.run('no_files'), + DIVIDER = TEMPLATES.run('divider'); + function get_selected_site() { var site_id = $('#files').data('site_id'); @@ -134,8 +144,6 @@ jQuery(function($) { return r; } - var NO_FILES = TEMPLATES.run('no_files'); - function reload() { var btns = $('#files-reload, #files-crumbs .btn'), list = $('#files'); @@ -159,7 +167,8 @@ jQuery(function($) { // draw crumbs var crumbs = get_crumbs($('#files').data('path')); $('#files-crumbs').html([ - make_site_dropdown() + make_site_dropdown(), + // DIVIDER, ].concat($.map(crumbs, function(crumb) { return TEMPLATES.run('crumb', { path: crumb, @@ -292,7 +301,10 @@ jQuery(function($) { return false; }); - $('#files-upload').click(function() { + $('#files-upload').on('click', 'a', function() { + // hide dropdown + $('body').trigger('click'); + alert('TODO: upload'); // stop event diff --git a/src/guff/views/panes/admin/pane.cr b/src/guff/views/panes/admin/pane.cr index 483badd..3da48da 100644 --- a/src/guff/views/panes/admin/pane.cr +++ b/src/guff/views/panes/admin/pane.cr @@ -24,7 +24,7 @@ class Guff::Views::Panes::Admin::Pane < Guff::Views::HTMLView > Create - +