From 1f074cb44c5deda5b480f5ff814ff3640ec843d0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 23 Jan 2012 15:07:40 -0800
Subject: [PATCH] shaka, slackr theme

---
 images/smiley-shaka.gif     | Bin 0 -> 2427 bytes
 include/text.php            |   4 ++-
 view/theme/slackr/style.css |  46 +++++++++++++++++++++++++++++++++
 view/theme/slackr/theme.php |  49 ++++++++++++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 images/smiley-shaka.gif
 create mode 100755 view/theme/slackr/style.css
 create mode 100755 view/theme/slackr/theme.php

diff --git a/images/smiley-shaka.gif b/images/smiley-shaka.gif
new file mode 100644
index 0000000000000000000000000000000000000000..336fe3bcdc490fa11284145b67c0d179a2e983e9
GIT binary patch
literal 2427
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
YwNc%buX_JgZBD|!s;yZ0z1lwh6YXpvO8@`>

literal 0
HcmV?d00001

diff --git a/include/text.php b/include/text.php
index 416e19927c..bca219658c 100755
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o',
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', 
 		'~friendika', '~friendica', 'Diaspora*' ),
 	array(
 		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
@@ -700,6 +700,8 @@ function smilies($s) {
 		'<img src="' . $a->get_baseurl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="o.O" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-Oo.gif" alt="O.o" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\.../" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-shaka.gif" alt="\\ooo/" />',
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
 		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
new file mode 100755
index 0000000000..e6589cfae8
--- /dev/null
+++ b/view/theme/slackr/style.css
@@ -0,0 +1,46 @@
+@import url('../duepuntozero/style.css');
+
+.wall-item-content-wrapper {
+	border: none;
+}
+
+.wall-item-content-wrapper.comment {
+	background: #ffffff !important;
+	border-left: 1px solid #EEE;
+}
+
+.wall-item-tools {
+	background: none;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	border: none;
+	border-left: 1px solid #EEE;
+	background: #EEEEEE;
+}
+
+.comment-edit-wrapper {
+	background: #ffffff !important;
+}
+
+section {
+	margin: 0px 32px;
+}
+
+aside {
+	margin-left: 32px;
+}
+nav {
+	margin-left: 32px;
+	margin-right: 32px;
+}
+
+nav #site-location {
+	top: 80px;
+	right: 36px;
+}
+
+.wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+}
\ No newline at end of file
diff --git a/view/theme/slackr/theme.php b/view/theme/slackr/theme.php
new file mode 100755
index 0000000000..5d63583f42
--- /dev/null
+++ b/view/theme/slackr/theme.php
@@ -0,0 +1,49 @@
+<?php
+$a->theme_info = array(
+  'extends' => 'duepuntozero',
+);
+
+$a->page['htmlhead'] .= <<< EOT
+<script>
+$(document).ready(function() {
+
+$('.group-edit-icon').hover(
+	function() {
+		$(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.sidebar-group-element').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+	);
+
+
+$('.savedsearchdrop').hover(
+	function() {
+		$(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+	function() {
+		$(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+	);
+
+$('.savedsearchterm').hover(
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).addClass('icon'); 	$('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+	function() {
+		id = $(this).attr('id');
+		$('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+	);
+
+});
+
+
+</script>
+EOT;