Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update

boot.php

@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1422' );
+define ( 'FRIENDICA_VERSION',      '3.0.1424' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -349,6 +349,7 @@ if(! class_exists('App')) {
 		public  $plugins;
 		public  $apps = array();
 		public  $identities;
+		public	$sourcename = '';
 	
 		public $nav_sel;
 

include/Photo.php

@@ -247,7 +247,7 @@ class Photo {
         if($this->is_imagick()) {
             $this->image->setFirstIterator();
             do {
-                $this->image->rotateImage(new ImagickPixel(), $degrees);
+                $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
             } while ($this->image->nextImage());
             return;
         }

include/conversation.php

@@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 							'$edurl' => t('Link'),
 							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => (($mode === 'network') ? $commentww : '')
 						));
 					}
@@ -1163,7 +1164,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$bang' => $x['bang'],
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
-		'$mobileapp' => t('Friendica mobile web'),
+		'$sourceapp' => t($a->sourcename),
 	));
 
 

include/items.php

@@ -578,6 +578,7 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = escape_tags($res['body']);
 	}
 
+
 	// this tag is obsolete but we keep it for really old sites
 
 	$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
@@ -3328,7 +3329,6 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	else
 		$body = $item['body'];
 
-
 	$o = "\r\n\r\n<entry>\r\n";
 
 	if(is_array($author))

include/network.php

@@ -854,6 +854,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 			}
 		}
 	}
+
+	// replace the special char encoding
+
+	$s = htmlspecialchars($s,ENT_QUOTES,'UTF-8');
 	return $s;
 }
 

mod/content.php

@@ -698,6 +698,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 							'$edurl' => t('Link'),
 							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => (($mode === 'network') ? $commentww : '')
 						));
 					}

mod/editpost.php

@@ -132,7 +132,7 @@ function editpost_content(&$a) {
 		'$profile_uid' => $_SESSION['uid'],
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
-		'$mobileapp' => t('Friendica mobile web'),
+		'$sourceapp' => t($a->sourcename),
 	));
 
 	return $o;

mod/item.php

@@ -438,6 +438,7 @@ function item_post(&$a) {
 
 	$body = bb_translate_video($body);
 
+
 	/**
 	 * Fold multi-line [code] sequences
 	 */
@@ -446,6 +447,8 @@ function item_post(&$a) {
 
 	$body = scale_external_images($body,false);
 
+
+
 	/**
 	 * Look for any tags and linkify them
 	 */

mod/photos.php

@@ -1324,6 +1324,7 @@ function photos_content(&$a) {
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => ''
 						));
 					}
@@ -1363,6 +1364,7 @@ function photos_content(&$a) {
 							'$myphoto' => $contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => ''
 						));
 					}
@@ -1394,6 +1396,7 @@ function photos_content(&$a) {
 								'$myphoto' => $contact['thumb'],
 								'$comment' => t('Comment'),
 								'$submit' => t('Submit'),
+								'$sourceapp' => t($a->sourcename),
 								'$ww' => ''
 							));
 						}

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1422\n"
+"Project-Id-Version: 3.0.1424\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-01 10:00-0700\n"
+"POT-Creation-Date: 2012-08-03 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2602,7 +2602,7 @@ msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:236
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488
 #: ../../include/text.php:677
 msgid "Save"
@@ -4787,23 +4787,23 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:233
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:238
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:241
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:243
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:245
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -7504,7 +7504,7 @@ msgstr ""
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:843
+#: ../../include/network.php:849
 msgid "view full size"
 msgstr ""
 
@@ -7803,11 +7803,11 @@ msgstr ""
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:102 ../../include/bbcode.php:317
+#: ../../include/bbcode.php:102 ../../include/bbcode.php:323
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:282 ../../include/bbcode.php:302
+#: ../../include/bbcode.php:288 ../../include/bbcode.php:308
 msgid "$1 wrote:"
 msgstr ""
 

view/birthdays_reminder.tpl

@@ -3,7 +3,7 @@
 <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
 <div id="birthday-title-end"></div>
 {{ for $events as $event }}
