From 1239bda75594f1338482f71054dbb6aa84538c86 Mon Sep 17 00:00:00 2001 From: tim b Date: Sat, 3 Apr 2010 20:36:43 -0700 Subject: committing stuff so i can merge pulled repo --- template/banner.st | 0 template/browser.st | 0 template/chat.st | 192 ++++++++++++++++++++---------------------- template/chat_help_bubbles.st | 12 +++ template/error_ie.st | 3 + template/footer.st | 12 +-- template/google_analytics.st | 7 ++ template/head.st | 70 +++------------ template/log.st | 88 ++++++++++--------- template/log_dump.st | 32 +++---- template/new_user_bubbles.st | 13 --- template/profile.st | 0 template/share_buttons.st | 16 ++-- 13 files changed, 192 insertions(+), 253 deletions(-) mode change 100755 => 100644 template/banner.st mode change 100755 => 100644 template/browser.st mode change 100755 => 100644 template/chat.st create mode 100644 template/chat_help_bubbles.st create mode 100644 template/error_ie.st mode change 100755 => 100644 template/footer.st create mode 100644 template/google_analytics.st mode change 100755 => 100644 template/head.st mode change 100755 => 100644 template/log.st delete mode 100644 template/new_user_bubbles.st mode change 100755 => 100644 template/profile.st (limited to 'template') diff --git a/template/banner.st b/template/banner.st old mode 100755 new mode 100644 diff --git a/template/browser.st b/template/browser.st old mode 100755 new mode 100644 diff --git a/template/chat.st b/template/chat.st old mode 100755 new mode 100644 index c903a39..13b0a60 --- a/template/chat.st +++ b/template/chat.st @@ -1,110 +1,98 @@ - - dump.fm - - - $head()$ - $if(!user_avatar)$ - - $endif$ - - - - - - - - - - $banner()$ -
-
-
-
-
-
-
-
- $users: { u | -
- $if(u.avatar)$$else$ $endif$ - $u.nick$
+ + dump.fm +$head()$ +$if(!user_avatar)$ + +$endif$ + + + + + + + + +$banner()$ +
+
+
+
+
+
+
+ -
-
- $messages: { m | -
- +}$ +
+
+
+$messages: { m | +
$m.nick$: - $m.content$ - - -
- - - }$ -
+ $m.content$
- $if(user_avatar)$ -
-
- - - - -
-
+}$ +
+
+$if(user_avatar)$ +
+
+ + + + +
+
+
$else$ - -
-
- +
+
+ - - -
-
- + + +
+
-
-
- $new_user_bubbles()$ - $endif$ -
-

- $footer()$ -

+ $chat_help_bubbles()$ +$endif$ +

+
- $preload()$ - - +
+
+

+$footer()$ +

+

+$preload()$ + + \ No newline at end of file diff --git a/template/chat_help_bubbles.st b/template/chat_help_bubbles.st new file mode 100644 index 0000000..fadf9dc --- /dev/null +++ b/template/chat_help_bubbles.st @@ -0,0 +1,12 @@ +
+
+
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/template/error_ie.st b/template/error_ie.st new file mode 100644 index 0000000..a4f5b66 --- /dev/null +++ b/template/error_ie.st @@ -0,0 +1,3 @@ +
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari ... (possibly Opera) ... sorry dude... +
\ No newline at end of file diff --git a/template/footer.st b/template/footer.st old mode 100755 new mode 100644 index c3b4563..f737221 --- a/template/footer.st +++ b/template/footer.st @@ -4,15 +4,5 @@ Help FAQ Terms Privacy
- - - - +$google_analytics()$ $debug_log()$ diff --git a/template/google_analytics.st b/template/google_analytics.st new file mode 100644 index 0000000..1f2d6fc --- /dev/null +++ b/template/google_analytics.st @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/template/head.st b/template/head.st old mode 100755 new mode 100644 index 20192f8..cb2d0fb --- a/template/head.st +++ b/template/head.st @@ -1,69 +1,21 @@ - - - - + + + - - + + - + $if(!user_nick)$ $endif$ - - - -

- - - - - - - - - -

+ \ No newline at end of file diff --git a/template/log.st b/template/log.st old mode 100755 new mode 100644 index 58e4e99..8af0154 --- a/template/log.st +++ b/template/log.st @@ -1,50 +1,48 @@ - - dump.fm log - $head()$ - - - - - $banner()$ -
-
-
-
- -
-
- -
- $if(dumpstest)$ - HELLO - $dumpstest: {du | $du$ }$ - $endif$ - $if(dumps)$ - $dumps: { d | $log_dump(dump=d)$ }$ - $else$ - No dumps! - $endif$ -
- - $if(next)$ - - $endif$ - + + dump.fm log +$head()$ + + + + + $banner()$ +
+
+
+
+
+
+ +
+$if(dumps)$ + $dumps: { d | $log_dump(dump=d)$ }$ + $if(json_tags)$ + + $endif$ +$else$ + No dumps! +$endif$ +
+$if(next)$ + +$endif$   - $if(prev)$ - - $endif$ - -

-
+$if(prev)$ + +$endif$ +

+
-
- + +
- + \ No newline at end of file diff --git a/template/log_dump.st b/template/log_dump.st index 7a9435c..c772868 100644 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -1,22 +1,18 @@ -$if(dump.tags)$ -
+$if(dump.ztags)$ +
$else$ -
+
$endif$ - $dump.created_on$ -- by $dump.nick$ - - -
- - $if(dump.avatar)$ - - $else$ - - $endif$ -
+$dump.created_on$ -- by $dump.nick$ +
+$if(dump.avatar)$ + +$else$ + +$endif$ +
$dump.content$
-
- $share_buttons()$ - -
\ No newline at end of file + +$share_buttons()$ +
\ No newline at end of file diff --git a/template/new_user_bubbles.st b/template/new_user_bubbles.st deleted file mode 100644 index a1e654d..0000000 --- a/template/new_user_bubbles.st +++ /dev/null @@ -1,13 +0,0 @@ -
-
-
-
-
-
-
-
-
- -
\ No newline at end of file diff --git a/template/profile.st b/template/profile.st old mode 100755 new mode 100644 diff --git a/template/share_buttons.st b/template/share_buttons.st index f446c43..4400fb3 100644 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -1,7 +1,13 @@
- - - - - +$if(dump.favorited)$ + +$else$ + +$endif$ + + + + + +
\ No newline at end of file -- cgit v1.2.3-70-g09d2