summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorMichael Francis <edude03@gmail.com>2011-06-20 22:10:57 -0400
committerMichael Francis <edude03@gmail.com>2011-06-20 22:11:15 -0400
commit45f1b2a052a4abc1d6d730d20c6eea44e7709c7f (patch)
tree684ee36c6093bf1b0f7f01acd02567976c9b8a15 /views
parentb3178389a36c78aded751c3ecc3113cd3334bd90 (diff)
downloadotakuhub-45f1b2a052a4abc1d6d730d20c6eea44e7709c7f.tar.xz
Created new feed view
Diffstat (limited to 'views')
-rw-r--r--views/Feeds/index.html.php670
-rw-r--r--views/Users/feed.html.php83
2 files changed, 77 insertions, 676 deletions
diff --git a/views/Feeds/index.html.php b/views/Feeds/index.html.php
index 9ab37d0..9aa744c 100644
--- a/views/Feeds/index.html.php
+++ b/views/Feeds/index.html.php
@@ -1,634 +1,42 @@
-<!DOCTYPE html>
-<html><!-- Source is http://carbontheme.tumblr.com/ -->
- <head>
- <meta charset="utf-8" />
-
- <title>Carbon</title>
-
- <meta name="tumblr-theme" content="16510" />
-
- <meta name="description" content="Designed by Mark Jardine and inspired by industrial design. Ready to go with your social links and Disqus support. Buy it now." />
-
- <link rel="alternate" type="application/rss+xml" href="http://carbontheme.tumblr.com/rss" />
- <link rel="shortcut icon" href="http://24.media.tumblr.com/avatar_9318cab29a1a_16.png" />
-
- <meta name="text:Facebook Url" content="" />
- <meta name="text:Flickr Url" content="" />
- <meta name="text:Vimeo Url" content="" />
- <meta name="text:Contact Email" content="" />
- <meta name="if:Show Archive" content="1" />
-
- <meta name="text:Tagline" content="A Tumblog by" />
- <meta name="if:Show Tagline" content="1" />
-
- <meta name="text:Disqus Shortname" content="" />
-
- <meta name="text:GA Property ID" content="" />
-
- <style>
-
- body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0; }
- table { border-collapse:collapse; border-spacing:0; }
- fieldset,img { border:0; }
- address,caption,cite,code,dfn,em,strong,th,var { font-style:normal; font-weight:normal; }
- ol,ul { list-style:none; }
- caption,th { text-align:left; }
- h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; }
- q:before,q:after { content:''; }
- abbr,acronym { border:0; }
- a { outline:none; }
-
-
- @font-face {
- font-family: 'TitilliumText22LXBold';
- src: url('http://static.tumblr.com/lakznp6/e0flbfi7z/titilliumtext22l006-webfont.eot');
- src: local('☺'), url('http://static.tumblr.com/lakznp6/Gizlbfiah/titilliumtext22l006-webfont.woff') format('woff'), url('http://static.tumblr.com/lakznp6/pvjlbfi9p/titilliumtext22l006-webfont.ttf') format('truetype'), url('http://static.tumblr.com/lakznp6/QE6lbfi8y/titilliumtext22l006-webfont.svg#webfontI2J8pdTu') format('svg');
- font-weight: bold;
- font-style: normal;
- }
-
-
-
- .hide { display:none !important; }
- .icon { display: inline-block; width: 29px; height: 29px; background-image: url(Carbon_files/sidebar_icon_sprite.png); background-repeat: no-repeat; }
- .icon.twitter { background-position: 0 0; }
- .icon.facebook { background-position: 0 -29px; }
- .icon.flickr { background-position: 0 -58px; }
- .icon.email { background-position: 0 -87px; }
- .icon.vimeo { background-position: 0 -116px; }
- .icon.page { background-position: 0 -145px; }
- .icon.ask { background-position: 0 -174px; }
- .icon.submit { background-position: 0 -203px; }
-
-
-
- html { background:#7f878f url(Carbon_files/bg_texture.png); height:100%; font-size:13px; min-width:960px; }
- body { height:100%; font-family:helvetica,arial,sans-serif; min-width:960px; }
-
- #container { width:1060px; min-width:1060px; height:100%; }
-
- #sidebar { position: relative; float:left; width:354px; height:100%; position:fixed; top: 0; left: 0; background:url(Carbon_files/bg_sidebar.png) repeat-y; }
- #sidebar-glow { position: absolute; z-index: 1; width: 279px; height: 274px; background: url(Carbon_files/sidebar_top.png) no-repeat 0 0;}
-
- #header { position: relative; z-index: 2; width: 279px; padding: 12px 0 15px; }
-
- #portrait { position: relative; display: block; padding: 5px; width: 72px; height: 73px; margin: 0 auto;}
- #portrait img, #portrait a { display: block; width: 72px; height: 72px;}
- #portrait .frame { position: absolute; display: block; top: 0; left: 0; width: 82px; height: 83px; background: url(Carbon_files/portrait_frame.png) no-repeat 0 0; }
-
- #title { padding: 0 20px 5px; }
- #title .top { width: 239px; height: 14px; background: url(Carbon_files/title_top.png) no-repeat 0 0; }
- #title .bottom { width: 239px; height: 13px; background: url(Carbon_files/title_bottom.png) no-repeat 0 0; }
- #title .content { background:url(Carbon_files/title_slice.png) repeat-y 0 0; padding: 10px 0 7px; }
- #title .tagline { display: block; text-align: center; color: #12253c; text-shadow: 0 1px 0 #7390b2; }
- #title h1 { padding: 0.1em 0 0; font: normal 28px/32px TitilliumText22LXBold, Helvetica, Arial, sans-serif; font-weight: bold; color: #fff; text-transform: uppercase; text-align: center; text-shadow: 0 -1px 0 #000; }
- #title h1 a { display:block; text-decoration:none; color: #fff; }
-
-
- #header p.info { font-size:12px; line-height:1.5em; width:220px; text-align:center; padding:0 30px; margin: 0; color:#a9c3e4; text-shadow:#112a49 0 -1px 0; -webkit-text-stroke:.5px transparent; }
- #header p.info a { color:#fff; text-decoration: none;}
- #header p.info a:hover { color:#a9c3e4; text-decoration: underline; }
-
- #mylinks { position: relative; z-index: 2; width:227px; margin:0 25px; margin-bottom:1.7em; }
- #mylinks ul { background:#111e2c; border:3px solid #445f82; border-radius: 10px; -webkit-border-radius:10px; -moz-border-radius:10px; -webkit-box-shadow: 0 0 0 #28476F; }
- #mylinks ul li { display: block; border-top: 1px solid #1C2E43; border-bottom: 1px solid #000; }
- #mylinks ul li:hover { background-color: #0b1621; }
-
- #mylinks ul li a { display:block; height: 29px; padding:10px; text-decoration:none; font-size:11px; line-height:1.2em; color:#7697c1; font-style:italic; -webkit-text-stroke:0.5px transparent; }
- #mylinks ul li a .icon { float: left; margin: 0 10px 0 0; }
- #mylinks ul li a strong { font-size:13px; line-height: 15px; color:#fff; text-shadow:#000 0 -1px 0; font-weight:bold; }
- #mylinks ul li.nolabel a strong { line-height: 29px; }
- #mylinks ul li:first-child a { border-top-left-radius:8px; border-top-right-radius:8px; -webkit-border-top-left-radius:8px; -webkit-border-top-right-radius:8px; -moz-border-radius-topleft:8px; -moz-border-radius-topright:8px; }
- #mylinks ul li:first-child { border-top: none; -webkit-border-top-left-radius:10px; -webkit-border-top-right-radius:10px; -moz-border-radius-topleft:8px; -moz-border-radius-topright:8px; }
- #mylinks ul li:last-child a { border-bottom-left-radius:8px; border-bottom-right-radius:8px; -webkit-border-bottom-left-radius:8px; -webkit-border-bottom-right-radius:8px; -moz-border-radius-bottomleft:8px; -moz-border-radius-bottomright:8px; background:none; }
- #mylinks ul li:last-child { border-bottom: none; border-bottom-left-radius:10px; border-bottom-right-radius:10px; -webkit-border-bottom-left-radius:10px; -webkit-border-bottom-right-radius:10px; -moz-border-radius-bottomleft:8px; -moz-border-radius-bottomright:8px; }
-
- #content { margin-left:354px; padding:50px 0 50px 0; float:left; }
-
- /* Search and RSS */
- #helper { margin:0 0 15px 25px; float:left; width:685px; padding-bottom:25px; background:url(Carbon_files/divider.png) repeat-x 0 bottom; }
- #helper form { float:left; border:0; width:284px; height:33px; display:block; font-weight:bold; background:url(Carbon_files/bg_search_focus.png) no-repeat 0 0; }
- #helper form input { background:url(Carbon_files/bg_search.png) no-repeat 0 0; border:0; margin:0; padding:0 10px 0 30px; line-height:33px; width:244px; height:33px; display:block; font-weight:bold; color:#aaa; font-size:13px; font-family:helvetica,arial,sans-serif; }
- #helper form input:focus { outline:0; color:#555; background:none; }
- #helper span.rss { margin-top:5px; float:right; display:block; width:150px; text-align:left; }
- #helper span.rss a { background:url(Carbon_files/icon_rss.png) no-repeat 3px 50%; display:block; padding:4px 0 4px 35px; font-size:10px; font-weight:bold; text-decoration:none; color:#2b3034; white-space:nowrap; text-shadow:#939aa2 0 1px 0; }
- #helper span.rss a:hover { color:#fff; text-shadow:#616973 0 1px 0; }
-
- /* Tag Page */
- #tag_header { margin-left:25px; }
- #tag_header h2 { font-size:15px; color:#434a50; text-shadow:#9aa2ab 0 1px 0; background:url(Carbon_files/divider.png) repeat-x 0 bottom; padding-bottom:18px; }
- #tag_header h2 strong { font-weight:bold; color:#32383e; }
-
- /* Sections */
- .section { width:685px; margin-left:25px; float:left; margin-bottom:20px; padding-bottom:20px; background:url(Carbon_files/divider.png) repeat-x 0 bottom; }
- .section .meta { width:150px; float:right; color:#2b3034; padding-top:20px; }
- .section .meta a { text-decoration:none; color:#2b3034; white-space:nowrap; }
- .section .meta a:hover { color:#fff; text-shadow:#616973 0 1px 0; }
- .section .meta li { font-size:10px; margin-bottom:.7em; line-height:1.5em; background:url(Carbon_files/icon_link.png) no-repeat 0 0; padding-left:35px; text-shadow:#939aa2 0 1px 0; }
- .section .meta .date { font-weight:bold; }
- .section .meta li.fav { background-image:url(Carbon_files/icon_fav.png); }
- .section .meta li.tags { background-image:url(Carbon_files/icon_tag.png); }
- .section .meta li.comments { background-image:url(Carbon_files/icon_comment.png); background-position: 4px 1px; }
- .section .meta li.source { background-image:url(Carbon_files/icon_source.png); background-position: 4px 1px;}
- .section .post { float:left; padding-top:20px; width:510px; min-height:50px; position:relative; margin-left:-89px; padding-left:89px; }
- .section .post .post_type { position:absolute; top:0; left:0; }
- .section .post .post_type a { text-indent:-5000px; margin-top:10px; width:63px; height:50px; display:block; background:url(Carbon_files/postmarker.png) no-repeat 0 0; }
- .section .post.audio .post_type a { background-image:url(Carbon_files/postmarker_audio.png); }
- .section .post.video .post_type a { background-image:url(Carbon_files/postmarker_video.png); }
- .section .post.link .post_type a { background-image:url(Carbon_files/postmarker_url.png); }
- .section .post.quote .post_type a { background-image:url(Carbon_files/postmarker_quote.png); }
- .section .post.text .post_type a { background-image:url(Carbon_files/postmarker_text.png); }
- .section .post.image .post_type a { background-image:url(Carbon_files/postmarker_img.png); }
- .section .post.chat .post_type a { background-image:url(Carbon_files/postmarker_chat.png); }
- .section .post .caption { background:url(Carbon_files/bg_caption.png); border:1px solid #676f78; border-radius:4px; -webkit-border-radius:4px; -moz-border-radius:4px; color:#202327; padding:7px 10px; float:left; min-width:35px; font-size:11px; text-shadow:#888e96 0 1px 0; position:relative; margin-bottom:20px; clear:both; }
- .section .post .caption:before { content:url(Carbon_files/caption_top.png); position:absolute; top:-13px; left:15px; }
- .section .post .caption p { margin-bottom:.7em; }
- .section .post .caption p:last-child { margin-bottom: 0; }
- .section .post a { color:#ddd; text-shadow:#5b656e 0 -1px 0; text-decoration:none; }
- .section .post a:hover { color:#fff; text-shadow:#616973 0 1px 0; }
- .section .post .repost { font-size:12px; text-align:right; font-style:italic; color:#121415; clear:both; text-shadow:#a6adb4 0 1px 0; }
-
- .post h1 { color:#ddd; font-weight:bold; font-size:21px; line-height:1em; margin-bottom:1em; }
- .post h1 a { color:#ddd; text-shadow:#5b656e 0 -1px 0; text-decoration:none; }
- .post h1 a:hover { color:#fff; text-shadow:#616973 0 1px 0; }
-
- /* Text */
- .section .post.text { color:#121415; text-shadow:#a6adb4 0 1px 0; font-size:14px; line-height:1.5em; }
- .section .meta.text { margin-top:45px; }
- .section .post.text p { line-height:1.5em; margin-bottom:1.5em; }
- .section .post.text h2 { font-size:15px; font-weight:bold; color:#000; line-height:1.5em; margin-bottom:1.5em; }
- .section .post.text strong { font-weight:bold; }
- .section .post.text em { font-style:italic; }
- .section .post.text hr { border:none; background:none; height:2px; background:url(Carbon_files/divider.png); line-height:.1em; margin:0 0 1.5em 0; padding:0; }
- .section .post.text ul,ol { margin:0 0 1.5em 1.5em; }
- .section .post.text li { list-style-position:inside; font-size:13px; line-height:1.5em; }
- .section .post.text ul li { list-style-type:disc; }
- .section .post.text ol li { list-style-type:decimal; }
- .section .post.text blockquote { border-left:2px solid #121415; padding:0 0 0 1em; margin-left:1.5em; margin-bottom:1.5em; }
- .section .post.text blockquote p { font-size:13px; line-height:1.5em; color:#222; font-style:italic; }
- /* Quote */
- .section .post.quote blockquote { font-size:18px; line-height:1.3em; background:url(Carbon_files/bg_caption.png); border:1px solid #676f78; border-radius:4px; -webkit-border-radius:4px; -moz-border-radius:4px; color:#202327; padding:10px; float:left; text-shadow:#888e96 0 1px 0; position:relative; margin-bottom:20px; }
- .section .post.quote blockquote:after { content:url(Carbon_files/caption_bot.png); position:absolute; bottom:-13px; left:15px; line-height:0em; }
- .section .post.quote blockquote p { margin-bottom:1em; }
- .section .post.quote em.source { font-size:12px; font-weight:bold; clear:both; color:#2b3034; text-shadow:#888e96 0 1px 0; display:block; margin-bottom:1.5em; }
- /* Image */
- .section .post.image .photo { border-bottom:1px solid #5a5f65; margin-bottom:1.5em; padding:5px; background:#fff; position:relative; }
- .section .post.image .photo a { display:block; text-decoration:none; }
- .section .post.image .photo a:hover { border:none; }
- .section .post.image .photo img { display:block; background:#000; }
- .section .post.image .photo:after { content:url(Carbon_files/photo_corner.png); position:absolute; display:block; z-index:1; top:-5px; right:-5px; }
- /* Video */
- .post.video .clip { padding: 4px; background:#000; border:1px solid #979ea5; margin-bottom:1.5em; }
- .post.video .clip object, .post.video .clip embed, .post.video .clip iframe { display:block; }
- /* Audio */
- .post.audio .clip { padding:8px; overflow: hidden; background:#000; margin-bottom:1.5em; border-radius:4px; -webkit-border-radius:4px; -moz-border-radius:4px; }
- .post.audio .albumart { float:left; margin: 0 24px 0 0; }
- .post.audio .albumart img { display: block; }
- .post.audio .player { position: relative; left: -10px; }
- .post.audio .clip embed, .post.audio .clip object { display:block; }
- .post.audio .info { color: #fff; margin: 40px 0 0; }
- .post.audio .info p { margin: 0.8em 0; font-size: 16px; }
- .post.audio .info .track { font-weight: bold; }
- /* Chat */
- .section .post.chat ul { }
- .section .post.chat ul li { color:#121415; text-shadow:#a6adb4 0 1px 0; font-size:14px; line-height:1.5em; margin-bottom:.5em; padding:4px 10px; }
- .section .post.chat ul li.odd { background:url(Carbon_files/bg_caption.png); border-radius:4px; -webkit-border-radius:4px; -moz-border-radius:4px; color:#222527; text-shadow:#939ba4 0 1px 0; }
- .section .post.chat ul li span.label { font-weight:bold; color:#000; }
- /* Link */
- .section .post.link .source { margin-bottom:1.5em; display:block; font-size:15px; float:left; border-radius: 4px; -webkit-border-radius:4px; -moz-border-radius:4px; padding:6px 10px; background:#374049; }
- .section .post.link .source a { color:#ddd; text-shadow:#29323a 0 -1px 0; text-decoration:none; border-bottom:1px solid #525c66; display:block; float:left; }
- .section .post.link .source a:hover { color:#fff; text-shadow:#29323a 0 1px 0; border-bottom-color:#69737c; }
- /* Pagination */
- #pagination { clear:both; text-align:center; margin-left:25px; color:#363d44; float:left; width:685px; text-shadow:#a6adb4 0 1px 0; margin-bottom:25px; }
- #pagination.top { background:url(Carbon_files/divider.png) repeat-x 0 bottom; padding-bottom:20px; }
- #pagination .new { float:left; }
- #pagination .old { float:right; }
- #pagination .current { padding-top:10px; margin:0 150px; }
- #pagination li a { text-decoration:none; color:#ddd; font-weight:bold; text-shadow:#333 0 -1px 0; height:36px; line-height: 36px; width:85px; padding: 0 8px 0 0; display:block; background:url(Carbon_files/button_nav_right.png) no-repeat 0 0; }
- #pagination li.new a { background-image:url(Carbon_files/button_nav_left.png); padding: 0 0 0 8px;}
- #pagination li a:hover { color:#fff; }
- #pagination li a:active { background-position:0 -36px; }
- /* Notes */
- #notes { clear:both; margin-left:25px; padding:20px 25px 10px 25px; background:#8f979f; border-radius:8px; -webkit-border-radius:8px; -moz-border-radius:8px; margin-top:-40px; position:relative; }
- #notes h4 { font-size:13px; font-weight:bold; color:#2c3336; text-shadow:#a6adb4 0 1px 0; margin-bottom:15px; }
- ol.notes li { padding:9px 0; clear:both; border-top:1px solid #808992; }
- ol.notes li blockquote { font-size:10px; margin-left:40px; border-left:2px solid #b0b6bc; padding-left:5px; margin-top:5px; }
- ol.notes li blockquote a { text-shadow:none; color:#5c646c; font-weight:normal; }
- ol.notes li blockquote a:hover { color:#fff; }
- ol.notes li a { color:#222; text-decoration:none; text-shadow:none; font-weight:bold; text-shadow:#a6adb4 0 1px 0; }
- ol.notes li a:hover { color:#fff; text-shadow:#707a83 0 1px 0; }
- ol.notes li a img { display:block; float:left; padding:1px; margin-top:-4px; background:#000; border:1px solid #aaa; }
- ol.notes li span.action { margin-left:30px; display:block; font-size:12px; color:#3c4448; text-shadow:#a6adb4 0 1px 0; }
- #footer { clear:both; position:fixed; bottom:10px; left:0; width:280px; text-align:center; }
- #footer p { font-size:11px; color:#08192b; text-shadow:#2e5a8a 0 1px 0; }
- #footer a { color:#08192b; text-decoration: none; }
- #footer a:hover { color:#fff; text-shadow:#29323a 0 1px 0; }
- /* Comments */
- #comments { color:#2b3034; text-shadow:#939aa2 0 1px 0; }
- #comments a { text-decoration:none; color:#2b3034; }
- #comments a:hover { color:#fff; text-shadow:#616973 0 1px 0; }
-
- </style>
-
-
- </head>
- <body>
- <!-- Tumblr Theme #16510 -->
- <div id="container">
- <div id="sidebar">
- <div id="sidebar-glow"></div>
- <div id="header">
- <a id="portrait" href="/">
- <img src="Carbon_files/avatar_9318cab29a1a_96.png" alt="" />
- <span class="frame"></span>
- </a>
-
- <div id="title">
- <div class="top"></div>
- <div class="content">
-
- <span class="tagline">A theme by Pixel Union</span>
-
- <h1><a href="/">Carbon</a></h1>
- </div>
- <div class="bottom"></div>
- </div>
-
-
- <p class="info">Designed by <a href="http://markjardine.com/">Mark Jardine</a> and inspired by industrial design. Ready to go with your social links and Disqus support. <a href="http://www.tumblr.com/theme/16510">Buy it now</a>.</p>
-
- </div>
-
- <div id="mylinks">
- <ul>
- <li><a href="http://twitter.com/KillSpillOrg"><span class="icon twitter"></span><strong>Twitter</strong><br />Follow Me</a></li>
- <li><a href="http://facebook.com"><span class="icon facebook"></span><strong>Facebook</strong><br />Friend Me (if you know me)</a></li>
- <li><a href="http://flickr.com"><span class="icon flickr"></span><strong>Flickr</strong><br />View my Photos</a></li>
-
-
-
- <li class="nolabel"><a href="/about"><span class="icon page"></span><strong>About me</strong></a></li>
-
-
- <li><a href="mailto:hello@example.com"><span class="icon email"></span><strong>Email</strong><br />Send a message</a></li>
- <li class="nolabel"><a href="/ask"><span class="icon ask"></span><strong>Ask me anything</strong></a></li>
-
- <li class="nolabel"><a href="/archive"><span class="icon page"></span><strong>Archive</strong></a></li>
- </ul>
- </div>
- </div><!--#sidebar-->
-
-
- <div id="content">
- What's up doc?
- <div id="helper">
- <form action="/search" method="get">
- <input type="text" name="q" class="searchbox" value=""/>
- <!-- <input type="submit" value="Search"/> -->
- </form>
- <span class="rss"><a href="http://carbontheme.tumblr.com/rss">Subscribe via RSS</a></span>
- </div>
- <hr class="hide" />
-
-
-
-
- <div class="section">
-
-
-
-
- <div class="post image metalab tim_wilkinson">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528498668/this-is-a-photo">Image</a></span>
- <div class="photo"><a href="http://carbontheme.tumblr.com/photo/1280/1528498668/1/tumblr_lbn4lf36zN1qeglo0"><img src="Carbon_files/tumblr_lbn4lf36zN1qeglo0o1_500.jpg" alt="This is a photo." /></a></div>
- <div class="caption"><p>This is a photo.</p></div>
- </div>
-
-
-
-
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528498668/this-is-a-photo">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528498668/this-is-a-photo#notes">6 notes</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528498668/this-is-a-photo#disqus_thread">0</a></li>
- <li class="tags"><a href="http://carbontheme.tumblr.com/tagged/MetaLab">MetaLab</a> <a href="http://carbontheme.tumblr.com/tagged/Tim_Wilkinson">Tim Wilkinson</a> </li>
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
-
-
-
-
- <div class="post video night canon_7d">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528718006/a-cool-little-video">Video</a></span>
- <div class="clip"><iframe src="http://player.vimeo.com/video/9290124" width="500" height="281" frameborder="0"></iframe></div>
- <div class="caption"><p>A cool little video.</p></div>
- </div>
-
-
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528718006/a-cool-little-video">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528718006/a-cool-little-video#notes">4 notes</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528718006/a-cool-little-video#disqus_thread">0</a></li>
- <li class="tags"><a href="http://carbontheme.tumblr.com/tagged/Night">Night</a> <a href="http://carbontheme.tumblr.com/tagged/Canon_7D">Canon 7D</a> </li>
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
-
-
-
-
-
-
- <div class="post chat ">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528595412/pursuing-peter">Chat Transcript</a></span>
- <h1><a href="http://carbontheme.tumblr.com/post/1528595412/pursuing-peter">Pursuing Peter</a></h1>
- <ul class="chat">
-
- <li class="odd user_1">
-
- <span class="label">Liam:</span>
-
- &quot;Peter has stopped replying to my emails again.&quot;
-
- </li>
-
- <li class="even user_2">
-
- <span class="label">William:</span>
-
- &quot;Let&#039;s both send him one at the same time.&quot;
-
- </li>
-
- <li class="odd user_1">
-
- <span class="label">Liam:</span>
-
- &quot;Good idea!&quot;
-
- </li>
-
- <li class="even user_2">
-
- <span class="label">William:</span>
-
- &quot;Alright!&quot;
- </li>
-
- </ul>
- </div>
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528595412/pursuing-peter">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528595412/pursuing-peter#notes">1 note</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528595412/pursuing-peter#disqus_thread">0</a></li>
-
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
-
-
-
-
-
-
-
- <div class="post link themes">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528532937/purchase-this-theme">Link</a></span>
- <span class="source"><a href="http://www.tumblr.com/theme/16510" class="link" >Purchase this theme</a></span>
-
- </div>
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528532937/purchase-this-theme">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528532937/purchase-this-theme#notes">0 notes</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528532937/purchase-this-theme#disqus_thread">0</a></li>
- <li class="tags"><a href="http://carbontheme.tumblr.com/tagged/Themes">Themes</a> </li>
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
-
- <div class="post quote great_criticism">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528515990/kelly-wants-to-know-if-there-is-something-for-the">Quote</a></span>
- <blockquote>Kelly wants to know if there is something for the background available besides the blue ladies underwear pattern.</blockquote>
- <em class="source">&mdash;Said in a high nasal voice.</em>
- </div>
-
-
-
-
-
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528515990/kelly-wants-to-know-if-there-is-something-for-the">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528515990/kelly-wants-to-know-if-there-is-something-for-the#notes">1 note</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528515990/kelly-wants-to-know-if-there-is-something-for-the#disqus_thread">0</a></li>
- <li class="tags"><a href="http://carbontheme.tumblr.com/tagged/Great_Criticism">Great Criticism</a> </li>
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
- <div class="post text literature hemingway">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528478631/a-clean-well-lighted-place">Text</a></span>
- <h1><a href="http://carbontheme.tumblr.com/post/1528478631/a-clean-well-lighted-place">A Clean, Well-Lighted Place </a></h1>
- <p>BY ERNEST HEMINGWAY</p>
-
-<p>It was very late and everyone had left the cafe except an old man who sat in the shadow the leaves of the tree made against the electric light. In the day time the street was dusty, but at night the dew settled the dust and the old man liked to sit late because he was deaf and now at night it was quiet and he felt the difference. The two waiters inside the cafe knew that the old man was a little drunk, and while he was a good client they knew that if he became too drunk he would leave without paying, so they kept watch on him. </p>
-
-<p>Read the rest: <a href="http://www.mrbauld.com/hemclean.html">here</a>.</p>
- </div>
-
-
-
-
-
-
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528478631/a-clean-well-lighted-place">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528478631/a-clean-well-lighted-place#notes">2 notes</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528478631/a-clean-well-lighted-place#disqus_thread">0</a></li>
- <li class="tags"><a href="http://carbontheme.tumblr.com/tagged/Literature">Literature</a> <a href="http://carbontheme.tumblr.com/tagged/Hemingway">Hemingway</a> </li>
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
- <div class="section">
-
-
-
-
-
-
-
- <div class="post audio ">
- <span class="post_type"><a href="http://carbontheme.tumblr.com/post/1528702798">Audio</a></span>
- <div class="clip">
-
- <div class="albumart">
- <img src="Carbon_files/tumblr_lbn5nwjpXc1qeglo0o1_1289347008_cover.jpg" alt="" width="200" height="200" />
- </div>
-
-
- <div class="player"><script type="text/javascript" language="javascript" src="Carbon_files/tumblelog.js"></script><span id="audio_player_1528702798">[<a href="http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash" target="_blank">Flash 9</a> is required to listen to audio.]</span><script type="text/javascript">replaceIfFlash(9,"audio_player_1528702798",'\x3cdiv class=\x22audio_player\x22\x3e<embed type="application/x-shockwave-flash" src="http://assets.tumblr.com/swf/audio_player_black.swf?audio_file=http://www.tumblr.com/audio_file/1528702798/tumblr_lbn5nwjpXc1qeglo0&color=FFFFFF" height="27" width="207" quality="best"></embed>\x3c/div\x3e')</script></div>
-
- <div class="info">
- <p class="track">Certain Things </p>
-
- <p class="artist">Destroyer</p>
-
- <p class="album">Your Blues</p>
- </div>
- </div>
- <span class="clipurl"></span>
-
- </div>
-
-
-
-
- <div class="meta">
- <ul>
- <li class="date"><a href="http://carbontheme.tumblr.com/post/1528702798">4 months ago</a></li>
- <li class="fav"><a href="http://carbontheme.tumblr.com/post/1528702798#notes">1 note</a></li>
- <li class="comments"><a href="http://carbontheme.tumblr.com/post/1528702798#disqus_thread">0</a></li>
-
-
- </ul>
- </div>
- </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
- <ul id="pagination">
-
- <li class="old"><a href="/page/2">Older</a></li>
- <li class="current">Page 1 of 2</li>
+<!-- page container -->
+ <div id="page" >
+ <!-- page title -->
+ <h2 class="ribbon blue full" >About Us <span>A bit about our company</span> </h2>
+ <div class="triangle-ribbon blue" ></div>
+ <br class="cl" >
+ <!-- page content -->
+ <div id="page-content" class="two-col container_12" >
+ <div class="grid_4">
+ <!-- sidebar -->
+ <aside>
+ <div class="sidebar-nav" >
+ <li class="first current" ><a href="#" >Feed</a></li>
+ <li class="" ><a href="#" >Direct Message</a></li>
+ </div>
+ </aside>
+ </div>
+ <!-- Page Content -->
+ <div class="grid_4"> <img class="inlinepic" src="img/about.jpg" alt="" /> </div>
+ <div class="grid_8">
+ <h4>John Doe</h4>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. </p>
+ <h5 class="inline">Skills:</h5>
+ <ul class="tags">
+ <li>HTML</li>
+ <li>CSS</li>
+ <li>JS/jQuery</li>
+ </ul>
+ <h5 class="inline">Social:</h5>
+ <ul class="social">
+ <li><a href="#"><img class="tooltip" src="img/social/16/twitter.png" title="Follow me on Twitter" alt="twitter" /></a></li>
+ <li><a href="#"><img class="tooltip" src="img/social/16/facebook.png" title="My Facebook profile" alt="facebook" /></a></li>
+ <li><a href="#"><img class="tooltip" src="img/social/16/linkedin.png" title="My LinkedIn profile" alt="linkedin" /></a></li>
+ <li><a href="#"><img class="tooltip" src="img/social/16/skype.png" title="Call me on Skype" alt="skype" /></a></li>
</ul>
-
- </div><!--#content-->
- <hr class="hide" />
- <div id="footer">
- <p>&copy; <a rel="external" href="http://www.pixelunion.net">Pixel Union</a></p>
</div>
- </div><!--#container-->
-
- <script src="Carbon_files/jquery.min.js"></script>
- <script>
- var iOS = !!(navigator.userAgent.match(/iP(?:hone|od|ad)/i))
- $(function(){
- if(!iOS) {
- $('embed[src^="http://www.youtube.com"]', this).each(function(){
- var parent = $(this).closest('.clip');
- parent.html( parent.html().replace(/rel=0/gmi, 'rel=0&amp;color1=0xFFFFFF&amp;color2=0xFFFFFF&amp;hd=1') );
- });
- }
- });
- </script>
-
-
-
-
- <script>
- var disqus_shortname = 'bikiniatoll';
- (function () {
- var s = document.createElement('script'); s.async = true;
- s.src = 'http://disqus.com/forums/bikiniatoll/count.js';
- (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
- }());
- </script>
-
-
- <!--
- This Tumblr Theme and all of its CSS, Javascript,
- and media assets are subject to Tumblr's Terms of Service:
+ <br class="cl" />
+ <br />
+ </div>
- http://www.tumblr.com/terms_of_service
- -->
- <!-- BEGIN TUMBLR CODE --><iframe src="http://assets.tumblr.com/iframe.html?9&src=http%3A%2F%2Fcarbontheme.tumblr.com%2F&amp;lang=en_US&amp;name=carbontheme&amp;brag=0" scrolling="no" width="330" height="25" frameborder="0" style="position:absolute; z-index:1337; top:0px; right:0px; border:0px; background-color:transparent; overflow:hidden;" id="tumblr_controls"></iframe><!--[if IE]><script type="text/javascript">document.getElementById('tumblr_controls').allowTransparency=true;</script><![endif]--><script type="text/javascript">_qoptions={qacct:"p-19UtqE8ngoZbM"};</script><script type="text/javascript" src="Carbon_files/quant.js"></script><noscript><img src="http://pixel.quantserve.com/pixel/p-19UtqE8ngoZbM.gif" style="display:none; border-width:0px; height:1px; width:1px;" alt=""/></noscript><!-- END TUMBLR CODE --></body>
-</html> \ No newline at end of file
+ <div>
+</div>
diff --git a/views/Users/feed.html.php b/views/Users/feed.html.php
index d37b0a6..6554fce 100644
--- a/views/Users/feed.html.php
+++ b/views/Users/feed.html.php
@@ -1,45 +1,38 @@
-<h1>Welcome <?= $user->username ?></h1>
-<div class="post">
-<?= $this->form->create(null, array('action' => 'post')); ?>
- <?= $this->form->field('body', array('type' => 'textarea')); ?>
- <?= $this->form->submit('Post!'); ?>
-<?= $this->form->end(); ?>
-</div>
-<h2> Here are some posts:</h2>
-
-<?php if($feed): ?>
-<?php foreach ($feed as $post): ?>
-<div class="date">
- <span class="month"><a href="#" title="">Nov</a></span>
- <span class="day"><a href="#" title="">8</a></span>
- </div> <!-- .date -->
-
-
-
- <div class="post post-link">
- <!--<h3><a href="#" title="http://" >My favorite web site</a></h3>-->
-
- <p><?php echo $post->body ?></p>
-
-
-
- <div class="postmeta">
-
- <p class="posttime"><a href="#" title="http://demo.tumblr.com/post/234/my-favorite-web-site">Posted <?=date('m/d/y', $post->datetime->sec) ?></a></p>
-
-
-
- <p class="notes"><a href="#" title="http://demo.tumblr.com/post/234/my-favorite-web-site#permalink-notes">1,256 notes</a></p>
-
-
-
-
-
- </div> <!-- .postmeta -->
- </div> <!-- .post -->
- <div class="clear newpost"></div>
-<?php endforeach; ?>
-<?php else: ?>
-<p>Woops! You have no posts, why not post something and get the party started!</p>
-<?php endif; ?>
- \ No newline at end of file
+<!-- page container -->
+<!-- page title -->
+<h2 class="ribbon blue full" >About Us <span>A bit about our company</span> </h2>
+<div class="triangle-ribbon blue" ></div>
+<br class="cl" >
+ <!-- sidebar -->
+ <aside>
+ <ul class="sidebar-nav" >
+ <li class="first current" ><a href="#" >Feed</a></li>
+ <li class="" ><a href="#" >Direct Message</a></li>
+ </ul>
+ </aside>
+ <!-- Page Content -->
+ <div id="page-content" class="two-col container_12" >
+ <?php foreach($feed as $post) { ?>
+ <div class="grid_4"><img class="inlinepic" src="/img/about.jpg" alt="" /></div>
+ <div class="grid_8">
+ <h4><?= $post->username ?></h4>
+ <p><?php echo $post->body; ?> </p>
+ <h5 class="inline">Skills:</h5>
+ <ul class="tags">
+ <li>HTML</li>
+ <li>CSS</li>
+ <li>JS/jQuery</li>
+ </ul>
+ <h5 class="inline">Social:</h5>
+ <ul class="social">
+ <li><a href="#"><img class="tooltip" src="/img/social/16/twitter.png" title="Follow me on Twitter" alt="twitter" /></a></li>
+ <li><a href="#"><img class="tooltip" src="/img/social/16/facebook.png" title="My Facebook profile" alt="facebook" /></a></li>
+ <li><a href="#"><img class="tooltip" src="/img/social/16/linkedin.png" title="My LinkedIn profile" alt="linkedin" /></a></li>
+ <li><a href="#"><img class="tooltip" src="/img/social/16/skype.png" title="Call me on Skype" alt="skype" /></a></li>
+ </ul>
+ </div>
+ <br class="cl">
+ <?php } ?>
+ </div>
+ <br class="cl" />
+ <br class="cl" /> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-06-28 23:36:11 +0000