diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes

view/theme/diabook-aerith/jot.tpl

@@ -14,6 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

view/theme/diabook-aerith/nav.tpl

@@ -36,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		

view/theme/diabook-aerith/style-wide.css

@@ -1954,7 +1954,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook-aerith/style.css

@@ -1945,7 +1945,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook-blue/jot.tpl

@@ -14,6 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

view/theme/diabook-blue/nav.tpl

@@ -36,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		

view/theme/diabook-blue/style-wide.css

@@ -1911,7 +1911,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook-blue/style.css

@@ -1903,7 +1903,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook-red/jot.tpl

@@ -14,6 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

view/theme/diabook-red/nav.tpl

@@ -36,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		

view/theme/diabook-red/style-wide.css

@@ -1939,7 +1939,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook-red/style.css

@@ -1931,7 +1931,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
   	 border-radius: 5px 5px 5px 5px;
     font-weight: bold;

view/theme/diabook/config.php

@@ -12,8 +12,9 @@ function theme_content(&$a){
 	$font_size = get_pconfig(local_user(), 'diabook', 'font_size' );
 	$line_height = get_pconfig(local_user(), 'diabook', 'line_height' );
 	$resolution = get_pconfig(local_user(), 'diabook', 'resolution' );
+	$color = get_pconfig(local_user(), 'diabook', 'color' );
 	
-	return diabook_form($a,$font_size, $line_height, $resolution);
+	return diabook_form($a,$font_size, $line_height, $resolution, $color);
 }
 
 function theme_post(&$a){
@@ -24,6 +25,7 @@ function theme_post(&$a){
 		set_pconfig(local_user(), 'diabook', 'font_size', $_POST['diabook_font_size']);
 		set_pconfig(local_user(), 'diabook', 'line_height', $_POST['diabook_line_height']);
 		set_pconfig(local_user(), 'diabook', 'resolution', $_POST['diabook_resolution']);
+		set_pconfig(local_user(), 'diabook', 'color', $_POST['diabook_color']);	
 	}
 }
 
@@ -32,8 +34,9 @@ function theme_admin(&$a){
 	$font_size = get_config('diabook', 'font_size' );
 	$line_height = get_config('diabook', 'line_height' );
 	$resolution = get_config('diabook', 'resolution' );
+	$color = get_config('diabook', 'color' );	
 	
-	return diabook_form($a,$font_size, $line_height, $resolution);
+	return diabook_form($a,$font_size, $line_height, $resolution, $color);
 }
 
 function theme_admin_post(&$a){
@@ -41,11 +44,12 @@ function theme_admin_post(&$a){
 		set_config('diabook', 'font_size', $_POST['diabook_font_size']);
 		set_config('diabook', 'line_height', $_POST['diabook_line_height']);
 		set_config('diabook', 'resolution', $_POST['diabook_resolution']);
+		set_config('diabook', 'color', $_POST['diabook_color']);
 	}
 }
 
 
