Skip to content

Commit 38fd114

Browse files
techieyanntechieyann
committed
reset share sprite, changed about, minor edits
1 parent 6bea45b commit 38fd114

File tree

5 files changed

+59
-102
lines changed

5 files changed

+59
-102
lines changed

‎about.php

+30-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
About this file
77
***********************************************/
8-
require('includes/includes.php');
8+
/*require('includes/includes.php');
99
1010
connect_to_db($mysql_user, $mysql_pass, $mysql_db);
1111
@@ -101,5 +101,32 @@ function print_body()
101101
</div>
102102
</div>
103103
</div>";
104-
}
105-
?>
104+
}*/
105+
?>
106+
107+
<h3>About</h3>
108+
109+
<div class="span12">
110+
<div class="span6">
111+
<h4>Contact Us</h4>
112+
113+
</div>
114+
<div class="span6">
115+
<!-- Begin MailChimp Signup Form -->
116+
<link href="http://cdn-images.mailchimp.com/embedcode/slim-081711.css" rel="stylesheet" type="text/css">
117+
<style type="text/css">
118+
#mc_embed_signup{background:#fff; clear:left; font:14px Helvetica,Arial,sans-serif; }
119+
/* Add your own MailChimp form style overrides in your site stylesheet or in this style block.
120+
We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
121+
</style>
122+
<div id="mc_embed_signup">
123+
<form action="http://tndrbox.us6.list-manage.com/subscribe/post?u=89daa78f6b&amp;id=f4856720f3" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
124+
<label for="mce-EMAIL">Subscribe to our mailing list</label>
125+
<input type="email" value="" name="EMAIL" class="email" id="mce-EMAIL" placeholder="email address" required>
126+
<div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
127+
</form>
128+
</div>
129+
130+
<!--End mc_embed_signup-->
131+
</div>
132+
</div>

‎css/tndrbox.css

+9
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,8 @@ left:0px;
725725
{
726726
padding:10px;
727727
}
728+
729+
}
728730
@media all and (max-width:767px){
729731
.post-spacetime
730732
{
@@ -745,4 +747,11 @@ left:0px;
745747
border-top-left-radius: 0px;
746748
}
747749
}
750+
751+
#about
752+
{
753+
width:61%;
754+
margin: 0px auto;
755+
padding-left:20px;
756+
padding-right:20px;
748757
}

‎images/tndr-sprites.png

-1.49 KB
Loading

‎js/tndrbox.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ function initPage()
8282
if($(window).innerWidth() < 769)
8383
{
8484
$('#list-format').parent().hide();
85-
toggleViewFormat();
85+
toggleViewFormat();
86+
welcomePageExpanded = false;
8687
}
8788
getPosts();
8889

@@ -111,7 +112,7 @@ function initPage()
111112

112113

113114

114-
/* if($(window).innerWidth()<360)
115+
/* If($(window).innerWidth()<360)
115116
{
116117
117118
}*/
@@ -601,7 +602,7 @@ function setIPLocation()
601602
console.log('getting ip');
602603
ip_url = "http://api.hostip.info/get_json.php";
603604
geo_url = "http://freegeoip.net/json/";
604-
console.log('getting ip');
605+
605606
$.getJSON(ip_url, function(data){
606607
console.log(data);
607608
geo_url = geo_url + data.ip;
@@ -651,6 +652,7 @@ function setPosition(latitude, longitude)
651652
map.fitBounds(mapBound);
652653
}
653654
}
655+
sortPostings();
654656
}
655657

656658
function setCookie(name, value, hours)
@@ -700,7 +702,7 @@ function getPosts()
700702
postings[i]['sorted_delta'] = postings[i]['time_delta'];
701703
activePostings[i] = i;
702704
}
703-
sortPostings();
705+
writePosts();
704706
});
705707

706708
}
@@ -1118,7 +1120,7 @@ function repositionContainers()
11181120

11191121
if(!initialized)
11201122
{
1121-
endLoading($('#tndr'));
1123+
endLoading($('#tndr'));
11221124

11231125
initialized = true;
11241126

@@ -1139,7 +1141,7 @@ function repositionContainers()
11391141
});
11401142
if(masonryInitReload)
11411143
{
1142-
window.setTimeout(function(){tiles.masonry('reload');window.setTimeout(function(){tiles.masonry('reload');}, 5000);}, 5000);
1144+
window.setTimeout(function(){tiles.masonry('reload');window.setTimeout(function(){tiles.masonry('reload'); }, 3000);}, 3000);
11431145
}
11441146
}
11451147
else

‎partials/about.php

+12-93
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,15 @@
1-
<div id='about' class='tabbable content'>
2-
<ul class='nav nav-tabs'>
3-
<li class='active'><a href='#contact' data-toggle='tab'>Contact</a></li>
4-
<li><a href='#the-basics' data-toggle='tab'>The Basics</a></li>
5-
<li><a href='#faq' data-toggle='tab'>F.A.Q.</a></li>
6-
</ul>
7-
<div class='tab-content'>
8-
<div id='contact' class='tab-pane active'>
9-
<h2 style=\"text-align:center;padding:20px;\">Contact Us</h2>
10-
<p>Interested in getting your establishment on our site?
11-
Questions about functionality? Want to sing our praises?
12-
Even if you just had a bad day and need to talk,</p>
13-
<br>
14-
<p>send us an email:<strong><a href=\"mailto:tndrbox@gmail.com\">tndrbox@gmail.com</a></strong></p>
15-
</div>
1+
<div id="about" class="content">
162

