shaka, slackr theme

4 files changed, 98 insertions, 1 deletions

diff --git a/images/smiley-shaka.gif b/images/smiley-shaka.gif
new file mode 100644
index 000000000..336fe3bcd
--- /dev/null
+++ b/images/smiley-shaka.gif
diff --git a/include/text.php b/include/text.php
index 416e19927..bca219658 100755
--- a/include/text.php
+++ b/include/text.php
@@ -678,7 +678,7 @@ function smilies($s) {
 	$a = get_app();
 
 	$s = str_replace(
-	array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o',
+	array( '<3', '</3', '<\\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 000000000..e6589cfae
--- /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 000000000..5d63583f4
--- /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;