Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'origin/develop' into develop
  • Loading branch information
noisesmith committed Jan 16, 2014
2 parents 5fe6c3e + f62b6fc commit a79ca02
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 21 deletions.
4 changes: 2 additions & 2 deletions project.clj
@@ -1,7 +1,7 @@
(defproject caribou/caribou-admin "0.13.3"
(defproject caribou/caribou-admin "0.13.8"
:description "Generic admin tool for Caribou projects"
:dependencies [[org.clojure/clojure "1.5.1"]
[caribou/caribou-frontend "0.13.3"]
[caribou/caribou-frontend "0.13.8"]
[clj-time "0.4.4"]]
:jvm-opts ["-agentlib:jdwp=transport=dt_socket,server=y,suspend=n"
"-Djava.awt.headless=true"
Expand Down
12 changes: 6 additions & 6 deletions resources/public/_admin/css/timepicker.css
@@ -1,30 +1,30 @@

div.time-picker {
div.ui-timepicker-wrapper {
position: absolute;
height: 191px;
width:4em; /* needed for IE */
width:7em; /* needed for IE */
overflow: auto;
background: #fff;
border: 1px solid #aaa;
z-index: 99;
margin: 0;
}
div.time-picker-12hours {
div.ui-timepicker-wrapper-12hours {
width:6em; /* needed for IE */
}

div.time-picker ul {
div.ui-timepicker-wrapper ul {
list-style-type: none;
margin: 0;
padding: 0;
}
div.time-picker li {
div.ui-timepicker-wrapper li {
cursor: pointer;
height: 10px;
font: 12px/1 Helvetica, Arial, sans-serif;
padding: 4px 3px;
}
div.time-picker li.selected {
div.ui-timepicker-wrapper li.ui-timepicker-selected {
background: #0063CE;
color: #fff;
}
Expand Up @@ -40,6 +40,7 @@
if ( !this.field.format || this.field.format === "time" || this.field.format === "datetime" ) {
$( this.parent.selector + " input[name=" + this.field.slug + "-time]" ).show().timepicker({
//show24Hours: false,
timeFormat: 'H:i',
step: 15
});
}
Expand Down
16 changes: 9 additions & 7 deletions src/caribou/admin/controllers/content/models.clj
Expand Up @@ -115,10 +115,12 @@
(admin-controller/render (merge all-helpers params))))

(defn json-response
[data]
{:status 200
:body (generate-string data {:escape-non-ascii true})
:headers {"Content-Type" "application/json"}})
([data]
{:status 200
:body (generate-string data {:escape-non-ascii true})
:headers {"Content-Type" "application/json"}})
([data opts]
(merge (json-response data) opts)))

(defn part
[f col]
Expand Down Expand Up @@ -477,11 +479,11 @@
(log/debug "Reloading model, clearing query cache!")
(query/clear-queries)
(model/init))
(when-not (or (:test request) ; because of a reset handler npe
(if (or (:test request) ; because of a reset handler npe
(empty? (set/intersection #{"page" "siphon"}
(set (map :model payload)))))
(handler/reset-handler))
(json-response results)))
(json-response results)
(json-response results {:reset-handler true}))))

(defn reorder-all
[{[role-id permissions] :permissions :as request}]
Expand Down
5 changes: 4 additions & 1 deletion src/caribou/admin/core.clj
Expand Up @@ -41,7 +41,9 @@

(defn reload-pages
[]
(pages/add-page-routes routes/admin-routes 'caribou.admin.controllers ""))
(pages/convert-pages-to-routes
routes/admin-routes
'caribou.admin.controllers ""))

(defn open-page?
[uri]
Expand Down Expand Up @@ -95,6 +97,7 @@
(let [config (app/environment-config)]
(caribou/with-caribou config
(reload-pages)
(template/init)
(hooks/init)
(def handler
(-> (handler/handler #'reload-pages)
Expand Down
5 changes: 0 additions & 5 deletions src/caribou/admin/helpers.clj
Expand Up @@ -50,10 +50,6 @@
(.format (java.text.SimpleDateFormat. "HH:mm") date)
"00:00"))

(defn safe-route-for
[slug & args]
(pages/route-for slug (pages/select-route slug (apply merge args))))

(defn asset-is-image
([asset]
(.startsWith (or (:content-type asset) "") "image"))
Expand Down Expand Up @@ -234,7 +230,6 @@
:position-of position-of
:get-in get-in-helper
:join-model? join-model?
:safe-route-for safe-route-for
:system-field? system-field?
:locales locales
:localized-models localized-models
Expand Down

0 comments on commit a79ca02

Please sign in to comment.