summaryrefslogtreecommitdiff
path: root/themes/okadmin/public
diff options
context:
space:
mode:
Diffstat (limited to 'themes/okadmin/public')
-rw-r--r--themes/okadmin/public/css/main.css39
-rw-r--r--themes/okadmin/public/js/app.js11
2 files changed, 40 insertions, 10 deletions
diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 3762fd4..67271bc 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -109,7 +109,7 @@ h2 {
pointer-events: none;
}
- /* Makes the button look like a link */
+/* Makes the button look like a link */
.main.index .resource-category button {
background: none !important;
height: 1.5em;
@@ -117,6 +117,8 @@ h2 {
padding: 0 !important;
font: inherit;
cursor: pointer;
+ font-family: Monaco, monospace;
+ text-transform: uppercase;
}
.main.index .resource-category .btn {
@@ -134,7 +136,7 @@ h2 {
}
.main.index .resource-category .btn:hover {
- border-bottom: 3px solid rgba(0, 0, 0, 0.25);
+ border-bottom: 1px solid rgba(0, 0, 0, 0.25);
}
.main.index .resource-category .btn {
@@ -203,6 +205,12 @@ label {
padding: 0 0.5em;
margin-bottom: 1em;
}
+.main.resource form input[name=id] {
+ width: 15em;
+}
+button, input[type=submit] {
+ cursor: pointer;
+}
.main.resource form .group {
display: block;
float: left;
@@ -280,18 +288,26 @@ label {
background: #ddd;
clear: left;
text-align: left;
- padding: 10px;
- width: 15em;
+ float: left;
+ margin-right: 1em;
position: relative;
+ overflow: hidden;
+ cursor: pointer;
}
.add-image-button:hover {
background: #def;
}
+.main.resource form .add-image-button button {
+ margin: 0;
+ pointer-events: none;
+ width: 100%; height: 100%;
+}
.add-image-button input[type=file] {
opacity: 0;
position: absolute;
top: 0; left: 0;
width: 100%; height: 100%;
+ margin: 0; padding: 0;
cursor: pointer;
}
li.image-element:hover .remove-image {
@@ -314,13 +330,20 @@ li.image-element .remove-image:hover {
}
-.errors {
+.success, .errors {
background: white;
- padding: 10px;
- width: 100%;
+ padding: 9px 8px 7px;
+ width: 50%;
line-height: 1.4em;
+ border: 1px solid;
+ margin: 1em;
+ border-radius: 2px;
+}
+
+.success {
+ color: green;
}
-.errors .message {
+.errors {
color: red;
}
diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index 1ab9956..91a8e1a 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -28,7 +28,7 @@ var OKAdmin = function(){
$(".captioned-image-list ol").disableSelection()
// delete image
- $(document).on("click", ".remove-image", function(){
+ $(document).on("mousedown", ".remove-image", function(){
if (confirm("Delete this image?")) {
$(this).parent().remove()
}
@@ -50,7 +50,14 @@ var OKAdmin = function(){
}))
// fix post indexing in list-driven inputs
- $(".main.resource form").submit(function(){
+ $(".main.resource form").submit(function(e){
+ var $id = $("[name=id]")
+ if ($id.length && ! $id.val()) {
+ alert("Please enter an ID")
+ $id.focus()
+ e.preventDefault()
+ return
+ }
$(".image-element").each(function(index){
$(this).find("input,textarea").each(function(){
var field = $(this).attr("name").replace(/\[[0-9]*\]/, "[" + index + "]")