-function diabook_form(&$a, $font_size, $line_height, $resolution){
+function diabook_form(&$a, $font_size, $line_height, $resolution, $color){
 	$line_heights = array(
 		"1.3"=>"1.3",
 		"---"=>"---",
@@ -68,6 +72,13 @@ function diabook_form(&$a, $font_size, $line_height, $resolution){
 		'normal'=>'normal',
 		'wide'=>'wide',		
 		);
+	$colors = array(
+		'diabook'=>'diabook',
+		'aerith'=>'aerith',		
+		'blue'=>'blue',		
+		'red'=>'red',
+		'pink'=>'pink',				
+		);
 	
 	
 	
@@ -79,6 +90,7 @@ function diabook_form(&$a, $font_size, $line_height, $resolution){
 		'$font_size' => array('diabook_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
 		'$line_height' => array('diabook_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
 		'$resolution' => array('diabook_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),
+		'$color' => array('diabook_color', t('Set color scheme'), $color, '', $colors),	
 	));
 	return $o;
 }

view/theme/diabook/diabook-aerith/admin_users.tpl

@@ -0,0 +1,88 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>

view/theme/diabook/diabook-aerith/ch_directory_item.tpl

@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>

view/theme/diabook/diabook-aerith/comment_item.tpl

@@ -0,0 +1,41 @@
+		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+				<input type="hidden" name="type" value="$type" />
+				<input type="hidden" name="profile_uid" value="$profile_uid" />
+				<input type="hidden" name="parent" value="$parent" />
+				<input type="hidden" name="return" value="$return_path" />
+				<input type="hidden" name="jsreload" value="$jsreload" />
+				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
+					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
+				</div>
+				<div class="comment-edit-photo-end"></div>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				{{ if $qcomment }}
+					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+					<option value=""></option>
+				{{ for $qcomment as $qc }}
+					<option value="$qc">$qc</option>				
+				{{ endfor }}
+					</select>
+				{{ endif }}
+
+				<div class="comment-edit-text-end"></div>
+				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+					<span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+					<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+				</div>
+
+				<div class="comment-edit-end"></div>
+			</form>
+
+		</div>

view/theme/diabook/diabook-aerith/communityhome.tpl

@@ -0,0 +1,86 @@
+<div id="close_pages">
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+</div>
+
+<div id="close_helpers">
+{{ if $lastusers_title }}
+<h3 style="margin-top:0px;">$helpers.title.1<a id="close_helpers_icon"  onClick="close_helpers()" class="icon close_box" title="close"></a></h3>
+<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a><br>
+<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
+<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br>
+<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a>
+{{ endif }}
+</div>
+
+<div id="close_services">
+{{ if $lastusers_title }}
+<h3>$con_services.title.1<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
+<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-aerith/icons/facebook.png" title="Facebook"></a>
+<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-aerith/icons/StatusNet.png?" title="StatusNet"></a>
+<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-aerith/icons/livejournal.png?" title="LiveJournal"></a>
+<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook-aerith/icons/posterous.png?" title="Posterous"></a>
+<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook-aerith/icons/tumblr.png?" title="Tumblr"></a>
+<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook-aerith/icons/twitter.png?" title="Twitter"></a>
+<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook-aerith/icons/wordpress.png?" title="WordPress"></a>
+<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook-aerith/icons/email.png?" title="E-Mail"></a>
+</div>
+{{ endif }}
+</div>
+
+<div id="close_friends" style="margin-bottom:53px;">
+{{ if $nv }}
+<h3>$nv.title.1<a id="close_friends_icon" onClick="close_friends()"  class="icon close_box" title="close"></a></h3>
+<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br>
+<a class="$nv.global_directory.2" href="$nv.global_directory.0" target="blank" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_directory.1</a><br>
+<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br>
+<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a><br>
+<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a>			
+$nv.search
+{{ endif }}
+</div>
+
+<div id="close_lastusers">
+{{ if $lastusers_title }}
+<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
+<div id='lastusers-wrapper' class='items-wrapper'>
+{{ for $lastusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+
+{{ if $activeusers_title }}
+<h3>$activeusers_title</h3>
+<div class='items-wrapper'>
+{{ for $activeusers_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+
+<div id="close_lastphotos">
+{{ if $photos_title }}
+<h3>$photos_title<a id="close_photos_icon" onClick="close_lastphotos()"  class="icon close_box" title="close"></a></h3>
+<div id='ra-photos-wrapper' class='items-wrapper'>
+{{ for $photos_items as $i }}
+	$i
+{{ endfor }}
+</div>
+{{ endif }}
+</div>
+
+<div id="close_lastlikes">
+{{ if $like_title }}
+<h3>$like_title<a id="close_lastlikes_icon" onClick="close_lastlikes()" class="icon close_box" title="close"></a></h3>
+<ul id='likes'>
+{{ for $like_items as $i }}
+	<li id='ra-photos-wrapper'>$i</li>
+{{ endfor }}
+</ul>
+{{ endif }}
+</div>

view/theme/diabook/diabook-aerith/config.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Theme settings
+ */
+
+
+
+function theme_content(&$a){
+	if(!local_user())
+		return;		
+	
+	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
+	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
+	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
+	
+	return diabook_form($a,$font_size, $line_height,$resolution);
+}
+
+function theme_post(&$a){
+	if(! local_user())
+		return;
+	
+	if (isset($_POST['diabook-aerith-settings-submit'])){
+		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
+		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
+		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
+	}
+}
+
+
+function theme_admin(&$a){
+	$font_size = get_config('diabook-aerith', 'font_size' );
+	$line_height = get_config('diabook-aerith', 'line_height' );
+	$resolution = get_config('diabook-aerith', 'resolution' );
+	
+	return diabook_form($a,$font_size, $line_height,$resolution);
+}
+
+function theme_admin_post(&$a){
+	if (isset($_POST['diabook-aerith-settings-submit'])){
+		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
+		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
+		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
+	}
+}
+
+
+function diabook_form(&$a, $font_size, $line_height, $resolution){
+	$line_heights = array(
+		"1.3"=>"1.3",
+		"---"=>"---",
+		"1.5"=>"1.5",		
+		"1.4"=>"1.4",
+		"1.2"=>"1.2",
+		"1.1"=>"1.1",
+	);
+	
+	$font_sizes = array(
+		'13'=>'13',
+		"---"=>"---",
+		"15"=>"15",
+		'14'=>'14',
+		'13.5'=>'13.5',		
+		'12.5'=>'12.5',
+		'12'=>'12',
+		);
+	$resolutions = array(
+		'normal'=>'normal',
+		'wide'=>'wide',		
+		);
+	
+	
+	
+	$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('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
+		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
+	));
+	return $o;
+}

view/theme/diabook/diabook-aerith/contact_template.tpl

@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+	<div class="contact-entry-photo-wrapper" >
+		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+			{{ if $contact.photo_menu }}
+			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+			{{ endif }}
+		</div>
+			
+	</div>
+	<div class="contact-entry-photo-end" ></div>
+		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+	<div class="contact-entry-end" ></div>
+</div>

view/theme/diabook/diabook-aerith/directory_item.tpl

@@ -0,0 +1,11 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
+</div>

view/theme/diabook/diabook-aerith/generic_links_widget.tpl

@@ -0,0 +1,11 @@
+<div id="widget_$title">
+	{{if $title}}<h3 style="border-bottom: 1px solid #D2D2D2;">$title</h3>{{endif}}
+	{{if $desc}}<div class="desc">$desc</div>{{endif}}
+	
+	<ul  class="rs_tabs">
+		{{ for $items as $item }}
+			<li><a href="$item.url" class="rs_tab button {{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>

view/theme/diabook/diabook-aerith/group_side.tpl

@@ -0,0 +1,34 @@
+<div id="profile_side" >
+	<div class="">
+		<h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
+	</div>
+
+	<div id="sidebar-group-list">
+		<ul class="menu-profile-side">
+			{{ for $groups as $group }}
+			<li class="menu-profile-list">
+				<span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
+				<a href="$group.href" class="menu-profile-list-item">
+					$group.text
+				</a>
+				{{ if $group.edit }}
+					<a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
+				{{ endif }}
+				{{ if $group.cid }}
+					<input type="checkbox" 
+						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+						{{ if $group.ismember }}checked="checked"{{ endif }}
+					/>
+				{{ endif }}
+			</li>
+			{{ endfor }}
+		</ul>
+	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
+</div>	
+

view/theme/diabook/diabook-aerith/jot.tpl

@@ -0,0 +1,85 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="$action" method="post" >
+		<input type="hidden" name="type" value="$ptyp" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="post_id" value="$post_id" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
+		<div id="character-counter" class="grey"></div>		
+		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+	
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+	</div> 
+	<div id="profile-attach-wrapper" style="display: $visitor;" >
+		<div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+	</div> 
+
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+	</div> 
+	<div id="profile-video-wrapper" style="display: $visitor;" >
+		<a id="profile-video" class="video2" title="$video" onclick="jotVideoURL();return false;"></a>
+	</div> 
+	<div id="profile-audio-wrapper" style="display: $visitor;" >
+		<a id="profile-audio" class="audio2" title="$audio" onclick="jotAudioURL();return false;"></a>
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+	</div> 
+
+	<input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+  
+   <span onclick="preview_post();" id="jot-preview-link" class="tab button">$preview</span>
+   
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+	</div>
+
+
+	<div id="profile-jot-plugin-wrapper">
+  	$jotplugins
+	</div>
+	
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+	</div> 
+	
+	</div>
+   <div id="profile-jot-perms-end"></div>
+	
+	<div id="jot-preview-content" style="display:none;"></div>
+
+	<div style="display: none;">
+		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+			$acl
+			<hr style="clear:both"/>
+			<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+			<div id="profile-jot-email-end"></div>
+			$jotnets
+		</div>
+	</div>
+
+
+
+
+</form>
+</div>
+		{{ if $content }}<script>initEditor();</script>{{ endif }}

view/theme/diabook/diabook-aerith/js/README

@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+  $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+});

view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.js

@@ -0,0 +1,69 @@
+(function( $ ) {
+
+  $.fn.aeImageResize = function( params ) {
+
+    var aspectRatio = 0
+      // Nasty I know but it's done only once, so not too bad I guess
+      // Alternate suggestions welcome :)
+      ,	isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+      ;
+
+    // We cannot do much unless we have one of these
+    if ( !params.height && !params.width ) {
+      return this;
+    }
+
+    // Calculate aspect ratio now, if possible
+    if ( params.height && params.width ) {
+      aspectRatio = params.width / params.height;
+    }
+
+    // Attach handler to load
+    // Handler is executed just once per element
+    // Load event required for Webkit browsers
+    return this.one( "load", function() {
+
+      // Remove all attributes and CSS rules
+      this.removeAttribute( "height" );
+      this.removeAttribute( "width" );
+      this.style.height = this.style.width = "";
+
+      var imgHeight = this.height
+        , imgWidth = this.width
+        , imgAspectRatio = imgWidth / imgHeight
+        , bxHeight = params.height
+        , bxWidth = params.width
+        , bxAspectRatio = aspectRatio;
+				
+      // Work the magic!
+      // If one parameter is missing, we just force calculate it
+      if ( !bxAspectRatio ) {
+        if ( bxHeight ) {
+          bxAspectRatio = imgAspectRatio + 1;
+        } else {
+          bxAspectRatio = imgAspectRatio - 1;
+        }
+      }
+
+      // Only resize the images that need resizing
+      if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+        if ( imgAspectRatio > bxAspectRatio ) {
+          bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+        } else {
+          bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+        }
+
+        this.height = bxHeight;
+        this.width = bxWidth;
+      }
+    })
+    .each(function() {
+
+      // Trigger load event (for Gecko and MSIE)
+      if ( this.complete || isIE6 ) {
+        $( this ).trigger( "load" );
+      }
+    });
+  };
+})( jQuery );

view/theme/diabook/diabook-aerith/js/jquery.ae.image.resize.min.js

@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery);