diff options
| -rwxr-xr-x | install.sh | 2 | ||||
| -rw-r--r-- | themes/okadmin/public/css/main.css | 3 | ||||
| -rw-r--r-- | themes/okadmin/public/js/app.js | 25 | ||||
| -rw-r--r-- | themes/okadmin/public/js/upload.js | 3 | ||||
| -rw-r--r-- | themes/okadmin/templates/partials/head.liquid | 4 |
5 files changed, 24 insertions, 13 deletions
@@ -1,5 +1,5 @@ cd app/node_modules ; for i in * ; do cd $i ; npm install; cd .. ; done ; cd ../.. npm install -cd examples +cd site node index diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css index a1e20a0..a01a85c 100644 --- a/themes/okadmin/public/css/main.css +++ b/themes/okadmin/public/css/main.css @@ -46,6 +46,9 @@ a:visited { color: rgba(0, 0, 0, 0.25); line-height: 50px; } +.admin-header .breadcrumb b { + color: #333; +} .admin-header .site-link { float: right; diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js index 4b8d98f..170b2ab 100644 --- a/themes/okadmin/public/js/app.js +++ b/themes/okadmin/public/js/app.js @@ -1,10 +1,20 @@ var OKAdmin = function(){ - OKUpload.bind() + // initialize our (single) ajax image uploader with an element and a template + OKUpload.bind( document.getElementById("file") ) OKUpload.add = function(data){ var url = data[0].extra.Location add_image(url) } + + // also handle straight image urls + $("#add-image-url").keydown(pressEnter(function(e){ + var url = $(this).val() + $(this).val("") + add_image(url) + })}) + + // clone and populate template function add_image(url){ var imageTemplate = $("#captioned-image-template").html() var $el = $(imageTemplate) @@ -12,21 +22,19 @@ var OKAdmin = function(){ $el.find("img").attr("src", url) $(".captioned-image-list ol").append($el) } + + // make the region sortable with drag-and-drop $(".captioned-image-list ol").sortable() $(".captioned-image-list ol").disableSelection() - - $("#add-image-url").keydown(pressEnter(function(e){ - var url = $(this).val() - $(this).val("") - add_image(url) - })}) - + + // delete image $(document).on("click", ".remove-image", function(){ if (confirm("Delete this image?")) { $(this).parent().remove() } }) + // populate a video field with info from our url parser $(".video .url").keydown(pressEnter(function(){ var $el = $(this) var url = $el.val() @@ -40,6 +48,7 @@ var OKAdmin = function(){ }) }})) + // fix post indexing in list-driven inputs $("form").submit(function(){ $(".image-element").each(function(index){ $(this).find("input,textarea").each(function(){ diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js index d9fd5ed..1c9094c 100644 --- a/themes/okadmin/public/js/upload.js +++ b/themes/okadmin/public/js/upload.js @@ -2,8 +2,7 @@ var OKUpload = { action: "/_services/image", - bind: function(){ - var el = document.getElementById("file") + bind: function(el){ if (! el) return el.addEventListener("change", OKUpload.handleFileSelect) }, diff --git a/themes/okadmin/templates/partials/head.liquid b/themes/okadmin/templates/partials/head.liquid index 3af59fd..c423584 100644 --- a/themes/okadmin/templates/partials/head.liquid +++ b/themes/okadmin/templates/partials/head.liquid @@ -2,12 +2,12 @@ <html> <head> <meta charset="utf8"> - <title>{{meta.title}}</title> + <title>TwoHustlers Admin {{meta.title}}</title> <link rel="stylesheet" href="{{meta.static}}/css/main.css"> </head> <body> <header class="admin-header"> - <span class="breadcrumb"><b>{{meta.title}}</b> Admin</span> + <span class="breadcrumb"><b>TwoHustlers{{meta.title}}</b> Admin</span> <a class="site-link" href="/">View Site</a> </header> <div class="container"> |