-<div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
+<div class="birthday-list" id="birthday-$event.id"> <a href="$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
 </div>
 {{ endif }}

view/events_reminder.tpl

@@ -3,7 +3,7 @@
 <div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
 <div id="event-title-end"></div>
 {{ for $events as $event }}
-<div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
+<div class="event-list" id="event-$event.id"> <a href="events/$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
 </div>
 {{ endif }}

view/theme/darkzero-NS/style.css

@@ -49,7 +49,7 @@ background: #444;
 	color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
 	color: #CCCCCC; background-color: #333333;
 }
 

view/theme/darkzero/style.css

@@ -49,7 +49,7 @@ background: #444;
 	color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
 	color: #CCCCCC; background-color: #333333;
 }
 

view/theme/frost-mobile/TODO

@@ -6,8 +6,6 @@ Photo album display?
 
 - Edit photo page: bottom buttons are off-center in Dolphin Mini
 
-- Pager: looks weird when only "prev" is there
-
 - BB code buttons for status updates
 
 - Get "add contact" back on contacts page

view/theme/frost-mobile/comment_item.tpl

@@ -13,6 +13,7 @@
 		<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="source" value="$sourceapp" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
 				<input type="hidden" name="return" value="$return_path" />

view/theme/frost-mobile/jot.tpl

@@ -13,7 +13,7 @@
 		<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="source" value="$mobileapp" />
+		<input type="hidden" name="source" value="$sourceapp" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>

view/theme/frost-mobile/nav.tpl

@@ -19,16 +19,16 @@
 		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
 		{{ endif }}
 
+		{{ if $nav.settings }}
+		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
+		{{ endif }}
+
 		{{ if $nav.manage }}
 		<li>
 		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
 		</li>
 		{{ endif }}
 
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
 		{{ if $nav.profiles }}
 		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
 		{{ endif }}

view/theme/frost-mobile/style.css

@@ -1357,7 +1357,7 @@ input#dfrn-url {
 }
 
 .wall-item-body code {
-	overflow: hidden;
+	overflow: auto;
 }
 
 .comment .wall-item-body {
@@ -1435,7 +1435,7 @@ input#dfrn-url {
 	height: 150px;
 /*	width: 350px;
 	overflow: auto;*/
-	width: 190px;
+	width: 250px;
 	margin-top: 15px;
 	margin-left: 20px;
 }
@@ -1688,8 +1688,8 @@ input#dfrn-url {
 	margin-right: 5px;
 	margin-bottom: 10px;*/
 /*	float: left;*/
-	margin-right: 15px;
+/*	margin-right: 15px;
-	margin-left: 15px;
+	margin-left: 15px;*/
 }
 
 .pager_first,
@@ -1698,14 +1698,10 @@ input#dfrn-url {
 	display: none;
 }
 
-.pager_first a,
+/*.pager_first a,
 .pager_last a,
 .pager_prev a,
 .pager_next a {
-/*	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-left: 4px;
-	padding-right: 8px;*/
 	padding-top: 5px;
 	padding-bottom: 5px;
 	padding-left: 25px;
@@ -1725,6 +1721,16 @@ input#dfrn-url {
 	padding-left: 9px;
 	padding-right: 18px;
 	text-decoration: none;
