Merge pull request #4 from beardy-unixer/master

Fancyred

view/theme/fancyred/js/fancyred.js

@@ -0,0 +1,89 @@
+
+
+function insertFormatting(comment,BBcode,id) {
+	
+		var tmpStr = $("#comment-edit-text-" + id).val();
+		if(tmpStr == comment) {
+			tmpStr = "";
+			$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
+			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
+			openMenu("comment-edit-submit-wrapper-" + id);
+			$("#comment-edit-text-" + id).val(tmpStr);
+		}
+
+	textarea = document.getElementById("comment-edit-text-" +id);
+	if (document.selection) {
+		textarea.focus();
+		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
+		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
+		var start = textarea.selectionStart;
+		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
+		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+	}
+	return true;
+}
+
+function cmtBbOpen(comment, id) {
+	if($(comment).hasClass('comment-edit-text-full')) {
+		$(".comment-edit-bb-" + id).show();
+		return true;
+	}
+	return false;
+}
+
+function cmtBbClose(comment, id) {
+//	if($(comment).hasClass('comment-edit-text-empty')) {
+//		$(".comment-edit-bb-" + id).hide();
+//		return true;
+//	}
+	return false;
+}
+
+$(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');}
+	);
+
+});
+
+
+

view/theme/fancyred/php/config.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Theme settings
+ */
+
+function theme_content(&$a) {
+	if(!local_user()) { return;	}
+
+	$font_size = get_pconfig(local_user(),'fancyred', 'font_size' );
+	$line_height = get_pconfig(local_user(), 'fancyred', 'line_height' );
+	$colour = get_pconfig(local_user(), 'fancyred', 'colour' );
+	
+	return fancyred_form($a, $font_size, $line_height, $colour);
+}
+
+function theme_post(&$a) {
+	if(!local_user()) { return; }
+	
+	if (isset($_POST['fancyred-settings-submit'])) {
+		set_pconfig(local_user(), 'fancyred', 'font_size', $_POST['fancyred_font_size']);
+		set_pconfig(local_user(), 'fancyred', 'line_height', $_POST['fancyred_line_height']);
+		set_pconfig(local_user(), 'fancyred', 'colour', $_POST['fancyred_colour']);	
+	}
+}
+
+function theme_admin(&$a) {
+	$font_size = get_config('fancyred', 'font_size' );
+	$line_height = get_config('fancyred', 'line_height' );
+	$colour = get_config('fancyred', 'colour' );	
+	
+	return fancyred_form($a, $font_size, $line_height, $colour);
+}
+
+function theme_admin_post(&$a) {
+	if (isset($_POST['fancyred-settings-submit'])) {
+		set_config('fancyred', 'font_size', $_POST['fancyred_font_size']);
+		set_config('fancyred', 'line_height', $_POST['fancyred_line_height']);
+		set_config('fancyred', 'colour', $_POST['fancyred_colour']);
+	}
+}
+
+function fancyred_form(&$a, $font_size, $line_height, $colour) {
+	$line_heights = array(
+		"1.3" => "1.3",
+		"---" => "---",
+		"1.6" => "1.6",				
+		"1.5" => "1.5",		
+		"1.4" => "1.4",
+		"1.2" => "1.2",
+		"1.1" => "1.1",
+	);	
+	$font_sizes = array(
+		'12' => '12',
+		'14' => '14',
+		"---" => "---",
+		"16" => "16",		
+		"15" => "15",
+		'13.5' => '13.5',
+		'13' => '13',		
+		'12.5' => '12.5',
+		'12' => '12',
+	);
+	$colours = array(
+		'light' => 'light',		
+		'dark' => 'dark',						
+	);
+
+	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$o .= replace_macros($t, array(
+		'$submit' => t('Submit'),
+		'$baseurl' => $a->get_baseurl(),
+		'$title' => t("Theme settings"),
+		'$font_size' => array('fancyred_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+		'$line_height' => array('fancyred_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$colour' => array('fancyred_colour', t('Set colour scheme'), $colour, '', $colours),	
+	));
+
+	return $o;
+}
+

view/theme/fancyred/php/style.php

@@ -0,0 +1,99 @@
+<?php
+    $line_height = false;
+    $fancyred_font_size = false;
+    $resolution = false;
+    $colour = false;
+    $site_line_height = get_config("fancyred","line_height");
+    $site_fancyred_font_size = get_config("fancyred", "font_size" );
+    $site_colour = get_config("fancyred", "colour" );
+
+    if (local_user()) {
+        $line_height = get_pconfig(local_user(), "fancyred","line_height");
+        $fancyred_font_size = get_pconfig(local_user(), "fancyred", "font_size");
+        $colour = get_pconfig(local_user(), "fancyred", "colour");
+    }
+
+    if ($line_height === false) {
+		$line_height = $site_line_height;
+	}
+    if ($line_height === false) {
+		$line_height = "1.2";
+	}
+    if ($fancyred_font_size === false) {
+		$fancyred_font_size = $site_fancyred_font_size;
+	}
+    if ($fancyred_font_size === false) {
+		$fancyred_font_size = "12";
+	}
+    if ($colour === false) {
+		$colour = $site_colour;
+	}
+		$colour = "light";
+
+    
+        if (file_exists("$THEMEPATH/css/style.css")) {
+            echo file_get_contents("$THEMEPATH/css/style.css");
+        }
+    
+
+	if($fancyred_font_size == "16") {
+		echo ".wall-item-content {
+				font-size: 16px;
+			}";
+	}
+	if($fancyred_font_size == "15") {
+		echo ".wall-item-content {
+				font-size: 15px;
+			}";
+	}	
+	if($fancyred_font_size == "14") {
+		echo ".wall-item-content {
+				font-size: 14px;
+			}";
+	}
+	if($fancyred_font_size == "13.5") {
+		echo ".wall-item-content {
+				font-size: 13.5px;
+			}";
+	}
+	if($fancyred_font_size == "13") {
+		echo ".wall-item-content {
+				font-size: 13px;
+			}";
+	}
+	if($fancyred_font_size == "12.5") {
+		echo ".wall-item-content {
+				font-size: 12.5px;
+			}";
+	}
+	if($fancyred_font_size == "12") {
+		echo ".wall-item-content {
+				font-size: 12px;
+			}";
+	}
+	if($line_height == "1.5") {
+		echo ".wall-item-content {
+				line-height: 1.5;
+			}";
+	}	
+	if($line_height == "1.4") {
+		echo ".wall-item-content {
+				line-height: 1.4;
+			}";
+	}
+	if($line_height == "1.3") {
+		echo ".wall-item-content {
+				line-height: 1.3;
+			}";
+	}
+	if($line_height == "1.2") {
+		echo ".wall-item-content {
+				line-height: 1.2;
+			}";
+	}
+	if($line_height == "1.1") {
+		echo ".wall-item-content {
+				line-height: 1.1;
+			}";
+	}
+

