From ae480c44c59a9e77ea279f2208dd7f932079e078 Mon Sep 17 00:00:00 2001 From: yo momma Date: Wed, 4 Feb 2026 18:52:20 +0000 Subject: Refactor templates: humps/hump variables --- src/site.clj | 138 +++++++++++++++---------------- template/altar_log.st | 6 +- template/altar_user_log.st | 6 +- template/directory.st | 22 ++--- template/fame.st | 6 +- template/fame2.st | 6 +- template/fame_dump.st | 12 +-- template/frontpage copy.st | 4 +- template/frontpage.st | 4 +- template/frontpagePROFILE.st | 6 +- template/frontpage_halloffame.st | 4 +- template/frontpage_share_buttons.st | 4 +- template/hall_log_dump.st | 8 +- template/hall_share_buttons.st | 8 +- template/hiscore_test.st | 8 +- template/log.st | 6 +- template/log_dump.st | 10 +-- template/mini_profile.st | 6 +- template/newlog.st | 6 +- template/nigga.st | 6 +- template/popular.st | 6 +- template/popular_dump.st | 8 +- template/profile.st | 2 +- template/profile_dump.st | 14 ++-- template/profilelog.st | 10 +-- template/profilenew.st | 2 +- template/rooms/frontpage.st | 6 +- template/search_files.st | 2 +- template/share_buttons.st | 8 +- template/simplerlog.st | 6 +- template/single_message.st | 20 ++--- template/single_message_share_buttons.st | 8 +- template/tagged_dumps.st | 4 +- template/topic.st | 4 +- template/topic_dump.st | 6 +- template/userlog.st | 6 +- 36 files changed, 194 insertions(+), 194 deletions(-) diff --git a/src/site.clj b/src/site.clj index be3edd4..8e5082b 100755 --- a/src/site.clj +++ b/src/site.clj @@ -232,7 +232,7 @@ (catch Exception e (println e) []))) 3600 nil)) -(def num-frontpage-dumps 20) +(def num-frontpage-humps 20) (defn front-page ([session] @@ -246,12 +246,12 @@ (cond (.before cur-date earliest-daily-hall) (redirect-to "/") (.after cur-date today) (redirect-to "/") :else (let [st (fetch-template "frontpage" session) - dumps (map process-message-for-output + humps (map process-message-for-output (if (:nick session) (fetch-redis-daily-hall cur-date 0 20 (:user_id session)) - (take num-frontpage-dumps + (take num-frontpage-humps (shuffle (poll frontpage-posts-agent)))))] - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (if-not (.after next-date today) (.setAttribute st "next_date" (format-yyyymmdd next-date))) (if-not (.before prev-date earliest-daily-hall) @@ -496,35 +496,35 @@ WHERE user_id IN ([session user-info date msg-id template] (let [st (fetch-template template session) logger (make-time-logger) - raw-dumps (tags/fetch-dumps + raw-humps (tags/fetch-dumps :nick (:nick user-info) :user-tag-id (:user_id session) :msg-id msg-id :date (if msg-id nil date) :limit (inc *dumps-per-page*)) - recips (map :nick (get-recips-from-msgs raw-dumps)) - back-dumps (if (or date msg-id) + recips (map :nick (get-recips-from-msgs raw-humps)) + back-humps (if (or date msg-id) (tags/fetch-dumps :nick (:nick user-info) :msg-id msg-id :date (if msg-id nil date) :limit (inc *dumps-per-page*) :direction :forward)) - dumps (map process-message-for-output (take *dumps-per-page* raw-dumps))] + humps (map process-message-for-output (take *dumps-per-page* raw-humps))] (.setAttribute st "nick" (:nick user-info)) (.setAttribute st "is_home" (= (:nick user-info) (:nick session))) (.setAttribute st "mini_profile" (build-mini-profile user-info)) - (when (> (count dumps) 0) - (.setAttribute st "dumps" dumps)) + (when (> (count humps) 0) + (.setAttribute st "humps" humps)) (.setAttribute st "recips" (json-str recips)) (.setAttribute st "prev" - (if back-dumps + (if back-humps (cond - (> (count back-dumps) *dumps-per-page*) (log-next-page-link (last back-dumps)) - (> (count back-dumps) 1) (format "/%s/log" (:nick user-info)) + (> (count back-humps) *dumps-per-page*) (log-next-page-link (last back-humps)) + (> (count back-humps) 1) (format "/%s/log" (:nick user-info)) :else nil))) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" (log-next-page-link (last raw-dumps)))) + (if (> (count raw-humps) *dumps-per-page*) + (.setAttribute st "next" (log-next-page-link (last raw-humps)))) (.setAttribute st "debug_log_items" (logger)) (.toString st)))) @@ -540,13 +540,13 @@ WHERE user_id IN (if-let [user-info (fetch-nick profile-nick)] (let [st (fetch-template "popular" session) profile-nick (:nick user-info) - raw-dumps (fetch-popular-dumps-redis profile-nick (:nick session)) - raw-dumps (filter #(> (:count %) 0) raw-dumps) - recips (map :nick (get-recips-from-msgs raw-dumps)) - dumps (map process-message-for-output raw-dumps)] + raw-humps (fetch-popular-dumps-redis profile-nick (:nick session)) + raw-humps (filter #(> (:count %) 0) raw-humps) + recips (map :nick (get-recips-from-msgs raw-humps)) + humps (map process-message-for-output raw-humps)] (.setAttribute st "nick" profile-nick) (.setAttribute st "mini_profile" (build-mini-profile user-info)) - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (.setAttribute st "recips" (json-str recips)) (.toString st)) (resp-error "NO_USER"))) @@ -610,9 +610,9 @@ WHERE user_id IN (if-let [message (fetch-public-message-by-id id-from-url (:nick session))] ; error if nick in url doesn't match the nick who posted the message from the id in url ; this prevents people from scraping all the content by incrementing the id in the url - (if (= nick-from-url (:nick message)) - (let [st (fetch-template "single_message" session)] - (.setAttribute st "dump" (process-message-for-output message)) + (if (= nick-from-url (:nick message)) + (let [st (fetch-template "single_message" session)] + (.setAttribute st "hump" (process-message-for-output message)) (.setAttribute st "recips" (json-str (map :nick (get-recips (:content message))))) (.toString st)) (resp-error "NO_MESSAGE")) @@ -762,7 +762,7 @@ WHERE user_id IN (.setAttribute st "recips" (json-str recips)) (.setAttribute st "topic" topic) (if-not (empty? msgs) - (.setAttribute st "dumps" msgs)) + (.setAttribute st "humps" msgs)) (.toString st))) ;; Chat Log @@ -772,24 +772,24 @@ WHERE user_id IN st (fetch-template "log" session) logger (make-time-logger) offset (maybe-parse-int offset 0) - dump-offset (* offset *dumps-per-page*) + hump-offset (* offset *dumps-per-page*) image-only (and (not (room :admin_only)) (not= (params :show) "all")) - raw-dumps (logger tags/fetch-dumps-by-room + raw-humps (logger tags/fetch-dumps-by-room :room-id (room :room_id) :image-only image-only :amount (+ 1 *dumps-per-page*) - :offset dump-offset) - dumps (map tags/add-favorited-flag - (take *dumps-per-page* raw-dumps) + :offset hump-offset) + humps (map tags/add-favorited-flag + (take *dumps-per-page* raw-humps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (logger doall (map process-message-for-output dumps))] - (if (> (count raw-dumps) *dumps-per-page*) + humps (map tags/remove-tags-for-output humps) + humps (logger doall (map process-message-for-output humps))] + (if (> (count raw-humps) *dumps-per-page*) (.setAttribute st "next" (inc offset))) (if (not= offset 0) (.setAttribute st "prev" (max (dec offset) 0))) - (.setAttribute st "dumps" dumps) + (.setAttribute st "humps" humps) (if (default-room? roomkey) (.setAttribute st "roomkey" "") (.setAttribute st "roomkey" (str roomkey "."))) @@ -814,13 +814,13 @@ WHERE user_id IN (defn hiscore-test [session params period] (let [st (fetch-template "hiscore_test" session) - dumps (tags/fetch-dumps-by-ids (redis-ids-test period)) - dumps (map tags/add-favorited-flag dumps (repeat session)) - dumps (map tags/add-fav-count dumps) - dumps (reverse (sort-by :favcount dumps)) - dumps (map tags/remove-tags-for-output dumps) - dumps (map process-message-for-output dumps)] - (.setAttribute st "dumps" dumps) + humps (tags/fetch-dumps-by-ids (redis-ids-test period)) + humps (map tags/add-favorited-flag humps (repeat session)) + humps (map tags/add-fav-count humps) + humps (reverse (sort-by :favcount humps)) + humps (map tags/remove-tags-for-output humps) + humps (map process-message-for-output humps)] + (.setAttribute st "humps" humps) (.toString st))) ;; Altars @@ -834,16 +834,16 @@ WHERE user_id IN user-id (if nick (user-id-from-nick nick) nil) template (if user-id "altar_user_log" "altar_log") st (fetch-template template session) - raw-dumps (tags/fetch-altars :message-id id :amount (+ 1 *dumps-per-page*) :user-id user-id) - dumps (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (map process-message-for-output dumps)] - (.setAttribute st "dumps" dumps) + raw-humps (tags/fetch-altars :message-id id :amount (+ 1 *dumps-per-page*) :user-id user-id) + humps (map tags/add-favorited-flag (take *dumps-per-page* raw-humps) (repeat session)) + humps (map tags/remove-tags-for-output humps) + humps (map process-message-for-output humps)] + (.setAttribute st "humps" humps) (.setAttribute st "nick" nick) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" ((last raw-dumps) :message_id))) + (if (> (count raw-humps) *dumps-per-page*) + (.setAttribute st "next" ((last raw-humps) :message_id))) (if id - (.setAttribute st "prev" ((first raw-dumps) :message_id))) + (.setAttribute st "prev" ((first raw-humps) :message_id))) (.toString st))) ;; Tags @@ -914,25 +914,25 @@ WHERE user_id IN :logger (make-time-logger) :include-vip false] (let [st (fetch-template "tagged_dumps" session) - offset (maybe-parse-int (params :offset) 0) - dump-offset (* offset *dumps-per-page*) - raw-dumps (logger tags/fetch-dumps-by-tag :tags tags + offset (maybe-parse-int (params :offset) 0) + hump-offset (* offset *dumps-per-page*) + raw-humps (logger tags/fetch-dumps-by-tag :tags tags :image-only false :amount (+ 1 *dumps-per-page*) - :offset dump-offset + :offset hump-offset :message-user-id message-user-id :tag-user-id tag-user-id :include-vip include-vip) - dumps (map tags/add-favorited-flag (take *dumps-per-page* raw-dumps) (repeat session)) - dumps (map tags/remove-tags-for-output dumps) - dumps (logger doall (map process-message-for-output dumps))] - (.setAttribute st "dumps" dumps) + humps (map tags/add-favorited-flag (take *dumps-per-page* raw-humps) (repeat session)) + humps (map tags/remove-tags-for-output humps) + humps (logger doall (map process-message-for-output humps))] + (.setAttribute st "humps" humps) (.setAttribute st "infobar" info-bar) (.setAttribute st "page_title" page-title) (.setAttribute st "page_url" url) (if (not= offset 0) (.setAttribute st "prev" (format "/%s/%s" url (max 0 (dec offset))))) - (if (> (count raw-dumps) *dumps-per-page*) + (if (> (count raw-humps) *dumps-per-page*) (.setAttribute st "next" (format "/%s/%s" url (inc offset)))) (.setAttribute st "debug_log_items" (logger)) (.toString st))) @@ -964,15 +964,15 @@ WHERE user_id IN (defn favorites [session user-info date msg-id] (let [st (fetch-template "tagged_dumps" session) logger (make-time-logger) - raw-dumps (tags/fetch-tagged-dumps + raw-humps (tags/fetch-tagged-dumps :nick (:nick user-info) :user-tag-id (:user_id session) :msg-id msg-id :hide-vip (not (:is_admin session)) :date (if msg-id nil date) :limit (inc *dumps-per-page*)) - recips (map :nick (get-recips-from-msgs raw-dumps)) - back-dumps (if (or date msg-id) + recips (map :nick (get-recips-from-msgs raw-humps)) + back-humps (if (or date msg-id) (tags/fetch-tagged-dumps :nick (:nick user-info) :msg-id msg-id @@ -980,17 +980,17 @@ WHERE user_id IN :date (if msg-id nil date) :limit (inc *dumps-per-page*) :direction :forward)) - dumps (map process-message-for-output (butlast raw-dumps))] + humps (map process-message-for-output (butlast raw-humps))] (.setAttribute st "prev" - (if back-dumps + (if back-humps (cond - (> (count back-dumps) *dumps-per-page*) (favorites-next-page-link (:nick user-info) - (last back-dumps)) - (> (count back-dumps) 1) (format "/%s/favorites" (:nick user-info)) + (> (count back-humps) *dumps-per-page*) (favorites-next-page-link (:nick user-info) + (last back-humps)) + (> (count back-humps) 1) (format "/%s/favorites" (:nick user-info)) :else nil))) - (if (> (count raw-dumps) *dumps-per-page*) - (.setAttribute st "next" (favorites-next-page-link (:nick user-info) (last raw-dumps)))) - (.setAttribute st "dumps" dumps) + (if (> (count raw-humps) *dumps-per-page*) + (.setAttribute st "next" (favorites-next-page-link (:nick user-info) (last raw-humps)))) + (.setAttribute st "humps" humps) (.setAttribute st "recips" (json-str recips)) (.setAttribute st "infobar" (build-mini-profile user-info)) (.setAttribute st "page_title" (format "%s'S FAVS" (:nick user-info))) @@ -1218,7 +1218,7 @@ WHERE user_id IN (defn hall-of-fame [session] (let [st (fetch-template "fame" session) msgs (fetch-redis-hall (:nick session))] - (.setAttribute st "dumps" (map process-message-for-output msgs)) + (.setAttribute st "humps" (map process-message-for-output msgs)) (.toString st))) ;; MGMT diff --git a/template/altar_log.st b/template/altar_log.st index c9a6fba..1bbc223 100755 --- a/template/altar_log.st +++ b/template/altar_log.st @@ -16,13 +16,13 @@ $banner()$
- $if(dumps)$ + $if(humps)$
- $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$
$json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/altar_user_log.st b/template/altar_user_log.st index e58bff8..8d19f58 100755 --- a/template/altar_user_log.st +++ b/template/altar_user_log.st @@ -16,13 +16,13 @@
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$ $json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/directory.st b/template/directory.st index f0f88fa..7c97da0 100755 --- a/template/directory.st +++ b/template/directory.st @@ -21,18 +21,18 @@
$if(users)$ - $users:{ dump | -
-
$dump.nick$'s - $if(dump.score_ent)$ - fav score: $dump.score$ - $dump.score_ent$ + $users:{ hump | +
+ $endif$ - $if(dump.avatar)$ -
- + $if(hump.avatar)$ +
+
$else$
@@ -41,9 +41,9 @@ $endif$
last post
- $dump.content$ + $hump.content$
- $share_buttons(dump=dump)$ + $share_buttons(hump=hump)$
}$ $else$ diff --git a/template/fame.st b/template/fame.st index ab47150..883e6bb 100755 --- a/template/fame.st +++ b/template/fame.st @@ -15,12 +15,12 @@
- $if(dumps)$ + $if(humps)$ - $dumps: { dump | $fame_dump()$ }$ + $humps: { hump | $fame_dump()$ }$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/fame2.st b/template/fame2.st index 5360c66..239f43e 100755 --- a/template/fame2.st +++ b/template/fame2.st @@ -27,12 +27,12 @@
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $fame_dump(dump=d)$ }$ + $humps: { d | $fame_dump(hump=d)$ }$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/fame_dump.st b/template/fame_dump.st index 5a8d637..f96bbae 100755 --- a/template/fame_dump.st +++ b/template/fame_dump.st @@ -1,14 +1,14 @@ -$if(dump.ztags)$ -
+$if(hump.ztags)$ +
$else$ -
+
$endif$ -$dump.created_on$ -- by $dump.nick$ -   $dump.count$ +$hump.created_on$ -- by $hump.nick$ +   $hump.count$ -
$dump.content$
+
$hump.content$
$hall_share_buttons()$
diff --git a/template/frontpage copy.st b/template/frontpage copy.st index 64d5f73..3bc12ae 100755 --- a/template/frontpage copy.st +++ b/template/frontpage copy.st @@ -130,8 +130,8 @@ $endif$
- $if(dumps)$ - $dumps: { dump | $hall_log_dump()$ }$ + $if(humps)$ + $humps: { hump | $hall_log_dump()$ }$ $endif$
diff --git a/template/frontpage.st b/template/frontpage.st index a1c58aa..8f51d9e 100755 --- a/template/frontpage.st +++ b/template/frontpage.st @@ -132,8 +132,8 @@ $endif$
- $if(dumps)$ - $dumps: { dump | $hall_log_dump()$ }$ + $if(humps)$ + $humps: { hump | $hall_log_dump()$ }$ $endif$
diff --git a/template/frontpagePROFILE.st b/template/frontpagePROFILE.st index 727843c..ae46b9e 100755 --- a/template/frontpagePROFILE.st +++ b/template/frontpagePROFILE.st @@ -150,15 +150,15 @@ You are viewing the current trending images posted to hump.fm; a super fun commu
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $hall_log_dump(dump=d)$ }$ + $humps: { d | $hall_log_dump(hump=d)$ }$ $json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/frontpage_halloffame.st b/template/frontpage_halloffame.st index a74eb94..c8dcc2a 100755 --- a/template/frontpage_halloffame.st +++ b/template/frontpage_halloffame.st @@ -130,8 +130,8 @@ $endif$ - $if(dumps)$ - $dumps: { dump | $hall_log_dump()$ }$ + $if(humps)$ + $humps: { hump | $hall_log_dump()$ }$ $endif$ diff --git a/template/frontpage_share_buttons.st b/template/frontpage_share_buttons.st index d5bdb01..0c8f4b4 100755 --- a/template/frontpage_share_buttons.st +++ b/template/frontpage_share_buttons.st @@ -1,6 +1,6 @@ - -$if(dump.favorited)$ + +$if(hump.favorited)$ $else$
diff --git a/template/hall_log_dump.st b/template/hall_log_dump.st index d12fecb..a6b014d 100755 --- a/template/hall_log_dump.st +++ b/template/hall_log_dump.st @@ -1,7 +1,7 @@ -
- $dump.nick$ - $if(dump.score)$$dump.score$$endif$ -
$dump.content$
+
+ $hump.nick$ + $if(hump.score)$$hump.score$$endif$ +
$hump.content$
$if(logged_in)$ $frontpage_share_buttons()$ diff --git a/template/hall_share_buttons.st b/template/hall_share_buttons.st index eb5dd64..a9e8c4e 100755 --- a/template/hall_share_buttons.st +++ b/template/hall_share_buttons.st @@ -3,9 +3,9 @@ - + $if(logged_in)$ -$if(dump.favorited)$ +$if(hump.favorited)$ $else$
@@ -13,7 +13,7 @@ $else$
$endif$ $endif$ -$if(dump.favcount)$ - $dump.favcount$ +$if(hump.favcount)$ + $hump.favcount$ $endif$ diff --git a/template/hiscore_test.st b/template/hiscore_test.st index 44c6346..662a0b1 100755 --- a/template/hiscore_test.st +++ b/template/hiscore_test.st @@ -12,7 +12,7 @@ $banner()$
-

most fav'd dumps this +

most fav'd humps this day, week, month, @@ -21,13 +21,13 @@ $banner()$

- $if(dumps)$ + $if(humps)$
- $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$
$json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/log.st b/template/log.st index a2a8888..1afb0d1 100755 --- a/template/log.st +++ b/template/log.st @@ -16,13 +16,13 @@
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$ $json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/log_dump.st b/template/log_dump.st index fced8de..daf6fda 100755 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -1,11 +1,11 @@ -$if(dump.ztags)$ -
+$if(hump.ztags)$ +
$else$ -
+
$endif$ -$dump.created_on$ -- by $dump.nick$ -
$dump.content$
+$hump.created_on$ -- by $hump.nick$ +
$hump.content$
$share_buttons()$
diff --git a/template/mini_profile.st b/template/mini_profile.st index e32cc5b..5db8977 100755 --- a/template/mini_profile.st +++ b/template/mini_profile.st @@ -18,9 +18,9 @@
$endif$ - - - + + +

contact info

$if(contact)$ diff --git a/template/newlog.st b/template/newlog.st index 559c4b7..9bef1f7 100755 --- a/template/newlog.st +++ b/template/newlog.st @@ -123,14 +123,14 @@ window.location = "/error/ie";
$roomkey$ log
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$ $json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/nigga.st b/template/nigga.st index f8920e4..91b0d8b 100755 --- a/template/nigga.st +++ b/template/nigga.st @@ -78,15 +78,15 @@
-

$dump_cnt$ dumps ➡

+

$dump_cnt$ humps ➡

-

$dumps_user_faved_cnt$ dumps Faved ➡

+

$dumps_user_faved_cnt$ humps Faved ➡

-

$if(score_ent)$ $score$ $else$ 0 $endif$ of $if(is_home)$ your $else$ $nick$'s$endif$ dumps Faved

+

$if(score_ent)$ $score$ $else$ 0 $endif$ of $if(is_home)$ your $else$ $nick$'s$endif$ humps Faved

$nick$'s most recent favs
diff --git a/template/popular.st b/template/popular.st index 49395c8..d7312c8 100755 --- a/template/popular.st +++ b/template/popular.st @@ -16,11 +16,11 @@
$mini_profile$
- $if(dumps)$ - $dumps:{ d | $popular_dump(dump=d)$ }$ + $if(humps)$ + $humps:{ d | $popular_dump(hump=d)$ }$ $else$ - no dumps + no humps $endif$
diff --git a/template/popular_dump.st b/template/popular_dump.st index ae15326..e98562c 100755 --- a/template/popular_dump.st +++ b/template/popular_dump.st @@ -1,15 +1,15 @@ -
+
-$dump.created_on$ - in $dump.key$ +$hump.created_on$ - in $hump.key$
-
$dump.content$
+
$hump.content$
-$dump.count$ $dump.favers: { nick | $nick$   }$ +$hump.count$ $hump.favers: { nick | $nick$   }$
$share_buttons()$
diff --git a/template/profile.st b/template/profile.st index 6f3e5dc..7522e8a 100755 --- a/template/profile.st +++ b/template/profile.st @@ -103,7 +103,7 @@ jQuery(document).ready(function() {
-
$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps
 +
$if(is_home)$ your $else$ $nick$'s$endif$ most recent humps
$imgs: { img | }$
diff --git a/template/profile_dump.st b/template/profile_dump.st index 23d8e6c..0fe4832 100755 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -1,23 +1,23 @@ -
+
- $dump.created_on$ -- in $dump.key$ + $hump.created_on$ -- in $hump.key$
- +
-$if(dump.avatar)$ - +$if(hump.avatar)$ + $else$ $endif$
-
$dump.content$
+
$hump.content$
$share_buttons()$
diff --git a/template/profilelog.st b/template/profilelog.st index 3f92185..d277f77 100755 --- a/template/profilelog.st +++ b/template/profilelog.st @@ -36,8 +36,8 @@
$endif$ -
dumps posted: $dump_cnt$
-
dumps $nick$ faved: $dumps_user_faved_cnt$
+
humps posted: $dump_cnt$
+
humps $nick$ faved: $dumps_user_faved_cnt$
$if(is_home)$
-
$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps
 +
$if(is_home)$ your $else$ $nick$'s$endif$ most recent humps
$imgs: { img | }$
diff --git a/template/rooms/frontpage.st b/template/rooms/frontpage.st index 1cf6fba..fb1b36a 100755 --- a/template/rooms/frontpage.st +++ b/template/rooms/frontpage.st @@ -78,12 +78,12 @@
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $fame_dump(dump=d)$ }$ + $humps: { d | $fame_dump(hump=d)$ }$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/search_files.st b/template/search_files.st index b375f83..ae24080 100755 --- a/template/search_files.st +++ b/template/search_files.st @@ -8,7 +8,7 @@ -
search dumps:


+
search humps:




diff --git a/template/share_buttons.st b/template/share_buttons.st index f10a29e..c481607 100755 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -3,9 +3,9 @@ - + $if(logged_in)$ -$if(dump.favorited)$ +$if(hump.favorited)$ $else$
@@ -13,7 +13,7 @@ $else$
$endif$ $endif$ -$if(dump.favcount)$ - $dump.favcount$ +$if(hump.favcount)$ + $hump.favcount$ $endif$ diff --git a/template/simplerlog.st b/template/simplerlog.st index d54f6b3..eee6b8e 100755 --- a/template/simplerlog.st +++ b/template/simplerlog.st @@ -141,15 +141,15 @@ hump.fm lets you talk with pictures! Paste an image url, upload, or snap a pic r
- $if(dumps)$ + $if(humps)$ - $dumps: { d | $log_dump(dump=d)$ }$ + $humps: { d | $log_dump(hump=d)$ }$ $json_tags_block(json_tags=json_tags)$ $else$ - No dumps! + No humps! $endif$
diff --git a/template/single_message.st b/template/single_message.st index 88d4e3d..33e5e3d 100755 --- a/template/single_message.st +++ b/template/single_message.st @@ -10,27 +10,27 @@ $banner()$



-
+
- - $if(dump.avatar)$ - -
$dump.content$
+
$hump.content$
- $dump.count$ + $hump.count$ - $dump.favers: { nick | $nick$  }$ + $hump.favers: { nick | $nick$  }$
$single_message_share_buttons()$
diff --git a/template/single_message_share_buttons.st b/template/single_message_share_buttons.st index 2781199..04a91a3 100755 --- a/template/single_message_share_buttons.st +++ b/template/single_message_share_buttons.st @@ -3,9 +3,9 @@ - + $if(user_nick)$ - $if(dump.favorited)$ + $if(hump.favorited)$ $else$
@@ -13,7 +13,7 @@ $if(user_nick)$
$endif$ $endif$ -$if(dump.favcount)$ - $dump.favcount$ +$if(hump.favcount)$ + $hump.favcount$ $endif$ diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st index 052aa34..5f72b4b 100755 --- a/template/tagged_dumps.st +++ b/template/tagged_dumps.st @@ -19,8 +19,8 @@ $infobar$
- $if(dumps)$ - $dumps: { d | $log_dump(dump=d)$ }$ + $if(humps)$ + $humps: { d | $log_dump(hump=d)$ }$ $else$ favless diff --git a/template/topic.st b/template/topic.st index 30a5b87..9addb22 100755 --- a/template/topic.st +++ b/template/topic.st @@ -16,9 +16,9 @@

- $if(dumps)$ + $if(humps)$ - $dumps: { d | $topic_dump(dump=d)$ }$ + $humps: { d | $topic_dump(hump=d)$ }$ $else$ Topic #$topic$ doesn't exist yet! diff --git a/template/topic_dump.st b/template/topic_dump.st index cc52e4e..be26aeb 100755 --- a/template/topic_dump.st +++ b/template/topic_dump.st @@ -1,8 +1,8 @@ -
+
- $dump.created_on$ -- by $dump.nick$ in $dump.key$ + $hump.created_on$ -- by $hump.nick$ in $hump.key$
-
$dump.content$
+
$hump.content$
$share_buttons()$
diff --git a/template/userlog.st b/template/userlog.st index 30925a9..6552642 100755 --- a/template/userlog.st +++ b/template/userlog.st @@ -13,11 +13,11 @@
$mini_profile$
- $if(dumps)$ - $dumps:{ d | $profile_dump(dump=d)$ }$ + $if(humps)$ + $humps:{ d | $profile_dump(hump=d)$ }$ $else$ - no dumps + no humps $endif$
-- cgit v1.2.3-70-g09d2