Merge https://github.com/friendica/friendica into pull

include/oauth.php

@@ -150,6 +150,7 @@ class FKOAuth1 extends OAuthServer {
 		$_SESSION['page_flags'] = $record['page-flags'];
 		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
+		$_SESSION["allow_api"] = true;
 
 		//notice( t("Welcome back ") . $record['username'] . EOL);
 		$a->user = $record;

mod/admin.php

@@ -710,6 +710,16 @@ function admin_page_users(&$a){
 	$users = array_map("_setup_users", $users);
 	
 	
+	// Get rid of dashes in key names, Smarty3 can't handle them
+	foreach($users as $key => $user) {
+		$new_user = array();
+		foreach($user as $k => $v) {
+			$k = str_replace('-','_',$k);
+			$new_user[$k] = $v;
+		}
+		$users[$key] = $new_user;
+	}
+
 	$t = get_markup_template("admin_users.tpl");
 	$o = replace_macros($t, array(
 		// strings //

mod/events.php

@@ -341,6 +341,17 @@ function events_content(&$a) {
 //				$tpl = get_markup_template("events.tpl");
 //			}
 		}
+
+		// Get rid of dashes in key names, Smarty3 can't handle them
+		foreach($events as $key => $event) {
+			$event_item = array();
+			foreach($event['item'] as $k => $v) {
+				$k = str_replace('-','_',$k);
+				$event_item[$k] = $v;
+			}
+			$events[$key]['item'] = $event_item;
+		}
+
 		$o = replace_macros($tpl, array(
 			'$baseurl'	=> $a->get_baseurl(),
 			'$tabs'		=> $tabs,

view/admin_users.tpl

@@ -70,7 +70,7 @@
 						<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 {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
 						<td class="checkbox"> 
                                     {{ if $u.is_admin }}
                                         &nbsp;

view/event.tpl

@@ -1,7 +1,7 @@
 {{ for $events as $event }}
 	<div class="event">
 	
-	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
 	$event.html
 	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
 	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}

view/events.tpl

@@ -14,7 +14,7 @@ $tabs
 {{ for $events as $event }}
 	<div class="event">
 	{{ if $event.is_first }}<hr /><a name="link-$event.j" ><div class="event-list-date">$event.d</div></a>{{ endif }}
-	{{ if $event.item.author-name }}<a href="$event.item.author-link" ><img src="$event.item.author-avatar" height="32" width="32" />$event.item.author-name</a>{{ endif }}
+	{{ if $event.item.author_name }}<a href="$event.item.author_link" ><img src="$event.item.author_avatar" height="32" width="32" />$event.item.author_name</a>{{ endif }}
 	$event.html
 	{{ if $event.item.plink }}<a href="$event.plink.0" title="$event.plink.1" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{ endif }}
 	{{ if $event.edit }}<a href="$event.edit.0" title="$event.edit.1" class="edit-event-link icon s22 pencil"></a>{{ endif }}

view/smarty3/admin_users.tpl

@@ -70,7 +70,7 @@
 						<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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class='login_date'>{{$u.page_flags}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
 						<td class="checkbox"> 
                                     {{if $u.is_admin}}
                                         &nbsp;

view/smarty3/event.tpl

@@ -1,7 +1,7 @@
 {{foreach $events as $event}}
 	<div class="event">
 	
-	{{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
 	{{$event.html}}
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
 	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}

view/smarty3/events.tpl

@@ -14,7 +14,7 @@
 {{foreach $events as $event}}
 	<div class="event">
 	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-	{{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
 	{{$event.html}}
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="external-link" class="plink-event-link icon s22 remote-link"></a>{{/if}}
 	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}

view/theme/diabook/admin_users.tpl

@@ -69,7 +69,7 @@
 						<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='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?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>

view/theme/diabook/smarty3/admin_users.tpl

@@ -69,7 +69,7 @@
 						<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='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}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>

view/theme/frost-mobile/admin_users.tpl

@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		<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='tool like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool 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 {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class="checkbox"> 
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+                                    {{ endif }}
+						<td class="tools">
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" 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?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+                                    {{ endif }}
+						</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/frost-mobile/default.php

@@ -5,7 +5,7 @@
   <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<body>
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
 	<?php if(x($page,'nav')) echo $page['nav']; ?>
 
 	<?php if( $a->module === 'home' ) { ?>

view/theme/frost-mobile/jot.tpl

@@ -28,6 +28,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
 
+	<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 id="profile-upload-wrapper" style="display: $visitor;" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
 	</div> 
@@ -64,10 +68,6 @@
   	$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 id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">
@@ -75,8 +75,8 @@
 			$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 id="profile-jot-networks-end"></div>
 		</div>
 	</div>
 

view/theme/frost-mobile/js/main.js

@@ -1,20 +1,33 @@
 
-  function openClose(theID) {
+	function openClose(listID) {
-    if(document.getElementById(theID).style.display == "block") { 
+/*		if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
+			document.getElementById(theID).style.display = "none" 
-    }
+		}
-    else { 
+		else { 
-      document.getElementById(theID).style.display = "block" 
+			document.getElementById(theID).style.display = "block" 
-    } 
+		}*/
-  }
+		listID = "#" + listID.replace(/:/g, "\\:");
+		listID = listID.replace(/\./g, "\\.");
+		listID = listID.replace(/@/g, "\\@");
 
-  function openMenu(theID) {
+		if($j(listID).is(":visible")) {
-      document.getElementById(theID).style.display = "block" 
+			$j(listID).hide();
-  }
+			$j(listID+"-wrapper").show();
+			alert($j(listID+"-wrapper").attr("id"));
+		}
+		else {
+			$j(listID).show();
+			$j(listID+"-wrapper").hide();
+		}
+	}
 
-  function closeMenu(theID) {
+	function openMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
+		document.getElementById(theID).style.display = "block" 
-  }
+	}
+
+	function closeMenu(theID) {
+		document.getElementById(theID).style.display = "none" 
+	}
 
 
 

view/theme/frost-mobile/js/theme.js

@@ -235,6 +235,13 @@ $j(function(){
 
 
 
+function homeRedirect() {
+	$j('html').fadeOut('slow', function(){
+		window.location = baseurl + "/login";
+	});
+}
+
+
 function insertFormatting(comment,BBcode,id) {
 	
 	var tmpStr = $j("#comment-edit-text-" + id).val();

view/theme/frost-mobile/login-style.css

@@ -36,6 +36,9 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 10px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 
 .login-button {
 	margin-top: 90px;
@@ -89,6 +92,7 @@ div.section-wrapper {
 
 #div_id_remember {
 	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
 #login_openid {

view/theme/frost-mobile/smarty3/admin_users.tpl

@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $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='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</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>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</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?!?
+		{{/if}}
+	</form>
+</div>

view/theme/frost-mobile/smarty3/jot.tpl

@@ -28,6 +28,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
+	<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 id="profile-upload-wrapper" style="display: {{$visitor}};" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
 	</div> 
@@ -64,10 +68,6 @@
   	{{$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 id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">
@@ -75,8 +75,8 @@
 			{{$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 id="profile-jot-networks-end"></div>
 		</div>
 	</div>
 

view/theme/frost-mobile/style.css

@@ -1164,14 +1164,14 @@ input#dfrn-url {
 }
 
 .wall-item-content-wrapper {
-	padding-top: 30px;
+	padding-top: 1em;
 	border-top: 2px solid #AAAAAA;
 	position: relative;
 
 }
 
 .wall-item-content-wrapper.comment {
-	margin-top: 30px;
+	margin-top: 15px;
 	padding-top: 0px;
 	margin-left: 5px;
 	margin-right: 5px;
@@ -1261,7 +1261,7 @@ input#dfrn-url {
 /*    z-index: 100;*/
 }
 .wall-item-lock {
-	margin-top: 30px;
+	margin-top: 1em;
 	left: 105px;
 	position: absolute;
 	top: 1px;	
@@ -1355,11 +1355,11 @@ input#dfrn-url {
 }
 .wall-item-photo {
 	border: none;
+	border-radius: 7px;
 }
 .comment .wall-item-photo {
 	width: 50px !important; 
 	height: 50px !important;
-	border-top-left-radius: 10px;
 }
 .wall-item-content {
 	float: left;
@@ -1630,6 +1630,9 @@ input#dfrn-url {
 #profile-jot-plugin-end{
   clear: both;
 }
+input#profile-jot-email {
+	display: block;
+}
 .profile-jot-net {
 	float: left;
 	margin-right: 10px;
@@ -2123,14 +2126,14 @@ input#dfrn-url {
 }
 
 #profile-jot-acl-wrapper{
-	width:270px;
+	/*width:270px;*/
 	padding-left:10px;
 	height:auto;
 	overflow:visible;
 }
 
 #acl-wrapper {
-	width: 270px;
+	/*width: 270px;*/
 	float:left;
 }
 #acl-search {
@@ -3898,6 +3901,9 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 10px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 .qcomment {
 	border: 1px solid #EEE;
 	padding: 3px;

view/theme/frost-mobile/theme.php

@@ -4,18 +4,20 @@
  * Name: Frost--mobile version
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.2.16
+ * Version: Version 0.2.17
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-$a->theme_info = array();
+function frost_mobile_init(&$a) {
-$a->sourcename = 'Friendica mobile web';
+	$a->theme_info = array();
-$a->videowidth = 250;
+	$a->sourcename = 'Friendica mobile web';
-$a->videoheight = 200;
+	$a->videowidth = 250;
-$a->theme_thread_allow = false;
+	$a->videoheight = 200;
-$a->force_max_items = 10;
+	$a->theme_thread_allow = false;
-set_template_engine($a, 'smarty3');
+	$a->force_max_items = 10;
+	set_template_engine($a, 'smarty3');
+}
 
 function frost_mobile_content_loaded(&$a) {
 

view/theme/frost/admin_users.tpl

@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		<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='tool like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool 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 {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
+						<td class="checkbox"> 
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+                                    {{ endif }}
+						<td class="tools">
+                                    {{ if $u.is_admin }}
+                                        &nbsp;
+                                    {{ else }}
+                                        <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" 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?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+                                    {{ endif }}
+						</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/frost/contacts-template.tpl

@@ -2,6 +2,8 @@
 
 {{ if $finding }}<h4>$finding</h4>{{ endif }}
 
+$tabs
+
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="$cmd" method="get" >
 <span class="contacts-search-desc">$desc</span>
@@ -11,8 +13,6 @@
 </div>
 <div id="contacts-search-end"></div>
 
-$tabs
-
 
 <div id="contacts-display-wrapper">
 {{ for $contacts as $c }}

view/theme/frost/default.php

@@ -5,7 +5,7 @@
   <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<body>
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
 	<?php if(x($page,'nav')) echo $page['nav']; ?>
 
 	<?php if( $a->module === 'home' ) { ?>

view/theme/frost/jot.tpl

@@ -27,6 +27,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="$share" />
 
+	<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 id="profile-upload-wrapper" style="display: $visitor;" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
 	</div> 
@@ -65,10 +69,6 @@
 
 <!--	<span id="jot-display-location" style="display: none;"></span>-->
 
-	<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 id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">

view/theme/frost/js/main.js

@@ -1,20 +1,32 @@
 
-  function openClose(theID) {
+	function openClose(listID) {
-    if(document.getElementById(theID).style.display == "block") { 
+/*		if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
+			document.getElementById(theID).style.display = "none" 
-    }
+		}
-    else { 
+		else { 
-      document.getElementById(theID).style.display = "block" 
+			document.getElementById(theID).style.display = "block" 
-    } 
+		}*/
-  }
+		listID = "#" + listID.replace(/:/g, "\\:");
+		listID = listID.replace(/\./g, "\\.");
+		listID = listID.replace(/@/g, "\\@");
 
-  function openMenu(theID) {
+		if($j(listID).is(":visible")) {
-      document.getElementById(theID).style.display = "block" 
+			$j(listID).hide();
-  }
+			$j(listID+"-wrapper").show();
+		}
+		else {
+			$j(listID).show();
+			$j(listID+"-wrapper").hide();
+		}
+	}
 
-  function closeMenu(theID) {
+	function openMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
+		document.getElementById(theID).style.display = "block" 
-  }
+	}
+
+	function closeMenu(theID) {
+		document.getElementById(theID).style.display = "none" 
+	}
 
 
 

view/theme/frost/js/theme.js

@@ -29,10 +29,10 @@ $j(document).ready(function() {
 	$j("#profile-jot-text").click(enableOnUser);
 
 
-	$j('.nav-menu-link').hover(function() {
+	$j('.nav-menu-list, .nav-menu-icon').hover(function() {
-		showNavMenu($j(this).attr('rel'));
+		showNavMenu($j(this).attr('point'));
 	}, function() {
-		hideNavMenu($j(this).attr('rel'));
+		hideNavMenu($j(this).attr('point'));
 	});
 
 /*	$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
@@ -305,6 +305,13 @@ $j(function(){
 });
 
 
+function homeRedirect() {
+	$j('html').fadeOut('slow', function(){
+		window.location = baseurl + "/login";
+	});
+}
+
+
 if(typeof window.photoEdit != 'undefined') {
 
 	$j(document).keydown(function(event) {
@@ -616,8 +623,8 @@ function initEditor(cb){
 			$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
 			$j("a#jot-perms-icon").fancybox({
-				'transitionIn' : 'elastic',
+				'transitionIn' : 'none', //'elastic',
-				'transitionOut' : 'elastic'
+				'transitionOut' : 'none' //'elastic'
 			});
 			$j(".jothidden").show();
 			if (typeof cb!="undefined") cb();

view/theme/frost/login-style.css

@@ -31,6 +31,9 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 15px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 
 .login-button {
 	margin-top: 110px;
@@ -89,6 +92,7 @@ div.section-wrapper {
 
 #div_id_remember {
 	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
 /*.openid input {*/

view/theme/frost/msg-header.tpl

@@ -2,7 +2,8 @@
 <script language="javascript" type="text/javascript">
 	window.nickname = "$nickname";
 	window.linkURL = "$linkurl";
-	var plaintext = "$editselect";
+	var none = "none";	// ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = $editselect;
 	window.ajaxType = 'msg-header';
 	window.autocompleteType = 'msg-header';
 </script>

view/theme/frost/nav.tpl

@@ -7,10 +7,10 @@
 
 <!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link" href="$nav.settings.0" title="Main Menu">
+	<a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
 	<img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
 	</a>
-	<ul id="system-menu-list" class="nav-menu-list">
+	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
 		{{ if $nav.login }}
 		<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
 		{{ endif }}
@@ -70,13 +70,15 @@
 
 <!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link" href="$nav.contacts.0" title="Contacts">
+	<a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
 	<img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
 	</a>
 	{{ if $nav.introductions }}
+	<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >
 	<span id="intro-update" class="nav-ajax-left"></span>
+	</a>
 	{{ endif }}
-	<ul id="contacts-menu-list" class="nav-menu-list">
+	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
 		{{ if $nav.contacts }}
 		<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
 		{{ endif }}
@@ -103,13 +105,13 @@
 
 <!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="network-menu-link nav-link" href="$nav.network.0" title="Network">
+	<a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
 	<img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
 	</a>
 	{{ if $nav.network }}
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{ endif }}
-	<ul id="network-menu-list" class="nav-menu-list">
+	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
 		{{ if $nav.network }}
 		<li>
 		<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@@ -129,7 +131,7 @@
 		{{ endif }}
 	</ul>
 	</div>
-		
+
 	{{ if $nav.network }}
 	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
 	<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">

view/theme/frost/smarty3/admin_users.tpl

@@ -0,0 +1,98 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "{{$confirm_delete}}".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("{{$confirm_delete_multi}}");
+	}
+	function selectall(cls){
+		$j("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>{{$title}} - {{$page}}</h1>
+	
+	<form action="{{$baseurl}}/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		
+		<h3>{{$h_pending}}</h3>
+		{{if $pending}}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{foreach $th_pending as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{foreach $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='tool like'></span></a>
+						<a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='tool dislike'></span></a>
+					</td>
+				</tr>
+			{{/foreach}}
+				</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>
+		{{/if}}
+	
+	
+		
+	
+		<h3>{{$h_users}}</h3>
+		{{if $users}}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{foreach $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}} {{if $u.is_admin}}({{$siteadmin}}){{/if}}</td>
+						<td class="checkbox"> 
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+                                    {{/if}}
+						<td class="tools">
+                                    {{if $u.is_admin}}
+                                        &nbsp;
+                                    {{else}}
+                                        <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                        <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                    {{/if}}
+						</td>
+					</tr>
+				{{/foreach}}
+				</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?!?
+		{{/if}}
+	</form>
+</div>

view/theme/frost/smarty3/contacts-template.tpl

@@ -2,6 +2,8 @@
 
 {{if $finding}}<h4>{{$finding}}</h4>{{/if}}
 
+{{$tabs}}
+
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="{{$cmd}}" method="get" >
 <span class="contacts-search-desc">{{$desc}}</span>
@@ -11,8 +13,6 @@
 </div>
 <div id="contacts-search-end"></div>
 
-{{$tabs}}
-
 
 <div id="contacts-display-wrapper">
 {{foreach $contacts as $c}}

view/theme/frost/smarty3/jot.tpl

@@ -27,6 +27,10 @@
 <div id="profile-jot-submit-wrapper" class="jothidden">
 	<input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
+	<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 id="profile-upload-wrapper" style="display: {{$visitor}};" >
 		<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
 	</div> 
@@ -65,10 +69,6 @@
 
 <!--	<span id="jot-display-location" style="display: none;"></span>-->
 
-	<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 id="jot-preview-content" style="display:none;"></div>
 
 	<div style="display: none;">

view/theme/frost/smarty3/msg-header.tpl

@@ -2,7 +2,8 @@
 <script language="javascript" type="text/javascript">
 	window.nickname = "{{$nickname}}";
 	window.linkURL = "{{$linkurl}}";
-	var plaintext = "{{$editselect}}";
+	var none = "none";	// ugly hack: {{$editselect}} shouldn't be a string if TinyMCE is enabled, but should if it isn't
+	window.editSelect = {{$editselect}};
 	window.ajaxType = 'msg-header';
 	window.autocompleteType = 'msg-header';
 </script>

view/theme/frost/smarty3/nav.tpl

@@ -7,10 +7,10 @@
 
 <!--	<a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#system-menu-list">
-	<a class="system-menu-link nav-link" href="{{$nav.settings.0}}" title="Main Menu">
+	<a class="system-menu-link nav-link nav-menu-icon" href="{{$nav.settings.0}}" title="Main Menu" point="#system-menu-list">
 	<img class="system-menu-link" src="{{$baseurl}}/view/theme/frost/images/menu.png">
 	</a>
-	<ul id="system-menu-list" class="nav-menu-list">
+	<ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
 		{{if $nav.login}}
 		<a id="nav-login-link" class="nav-load-page-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
 		{{/if}}
@@ -70,13 +70,15 @@
 
 <!--	<a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
-	<a class="contacts-menu-link nav-link" href="{{$nav.contacts.0}}" title="Contacts">
+	<a class="contacts-menu-link nav-link nav-menu-icon" href="{{$nav.contacts.0}}" title="Contacts" point="#contacts-menu-list">
 	<img class="contacts-menu-link" src="{{$baseurl}}/view/theme/frost/images/contacts.png">
 	</a>
 	{{if $nav.introductions}}
+	<a id="nav-notify-link" class="{{$nav.introductions.2}} {{$sel.introductions}} nav-load-page-link" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >
 	<span id="intro-update" class="nav-ajax-left"></span>
+	</a>
 	{{/if}}
-	<ul id="contacts-menu-list" class="nav-menu-list">
+	<ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
 		{{if $nav.contacts}}
 		<li><a id="nav-contacts-link" class="{{$nav.contacts.2}} nav-load-page-link" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><li>
 		{{/if}}
@@ -103,13 +105,13 @@
 
 <!--	<a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
 	<div class="nav-button-container nav-menu-link" rel="#network-menu-list">
-	<a class="network-menu-link nav-link" href="{{$nav.network.0}}" title="Network">
+	<a class="nav-menu-icon network-menu-link nav-link" href="{{$nav.network.0}}" title="Network" point="#network-menu-list">
 	<img class="network-menu-link" src="{{$baseurl}}/view/theme/frost/images/network.png">
 	</a>
 	{{if $nav.network}}
 	<span id="net-update" class="nav-ajax-left"></span>
 	{{/if}}
-	<ul id="network-menu-list" class="nav-menu-list">
+	<ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
 		{{if $nav.network}}
 		<li>
 		<a id="nav-network-link" class="{{$nav.network.2}} {{$sel.network}} nav-load-page-link" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
@@ -129,7 +131,7 @@
 		{{/if}}
 	</ul>
 	</div>
-		
+
 	{{if $nav.network}}
 	<div class="nav-button-container nav-menu-link" rel="#network-reset-button">
 	<a class="nav-menu-icon network-reset-link nav-link" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">

view/theme/frost/smarty3/threaded_conversation.tpl

@@ -4,6 +4,10 @@
   <div id="item-delete-selected-top-desc" >{{$dropping}}</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{else}}
+{{if $mode==display}}
+<div id="display-top-padding"></div>
+{{/if}}
 {{/if}}
 
 {{$live_update}}

view/theme/frost/smarty3/wall_thread.tpl

@@ -40,7 +40,7 @@
 		</div>
 		<!--<div class="wall-item-author">-->
 				<a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" >{{$item.ago}}</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}" ><a href="display/{{$user.nickname}}/{{$item.id}}">{{$item.ago}}</a></div>
 		<!--</div>-->
 		<div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>

view/theme/frost/style.css

@@ -311,7 +311,7 @@ section {
 
 	padding-left: 1em;
 	padding-right: 1em;
-	padding-top: 1em;
+	padding-top: 0.5em;
 
 	background-color: #ffffff;
 /*	background-image: url(border.jpg);
@@ -319,20 +319,36 @@ section {
 	background-repeat: no-repeat;*/
 
 	min-height: 112px;
-	border-top: 1px solid #babdb6;
+/*	border-top: 1px solid #babdb6;*/
-	border-left: 1px dotted #AAA;
+	border-top: 1px solid #CCC;
-	border-right: 1px dotted #AAA;
+	border-left: 1px solid #CCC;
+	border-right: 1px solid #CCC;
+	border-top-left-radius: 10px;
+	border-top-right-radius: 10px;
 }
 
 .tabs {
 	height: 27px;
-	background-image: url(head.jpg);
+	/*background-image: url(head.jpg);
 	background-repeat: repeat-x;	
 	background-position: 0px -20px;
-	border-bottom: 1px solid #babdb6;
+	border-bottom: 1px solid #babdb6;*/
 	padding:0px;
 }
 .tabs li { margin: 0px; list-style: none; }
+.tabs a {
+	padding: 0.4em 0.5em;
+	margin-right: 0.5em;
+	margin-bottom: 0.5em;
+	border: 1px solid #aaa;
+	border-radius: 8px;
+	-moz-border-radius: 8px;
+	-webkit-border-radius: 8px;
+
+	box-shadow: -2px -2px 3px #aaa inset;
+	-moz-box-shadow: -2px -2px 3px #aaa inset;
+	-webkit-box-shadow: -2px -2px 3px #aaa inset;
+}
 .tab {
 	display:block;
 	float:left;
@@ -342,7 +358,14 @@ section {
 }
 .tab.active {
 	font-weight: bold;
-	
+
+	box-shadow: 2px 2px 3px #aaa inset;
+	-moz-box-shadow: 2px 2px 3px #aaa inset;
+	-webkit-box-shadow: 2px 2px 3px #aaa inset;
+}
+
+#display-top-padding {
+	padding-top: 3em;
 }
 
 
@@ -401,13 +424,17 @@ div.wall-item-content-wrapper.shiny {
 }
 
 #jot-title, #jot-category {
-	border: 0px;
 	margin: 0px;
-	height: 20px;
-	width: 530px;
 	margin-bottom: 5px;
+
+	height: 20px;
+	width: 465px;
 	font-weight: bold;
+
 	border: 1px solid #ffffff;
+
+	display: block;
+	clear: left;
 }
 
 #jot-title::-webkit-input-placeholder{font-weight: normal;}
@@ -1013,6 +1040,12 @@ input#dfrn-url {
 	padding-left: 0px;
 }
 
+#contacts-search-wrapper {
+	padding-top: 1em;
+	padding-bottom: 2em;
+	clear: left;
+}
+
 #contacts-main {
 	margin-top: 20px;
 	margin-bottom: 20px;
@@ -1103,7 +1136,7 @@ input#dfrn-url {
 }
 
 .wall-item-content-wrapper {
-	padding-top: 30px;
+	padding-top: 1em; /* wall-item-lock margin-top needs to match this */
 	border-top: 2px solid #AAA;
 	position: relative;
 
@@ -1205,7 +1238,7 @@ input#dfrn-url {
     z-index: 100;
 }
 .wall-item-lock {
-	margin-top: 30px;
+	margin-top: 1em; /* needs to match .wall-item-content-wrapper padding-top */
 	left: 105px;
 	position: absolute;
 	top: 1px;	
@@ -1215,7 +1248,7 @@ input#dfrn-url {
 	margin-top: 0px;
 }
 
-.wall-item-ago {
+.wall-item-ago, .wall-item-ago a {
 	color: #888888;
 	font-size: 0.8em;
 }
@@ -1301,10 +1334,16 @@ input#dfrn-url {
 }
 .wall-item-photo {
 	border: none;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	-webkit-border-radius: 7px;
 }
 .comment .wall-item-photo {
 	width: 50px !important; 
 	height: 50px !important;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 .wall-item-content {
 	margin-left: 10px;
@@ -1467,6 +1506,11 @@ input#dfrn-url {
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
 }
+#profile-jot-banner-wrapper {
+	height: 1.5em;
+	display: block;
+	clear: left
+}
 
 #profile-jot-submit {
 	float: left;
@@ -3314,7 +3358,7 @@ aside input[type='text'] {
 
 #adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
 #adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
+#adminpage td .icon, #adminpage td .tool { float: left;}
 #adminpage table#users img { width: 16px; height: 16px; }
 #adminpage table tr:hover { background-color: #bbc7d7; }
 #adminpage .selectall { text-align: right; }
@@ -3763,9 +3807,12 @@ div.jGrowl div.info {
   padding-left: 58px;
 }
 #jGrowl.top-right {
-	top: 15px;
+	top: 75px;
 	right: 15px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 .qcomment {
 	border: 1px solid #EEE;
 	padding: 3px;

view/theme/frost/theme.php

@@ -4,16 +4,18 @@
  * Name: Frost
  * Description: Like frosted glass
  * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
- * Version: Version 0.3.1
+ * Version: Version 0.3.2
  * Author: Zach P <techcity@f.shmuz.in>
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-$a->theme_info = array();
+function frost_init(&$a) {
-$a->videowidth = 400;
+	$a->theme_info = array();
-$a->videoheight = 330;
+	$a->videowidth = 400;
-$a->theme_thread_allow = false;
+	$a->videoheight = 330;
-set_template_engine($a, 'smarty3');
+	$a->theme_thread_allow = false;
+	set_template_engine($a, 'smarty3');
+}
 
 function frost_content_loaded(&$a) {
 

view/theme/frost/threaded_conversation.tpl

@@ -4,6 +4,10 @@
   <div id="item-delete-selected-top-desc" >$dropping</div>
 </div>
 <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
+{{ else }}
+{{ if $mode==display }}
+<div id="display-top-padding"></div>
+{{ endif }}
 {{ endif }}
 
 $live_update

view/theme/frost/wall_thread.tpl

@@ -40,7 +40,7 @@
 		</div>
 		<!--<div class="wall-item-author">-->
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>{{ if $item.owner_url }} $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall{{ endif }}<br />
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime" >$item.ago</div>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime" ><a href="display/$user.nickname/$item.id">$item.ago</a></div>
 		<!--</div>-->
 		<div class="wall-item-content" id="wall-item-content-$item.id" >
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>