view/theme/fancyred/php/theme.php

@@ -0,0 +1,5 @@
+<?php
+
+function fancyred_init(&$a) {
+//	head_add_js('redbasic.js');
+}

view/theme/fancyred/tpl/nav.tpl

@@ -0,0 +1,111 @@
+<header>
+	<div id="site-location">$sitelocation</div>
+	<div id="banner">$banner</div>
+</header>
+<nav>
+	<ul>
+		{{ if $nav.lock }}
+			<li id="nav-rmagic-link" class="nav-menu-icon" >
+				<a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a>
+			</li>
+		{{ endif }}
+
+		
+		{{ if $nav.network }}
+			<li id="nav-network-link" class="nav-menu $sel.network">
+				<a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a>
+				<span id="net-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		{{ if $nav.home }}
+			<li id="nav-home-link" class="nav-menu $sel.home">
+				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a>
+				<span id="home-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		
+		{{ if $nav.intros }}
+			<li id="nav-intros-link" class="nav-menu $sel.intros">
+				<a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</a>
+				<span id="intro-update" class="nav-notify"></span>
+			</li>
+		{{ endif }}
+		
+
+	{{ if $nav.notifications }}
+
+		<li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup(); return false;" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+			<span id="notify-update" class="nav-notify"></span>
+			<ul id="nav-notifications-menu" class="menu-popup">
+				<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+				<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+				<li class="empty">$emptynotifications</li>
+			</ul>
+		</li>
+	{{ endif }}		
+
+		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+			<ul id="nav-site-menu" class="menu-popup">
+				{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
+				{{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }}				
+
+				{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+				{{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+				{{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+			</ul>		
+		</li>
+
+		{{ if $userinfo }}
+			<li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+				{{ if $localuser }}
+				<ul id="nav-user-menu" class="menu-popup">
+					{{ for $nav.usermenu as $usermenu }}
+						<li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+					{{ endfor }}
+					
+					{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+					{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+					{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}	
+				</ul>
+				{{ endif }}
+			</li>
+		{{ endif }}
+
+		{{ if $nav.help }} 
+		<li id="nav-help-link" class="nav-menu $sel.help">
+			<a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+		</li>
+		{{ endif }}
+
+		{{ if $nav.apps }}
+			<li id="nav-apps-link" class="nav-menu $sel.apps">
+				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+				<ul id="nav-apps-menu" class="menu-popup">
+					{{ for $apps as $ap }}
+					<li>$ap</li>
+					{{ endfor }}
+				</ul>
+			</li>
+		{{ endif }}
+
+		<li id="nav-searchbar">		
+		<form method="get" action="search">
+		<input id="nav-search-text" type="text" value="" placeholder="$nav.search.1" name="search" title="$nav.search.3" onclick="this.submit();" />
+		</form>
+		</li>
+
+
+
+
+	</ul>
+
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+<div style="position: fixed; top: 3px; left: 5px; z-index:9999">$langselector</div>
+<div id="panel" style="display: none;"></div>

view/theme/fancyred/tpl/theme_settings.tpl

@@ -0,0 +1,7 @@
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+
+{{inc field_select.tpl with $field=$line_height}}{{endinc}}
+
+<div class="settings-submit-wrapper">
+	<input type="submit" value="$submit" class="settings-submit" name="fancyred-settings-submit" />
+</div>