diff options
| -rw-r--r-- | src/site.clj | 10 | ||||
| -rw-r--r-- | src/tags.clj | 22 | ||||
| -rwxr-xr-x | src/utils.clj | 17 | ||||
| -rwxr-xr-x | static/css/dump.css | 18 | ||||
| -rw-r--r-- | static/index.html | 1 | ||||
| -rw-r--r-- | static/js/pichat.js | 9 | ||||
| -rwxr-xr-x | static/js/register.js | 5 | ||||
| -rw-r--r-- | template/banner.st | 22 | ||||
| -rw-r--r-- | template/chat.st | 12 | ||||
| -rw-r--r-- | template/directory.st | 1 | ||||
| -rw-r--r-- | template/fame.st | 1 | ||||
| -rw-r--r-- | template/fame_dump.st | 2 | ||||
| -rw-r--r-- | template/head.st | 17 | ||||
| -rw-r--r-- | template/log.st | 1 | ||||
| -rw-r--r-- | template/log_dump.st | 2 | ||||
| -rw-r--r-- | template/nigga.st | 1 | ||||
| -rw-r--r-- | template/profile.st | 1 | ||||
| -rw-r--r-- | template/profile_dump.st | 2 | ||||
| -rw-r--r-- | template/profilelog.st | 1 | ||||
| -rw-r--r-- | template/share_buttons.st | 19 | ||||
| -rw-r--r-- | template/single_message.st | 33 | ||||
| -rw-r--r-- | template/userlog.st | 1 |
22 files changed, 112 insertions, 86 deletions
diff --git a/src/site.clj b/src/site.clj index 45331c7..91f982e 100644 --- a/src/site.clj +++ b/src/site.clj @@ -17,7 +17,7 @@ admin compojure email - fame + fame utils cookie-login session-sweeper @@ -145,7 +145,7 @@ (first (do-select [query (maybe-parse-int m-id -1)])))) (defn fetch-public-message-by-id [m-id] - (let [msg (fetch-message-by-id m-id)] + (let [msg (tags/fetch-dump-by-id m-id)] (if (and msg (not (:admin_only msg))) msg))) @@ -570,8 +570,10 @@ FROM users u ; 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 (= (user-info :user_id) (message :user_id)) - (let [st (fetch-template "single_message" session)] - (.setAttribute st "message" (process-message-for-output message)) + (let [st (fetch-template "single_message" session) + message (tags/add-favorited-flag message session) + message (tags/remove-tags-for-output message)] + (.setAttribute st "dump" (process-message-for-output message)) (.toString st)) (resp-error "NO_MESSAGE")) (resp-error "NO_MESSAGE")) diff --git a/src/tags.clj b/src/tags.clj index de0b476..b6642d3 100644 --- a/src/tags.clj +++ b/src/tags.clj @@ -86,6 +86,22 @@ WHERE EXISTS (defn explain-query [query] (str "EXPLAIN ANALYZE " query)) +(defn fetch-dump-by-message-id-query [] (str +" SELECT + m.content, m.message_id, m.created_on, m.user_id, + u.nick, u.avatar, + r.key, r.admin_only, + array_to_string(ARRAY(SELECT nick || ' ' || tag + FROM tags, users + WHERE message_id = m.message_id AND tags.user_id = users.user_id), ' ') as tags + FROM + messages m, + users u, + rooms r + WHERE m.user_id = u.user_id + AND r.room_id = m.room_id + AND m.message_id = ?")) + ;; OFFSET is very slow when it is large ;; so, a subquery could be used when offset is large ;; one other thing we could do is include message_id in 'next page' url (tumblr & reddit do that for example) @@ -186,6 +202,7 @@ WHERE EXISTS ;; todo: only return distinct dumps? sorted by tag.created_on? ;; tag intersections +;; timb: just realized this is implemented wrongly... looking up "foo+bar" will also match stuff tagged "foo" by two people (defnk fetch-dumps-by-tags-query [:image-only true :num-tags 1 :message-user-id false :tag-user-id false :with-tags true :include-vip false] (str " SELECT m.content, m.message_id, m.created_on, @@ -212,6 +229,11 @@ WHERE EXISTS (if include-vip "" "AND r.admin_only = false"))) +(defn fetch-dump-by-id [m-id] + (let [query (fetch-dump-by-message-id-query)] + (let [rows (do-select [query (maybe-parse-int m-id -1)])] + (first (map parse-tags-from-row-as-tag-map rows))))) + (defnk fetch-dumps-by-room [:room-id 1 :image-only true :amount *dumps-per-page* :offset 0] (let [query (fetch-dumps-by-room-query image-only)] (let [rows (do-select [query room-id amount offset])] diff --git a/src/utils.clj b/src/utils.clj index fbdefda..9008793 100755 --- a/src/utils.clj +++ b/src/utils.clj @@ -13,7 +13,8 @@ clojure.contrib.sql clojure.contrib.duck-streams clojure.contrib.str-utils - compojure)) + compojure + config)) (let [db-host "localhost" db-name "dumpfm" @@ -263,13 +264,15 @@ (try (let [st (.getInstanceOf template-group template)] (if (session :nick) - (doto st - (.setAttribute "user_email" (session :email)) - (.setAttribute "user_nick" (session :nick)) - (.setAttribute "user_avatar" (if (non-empty-string? (session :avatar)) + (doto st + (.setAttribute "user_email" (session :email)) + (.setAttribute "user_nick" (session :nick)) + (.setAttribute "user_avatar" (if (non-empty-string? (session :avatar)) (session :avatar) nil)) - (.setAttribute "isadmin" (session :is_admin))) - st)) + (.setAttribute "isadmin" (session :is_admin)) + (.setAttribute "domain" config/*server-url*)) + (doto st + (.setAttribute "domain" config/*server-url*)))) (catch Exception e nil))) (defn fetch-template-fragment [template] diff --git a/static/css/dump.css b/static/css/dump.css index fc8ec4a..48135a3 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -425,7 +425,7 @@ a.msg-image-zoom img.zoom-icon:hover { } -div.content img:hover{background-color:white;} +/*div.content img:hover{background-color:white;}*/ .nick{background-color:white;margin-right:3px;} .msgDiv dump{background-color:white;} @@ -1423,10 +1423,18 @@ background-color:#fff; -moz-border-radius-bottomright:5px; } -#profiletxt img{ + + +.buttons .permalink img { width:16px; height:16px; } +/* don't show permalink button on permalink pages */ +body.permalink .buttons .permalink { + display: none; +} + + #pnav a { font-size: 30px; color:#000; @@ -1483,22 +1491,18 @@ color:000; .logged-dump img{ max-width:400px; - width: expression(this.width > 600 ? 600: true); max-height:400px; - height: expression(this.width > 600 ? 600: true); border:0px; z-index:4; } #messageList img { max-width:400px; - width: expression(this.width > 600 ? 600: true); max-height:400px; - height: expression(this.width > 600 ? 600: true); z-index:4; } .logged-dump { - background-color:#f0f9ff; + background-color:#fff; text-overflow: ellipsis-word; padding: 18px 18px 6px 18px; font-family: Arial, Helvetica, sans-serif; diff --git a/static/index.html b/static/index.html index 4eaeafa..9a8c434 100644 --- a/static/index.html +++ b/static/index.html @@ -2,7 +2,6 @@ <head> <title>dump.fm</title> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board"> <META NAME="description" CONTENT="Talk with pictures!"> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> <script type="text/javascript" src="/static/js/home.js"></script> diff --git a/static/js/pichat.js b/static/js/pichat.js index 5f66ee2..7b60071 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -240,9 +240,16 @@ function removeFavAndHideBox() { function showFav(f) { $('#favbox').show(); - buildFav(f).appendTo('#favbox').fadeOut(5000, removeFavAndHideBox); + buildFav(f).appendTo('#favbox').animate( + {"opacity": 0}, + {"duration": 9000, + "easing": "easeInExpo", + "complete": removeFavAndHideBox + }) + } + function updateFavs(fs) { if (fs.length == 0) return; diff --git a/static/js/register.js b/static/js/register.js index ebdc095..35fcc8a 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -26,11 +26,6 @@ function submitRegistration() { return; } - if (password.length < 5) { - alert("Password must be at least 5 characters long."); - return; - } - var hash = hex_sha1(nick + '$' + password + '$dumpfm'); var onSuccess = function() { if (typeof pageTracker !== 'undefined') { diff --git a/template/banner.st b/template/banner.st index 3bec6fa..cbd4639 100644 --- a/template/banner.st +++ b/template/banner.st @@ -4,7 +4,7 @@ <div id="logo7"> <div align="center"> <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 /> - <a class="img_roll" href="http://dump.fm/"></a> + <a class="img_roll" href="$domain$"></a> </div> </div> <div class="white"> @@ -12,18 +12,18 @@ <div style="float: left;"> <div align="center"> $if(user_nick)$ - <a href="http://dump.fm/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="http://dump.fm/static/img/thumbs/logbaricon.png"/> Log</a> - <a href="http://dump.fm/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> + <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> + <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="http://dump.fm/static/img/thumbs/profilebaricon.png"/> Profile</a> - <a href="http://dump.fm/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="http://dump.fm/static/img/thumbs/directorybaricon.png"/> Directory + <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> + <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory </a> - <a href="http://dump.fm/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="http://dump.fm/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> + <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> - <a href="http://dump.fm/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="http://dump.fm/static/img/thumbs/favsbaricon.png"/> Favs</a> - <a href="http://dump.fm/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="http://dump.fm/static/img/thumbs/searchbaricon.png"/> Image Search</a> + <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a> + <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a> $else$ <a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a> $endif$ @@ -45,7 +45,7 @@ <div id="topic"></div> <div id="dumplist"> $if(user_nick)$ - want a room? <a href="mailto:info@dump.fm">contact us! - <a href="http://dump.fm/chat/vortex"> checkout the image vortex!! </a>$else$ Talk with pictures! - <a href="http://dump.fm/chat/vortex"> checkout the nifty dump fm image vortex! </a> $endif$ $if(isadmin)$ + want a room? <a href="mailto:info@dump.fm">contact us! - <a href="$domain$/chat/vortex"> checkout the image vortex!! </a>$else$ Talk with pictures! - <a href="$domain$/chat/vortex"> checkout the nifty dump fm image vortex! </a> $endif$ $if(isadmin)$ <a href="http://news.dump.fm">- news</a> - <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> - <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a> -<a href="http://vip.dump.fm/"> NAUGHTY BOYS DELIGHT </a> $endif$ diff --git a/template/chat.st b/template/chat.st index d9de62c..43a1f34 100644 --- a/template/chat.st +++ b/template/chat.st @@ -19,13 +19,11 @@ $head()$ <title>$roomname$ dump.fm</title> -<META name="keywords" content="credit, mortgage, dating, hot girls, hot guys, debt solutions, get rich quick"> - <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css"> - <script type="text/javascript" src="http://dump.fm/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="http://dump.fm/static/webcam/webcam.js"></script> - <script type="text/javascript" src="http://dump.fm/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> + <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="http://dump.fm/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> $endif$ <script> jQuery(document).ready(initChat); @@ -98,7 +96,7 @@ $banner()$ $messages: { m | <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$"> <span class="nick"> - <b><a href="http://dump.fm/$m.nick$" target="_blank">$m.nick$</a></b> + <b><a href="$domain$/$m.nick$" target="_blank">$m.nick$</a></b> $if(m.favorited)$ <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)"> $else$ diff --git a/template/directory.st b/template/directory.st index 6d16942..1bf1eb5 100644 --- a/template/directory.st +++ b/template/directory.st @@ -6,7 +6,6 @@ <title>dump.fm directory</title> $endif$ $head()$ - <link rel="stylesheet" type="text/css" href="/static/css/dump.css"> <script> jQuery(document).ready(initDirectory); </script> diff --git a/template/fame.st b/template/fame.st index 1088a8f..4735cab 100644 --- a/template/fame.st +++ b/template/fame.st @@ -2,7 +2,6 @@ <head> <title>dump.fm hall of fame</title> $head()$ - <link rel="stylesheet" type="text/css" href="/static/css/dump.css"> <script> jQuery(document).ready(initLog); </script> diff --git a/template/fame_dump.st b/template/fame_dump.st index 8ebce02..05cc9fe 100644 --- a/template/fame_dump.st +++ b/template/fame_dump.st @@ -12,11 +12,13 @@ $else$ <img height="50" width="50" src="/static/noinfo.png"> $endif$ </div></a> <img height="16px" width="16px" src="http://dump.fm/static/img/thumbs/heartfaved.gif">$dump.count$ +<!-- $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)"> $else$ <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)"> $endif$ +--> <div class="content">$dump.content$</div> <hr /> $share_buttons()$ diff --git a/template/head.st b/template/head.st index d88c146..1ebb8f8 100644 --- a/template/head.st +++ b/template/head.st @@ -1,24 +1,25 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<meta name="keywords" content="dump.fm,mortgage, dating, hot girls, hot guys, debt solutions, get rich quick,buy gold,free stuff, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board,credit,"> +<meta name="keywords" content="dump.fm,hot girls, hot guys, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board"> <meta name="description" content="dump.fm - Talk with pictures!" /> - <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript" charset="utf-8"></script> -<script type="text/javascript" src="http://dump.fm/static/js/jquery-ui-1.8.effects.min.js"></script> -<script type="text/javascript" src="http://dump.fm/static/js/pichat.js"></script> +<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> +<script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> +<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> +<link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css"> $if(!user_nick)$ -<link href="http://dump.fm/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css"> +<link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css"> $endif$ $if(isadmin)$ <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<link rel="stylesheet" href="http://dump.fm/static/css/admin.css" +<link rel="stylesheet" href="$domain$/static/css/admin.css" type="text/css" media="all" /> <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="http://dump.fm/static/js/admin.js" type="text/javascript"></script> +<script src="$domain$/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="http://dump.fm/static/favicon.ico"> +<link rel="shortcut icon" href="$domain$/static/favicon.ico"> <!--[if IE]> <script> diff --git a/template/log.st b/template/log.st index 5c44f4e..c747305 100644 --- a/template/log.st +++ b/template/log.st @@ -2,7 +2,6 @@ <head> <title>dump.fm log</title> $head()$ - <link rel="stylesheet" type="text/css" href="/static/css/dump.css"> <script> jQuery(document).ready(initLog); </script> diff --git a/template/log_dump.st b/template/log_dump.st index fca3b82..f594cea 100644 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -12,11 +12,13 @@ $else$ <img height="50" width="50" src="/static/noinfo.png"> $endif$ </div></a> +<!-- $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)"> $else$ <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)"> $endif$ +--> <div class="content">$dump.content$</div> <hr /> $share_buttons()$ diff --git a/template/nigga.st b/template/nigga.st index 68c85eb..e46e61b 100644 --- a/template/nigga.st +++ b/template/nigga.st @@ -2,7 +2,6 @@ <head> <title>$nick$'s dump.fm</title> $head()$ - <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css"> <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script> <script src="/static/js/ajaxupload.js"></script> <script> diff --git a/template/profile.st b/template/profile.st index 97fcfa8..22e2978 100644 --- a/template/profile.st +++ b/template/profile.st @@ -5,7 +5,6 @@ <meta property="og:title" content="$nick$'s dump.fm"/> <meta property="og:site_name" content="dump.fm"/> $head()$ - <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css"> <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script> <script src="/static/js/ajaxupload.js"></script> <script> diff --git a/template/profile_dump.st b/template/profile_dump.st index 8866ae4..b101a08 100644 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -10,11 +10,13 @@ $else$ <img height="50" width="50" src="/static/img/noinfo.png"> $endif$ </div></a> +<!-- $if(dump.favorited)$ <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)"> $else$ <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)"> $endif$ +--> <div class="content">$dump.content$</div> <hr/> $share_buttons()$ diff --git a/template/profilelog.st b/template/profilelog.st index 7189377..24e9e07 100644 --- a/template/profilelog.st +++ b/template/profilelog.st @@ -2,7 +2,6 @@ <head> <title>$nick$'s dump.fm</title> $head()$ - <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css"> <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script> <script src="/static/js/ajaxupload.js"></script> <script> diff --git a/template/share_buttons.st b/template/share_buttons.st index a251cff..ca51b23 100644 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -1,11 +1,12 @@ <div class="buttons"> - <span class="other-sites"> - <div id="profiletxt"> - <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)"> - <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> - <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)"> - <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)"> - <a href="http://dump.fm/p/$dump.nick$/$dump.message_id$"><img src="http://dump.fm/static/img/link.gif"></a> - </div> - </span> + <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)"> + <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> + <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)"> + <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)"> + <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a> +$if(dump.favorited)$ + <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)"> +$else$ + <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)"> +$endif$ </div>
\ No newline at end of file diff --git a/template/single_message.st b/template/single_message.st index 79ef06f..13c3ac0 100644 --- a/template/single_message.st +++ b/template/single_message.st @@ -3,40 +3,35 @@ <title>dump.fm</title> $head()$ - <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/dump.css"> <script> - jQuery(document).ready(initDirectory); + jQuery(document).ready(initLog); </script> </head> - <body> + <body class="permalink"> $banner()$ - <div id="content"> - - <div id="messagePanep"> -<br> <a href="/$message.nick$"> - $if(message.avatar)$ - <div style="border-image:url($message.avatar$)"> + <div class="content"> + <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$"> +<br> <a href="/$dump.nick$"> +$if(dump.avatar)$ + <div style="border-image:url($dump.avatar$)"> <div id="avatarPic"> - <img height="50" width="50" src="$message.avatar$"></img> + <img height="50" width="50" src="$dump.avatar$"></img> </div> - - <b>$message.nick$</b> + <b>$dump.nick$</b> <hr> - $endif$ + </div> +$endif$ </a> - <div id="messageList"> - <div class="content" id="message-$message.message_id$"> - - <span class="linkify">$message.content$</span> + <div class="content">$dump.content$</div> <hr /> - </div> +$share_buttons()$ </div> <div id="footerc"> $footer()$ - </div> </div> + </div> </body> </html> diff --git a/template/userlog.st b/template/userlog.st index cc6678d..ee01b09 100644 --- a/template/userlog.st +++ b/template/userlog.st @@ -2,7 +2,6 @@ <head> <title>$nick$'s dump.fm</title> $head()$ - <link rel="stylesheet" type="text/css" media="screen" href="/static/css/dump.css"> <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script> <script src="/static/js/ajaxupload.js"></script> |