17-
<div id='the-basics' class='tab-pane'>
18-
<div class='tabbable tabs-left content'>
19-
<ul class='nav nav-tabs'>
20-
<li class='active'><a href='#what' data-toggle='tab'>What</a></li>
21-
<li><a href='#why' data-toggle='tab'>Why</a></li>
22-
<li><a href='#how' data-toggle='tab'>How</a></li>
23-
<li><a href='#who' data-toggle='tab'>Who</a></li>
24-
<li><a href='#when' data-toggle='tab'>When</a></li>
25-
<li><a href='#where' data-toggle='tab'>Where</a></li>
26-
</ul>
27-
<div class='tab-content'>
28-
<div id='what' class='about-tab tab-pane active'>
29-
<h3>What tndrbox?</h3>
30-
<p>tndrbox is an online, community events board built for Oakland, by Oakland.</p>
31-
<p>It is built to connect local businesses, community groups and organizations to their communities by keeping neighbors posted about events, organizing efforts, and new happenings.</p>
32-
</div>
33-
<div id='why' class='about-tab tab-pane'>
34-
<h3>Why tndrbox?</h3>
35-
<p>We are tired of the hollow hype of social media blasts; We are over hipper-than-thou city guides that ask us to spend our paycheck on fashionable frivolity; and we are frustrated by mass coupons that undercut small businesses.</p>
36-
<p>We want to grow with our community as a part of it. Helping it become stronger and more vibrant.</p>
37-
</div>
38-
<div id='how' class='about-tab tab-pane'>
39-
<h3>How tndrbox?</h3>
40-
<p>Conveniently on your computer or phone. Find out what is happening when you are out and about or at home.</p>
41-
</div>
42-
<div id='who' class='about-tab tab-pane'>
43-
<h3>Who tndrbox?</h3>
44-
<p>We are Oakland natives who love our town. We are building the site that we need to connect to the community around us - a site that does what we love.</p>
45-
</div>
46-
<div id='when' class='about-tab tab-pane'>
47-
<h3>When tndrbox?</h3>
48-
<p>We are currently undergoing beta development and testing with a select user base (that's you!). If you want to get in on the fun, please email us.</p>
49-
</div>
50-
<div id='where' class='about-tab tab-pane'>
51-
<h3>Where tndrbox?</h3>
52-
<p>We are based in Oakland, CA. Hold on baby, we are coming.</p>
53-
</div>
54-
</div>
55-
</div>
56-
</div>
57-
<div id='faq' class='tab-pane'>
58-
<div class='tabbable tabs-left content'>
59-
<ul class='nav nav-tabs'>
60-
<li class='active'><a href='#name' data-toggle='tab'>Name</a></li>
61-
<li><a href='#price' data-toggle='tab'>Price</a></li>
62-
<li><a href='#app' data-toggle='tab'>App</a></li>
63-
<li><a href='#features' data-toggle='tab'>Features</a></li>
64-
<li><a href='#other' data-toggle='tab'>Other...</a></li>
65-
</ul>
66-
<div class='tab-content'>
67-
<div id='name' class='about-tab tab-pane active'>
68-
<h4>What's your name again?</h4>
69-
<p>We're tndrbox, pronounced tinderbox. Nice to meet you.</p>
70-
</div>
71-
<div id='price' class='about-tab tab-pane'>
72-
<h4> How much does it cost?</h4>
73-
<p>Nothing! It is free.</p>
74-
<h4>So how are you going to make money?</h4>
75-
<p>We're just focused on building the thing. But since you asked: we keep our costs low with a DIY mentality and don't need that much to operate. Profitability comes from doing something great, and doing something great is a product of love. We love what we do.</p>
76-
<p>We can promise you this: you are not the product. Ever.</p>
77-
</div>
78-
<div id='app' class='about-tab tab-pane'>
79-
<h4>Are you making an app?</h4>
80-
<p>Hold your horses city-boy! The website is already mobile-friendly, and an app is in the works.</p>
81-
</div>
82-
<div id='features' class='about-tab tab-pane'>
83-
<h4>When are you releasing more features?</h4>
84-
<p>Right now, we're focused on the foundation - having good content and good relations with our community. We don't have a public schedule available, but if you don't see something you'd like, please <a href=\"#contact\">email us!</a></p>
85-
</div>
86-
<div id='other' class='about-tab tab-pane'>
87-
<h4>Why wasn't my question listed?</h4>
88-
<p>Because no one asked us yet!
89-
Feel free to <a href=\"#contact\">contact us</a> with your query.</p>
90-
</div>
91-
</div>
92-
</div>
93-
</div>
3+
<p>tndrbox is an online community events board built by two native Oaklanders for Oakland.</p>
4+
5+
<p>A place where local businesses and visitors, community groups and neighbors, can promote the projects they care about that shape our city.</p>
6+
7+
<p>New bike lanes, a sweet new workshop, community cleanup days, the latest culinary creation--these are the things that make Oakland and our communities uniquely ours. We want to help those projects succeed, and the neighborhoods they’re in along with them, by connecting like-minded residents together.</p>
8+
9+
<p>Gardeners discovering a local guerilla gardening spree, beer lovers knowing a new brew just came in on tap around the corner. A place online where common interests and neighborhoods intersect, where neighbors and common goals spark new action and forge stronger communities.</p>
10+
11+
<p>We didn’t built tndrbox to be another social network—we built it because we know there’s a better way to discover and participate for every block.</p>
12+
13+
<p><strong>Contact us</strong> to participate at <a href="mailto:tndrbox@gmail.com">tndrbox@gmail.com</a></p>
9414

95-
</div>
9615
</div>

0 commit comments

Comments
 (0)