+}*/
+
+.pager_prev a,
+.pager_next a {
+	font-size: 1.5em;
+	padding: 0.2em 1em;
+	border: 1px solid #aaa;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
 }
 
 .pager_current {
@@ -2895,7 +2901,7 @@ aside input[type='text'] {
 }
 
 #event-summary {
-	width: 400px;
+	width: 280px;
 }
 
 .vevent {
@@ -2934,13 +2940,16 @@ aside input[type='text'] {
 }
 
 .event-start, .event-end {
+	font-size: 14px;
 	margin-left: 10px;
-	width: 330px;
+	width: 280px;
 	clear: both;
+	padding-bottom: 1.5em;
 }
 
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+	clear: both;
+	float: left;
 }
 
 .event-list-date {
@@ -3505,7 +3514,7 @@ aside input[type='text'] {
 	background-repeat: no-repeat;
 	opacity: 0.5;
 }
-.link { display: none; background-position: -144px 0px;}
+.icon.link { display: none; background-position: -144px 0px;}
 
 /*.globe { background-position: 0px -16px;}*/
 .icon.globe {

view/theme/frost-mobile/theme.php

@@ -4,7 +4,7 @@
  * 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.2
+ * Version: Version 0.2.3
  * Author: Zach P <windforest@f.shmuz.in>
  * Maintainer: Zach P <windforest@f.shmuz.in>
  */
@@ -22,4 +22,7 @@ function frost_mobile_init(&$a) {
 	if( $a->module === 'login' )
 		$a->page['end'] .= '<script type="text/javascript"> $j(document).ready(function() { $j("#id_" + window.loginName).focus();} );</script>';
 
+
+	$a->sourcename = 'Friendica mobile web';
+
 }

view/theme/frost/js/acl.js

@@ -11,7 +11,7 @@ function ACL(backend_url, preset){
 	that.deny_cid  = (preset[2] || []);
 	that.deny_gid  = (preset[3] || []);
 	that.group_uids = [];
-	that.nw = 4; //items per row. should be calulated from #acl-list.width
+	that.nw = 3; //items per row. should be calulated from #acl-list.width
 	
 	that.list_content = $j("#acl-list-content");
 	that.item_tpl = unescape($j(".acl-list-item[rel=acl-template]").html());

view/theme/frost/js/acl.min.js

@@ -1 +1 @@
-function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};
+function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=3,that.list_content=$j("#acl-list-content"),that.item_tpl=unescape($j(".acl-list-item[rel=acl-template]").html()),that.showall=$j("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$j(".acl-button-show").live("click",that.on_button_show),$j(".acl-button-hide").live("click",that.on_button_hide),$j("#acl-search").keypress(that.on_search),$j("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$j("#acl-fields").html(""),$j(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$j(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$j(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$j(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$j("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($j(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($j(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show(),$j(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$j("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide(),$j(".profile-jot-net input").attr("disabled","disabled"),$j("#profile-jot-desc").html("&nbsp;")),$j("#acl-list-content .acl-list-item").each(function(){$j(this).removeClass("groupshow grouphide")}),$j("#acl-list-content .acl-list-item").each(function(){itemid=$j(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$j(this).children(".acl-button-show").removeClass("selected"),bthide=$j(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$j(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$j("#c"+n).removeClass("groupshow");if(e!=""){var r=$j("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$j("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$j.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$j(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};

view/theme/frost/nav.tpl

@@ -19,16 +19,16 @@
 		<a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
 		{{ endif }}
 
+		{{ if $nav.settings }}
+		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
+		{{ endif }}
+
 		{{ if $nav.manage }}
 		<li>
 		<a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
 		</li>
 		{{ endif }}
 
-		{{ if $nav.settings }}
-		<li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
-		{{ endif }}
-
 		{{ if $nav.profiles }}
 		<li><a id="nav-profiles-link" class="$nav.profiles.2 nav-load-page-link" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a></li>
 		{{ endif }}

view/theme/frost/style.css

@@ -1894,7 +1894,7 @@ input#dfrn-url {
 
 
 #acl-wrapper {
-	width: 690px;
+	width: 580px;
 	float:left;
 }
 #acl-search {
@@ -1935,7 +1935,7 @@ input#dfrn-url {
 }
 .acl-list-item {
 	display: block;
-	width: 150px;
+	width: 170px;
 	height: 30px;
 	border: 1px solid #cccccc;
 	margin: 5px;
@@ -1949,10 +1949,10 @@ input#dfrn-url {
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
 .acl-list-item a { 
-	font-size: 8px;
+	font-size: 10px; /* 8px; */
 	display: block;
-	width: 40px;
+	width: 50px;
-	height: 10px;
+	height: 12px;
 	float: left;
 	color: #999999;
 	background-color: #cccccc;

view/theme/frost/theme.php

@@ -4,7 +4,7 @@
  * 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.2.2
+ * Version: Version 0.2.3
  * Author: Zach P <windforest@f.shmuz.in>
  * Maintainer: Zach P <windforest@f.shmuz.in>
  */