Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: aquarion/Lifestream
base: ed1ae53cba
...
head fork: aquarion/Lifestream
compare: 880f71c1e3
  • 7 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
19 dayze/assets/css/style.css
@@ -15,7 +15,15 @@ background-repeat: repeat;
header {
font-family: "Trebuchet MS";
- background: rgba(128,128,255,.3);
+ /* background: rgba(128,128,255,.3) url("http://art.istic.net/coa/avenell_small.png") 2% center no-repeat;
+
+ */
+ background-color: rgba(128,128,255,.3);
+ background-image: url("http://art.istic.net/coa/avenell_small.png"), url("http://art.istic.net/coa/avenell_small.png");
+ background-position: 2% center, 98% center;
+ background-repeat: no-repeat, no-repeat;
+
+
text-align: center;
color: white;
max-width: 960px;
@@ -67,7 +75,7 @@ a:visited {
h1#header {
font-size: 400%;
text-align: center;
- margin: 0 0 0 0;
+ margin: 0 100px 0 100px;
text-shadow: 2px 2px 2px rgba(0,0,0,.25);
}
@@ -119,7 +127,8 @@ border: none;
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EEE), to(#333));*/
margin: .2em;
padding: 0 0 0 0;
- width: 128px;
+
+ width: 230px;
padding: .5em;
@@ -131,11 +140,10 @@ border: none;
font-weight: normal;
/*border-radius: .4em;*/
text-shadow: 1px 1px 1px rgba(0,0,0,.2);
- min-height: 128;
background: rgba(125,96,103, .4);
background: -moz-linear-gradient(100% 100% 90deg, rgba(125,96,103, .8), rgba(184,163,168, .8));
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(125,96,103, .8)), to(rgba(184,163,168, .8)));
-
+ list-style: none;
}
@@ -380,7 +388,6 @@ h2#nav a {
#tilelist {
- width: 960px;
padding-left: 0;
}
View
21 dayze/assets/js/tickytacky.js
@@ -20,7 +20,7 @@ TickyTacky = {
grid : false,
currentline : 0,
- box_height : 200,
+ box_height : 100,
box_width : 230,
padding : 2,
margin : 1,
@@ -45,8 +45,8 @@ TickyTacky = {
}
columns = Math.round(box.outerWidth() / TickyTacky.box_width);
- rows = Math.round(box.height() / TickyTacky.box_height);
-
+ rows = Math.round(box.outerHeight() / TickyTacky.box_height);
+
n = 0;
while (column == -1){
n = n + 1;
@@ -129,6 +129,11 @@ TickyTacky = {
playground_width_in_boxes = Math.floor(playground_width/TickyTacky.box_width);
// How many boxes we can fit in that.
+ if((($(".contentbox").length / playground_width_in_boxes) < 2) && playground_width_in_boxes >= 4 ){
+ playground_width_in_boxes = 4;
+ } else if((($(".contentbox").length / playground_width_in_boxes) < 3) && playground_width_in_boxes >= 6) {
+ playground_width_in_boxes = 6;
+ }
if (playground_width_in_boxes == TickyTacky.columns){
// If we've already rendered for this number of columns, go home.
@@ -162,24 +167,24 @@ TickyTacky = {
box = $(this)
box.show();
-
// ... And they all look just the same.
// Normalise the heights and widths of the boxes to a muliplyer of box_height/box_width
if (!box.hasClass("boxresized")){
- border = parseInt(box.css("border-left-width"));
+ border = parseInt(box.css("border-top-width")) + parseInt(box.css("border-bottom-width"));
h = box.innerHeight();
if(border){
- h += (border *2);
+ h += border;
}
w = box.outerWidth();
- height_in_boxes = (Math.round(h/TickyTacky.box_height) );
+ height_in_boxes = (Math.ceil(h/TickyTacky.box_height) );
+
if(height_in_boxes == 0){
height_in_boxes = 1;
}
-
+
outer_height_in_px = TickyTacky.box_height * height_in_boxes;
inner_height_to_get_that = outer_height_in_px - (h - box.height());
box.height(inner_height_to_get_that - TickyTacky.padding);
View
37 dayze/today.php
@@ -20,7 +20,8 @@
$tidy_config = array(
'indent' => true,
- 'output-xhtml' => true,
+ 'output-html' => true,
+ 'show-body-only' => true,
'wrap' => 200);
$tidy = new tidy;
@@ -149,6 +150,7 @@
$structure['things'] = array();
$music = array();
+$musictotal = 0;
while ($row = mysql_fetch_assoc($results)){
@@ -178,6 +180,9 @@
} else {
$music[$artist] += 1;
}
+
+ $musictotal ++;
+
continue 2;
break;
@@ -188,7 +193,7 @@
case "twitter":
$class = "Twitter";
if ($row['originaltext'][0] == "@"){
- continue 2;
+ //continue 2;
}
break;
@@ -237,7 +242,7 @@
}
-$q = sprintf("select post_title, post_content, ID, unix_timestamp(post_date) as epoch from aqcom_wp_posts where post_status = 'publish' and post_date between '%s' and '%s' order by post_date", date(DATE_ISO8601, $from), date(DATE_ISO8601, $to));
+$q = sprintf("select post_title, post_content, ID, unix_timestamp(post_date) as epoch, guid from aqcom_wp_posts where post_status = 'publish' and post_date between '%s' and '%s' order by post_date", date(DATE_ISO8601, $from), date(DATE_ISO8601, $to));
$results = mysql_query($q) or die(mysql_error());
@@ -246,13 +251,31 @@
$class = "Blog";
+ $blogpost = $row['post_content'];
+
+ $regex = "/\[caption .*?\](.*)\[\/caption\]/m";
+
+ preg_match($regex, $blogpost, $matches);
+
+ $blogpost = preg_replace($regex, '', $blogpost);
+
+ $continue = sprintf(' [<a href="%s">More...</a>]', $row['guid']);
+
+ if(count($matches)){
+ $image = $matches[1];
+ $content = sprintf("<h2>%s</h2> <div style=\"float: right\">%s</div> %s",$row['post_title'], $image, substr($blogpost, 0,500));
+ } else {
+ $content = sprintf("<h2>%s</h2> %s",$row['post_title'], substr($blogpost, 0,500));
+ }
+
+
#$row['content'] = $row['post_title'];
#$row['content'] = $row['post_title']." &mdash; ".substr($row['post_content'], 0,256).'[...]';
-$tidy = new tidy;
- $tidy->parseString($row['post_title']." &mdash; ".substr($row['post_content'], 0,256), $tidy_config, 'utf8');
+ $tidy = new tidy;
+ $tidy->parseString($content, $tidy_config, 'utf8');
$tidy->cleanRepair();
- $row['content'] = $tidy;
- $row['title'] = $row['post_title'];
+ $row['content'] = $tidy.$continue;
+ $row['title'] = sprintf("<h2>%s</h2>",$row['post_title']);
$row['url'] = "http://www.aquarionics.com/?p=".$row['ID'];
$row['source'] = "Aquarionics";
$row['icon'] = 'http://art.istic.net/iconography/aqcom/logo_64.png';
View
39 dayze/view.php
@@ -34,9 +34,27 @@
?>
var music_data = [
-<?PHP foreach($music as $artist => $count){
- printf("\t['%s', %d],\n", addslashes($artist), $count);
- }?>]
+<?PHP
+
+$other = 0;
+$otherartists = array();
+
+arsort($music);
+
+foreach($music as $artist => $count){
+ if ($count/$musictotal > 0.01){
+ printf("\t['%s - %d%%', %d],\n", addslashes($artist), ($count/$musictotal) * 100, $count);
+ } else {
+ $other += $count;
+ $otherartists[] = $artist;
+ }
+
+ }
+
+ if($musictotal){
+ printf("\t['(%s - %d%%)', %d],\n", "Other", ($other/$musictotal) * 100, $other);
+ }
+ ?>]
addMusicChart = function(){
@@ -134,7 +152,7 @@
<h2><a href="<?PHP echo $backwards ?>" title="<?PHP echo $backwards_title ?>">&#xff1c;</a>
<?PHP
- if($up){
+ if(isset($up)){
?><a href="<?PHP echo $up ?>" title="<?PHP echo $up_title ?>">&#x2227;</a><?PHP
}
@@ -178,7 +196,7 @@
usort($items, "epochsort");
foreach($items as $row){
- echo "<li class=\"contentbox ".$row['class']." source".$row['type']."\" >";
+ echo "<li class=\"contentbox ".$row['class']." source".(isset($row['type']) ? $row['type'] : '')."\" >";
if ($row['icon']){
echo "<a href=\"".$row['url']."\" class=\"iconlink\"/>";
@@ -224,7 +242,16 @@
<?PHP if(count($music) && true){?>
- <li id="musicChart" class="contentbox Music chart"></li>
+ <li id="musicChart" class="contentbox Music chart">
+
+ <?PHP if(count($otherartists)){?>
+ <li class="contentbox Music chart scaleup" style="width: 100%">Other Artists include <?PHP
+ sort($otherartists);
+ $last = array_pop($otherartists);
+ echo implode(", ",$otherartists)." &amp; ".$last;
+ ?></li>
+ <?PHP } ?>
+ </li>
<?PHP } ?>
<?PHP if(count($locations)){ ?>

No commit comments for this range

Something went wrong with that request. Please try again.