From 4e967fc79ffec8219a89a04f4e47fdc6662a7b08 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 16 Apr 2012 22:58:28 -0400
Subject: [PATCH 1/6] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master: (22 commits)
  diabook-themes: bugfix (sry, necessary)
  diabook-themes: small bug/css-fixes ---> ver. 1.019
  diabook-themes: bug-fixes
  diabook-themes: minor bugfixes
  turn on comment edit
  propagate edited comments
  edited comments weren't being relayed
  rev update
  diabook-themes: css-fixes
  open contact edit in same window
  where did this "lang" string come from and why?
  function name typo
  track requested profile error msg
  DBA: Reverting back to original source
  DBA: Nothing really done ..
  DBA: Deactivation of the mysqli-class for testing purposes.
  API: Improved the timeline. Several (disabled) tests with caching of photos.
  html2plain: changed behaviour for the "hr" element.
  API: Tweetdeck is now working
  API: Added Public Timeline
  ...

* master:

From 68e1523496437eae9d33011b4317590de3e32ecb Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 17 Apr 2012 00:26:37 -0400
Subject: [PATCH 2/6] finally fix the ui in the settings. it was fugly....
 other bug fixes too

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/style.css | 1504 +++++++++++++++---------------
 view/theme/dispy/jot-header.tpl |    1 -
 view/theme/dispy/style.css      | 1528 ++++++++++++++++---------------
 3 files changed, 1571 insertions(+), 1462 deletions(-)

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 20f5c5898..9743800bf 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -51,20 +51,23 @@ body, button, input, select, textarea {
     background-color: #2e2f2e;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #eec;
-	background: #2e2f2e;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #eec;
+    background: #2e2f2e;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #eec;
-	background: #2e2f2e;
+    padding: 3px;
+    color: #eec;
+    background: #2e2f2e;
+}
+option[selected="selected"] {
+	color: #2e2f2e;
+	background: #eec;
 }
 ul, ol {
-	padding: 0;
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -134,7 +137,7 @@ a:hover img {
 }
 blockquote {
     background: #444;
-	color: #eec;
+    color: #eec;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -158,36 +161,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #eee;
-	color: #2e302e;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e302e;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e302e;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -204,25 +196,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	width: 100%;
-	height: 100%;
-	margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -237,34 +229,34 @@ input[type=submit] {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid #id_openid_url {
-	width: 180px !important;
-	overflow: hidden !important;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -272,77 +264,77 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: #1d1f1d;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
+    height: 60px;
+    background-color: #1d1f1d;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    display: none;
+    position: absolute;
+    background-color: #555753;
+    width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	top: 20px;
-	left: 0;
-	-webkit-border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	box-shadow: 5px 10px 10px 0 #111;
-	z-index: 10000;
+    top: 20px;
+    left: 0;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    box-shadow: 5px 10px 10px 0 #111;
+    z-index: 10000;
 }
 ul#user-menu-popup li {
-	display: block;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e302e;
-	background-color: #eeeeec;
+    color: #2e302e;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    float: right;
+    display: block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -357,16 +349,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -375,22 +367,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -411,10 +403,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -477,18 +469,19 @@ div.jGrowl div.info {
     color: black;
     text-decoration: underline;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png");
 }
 .show {
     display: block;
 }
 #notifications {
-	height: 20px;
-	width: 170px;
-	position: absolute;
-	top: -19px;
-	left: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -496,132 +489,133 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #1d1f1d;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0 7px 0 0;
+    height: 25px;
 }
 #nav-buttons li {
-	padding: 0;
+    padding: 0;
 }
 .floaterflip {
-	display: block;
+    display: block;
     position: fixed;
     z-index: 110;
     top: 56px;
     right: 19px;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(icons.png) -190px -60px no-repeat;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: #1d1f1d;
+    border-radius: 5px;
 }
 #search-text {
-	border: 1px #eec solid;
-	background: #2e2f2e;
-	color: #eec;
+    border: 1px #eec solid;
+    background: #2e2f2e;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    margin: 8px;
+    width: 10em;
+    height: 14px;
+    color: #eec;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
 }
 #scrollup a:hover {
-	text-decoration: none;
-	border: 0;
+    text-decoration: none;
+    border: 0;
 }
 #user-menu {
-	box-shadow: 5px 0 10px 0 #111;
+    box-shadow: 5px 0 10px 0 #111;
     display: block;	
     width: 75%;
     margin: 3px 0 0 0;
     position: relative;
-	background-color: #555753;
+    background-color: #555753;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
 .nav-ajax-update, .nav-ajax-left {
-	width: 30px;
-	height: 19px;
-	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #222;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -683,133 +677,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * sysmsg
+ */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border:2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border: 2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border: 2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid #ccccce;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
+ * aside
+ */
 #asidemain {
-	float: left;
+    float: left;
     font-size: smaller;
     margin: 20px 0 20px 35px;
     width: 25%;
-	display: inline;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard .fn {
-	font-size: 1.7em;
-	font-weight: bold;
-	border-bottom: 1px solid #729fcf;
-	padding-bottom: 3px;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
 #asidemain h4 {
-	font-size: 1.2em;
+    font-size: 1.2em;
 }
 #asidemain #viewcontacts {
-	text-align: right;
+    text-align: right;
 }
 .aprofile dt {
-	background: #eec;
-	color: #2e2f2e;
-	font-weight: bold;
+    background: #eec;
+    color: #2e2f2e;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background: #3465A4 url(connect.png) no-repeat 95% center;
-	border-radius: 5px 5px 5px 5px;
-	color: #eec;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #eec;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #wallmessage-link {
-	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-	/*border-radius: 5px 5px 5px 5px;*/
-	color: #eee;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -827,20 +823,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -866,67 +862,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 #jot-category {
-	margin: 5px 0;
-	border-radius: 5px;
-	border: 1px #999 solid;
-	color: #aaa;
-	font-size: smaller;
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #999 solid;
+    color: #aaa;
+    font-size: smaller;
 }
 #jot-category:focus {
-	color: #eee;
+    color: #eee;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    width: 6%;
+    float: right;
+    text-align: right;
+    height: 15px;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	/*border-radius: 10px;*/
-	box-shadow: 5px 0 10px 0 #111;
+    /*border-radius: 10px;*/
+    box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	/*border-radius: 10px;*/
-	background: #888;
+    margin-bottom: 10px;
+    /*border-radius: 10px;*/
+    background: #888;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-	background: #888;
+    background: #888;
 }
 .mceCenter table tr {
-	background: #888;
+    background: #888;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 .mceFirst tr {
-	background: #888;
+    background: #888;
 }
 .mceFirst td {
-	/*border-radius: 10px 10px 0px 0px;*/
+    /*border-radius: 10px 10px 0px 0px;*/
 }
 .mceLast td {
-	/*border-radius: 0 0 10px 10px;*/
+    /*border-radius: 0 0 10px 10px;*/
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -937,58 +933,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    margin: 0 0 -18px 0;
+    display: block;
     width: 20px;
     height: 20px;
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
-	float: right;
-	cursor: pointer;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -1000,103 +996,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	list-style: none;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    height: auto;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 2px outset #222420;
+    margin: 0;
+    float: right;
+    text-shadow: 1px 1px #111;
+    width: auto;
+}
+#profile-jot-submit:active {
+    box-shadow: 0 0 0 0;
 }
 #jot-perms-icon {
-	height: 22px;
-	width: 20px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	overflow: hidden;
-	border: 0;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    border: 0;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	border: 1px solid #555753;
-	border-top: 0;
-	display: block !important;
+    margin: 0 10px;
+    border: 1px solid #555753;
+    border-top: 0;
+    display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	width:47%;
-	float:left;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #ff2000;
-	margin: 5px 0;
+    color: #ff2000;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #3e3f3e;
-	color: #eec;
+    color: #eec;
     border: 1px #eec solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
@@ -1106,13 +1107,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #sectionmain {
     margin: 20px;
     font-size: 0.8em;
-	min-width: 475px;
-	width: 67%;
-	float: left;
-	display: inline;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1120,12 +1123,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #88a9d2;
@@ -1136,60 +1139,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     color: #2e2f2e;
 }
 .tab.active {
-	background: #88a9d2;
+    background: #88a9d2;
     color: #2e2f2e;
 }
 .tab.active a {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	box-shadow: 5px 0 10px 0 #111;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #111;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #2e3436;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    overflow-x: auto;
+    margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
- * might break things for people. we shall see ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1223,7 +1226,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1259,41 +1262,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 20px 20px 0 110px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1342,17 +1345,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	border: 2px solid #FFFFFF;
-	border-top: 0px;
-	background: #555753;
-	position: absolute;
-	left: -2px; top: 101px;
-	display: none;
-	z-index: 10003;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
-	border-radius: 0px 5px 5px 5px;
+    min-width: 92px;
+    border: 2px solid #FFFFFF;
+    border-top: 0px;
+    background: #555753;
+    position: absolute;
+    left: -2px; top: 101px;
+    display: none;
+    z-index: 10003;
+    -webkit-border-radius: 0px 5px 5px 5px;
+    -moz-border-radius: 0px 5px 5px 5px;
+    border-radius: 0px 5px 5px 5px;
 }
 .wall-item-photo-menu ul {
     margin:0px;
@@ -1374,27 +1377,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 100%;
 }
 #connect-services-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1413,7 +1416,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1439,12 +1442,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	width: 20px;
-	height: 20px;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    float: left;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1456,32 +1459,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #c8bebe solid;
-	border-radius: 5px;
-	color: #c8bebe;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #c8bebe solid;
+    border-radius: 5px;
+    color: #c8bebe;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    height: 10em;
     border-radius: 5px;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1496,22 +1499,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #2e2f2e;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #2e2f2e;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1530,10 +1533,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1545,7 +1548,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #222;
-	color: #2e2f2e;
+    color: #2e2f2e;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1581,8 +1584,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
+    position: relative;
+    float:left;
 }
 #photo-photo-end {
     clear: both;
@@ -1659,10 +1662,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1684,15 +1687,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1716,7 +1719,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1724,7 +1727,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1734,7 +1737,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1764,15 +1767,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1787,7 +1790,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1795,7 +1798,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1838,7 +1841,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1883,7 +1886,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #2e2f2e;
-	color: #eec;
+    color: #eec;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1906,7 +1909,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1923,7 +1926,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1932,7 +1935,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1946,23 +1957,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1971,16 +1982,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 113px;
-	right: 260px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1988,26 +1999,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2130,70 +2147,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2203,69 +2220,69 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .filesavetags, .categorytags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .filesavetags:hover, .categorytags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    float: right;
+    margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2274,15 +2291,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2295,12 +2312,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #2e2f2e;
+    color: #2e2f2e;
     background: #88a9d2;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2331,7 +2348,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2346,14 +2363,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #2e2f2e;
     color: #eec;
-	border: 1px 999 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 999 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2379,7 +2396,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2395,10 +2412,10 @@ div[id$="wrapper"] br {
     list-style-position: inside;
 }
 #adminpage {
-	color: #eec;
-	background: #2e2f2e;
-	margin: 5px;
-	padding: 10px;
+    color: #eec;
+    background: #2e2f2e;
+    margin: 5px;
+    padding: 10px;
 }
 #adminpage dl {
     clear:left;
@@ -2412,14 +2429,14 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
 #adminpage #pluginslist {
     margin: 0;
@@ -2434,8 +2451,8 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
 #adminpage table {
     width: 100%;
@@ -2452,46 +2469,67 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-	color: #2e2f2e;
+    color: #2e2f2e;
     background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
 #adminpage #users a {
-	color: #eec;
-	text-decoration: underline;
+    color: #eec;
+    text-decoration: underline;
 }
 #users .name {
-	color: #eec;
+    color: #eec;
 }
 
 
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #2e2f2e solid;
-	padding: 5px;
-	background: #eec;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #2e2f2e solid;
+    padding: 5px;
+    background: #eec;
+    color: #111;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #eee;
+    border: 2px outset #aaa;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #2e302e;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #000;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2514,12 +2552,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2532,34 +2570,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2608,32 +2646,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    float: left;
+    width: 48px; height: 48px;
+    margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2644,7 +2682,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2653,15 +2691,15 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
-	margin: 0 2px;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2677,118 +2715,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 40px;
-	right: 30px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2817,7 +2855,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2825,7 +2863,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-	/*margin: 50px 20%;*/
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2837,24 +2875,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
-	color: #111;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2867,7 +2907,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2883,7 +2923,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #eec;
+    border: 1px solid #eec;
     display: block;
     float: left;
     height: 110px;
@@ -2907,29 +2947,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #2e2f2e;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #2e2f2e;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #2e2f2e;
@@ -2952,25 +2992,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e302e;
+    color: #2e302e;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2978,12 +3018,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2996,32 +3036,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 5838729cc..c55ac503a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -346,4 +346,3 @@ function enableOnUser(){
 	}
 
 </script>
-
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 9d10d2409..bc2677b4a 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -9,11 +9,22 @@
 /* from html5boilerplate */
 
 /* these are to tell browsers they should be displayed a certain way */
-article, aside, details, figcaption, figure, footer,
-header, hgroup, nav, section {
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
     display: block;
 }
-audio, canvas, video, time {
+audio,
+canvas,
+video,
+time {
     display: inline-block;
     *display: inline;
     *zoom: 1;
@@ -46,31 +57,41 @@ body {
     font-size: 16px;
     line-height: 1.1em;
 }
-body, button, input, select, textarea {
+body,
+button,
+input,
+select,
+textarea {
     font-family: sans-serif;
     color: #222;
-    background-color: #efefef;
+    background-color: #e8e8e8;
 }
 select {
-	border: 1px #555 dotted;
-	padding: 3px;
-	margin: 2px;
-	color: #222;
-	background: #efefef;
+    border: 1px #555 dotted;
+    padding: 3px;
+    margin: 3px;
+    color: #222;
+    background: #e8e8e8;
 }
 option {
-	padding: 3px;
-	vertical-align: middle;
-	color: #222;
-	background: #efefef;
+    padding: 3px;
+    color: #222;
+    background: #e8e8e8;
+}
+option[selected="selected"] {
+	background: #cca;
 }
 ul, ol {
-	padding: 0;
+    padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
     outline: 0;
 }
+[disabled="disabled"] {
+    background: #ddd;
+    color: #333;
+}
 
 /* remember to highlight inserts somehow! */
 ins {
@@ -135,7 +156,7 @@ a:hover img {
 }
 blockquote {
     background: #eee;
-	color: #111;
+    color: #111;
     text-indent: 5px;
     padding: 5px;
     border: 1px #aaa solid;
@@ -159,36 +180,25 @@ a:hover {
 .fakelink:hover {
     color: #729fcf;
 }
-input[type=submit] {
-    background-color: #555753;
-	color: #eeeeec;
-	font-weight: bold;
-    margin-top: 10px;
-    height: 22px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 0;
-}
 .smalltext {
     font-size: 0.7em;
 }
 #panel {
-	position: absolute;
-	font-size: 0.8em;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 1px solid #fff;
-	background-color: #2e3436;
-	color: #eeeeec;
-	padding: 1em;
+    position: absolute;
+    font-size: 0.8em;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 1px solid #fff;
+    background-color: #2e3436;
+    color: #eeeeec;
+    padding: 1em;
 }
 .pager {
-	margin-top: 60px;
-	display: block;
-	clear: both;
-	text-align: center;
+    margin-top: 60px;
+    display: block;
+    clear: both;
+    text-align: center;
 }
 .pager span {
     padding: 4px;
@@ -205,25 +215,25 @@ input[type=submit] {
  */
 /* .tool .action */
 .action {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 .tool {
-	margin: 5px 0;
-	list-style: none;
+    margin: 5px 0;
+    list-style: none;
 }
 #articlemain {
-	width: 100%;
-	height: 100%;
-	margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    margin: 0 auto;
 }
 
 
 /**
- * 	login
+ * login
  */
 #asidemain .field {
-	overflow: hidden;
-	width: 200px;
+    overflow: hidden;
+    width: 200px;
 }
 #login-extra-links {
     overflow: auto !important;
@@ -238,34 +248,34 @@ input[type=submit] {
     float: none !important;
     height: 100% !important;
     position: relative !important;
-	width: 100% !important;
+    width: 100% !important;
 }
 #login_standard .field label {
-	width: 200px !important;
+    width: 200px !important;
 }
 #login_standard input, #login_standard input[type="text"] {
-	margin: 0 0 8px !important;
+    margin: 0 0 8px !important;
     width: 210px !important;
 }
 #login-submit-wrapper {
-	margin: 0 !important;
+    margin: 0 !important;
 }
 #login-submit-button {
     margin-left: 0px !important;
 }
 #asidemain #login_openid {
-	position: relative !important;
-	float: none !important;
-	margin-left: 0px !important;
-	height: auto !important;
-	width: 200px !important;
+    position: relative !important;
+    float: none !important;
+    margin-left: 0px !important;
+    height: auto !important;
+    width: 200px !important;
 }
 #login_openid #id_openid_url {
-	width: 180px !important;
-	overflow: hidden !important;
+    width: 180px !important;
+    overflow: hidden !important;
 }
 #login_openid label {
-	width: 180px !important;
+    width: 180px !important;
 }
 
 
@@ -273,77 +283,77 @@ input[type=submit] {
  * nav
  */
 nav {
-	height: 60px;
-	background-color: #2e3436;
-	color: #eeeeec;
-	position: relative;
-	padding: 20px 20px 10px 95px;
+    height: 60px;
+    background-color: #2e3436;
+    color: #eeeeec;
+    position: relative;
+    padding: 20px 20px 10px 95px;
 }
 nav a {
-	text-decoration: none;
-	color: #eeeeec;
-	border: 0px;
+    text-decoration: none;
+    color: #eeeeec;
+    border: 0px;
 }
 nav a:hover {
-	text-decoration: none;
-	color: #eeeeec;
+    text-decoration: none;
+    color: #eeeeec;
     border: 0px;
 }
 nav #banner {
-	display: block;
-	position: absolute;
-	left: 51px;
-	top: 25px;
+    display: block;
+    position: absolute;
+    left: 51px;
+    top: 25px;
 }
 nav #banner #logo-text a {
-	font-size: 40px;
-	font-weight: bold;
-	margin-left: 3px;
+    font-size: 40px;
+    font-weight: bold;
+    margin-left: 3px;
 }
 ul#user-menu-popup {
-	display: none;
-	position: absolute;
-	background-color: #555753;
-	width: 100%;
+    display: none;
+    position: absolute;
+    background-color: #555753;
+    width: 100%;
     padding: 10px 0px;
     margin: 0px;
-	top: 20px;
-	left: 0;
-	-webkit-border-radius: 0 0 5px 5px;
-	-moz-border-radius: 0 0 5px 5px;
-	border-radius: 0 0 5px 5px;
-	box-shadow: 5px 10px 10px 0 #111;
-	z-index: 10000;
+    top: 20px;
+    left: 0;
+    -webkit-border-radius: 0 0 5px 5px;
+    -moz-border-radius: 0 0 5px 5px;
+    border-radius: 0 0 5px 5px;
+    box-shadow: 5px 10px 10px 0 #111;
+    z-index: 10000;
 }
 ul#user-menu-popup li {
-	display: block;
+    display: block;
 }
 ul#user-menu-popup li a {
-	display: block;
-	padding: 5px;
+    display: block;
+    padding: 5px;
 }
 ul#user-menu-popup li a:hover {
-	color: #2e3436;
-	background-color: #eeeeec;
+    color: #2e3436;
+    background-color: #eeeeec;
 }
 ul#user-menu-popup li a.nav-sep {
-	border-top: 1px solid #eeeeec;
+    border-top: 1px solid #eeeeec;
 }
 nav .nav-link {
-	float: right;
-	display: block;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px 5px 5px;
-	text-indent: 50px;
-	background: transparent url(icons.png) 0 0 no-repeat;
+    float: right;
+    display: block;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px 5px 5px;
+    text-indent: 50px;
+    background: transparent url(icons.png) 0 0 no-repeat;
 }
 #nav-apps-link {
-	background-position: 0 -66px;
+    background-position: 0 -66px;
 }
 #nav-apps-link:hover {
-	background-position: -22px -66px;
+    background-position: -22px -66px;
 }
 #nav-community-link {
     background-position: 0 -22px;
@@ -358,16 +368,16 @@ nav .nav-link {
     background-position: -22px -22px;
 }
 #nav-directory-link {
-	background-position: -44px -154px;
+    background-position: -44px -154px;
 }
 #nav-directory-link:hover {
-	background-position: -66px -154px;
+    background-position: -66px -154px;
 }
 #nav-help-link {
-	background-position: 0 -110px;
+    background-position: 0 -110px;
 }
 #nav-help-link:hover {
-	background-position: -22px -110px;
+    background-position: -22px -110px;
 }
 #nav-home-link {
     background-position: -44px -132px;
@@ -376,22 +386,22 @@ nav .nav-link {
     background-position: -66px -132px;
 }
 #nav-intro-link {
-	background-position: 0px -190px;
+    background-position: 0px -190px;
 }
 #nav-intro-link:hover {
-	background-position: -44px -190px;
+    background-position: -44px -190px;
 }
 #nav-login-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-login-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-logout-link {
-	background-position: 0 -88px;
+    background-position: 0 -88px;
 }
 #nav-logout-link:hover {
-	background-position: -22px -88px;
+    background-position: -22px -88px;
 }
 #nav-messages-link {
     background-position: -44px -88px;
@@ -412,10 +422,10 @@ nav .nav-link {
     background-position: -22px -177px;
 }
 #nav-search-link {
-	background-position: 0 -44px;
+    background-position: 0 -44px;
 }
 #nav-search-link:hover {
-	background-position: -22px -44px;
+    background-position: -22px -44px;
 }
 #profile-link,
 #profile-title, 
@@ -478,18 +488,19 @@ div.jGrowl div.info {
     color: black;
     text-decoration: underline;
 }
-nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify {
-  background-image: url("../../../images/icons/22/notify_on.png");
+nav #nav-notifications-linkmenu.on .icon.s22.notify,
+nav #nav-notifications-linkmenu.selected .icon.s22.notify {
+    background-image: url("../../../images/icons/22/notify_on.png");
 }
 .show {
     display: block;
 }
 #notifications {
-	height: 20px;
-	width: 170px;
-	position: absolute;
-	top: -19px;
-	left: 7px;
+    height: 20px;
+    width: 170px;
+    position: absolute;
+    top: -19px;
+    left: 7px;
 }
 #nav-floater {
     position: fixed;
@@ -497,132 +508,133 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     right: 1%;
     padding: 5px;
     background: #2e3436;
-	color: transparent;
+    color: transparent;
     border-radius: 5px;
     z-index: 100;
-	width: 300px;
-	height: 60px;
+    width: 300px;
+    height: 60px;
 }
 #nav-buttons {
     clear: both;
-	list-style: none;
-	padding: 0px;
-	margin: 0 7px 0 0;
-	height: 25px;
+    list-style: none;
+    padding: 0px;
+    margin: 0 7px 0 0;
+    height: 25px;
 }
 #nav-buttons li {
-	padding: 0;
+    padding: 0;
 }
 .floaterflip {
-	display: block;
+    display: block;
     position: fixed;
     z-index: 110;
     top: 56px;
     right: 19px;
-	width: 22px;
-	height: 22px;
-	overflow: hidden;
-	margin: 0px;
-	background: transparent url(icons.png) -190px -60px no-repeat;
+    width: 22px;
+    height: 22px;
+    overflow: hidden;
+    margin: 0px;
+    background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	display: inline-block;
-	margin: 5px;
-	position: fixed;
-	right: 0px;
-	bottom: 0px;
-	z-index: 100;
-	background: #1d1f1d;
-	border-radius: 5px;
+    display: inline-block;
+    margin: 5px;
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+    z-index: 100;
+    background: #1d1f1d;
+    border-radius: 5px;
 }
 #search-text {
-	border: 1px #eec solid;
-	background: #2e3436;
-	color: #eec;
+    border: 1px #eec solid;
+    background: #2e3436;
+    color: #eec;
 }
 .search-box #search-text {
-	margin: 8px;
-	width: 10em;
-	color: #eec;
+    margin: 8px;
+    width: 10em;
+    height: 14px;
+    color: #eec;
 }
 #scrollup {
-	position: fixed;
-	right: 5px;
-	bottom: 40px;
-	z-index: 100;
+    position: fixed;
+    right: 5px;
+    bottom: 40px;
+    z-index: 100;
 }
 #scrollup a:hover {
-	text-decoration: none;
-	border: 0;
+    text-decoration: none;
+    border: 0;
 }
 #user-menu {
-	box-shadow: 5px 0 10px 0 #111;
+    box-shadow: 5px 0 10px 0 #111;
     display: block;	
     width: 75%;
     margin: 3px 0 0 0;
     position: relative;
-	background-color: #555753;
+    background-color: #555753;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
     background: #555753 url("menu-user-pin.jpg") 98% center no-repeat;
     clear: both;
-	top: 4px;
-	left: 10px;
-	padding: 2px;
+    top: 4px;
+    left: 10px;
+    padding: 2px;
 }
 #user-menu > a {
-	vertical-align: top;
+    vertical-align: top;
 }
 #user-menu-label {
-   	font-size: 12px;
+    font-size: 12px;
     padding: 3px 20px 9px 5px;
     height: 10px;
 }
 .nav-ajax-update, .nav-ajax-left {
-	width: 30px;
-	height: 19px;
-	background: transparent url(notifications.png) 0 0 no-repeat;
-	color: #222;
-	font-weight: bold;
-	font-size: 0.8em;
-	padding-top: 0.2em;
-	text-align: center;
-	float: left;
-	margin: 0 -1px 0 3px;
-	display: block;
-	visibility: hidden;
+    width: 30px;
+    height: 19px;
+    background: transparent url(notifications.png) 0 0 no-repeat;
+    color: #222;
+    font-weight: bold;
+    font-size: 0.8em;
+    padding-top: 0.2em;
+    text-align: center;
+    float: left;
+    margin: 0 -1px 0 3px;
+    display: block;
+    visibility: hidden;
 }
 .nav-ajax-update.show, .nav-ajax-left.show {
     visibility: visible;
 }
 #net-update {
-	background-position: 0px 0px;
+    background-position: 0px 0px;
 }
 #mail-update {
-	background-position: -30px 0;
+    background-position: -30px 0;
 }
 #notify-update {
-	background-position: -60px 0px;
+    background-position: -60px 0px;
 }
 #home-update {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 #intro-update {
-	background-position: -120px 0px;
+    background-position: -120px 0px;
 }
 #lang-select-icon {
-	cursor: pointer;
-	position: fixed;
-	left: 28px;
-	bottom: 6px;
-	z-index: 10;
+    cursor: pointer;
+    position: fixed;
+    left: 28px;
+    bottom: 6px;
+    z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
-	z-index: 10;
+    z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -684,133 +696,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 
 
-/** sysmsg **/
+/**
+ * sysmsg
+ */
 #sysmsg_info {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border:2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border:2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg {
-	position: fixed;
-	bottom: 0;
-	-moz-box-shadow: 3px 3px 10px 0 #000;
-	-webkit-box-shadow: 3px 3px 10px 0 #000;
-	box-shadow: 3px 3px 10px 0 #000;
+    position: fixed;
+    bottom: 0;
+    -moz-box-shadow: 3px 3px 10px 0 #000;
+    -webkit-box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
     padding: 10px;
-	background-color: #fcaf3e;
-	border: 2px solid #f8911b;
-	border-bottom: 0;
-	padding-bottom: 50px;
-	z-index: 1000;
+    background-color: #fcaf3e;
+    border: 2px solid #f8911b;
+    border-bottom: 0;
+    padding-bottom: 50px;
+    z-index: 1000;
 }
 #sysmsg_info br,
 #sysmsg br {
-	display: block;
-	margin: 2px 0px;
-	border-top: 1px solid #ccccce;
+    display: block;
+    margin: 2px 0px;
+    border-top: 1px solid #ccccce;
 }
 
 
 /**
-* aside
-**/
+ * aside
+ */
 #asidemain {
-	float: left;
+    float: left;
     font-size: smaller;
     margin: 20px 0 20px 35px;
     width: 25%;
-	display: inline;
+    display: inline;
 }
 /* for now, disappear these */
 #asideright, #asideleft {
-	display: none;
+    display: none;
 }
 .vcard .fn {
-	font-size: 1.7em;
-	font-weight: bold;
-	border-bottom: 1px solid #729fcf;
-	padding-bottom: 3px;
+    font-size: 1.7em;
+    font-weight: bold;
+    border-bottom: 1px solid #729fcf;
+    padding-bottom: 3px;
 }
 .vcard #profile-photo-wrapper {
-	margin: 20px;
+    margin: 20px;
 }
 /* http://css-tricks.com/snippets/css/css-box-shadow/
- * box-shadow:
- * 1. The horizontal offset of the shadow, positive means
- * the shadow will be on the right of the box, a negative
- * offset will put the shadow on the left of the box.
- * 2. The vertical offset of the shadow, a negative one
- * means the box-shadow will be above the box, a
- * positive one means the shadow will be below the box.
- * 3. The blur radius (optional), if set to 0 the shadow
- * will be sharp, the higher the number, the more blurred
- * it will be.
- * 4. The spread radius (optional), positive values increase
- * the size of the shadow, negative values decrease the size.
- * Default is 0 (the shadow is same size as blur).
- * 5. Colo[u]r
- */
+* box-shadow:
+* 1. The horizontal offset of the shadow, positive means
+* the shadow will be on the right of the box, a negative
+* offset will put the shadow on the left of the box.
+* 2. The vertical offset of the shadow, a negative one
+* means the box-shadow will be above the box, a
+* positive one means the shadow will be below the box.
+* 3. The blur radius (optional), if set to 0 the shadow
+* will be sharp, the higher the number, the more blurred
+* it will be.
+* 4. The spread radius (optional), positive values increase
+* the size of the shadow, negative values decrease the size.
+* Default is 0 (the shadow is same size as blur).
+* 5. Colo[u]r
+*/
 .vcard #profile-photo-wrapper img {
-	box-shadow: 3px 3px 10px 0 #000;
+    box-shadow: 3px 3px 10px 0 #000;
 }
 #asidemain h4 {
-	font-size: 1.2em;
+    font-size: 1.2em;
 }
 #asidemain #viewcontacts {
-	text-align: right;
+    text-align: right;
 }
 .aprofile dt {
-	background: transparent;
-	color: #666666;
-	font-weight: bold;
+    background: transparent;
+    color: #666666;
+    font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
     padding-left: 5px;
 }
 #profile-extra-links ul {
-	margin-left: 0px;
+    margin-left: 0px;
     padding-left: 0px;
     list-style: none;
 }
 #dfrn-request-link {
-	background: #3465A4 url(connect.png) no-repeat 95% center;
-	border-radius: 5px 5px 5px 5px;
-	color: #fff;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    background: #3465A4 url(connect.png) no-repeat 95% center;
+    border-radius: 5px 5px 5px 5px;
+    color: #fff;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #wallmessage-link {
-	/*background: #3465A4 url(connect.png) no-repeat 95% center;*/
-	/*border-radius: 5px 5px 5px 5px;*/
-	color: #eee;
-	display: block;
-	font-size: 1.2em;
-	padding: 0.2em 0.5em;
+    /*background: #3465A4 url(connect.png) no-repeat 95% center;*/
+    /*border-radius: 5px 5px 5px 5px;*/
+    color: #eee;
+    display: block;
+    font-size: 1.2em;
+    padding: 0.2em 0.5em;
 }
 #netsearch-box {
-	margin: 20px 0px 30px;
+    margin: 20px 0px 30px;
     width: 150px;
 }
 #netsearch-box #search-submit {
     margin: 5px 5px 0px 0px;
 }
 .ttright {
-	margin: 0px 0px 0px 0px;
+    margin: 0px 0px 0px 0px;
 }
 
 
 /**
-* contacts block
-*/
+ * contacts block
+ */
 .contact-block-div {
     width: 50px;
     height: 50px;
@@ -828,20 +842,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * jot
- **/
+ */
 #jot {
-  /*width: 785px;*/
-  margin: 10px 0 20px 0px;
-  width: 100%;
+/*width: 785px;*/
+margin: 10px 0 20px 0px;
+width: 100%;
 }
 #jot #jot-tools {
-  margin: 0px;
-  padding: 0px;
-  height: 35px;
-  overflow: none;
-  width: 100%;
-  /*background-color: #0e232e;*/
-  /*border-bottom: 2px solid #9eabb0;*/
+margin: 0px;
+padding: 0px;
+height: 35px;
+overflow: none;
+width: 100%;
+/*background-color: #0e232e;*/
+/*border-bottom: 2px solid #9eabb0;*/
 }
 #jot #jot-tools span {
     float: left;
@@ -867,67 +881,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin-top: 10px;
 }
 #jot #jot-title {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     margin: 0 0 5px;
     height: 20px;
     width: 90%;
     font-weight: bold;
     border-radius: 5px;
-	vertical-align: middle;
+    vertical-align: middle;
 }
 #jot-category {
-	margin: 5px 0;
-	border-radius: 5px;
-	border: 1px #ccc solid;
-	color: #666;
-	font-size: small;
+    margin: 5px 0;
+    border-radius: 5px;
+    border: 1px #ccc solid;
+    color: #666;
+    font-size: smaller;
 }
 #jot-category:focus {
-	color: #111;
+    color: #111;
 }
 #jot #character-counter {
-	width: 6%;
-	float: right;
-	text-align: right;
-	height: 15px;
-	line-height: 20px;
-	padding: 2px 20px 5px 0;
+    width: 6%;
+    float: right;
+    text-align: right;
+    height: 15px;
+    line-height: 20px;
+    padding: 2px 20px 5px 0;
 }
 #profile-jot-text_parent {
-	/*border-radius: 10px;*/
-	box-shadow: 5px 0 10px 0 #111;
+    /*border-radius: 10px;*/
+    box-shadow: 5px 0 10px 0 #111;
 }
 #profile-jot-text_tbl {
-	margin-bottom: 10px;
-	/*border-radius: 10px;*/
-	background: #888;
+    margin-bottom: 10px;
+    /*border-radius: 10px;*/
+    background: #888;
 }
 #profile-jot-text_ifr {
-	width:99.900002% !important;
+    width:99.900002% !important;
 }
 #profile-jot-text_toolbargroup {
-	background: #888;
+    background: #888;
 }
 .mceCenter table tr {
-	background: #888;
+    background: #888;
 }
 [id$="jot-text_ifr"] {
-	width: 99.900002% !important;
-	color: #2e2f2e;
-	background: #eec;
+    width: 99.900002% !important;
+    color: #2e2f2e;
+    background: #eec;
 }
 [id$="jot-text_ifr"] .mceContentBody {
-	color: #2e2f2e;
-	background: #eec;
+    color: #2e2f2e;
+    background: #eec;
 }
 .mceFirst tr {
-	background: #888;
+    background: #888;
 }
 .mceFirst td {
-	/*border-radius: 10px 10px 0px 0px;*/
+    /*border-radius: 10px 10px 0px 0px;*/
 }
 .mceLast td {
-	/*border-radius: 0 0 10px 10px;*/
+    /*border-radius: 0 0 10px 10px;*/
 }
 #profile-attach-wrapper,
 #profile-audio-wrapper,
@@ -938,58 +952,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #profile-upload-wrapper,
 #profile-video-wrapper {
     float: left;
-	margin: 0 20px 0 0;
+    margin: 0 20px 0 0;
 }
 #profile-rotator-wrapper {
-	float: right; 
+    float: right; 
 }
 #profile-jot-tools-end,
 #profile-jot-banner-end {
-	clear: both;
+    clear: both;
 }
 #profile-jot-email-wrapper {
-	margin:10px 10% 0;
-	border:1px solid #555753;
-	border-bottom:0;
+    margin:10px 10% 0;
+    border:1px solid #555753;
+    border-bottom:0;
 }
 #profile-jot-email-label {
-	background-color:#555753;
-	color:#ccccce;
-	padding:5px;
+    background-color:#555753;
+    color:#ccccce;
+    padding:5px;
 }
 #profile-jot-email {
-	width:90%;
-	margin:5px;
+    width:90%;
+    margin:5px;
 }
 #profile-jot-networks {
-	margin: 0 10%;
-	border: 1px solid #555753;
-	border-top: 0;
-	border-bottom: 0;
-	padding: 5px;
+    margin: 0 10%;
+    border: 1px solid #555753;
+    border-top: 0;
+    border-bottom: 0;
+    padding: 5px;
 }
 #profile-jot-net {
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
     text-decoration: none;
-	float: right;
+    float: right;
 }
 .icon-text-preview {
-	margin: 0 0 -18px 0;
-	display: block;
+    margin: 0 0 -18px 0;
+    display: block;
     width: 20px;
     height: 20px;
     background: url(icons.png) no-repeat -128px -40px;
     border: 0;
     text-decoration: none;
-	float: right;
-	cursor: pointer;
+    float: right;
+    cursor: pointer;
 }
 #profile-jot-perms { 
-	float: right;
+    float: right;
     background-color: #555753;
     height: 22px;
     width: 20px;
@@ -1001,103 +1015,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
-	width: 1px;
-	margin: 10px 0 0 0;
-	float: right;
+    width: 1px;
+    margin: 10px 0 0 0;
+    float: right;
 }
 #profile-jot-submit-wrapper {
-	float: right;
-	width: 100%;
-	list-style: none;
-	margin: 10px 0 0 0;
-	padding: 0;
+    float: right;
+    width: 100%;
+    list-style: none;
+    margin: 10px 0 0 0;
+    padding: 0;
 }
 #profile-jot-submit {
-	height: 22px;
-	background-color: #555753;
-	color: #eeeeec;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	border: 0;
-	margin: 0;
-	float: right;
+    height: auto;
+    background-color: #555753;
+    color: #eeeeec;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border: 2px outset #222420;
+    margin: 0;
+    float: right;
+    text-shadow: 1px 1px #111;
+    width: auto;
+}
+#profile-jot-submit:active {
+    box-shadow: 0 0 0 0;
 }
 #jot-perms-icon {
-	height: 22px;
-	width: 20px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-	overflow: hidden;
-	border: 0;
+    height: 22px;
+    width: 20px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    overflow: hidden;
+    border: 0;
 }
 #profile-jot-acl-wrapper {
-	margin: 0 10px;
-	border: 1px solid #555753;
-	border-top: 0;
-	display: block !important;
+    margin: 0 10px;
+    border: 1px solid #555753;
+    border-top: 0;
+    display: block !important;
 }
 #group_allow_wrapper,
 #group_deny_wrapper,
 #acl-permit-outer-wrapper {
-	width:47%;
-	float:left;
+    width:47%;
+    float:left;
 }
 #contact_allow_wrapper,
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper {
-	width:47%;
-	float:right;
+    width:47%;
+    float:right;
 }
 #acl-permit-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #jot-public {
-	background-color: #555753;
-	color: #ff0000;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ff0000;
+    padding: 5px;
+    float: left;
 }
 #acl-deny-text {
-	background-color: #555753;
-	color: #ccccce;
-	padding: 5px;
-	float: left;
+    background-color: #555753;
+    color: #ccccce;
+    padding: 5px;
+    float: left;
 }
 #acl-permit-text-end,
 #acl-deny-text-end {
-	clear: both;
+    clear: both;
 }
 #jot-title-desc {
-	color: #ccc;
+    color: #ccc;
 }
 #profile-jot-desc {
-	color: #a00;
-	margin: 5px 0;
+    color: #a00;
+    margin: 5px 0;
 }
 #jot-title-wrapper {
-	margin-bottom: 5px;
+    margin-bottom: 5px;
 }
 #jot-title-display {
-	font-weight: bold;
+    font-weight: bold;
 }
 .jothidden {
     display: none;
 }
 #jot-preview-content {
     background-color: #ffffe0;
-	color: #111;
+    color: #111;
     border: 1px #aa0 solid;
     border-radius: 5px;
     padding: 3px 3px 6px 10px;
 }
 #jot-preview-content .wall-item-outside-wrapper {
-	border: 0;
-	border-radius: 0px;
+    border: 0;
+    border-radius: 0px;
 }
 
 
@@ -1107,13 +1126,15 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 #sectionmain {
     margin: 20px;
     font-size: 0.8em;
-	min-width: 475px;
-	width: 67%;
-	float: left;
-	display: inline;
+    min-width: 475px;
+    width: 67%;
+    float: left;
+    display: inline;
 }
 
-/** tabs **/
+/**
+ * tabs
+ */
 .tabs {
     list-style: none;
     margin: 10px 0;
@@ -1121,12 +1142,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .tabs li {
     display: inline;
-	font-size: smaller;
-	font-weight: bold;
+    font-size: smaller;
+    font-weight: bold;
 }
 .tab {
     border: 1px solid #729fcf;
-	padding: 4px;
+    padding: 4px;
 }
 .tab:hover, .tab.active:hover {
     background: #729fcf;
@@ -1137,60 +1158,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     color: #eeeeec;
 }
 .tab.active {
-	background: #729fcf;
+    background: #729fcf;
     color: #eeeeec;
 }
 .tab.active a {
-	color: #729fcf;
+    color: #729fcf;
 }
 .tab a {
-	border: 0;
-	text-decoration: none;
+    border: 0;
+    text-decoration: none;
 }
 
 
 /**
- * 	items
+ * items
  */
 .wall-item-outside-wrapper {
-	border: 1px solid #aaa;
-	border-radius: 5px;
-	box-shadow: 5px 0 10px 0 #999;
+    border: 1px solid #aaa;
+    border-radius: 5px;
+    box-shadow: 5px 0 10px 0 #888;
 }
 .wall-item-outside-wrapper.comment {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 .wall-item-outside-wrapper-end {
     clear: both;
 }
 .wall-item-content-wrapper {
     position: relative;
-	padding: 10px;
-	width: auto;
+    padding: 10px;
+    width: auto;
 }
 .wall-item-outside-wrapper .wall-item-comment-wrapper {
     /*margin-left: 90px;*/
 }
 .shiny {
     background: #efefdf;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .wall-outside-wrapper .shiny {
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .heart {
-	color: red;
+    color: red;
 }
 .wall-item-content {
-	overflow-x: auto;
-	margin: 0px 15px 0px 5px;
+    overflow-x: auto;
+    margin: 0px 15px 0px 5px;
 }
 /* removing it from here, vs. putting it in .wall-item-content
- * might break things for people. we shall see ;) */
+* might break things for people. we shall see ;) */
 [id^="tread-wrapper"], [class^="tread-wrapper"] {
     margin: 15px 0 0 0;
     padding: 0px;
-	/*overflow-x: auto;*/
+    /*overflow-x: auto;*/
 }
 .wall-item-photo-menu {
     display: none;
@@ -1224,7 +1245,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     border-radius: 5px;
 }
 [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * {
-	/*margin: 0 0 5px 0;*/
+    /*margin: 0 0 5px 0;*/
 }
 .wall-item-tools {
     float: right;
@@ -1260,41 +1281,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 25px;
 }
 .wall-item-title {
-	font-size: 1.2em;
-	font-weight: bold;
+    font-size: 1.2em;
+    font-weight: bold;
     margin-bottom: 1em;
 }
 .wall-item-body {
-	margin: 20px 20px 10px 0px;
+    margin: 20px 20px 10px 0px;
     text-align: left;
-	overflow-x: auto;
+    overflow-x: auto;
 }
 .wall-item-lock-wrapper {
-	float: right;
+    float: right;
     height: 22px;
     margin: 0 -5px 0 0;
     width: 22px;
-	opacity: 1;
+    opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 5px 0 5px 120px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 5px 0 5px 120px;
 }
 .wall-item-author, .wall-item-actions-author {
-	clear: left;
-	font-size: 0.8em;
-	color: #878883;
-	margin: 20px 20px 0 110px;
+    clear: left;
+    font-size: 0.8em;
+    color: #878883;
+    margin: 20px 20px 0 110px;
 }
 .wall-item-ago {
-	display: inline;
-	padding-left: 10px;
+    display: inline;
+    padding-left: 10px;
 }
 .wall-item-wrapper-end {
-	clear:both;
+    clear:both;
 }
 .wall-item-location {
     margin-top: 15px;
@@ -1343,17 +1364,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     z-index: 10002;
 }
 .wall-item-photo-menu {
-	min-width: 92px;
-	border: 2px solid #FFFFFF;
-	border-top: 0px;
-	background: #555753;
-	position: absolute;
-	left: -2px; top: 101px;
-	display: none;
-	z-index: 10003;
-	-webkit-border-radius: 0px 5px 5px 5px;
-	-moz-border-radius: 0px 5px 5px 5px;
-	border-radius: 0px 5px 5px 5px;
+    min-width: 92px;
+    border: 2px solid #FFFFFF;
+    border-top: 0px;
+    background: #555753;
+    position: absolute;
+    left: -2px; top: 101px;
+    display: none;
+    z-index: 10003;
+    -webkit-border-radius: 0px 5px 5px 5px;
+    -moz-border-radius: 0px 5px 5px 5px;
+    border-radius: 0px 5px 5px 5px;
 }
 .wall-item-photo-menu ul {
     margin:0px;
@@ -1375,27 +1396,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 100%;
 }
 #connect-services-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #connect-services {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #extra-help {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit-header {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 #postit {
-	margin: 5px 0 0 0;
+    margin: 5px 0 0 0;
 }
 
 
 /**
- * 	comment
+ * comment
  */
 .ccollapse-wrapper {
     font-size: 0.9em;
@@ -1414,7 +1435,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     height: 40px;
 }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
-	width: 50px;
+    width: 50px;
     top: 45px;
     background-position: 35px center;
 }
@@ -1440,12 +1461,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 }
 .comment-wwedit-wrapper img,
 .comment-edit-wrapper img {
-	width: 20px;
-	height: 20px;
+    width: 20px;
+    height: 20px;
 }
 .comment-edit-photo-link, .comment-edit-photo {
-	float: left;
-	margin-left: 10px;
+    float: left;
+    margin-left: 10px;
 }
 .my-comment-photo {
     width: 40px;
@@ -1457,32 +1478,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
     width: 84.5%;
 }
 .comment-edit-text-empty {
-	height: 20px;
-	border: 2px #babdd6 solid;
-	border-radius: 5px;
-	color: #babdb6;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    height: 20px;
+    border: 2px #babdd6 solid;
+    border-radius: 5px;
+    color: #babdb6;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-text-empty:hover {
-	color: #999999;
+    color: #999999;
 }
 .comment-edit-text-full {
-	height: 10em;
+    height: 10em;
     border-radius: 5px;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;	
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;	
 }
 .comment-edit-submit-wrapper {
-	width: 90%;
-	margin: 5px 5px 10px 50px;
-	text-align: right;
+    width: 90%;
+    margin: 5px 5px 10px 50px;
+    text-align: right;
 }
 .comment-edit-submit {
     height: 22px;
@@ -1497,22 +1518,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 
 /**
  * item text style
- **/
+ */
 .wall-item-body code {
-	display: block;
-	padding: 0 0 10px 5px;
-	border-color: #ccc;
-	border-style: solid;
-	border-width: 1px 1px 1px 10px;
-	background: #eee;
-	color: #444;
-	width: 95%;
+    display: block;
+    padding: 0 0 10px 5px;
+    border-color: #ccc;
+    border-style: solid;
+    border-width: 1px 1px 1px 10px;
+    background: #eee;
+    color: #444;
+    width: 95%;
 }
 
 
 /**
  * profile
- **/
+ */
 div[id$="text"] {
     font-weight: bold;
     border-bottom: 1px solid #ccc;
@@ -1531,10 +1552,10 @@ div[id$="wrapper"] br {
 
 /**
  * photos
- **/
+ */
 .photos {
-	height: auto;
-	overflow: auto;
+    height: auto;
+    overflow: auto;
 }
 #photo-top-links {
     margin-bottom: 30px;
@@ -1546,7 +1567,7 @@ div[id$="wrapper"] br {
     -webkit-box-shadow: 3px 3px 10px 0 #000;
     box-shadow: 3px 3px 10px 0 #000;
     background-color: #eee;
-	color: #111;
+    color: #111;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -1582,8 +1603,8 @@ div[id$="wrapper"] br {
     margin: 0 5px;
 }
 #photo-photo {
-	position: relative;
-	float:left;
+    position: relative;
+    float:left;
 }
 #photo-photo-end {
     clear: both;
@@ -1660,10 +1681,10 @@ div[id$="wrapper"] br {
     margin-bottom: 15px;
 }
 #photo-edit-caption {
-	width: 100%;
+    width: 100%;
 }
 #photo-edit-newtag {
-	width: 100%;
+    width: 100%;
 }
 #photo-like-div {
     margin-bottom: 25px;
@@ -1685,15 +1706,15 @@ div[id$="wrapper"] br {
 }
 
 /**
- * 	message
+ * message
  */
 .prvmail-text {
     width: 100%;
 }
 #prvmail-subject {
     width: 100%;
-	color: #eec;
-	background: #444;
+    color: #eec;
+    background: #444;
 }
 #prvmail-submit-wrapper {
     margin-top: 10px;
@@ -1717,7 +1738,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
-	font-size: 1.1em;
+    font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
@@ -1725,7 +1746,7 @@ div[id$="wrapper"] br {
     padding-left: 10px;
 }
 .mail-list-sender-name, .mail-list-date {
-	font-style: italic;
+    font-style: italic;
 }
 .mail-list-subject {
     font-size: 1.2em;
@@ -1735,7 +1756,7 @@ div[id$="wrapper"] br {
 }
 .mail-list-outside-wrapper-end {
     clear: both;
-	border-bottom: 1px #eec dotted;
+    border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1765,15 +1786,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	contacts
+ * contacts
  */
 .view-contact-wrapper,
 .contact-entry-wrapper {
     float: left;
     margin: 0 5px 40px 0;
     width: 120px;
-	height: 120px;
-	padding: 3px;
+    height: 120px;
+    padding: 3px;
     position: relative;
 }
 .contact-direction-wrapper {
@@ -1788,7 +1809,7 @@ div[id$="wrapper"] br {
 
 }
 .contact-entry-photo {
-	margin-left: 20px;
+    margin-left: 20px;
 }
 .contact-entry-name {
     width: 120px;
@@ -1796,7 +1817,7 @@ div[id$="wrapper"] br {
     /*overflow: hidden;*/
 }
 .contact-entry-photo {
-	position: relative;
+    position: relative;
 }
 .contact-entry-edit-links .icon {
     border: 1px solid #babdb6;
@@ -1839,7 +1860,7 @@ div[id$="wrapper"] br {
     margin-left:5px;
 }
 #contact-edit-nav-wrapper .icon {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;	
@@ -1884,7 +1905,7 @@ div[id$="wrapper"] br {
     width: auto;
     border: 2px solid #444;
     background: #eee;
-	color: #111;
+    color: #111;
     position: absolute;
     left: 0px; top: 90px;
     display: none;
@@ -1907,7 +1928,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	register, settings & profile forms
+ * register, settings & profile forms
  */
 .openid {
 
@@ -1924,7 +1945,7 @@ div[id$="wrapper"] br {
     -moz-border-radius: 5px;
     border-radius: 5px;
     padding: 5px;
-	color: #111;
+    color: #111;
 }
 #settings-default-perms {
     margin-bottom: 20px;
@@ -1933,7 +1954,15 @@ div[id$="wrapper"] br {
 #profile-edit-form div {
     clear: both;
 }
-
+.settings-block {
+    
+}
+.settings-block label {
+    clear: left;
+}
+.settings-block input {
+    margin: 10px 5px;
+}
 /*#register-form label,     */
 /*#profile-edit-form label {*/
 /*    width: 300px;         */
@@ -1947,23 +1976,23 @@ div[id$="wrapper"] br {
 /*    margin-bottom: 20px; */
 /*}                        */
 #profile-edit-marital-label span {
-	margin: -4px;
+    margin: -4px;
 }
 .settings-submit-wrapper,
 .profile-edit-submit-wrapper {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-	display: none;
+    display: none;
 }
 /*.profile-edit-side-div:hover {
-	display: block;
+    display: block;
 }
 .profile-edit-side-link {
-	margin: 3px 0px 0px 70px;
+    margin: 3px 0px 0px 70px;
 }*/
 #profiles-menu-trigger {
-	margin: 0px 0px 0px 25px;
+    margin: 0px 0px 0px 25px;
 }
 .profile-listing {
     float: left;
@@ -1972,16 +2001,16 @@ div[id$="wrapper"] br {
 .icon-profile-edit {
     background: url("icons.png") -150px 0px no-repeat;
     border: 0;
-	cursor: pointer;
+    cursor: pointer;
     display: block;
     float: right;
-	width: 20px;
+    width: 20px;
     height: 20px;
     margin: 0 0 -18px;
-	position: absolute;
+    position: absolute;
     text-decoration: none;
-	top: 113px;
-	right: 260px;
+    top: 113px;
+    right: 260px;
 }
 #profile-edit-links ul {
     margin: 20px 0;
@@ -1989,26 +2018,32 @@ div[id$="wrapper"] br {
     list-style: none;
 }
 .marital {
-	margin-top: 5px;
+    margin-top: 5px;
 }
 #register-sitename {
     display: inline;
     font-weight: bold;
 }
 #advanced-expire-popup {
-	background: #2e2f2e;
-	color: #eec;
+    background: #2e2f2e;
+    color: #eec;
 }
 #id_ssl_policy {
-	width: 374px;
+    width: 374px;
+}
+#theme-preview {
+
+}
+#theme-preview img {
+    margin: 10px 10px 10px 288px;
 }
 
 
 /**
- * 	contacts selector
+ * contacts selector
  */
 .group-delete-wrapper {
-	margin: -31px 50px 0 0;
+    margin: -31px 50px 0 0;
     float: right;
 }
 /*.group-delete-icon {
@@ -2131,70 +2166,70 @@ div[id$="wrapper"] br {
 
 /**
  * events
- **/
+ */
 .clear { clear: both; }
 .eventcal {
     float:left;
     font-size:20px;
 }
 .event {
-	background: #2e2f2e;
+    background: #2e2f2e;
 }
 .vevent {
     border:1px solid #ccc;
 }
 .vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 .vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
+    margin-left: 10px;
+    margin-right: 10px;
 }
 #new-event-link {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .edit-event-link, .plink-event-link {
-	/*float: left;      */
-	/*margin-top: 4px;  */
-	/*margin-right: 4px;*/
-	/*margin-bottom: 15px;*/
+    /*float: left;      */
+    /*margin-top: 4px;  */
+    /*margin-right: 4px;*/
+    /*margin-bottom: 15px;*/
 }
 .event-description:before {
-	content: url('../../../images/calendar.png');
-	margin-right: 15px;
+    content: url('../../../images/calendar.png');
+    margin-right: 15px;
 }
 .event-start, .event-end {
-	margin-left: 10px;
-	width: 330px;
-	font-size: smaller;
+    margin-left: 10px;
+    width: 330px;
+    font-size: smaller;
 }
 .event-start .dtstart, .event-end .dtend {
-	float: right;
+    float: right;
 }
 .event-list-date {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 .prevcal, .nextcal {
-	float: left;
-	margin-left: 32px;
-	margin-right: 32px;
-	margin-top: 64px;
+    float: left;
+    margin-left: 32px;
+    margin-right: 32px;
+    margin-top: 64px;
 }
 .event-calendar-end {
-	clear: both;
+    clear: both;
 }
 .calendar {
     font-family: monospace;
 }
 .today {
-	font-weight: bold;
-	color: #FF0000;
+    font-weight: bold;
+    color: #FF0000;
 } 
 #event-start-text, 
 #event-finish-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-nofinish-checkbox,
 #event-nofinish-text,
@@ -2204,69 +2239,69 @@ div[id$="wrapper"] br {
     float:left;
 }
 #event-datetime-break {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #event-nofinish-break,
 #event-adjust-break,
 #event-share-break {
-	clear: both;
+    clear: both;
 }
 #event-desc-text, 
 #event-location-text {
-	margin-top: 10px;
-	margin-bottom: 5px;
+    margin-top: 10px;
+    margin-bottom: 5px;
 }
 #event-submit {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 .body-tag {
-	margin: 10px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 10px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .body-tag:hover {
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .filesavetags, .categorytags {
-	margin: 20px 0;
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    margin: 20px 0;
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .filesavetags:hover, .categorytags:hover {
-	margin: 20px 0;
-	opacity: 1.0 !important;
-	filter:alpha(opacity=100) !important;
+    margin: 20px 0;
+    opacity: 1.0 !important;
+    filter:alpha(opacity=100) !important;
 }
 .item-select {
-	opacity: 0.1;
-	filter:alpha(opacity=10);
-	float: right;
-	margin-right: 5px;
+    opacity: 0.1;
+    filter:alpha(opacity=10);
+    float: right;
+    margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
-	opacity: 1;
-	filter:alpha(opacity=100);
+    opacity: 1;
+    filter:alpha(opacity=100);
 }
 #item-delete-selected {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 /* was tired of having no way of moving it around, so
- * here's a little 'hook' to do so */
+* here's a little 'hook' to do so */
 .delete-checked {
-	position: absolute;
-	left: 35px;
-	margin-top: 20px;
+    position: absolute;
+    left: 35px;
+    margin-top: 20px;
 }
 #item-delete-selected-end {
-	clear: both;
+    clear: both;
 }
 #item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
+    float: left;
+    margin-right: 5px;
 }
 #item-delete-selected-desc:hover {
-	text-decoration: underline;
+    text-decoration: underline;
 }
 .fc-state-highlight {
     background: #eec;
@@ -2275,15 +2310,15 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	directory
+ * directory
  */
 .directory-item {
     float: left;
-	/*margin: 50px 50px 0px 0px;*/
-	margin: 0 5px 4px 0;
-	padding: 3px;
-	width: 180px;
-	height: 250px;
+    /*margin: 50px 50px 0px 0px;*/
+    margin: 0 5px 4px 0;
+    padding: 3px;
+    width: 180px;
+    height: 250px;
     position: relative;
 }
 
@@ -2296,12 +2331,12 @@ div[id$="wrapper"] br {
 }
 .group-selected, .nets-selected, .fileas-selected {
     padding: 3px;
-	color: #111;
+    color: #111;
     background: #f8f8f8;
     font-weight: bold;
 }
 .group-selected:hover, .nets-selected:hover, .fileas-selected:hover {
-	color: #111;
+    color: #111;
 }
 .groupsideedit {
     margin-right: 10px;
@@ -2332,7 +2367,7 @@ div[id$="wrapper"] br {
     text-align: center;
 }
 #peoplefind-sidebar form {
-	margin-bottom: 10px;
+    margin-bottom: 10px;
 }
 #sidebar-new-group:hover {
     /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/
@@ -2347,14 +2382,14 @@ div[id$="wrapper"] br {
 #side-peoplefind-url {
     background-color: #e5e0cf;
     color: #666;
-	border: 1px 666 solid;
-	margin-right: 3px;
-	width: 75%;
+    border: 1px 666 solid;
+    margin-right: 3px;
+    width: 75%;
 }
 #side-peoplefind-url:hover, #side-peoplefind-url:focus {
     background-color: #efefef;
     color: #222;
-	border: 1px 333 solid;
+    border: 1px 333 solid;
 }
 .nets-ul {
     list-style-type: none;
@@ -2380,7 +2415,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * ADMIN
+ * admin
  */
 #pending-update {
     float:right;
@@ -2396,10 +2431,10 @@ div[id$="wrapper"] br {
     list-style-position: inside;
 }
 #adminpage {
-	color: #111;
-	background: transparent;
-	margin: 5px;
-	padding: 10px;
+    color: #111;
+    background: transparent;
+    margin: 5px;
+    padding: 10px;
 }
 #adminpage dl {
     clear:left;
@@ -2413,14 +2448,14 @@ div[id$="wrapper"] br {
     font-weight: bold;
 }
 #adminpage dd {
-	margin-left: 250px;
+    margin-left: 250px;
 }
 #adminpage h3 {
     border-bottom:1px solid #ccc;
 }
 
 #adminpage .submit {
-	clear:left;
+    clear:left;
 }
 #adminpage #pluginslist {
     margin: 0;
@@ -2435,8 +2470,8 @@ div[id$="wrapper"] br {
     clear: left;
 }
 #adminpage .toggleplugin {
-	float:left;
-	margin-right: 1em;
+    float:left;
+    margin-right: 1em;
 }
 #adminpage table {
     width: 100%;
@@ -2461,38 +2496,59 @@ div[id$="wrapper"] br {
 }
 #adminpage #users a {
 /*	color: #;*/
-	text-decoration: underline;
+    text-decoration: underline;
 }
 #users .name {
-	color: #eec;
+    color: #eec;
 }
 
 
 /**
- * Form fields
+ * form fields
  */
 .field {
-	/*margin-bottom: 10px;*/
-	/*padding-bottom: 10px;*/
-	overflow: auto;
+    /*margin-bottom: 10px;*/
+    /*padding-bottom: 10px;*/
+    overflow: auto;
     width: 100%;
 }
 .field label, label {
-    float: left;
-    width: 275px;
-	display: block;
-	font-size: 1.077em;
-	margin: 0 10px 0.5em 0;
-	border: 1px #999 solid;
-	padding: 5px;
-	background: #ccc;
-	vertical-align: middle;
-	color: #111;
+    width: 38%;
+    display: inline-block;
+    font-size: 1.077em;
+    margin: 0 10px 1em 0;
+    border: 1px #999 solid;
+    padding: 5px;
+    background: #ccc;
+    color: #111;
 }
-.field input, input[type="text"] {
-	width: 250px;
-	height: 25px;
-	border: 1px #999 solid;
+input,
+input[type="text"],
+input[type="password"],
+input[type="search"] {
+    width: 250px;
+    height: 25px;
+    border: 1px #999 solid;
+}
+input[type="checkbox"], input[type="radio"] {
+    border: 1px #999 solid;
+    margin: 0 0 0 0;
+}
+input[type="submit"], input[type="button"] {
+    background-color: #555753;
+    border: 2px outset #444;
+    border-radius: 5px;
+    box-shadow: 1px 3px 4px 0 #111;
+    color: #eeeeec;
+    cursor: pointer;
+    font-weight: bold;
+    width: auto;
+    text-shadow: 1px 1px #111;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+}
+input[type="submit"]:active, input[type="button"]:active {
+    box-shadow: 0 0 0 0;
 }
 .field textarea {
     width: 80%;
@@ -2515,12 +2571,12 @@ div[id$="wrapper"] br {
     text-decoration: none;
 }
 .field .onoff .on {
-	background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
+    background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999;
     color: #111;
     text-align: left;
 }
 .field .onoff .off {
-	background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
+    background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc;
     color: #333;
     text-align: right;
 }
@@ -2533,34 +2589,34 @@ div[id$="wrapper"] br {
 
 
 /*
- * UPDATE
+ * update
  */
 .popup { 	
-	width: 100%;
+    width: 100%;
     height: 100%;
-	top: 0px;
+    top: 0px;
     left: 0px;
-	position: absolute;
-	display: none;
+    position: absolute;
+    display: none;
 }
 .popup .background {
-	background-color: rgba(0,0,0,128);
-	opacity: 0.5;
-	width: 100%;
+    background-color: rgba(0,0,0,128);
+    opacity: 0.5;
+    width: 100%;
     height: 100%;
-	position: absolute;
-	top:0px;
+    position: absolute;
+    top:0px;
     left:0px;
 }
 .popup .panel {
-	top: 25%;
+    top: 25%;
     left: 25%;
     width: 50%;
     height: 50%;
-	padding: 1em;
-	position: absolute;
-	border: 4px solid #000000;
-	background-color: #FFFFFF;
+    padding: 1em;
+    position: absolute;
+    border: 4px solid #000000;
+    background-color: #FFFFFF;
 }
 #panel {
     z-index: 100;
@@ -2609,32 +2665,32 @@ div[id$="wrapper"] br {
  * OAuth
  */
 .oauthapp {
-	height: auto;
+    height: auto;
     overflow: auto;
-	border-bottom: 2px solid #cccccc;
-	padding-bottom: 1em;
-	margin-bottom: 1em;	
+    border-bottom: 2px solid #cccccc;
+    padding-bottom: 1em;
+    margin-bottom: 1em;	
 }
 .oauthapp img {
-	float: left;
-	width: 48px; height: 48px;
-	margin: 10px;
+    float: left;
+    width: 48px; height: 48px;
+    margin: 10px;
 }
 .oauthapp img.noicon {
-	background-image: url("../../../images/icons/48/plugin.png");
-	background-position: center center;
-	background-repeat: no-repeat;
+    background-image: url("../../../images/icons/48/plugin.png");
+    background-position: center center;
+    background-repeat: no-repeat;
 }
 .oauthapp a {
-	float: left;
+    float: left;
 }
 
 
 /**
- * ICONS
+ * icons
  */
 .iconspacer {
-	display: block;
+    display: block;
     width: 16px;
     height: 16px;
 }
@@ -2645,7 +2701,7 @@ div[id$="wrapper"] br {
     background: url(icons.png) no-repeat;
     border: 0;
     text-decoration: none;
-	border-radius: 5px;
+    border-radius: 5px;
 }
 .icon:hover {
     border: 0;
@@ -2654,15 +2710,15 @@ div[id$="wrapper"] br {
 .icon.drop,
 .icon.drophide, .icon.delete {
     float: left;
-	margin: 0 2px;
+    margin: 0 2px;
 }
 .icon.s22.delete {
-	display: block;
-	background-position: -110px 0;
+    display: block;
+    background-position: -110px 0;
 }
 .icon.s22.text {
-	padding: 10px 0px 0px 25px;
-	width: 200px;
+    padding: 10px 0px 0px 25px;
+    width: 200px;
 }
 .icon.text {
     text-indent: 0px;
@@ -2678,118 +2734,118 @@ div[id$="wrapper"] br {
     margin: 0px 5px;    
 }
 .article {
-	background-position: -50px 0;
+    background-position: -50px 0;
 }
 .audio {
-	background-position: -70px 0;
+    background-position: -70px 0;
 }
 .block {
-	background-position: -90px 0px;
+    background-position: -90px 0px;
 }
 .drop, .delete {
-	background-position: -110px 0;
+    background-position: -110px 0;
 }
 .drophide {
-	background-position: -130px 0;
+    background-position: -130px 0;
 }
 .edit {
-	background-position: -150px 0;
+    background-position: -150px 0;
 }
 .camera {
-	background-position: -170px 0;
+    background-position: -170px 0;
 }
 .dislike {
-	background-position: -190px 0;
+    background-position: -190px 0;
 }
 .file-as {
-	background-position: -230px -60px;
+    background-position: -230px -60px;
 }
 .like {
-	background-position: -211px 0;
+    background-position: -211px 0;
 }
 .link {
-	background-position: -230px 0;
+    background-position: -230px 0;
 }
 .globe, .location {
-	background-position: -50px -20px;
+    background-position: -50px -20px;
 }
 .noglobe, .nolocation {
-	background-position: -70px -20px;
+    background-position: -70px -20px;
 }
 .no {
-	background-position: -90px -20px;
+    background-position: -90px -20px;
 }
 .pause {
-	background-position: -110px -20px;
+    background-position: -110px -20px;
 }
 .play {
-	background-position: -130px -20px;
+    background-position: -130px -20px;
 }
 .pencil {
-	background-position: -151px -18px;
+    background-position: -151px -18px;
 }
 .small-pencil {
-	background-position: -170px -20px;
+    background-position: -170px -20px;
 }
 .recycle {
-	background-position: -190px -20px;
+    background-position: -190px -20px;
 }
 .remote-link {
-	background-position: -210px -20px;
+    background-position: -210px -20px;
 }
 .share {
-	background-position: -230px -20px;
+    background-position: -230px -20px;
 }
 .tools {
-	background-position: -50px -40px;
+    background-position: -50px -40px;
 }
 .lock {
-	background-position: -70px -40px;
+    background-position: -70px -40px;
 }
 .unlock {
-	background-position: -88px -40px;
+    background-position: -88px -40px;
 }
 .video {
-	background-position: -110px -40px;
+    background-position: -110px -40px;
 }
 .attach {
-	background-position: -190px -40px;
+    background-position: -190px -40px;
 }
 .language {
-	background-position: -210px -40px;
+    background-position: -210px -40px;
 }
 .starred {
-	background-position: -130px -60px;
+    background-position: -130px -60px;
 }
 .unstarred {
-	background-position: -150px -60px;
+    background-position: -150px -60px;
 }
 .tagged {
-	background-position: -170px -60px;
+    background-position: -170px -60px;
 }
 .on {
-	background-position: -50px  -60px;
+    background-position: -50px  -60px;
 }
 .off {
-	background-position: -70px  -60px;
+    background-position: -70px  -60px;
 }
 .prev {
-	background-position: -90px  -60px;
+    background-position: -90px  -60px;
 }
 .next {
-	background-position: -110px  -60px;
+    background-position: -110px  -60px;
 }
 .icon.dim {
-	opacity: 0.3;
-	filter: alpha(opacity=30);
+    opacity: 0.3;
+    filter: alpha(opacity=30);
 }
 #pause {
-	position: fixed;
-	bottom: 40px;
-	right: 30px;
+    position: fixed;
+    bottom: 40px;
+    right: 30px;
 }
 .border, .border:hover {
-	border: 1px solid #babdb6;
+    border: 1px solid #babdb6;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;	
@@ -2818,7 +2874,7 @@ div[id$="wrapper"] br {
 
 
 /**
- * 	footer
+ * footer
  */
 .cc-license {
     margin-top: 100px;
@@ -2826,7 +2882,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-	/*margin: 50px 20%;*/
+    /*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
@@ -2838,24 +2894,26 @@ footer {
 }
 
 
-/** acl **/
+/**
+ * acl
+ */
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
-	background: #eec;
-	color: #2e2f2e;
+    background: #eec;
+    color: #2e2f2e;
 }
 #acl-wrapper {
     width: 660px;
-	margin: 0 auto;
+    margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
-	margin: 6px;
-	color: #111;
+    margin: 6px;
+    color: #111;
 }
 #acl-showall {
     float: left;
@@ -2868,7 +2926,7 @@ footer {
     -moz-border-radius: 5px;
     border-radius: 5px;
     color: #999;
-	margin: 5px 0;
+    margin: 5px 0;
 }
 #acl-showall.selected {
     color: #000;
@@ -2884,7 +2942,7 @@ footer {
 /*#acl-list-content {
 }*/
 .acl-list-item {
-	border: 1px solid #ccc;
+    border: 1px solid #ccc;
     display: block;
     float: left;
     height: 110px;
@@ -2908,29 +2966,29 @@ footer {
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
     border-radius: 2px;
-	clear: both;
+    clear: both;
     font-size: 10px;
     display: block;
     width: 55px;
     height: 20px;
     color: #999;
     margin: 5px auto 0;
-	padding: 0 3px;
-	text-align: center;
-	vertical-align: middle;
+    padding: 0 3px;
+    text-align: center;
+    vertical-align: middle;
 }
 #acl-wrapper a:hover {
     text-decoration: none;
     color: #000;
-	border: 0;
+    border: 0;
 }
 .acl-button-show {
     background-image: url('../../../images/show_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-hide {
     background-image: url('../../../images/hide_off.png');
-	margin: 0 auto;
+    margin: 0 auto;
 }
 .acl-button-show.selected {
     color: #000;
@@ -2953,25 +3011,25 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 175px;
+    max-height: 175px;
     max-width: 42%;
-	background-color: #555753;
-	color: #fff;
-	overflow: auto;
-	z-index: 100000;
-	border: 1px solid #cccccc;
+    background-color: #555753;
+    color: #fff;
+    overflow: auto;
+    z-index: 100000;
+    border: 1px solid #cccccc;
 }
 .acpopupitem {
-	background-color: #555753;
+    background-color: #555753;
     padding: 4px;
-	clear: left;
+    clear: left;
 }
 .acpopupitem img {
-	float: left;
-	margin-right: 4px;
+    float: left;
+    margin-right: 4px;
 }
 .acpopupitem.selected {
-	color: #2e3436;
+    color: #2e3436;
     background-color: #eeeeec;
 }
 .qcomment-wrapper {
@@ -2979,12 +3037,12 @@ footer {
     margin: 5px 5px 5px 81%;
 }
 .qcomment {
-	opacity: 0.5;
-	filter:alpha(opacity=50);
+    opacity: 0.5;
+    filter:alpha(opacity=50);
 }
 .qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
+    opacity: 1.0;
+    filter:alpha(opacity=100);
 }
 #network-star-link {
     margin-top: 10px;
@@ -2997,32 +3055,38 @@ footer {
     display: inline-block;
 }
 #fileas-sidebar {
-	
+    
 }
 .fileas-ul {
-	padding: 0;
+    padding: 0;
 }
 
 
 
 /*
- * ADDONS THEMING
+ * addons theming
  */
 
 #sidebar-page-list {
-	
+    
 }
 #sidebar-page-list ul {
-	padding: 0;
-	margin: 5px 0;
+    padding: 0;
+    margin: 5px 0;
 }
 #sidebar-page-list li {
-	list-style: none;
+    list-style: none;
+}
+#jappix_mini {
+    margin-left: 130px;
+    position: fixed;
+    bottom: 0;
+    right: 175px !important; /* override the jappix css */
+    z-index: 999;
 }
-
 
 @media handheld {
-	body {
-		font-size: 15pt;
-	}
+    body {
+        font-size: 15pt;
+    }
 }

From 7ebca2b37d98f5865f6d006300c894ec9c44f165 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 16 Apr 2012 22:58:52 -0700
Subject: [PATCH 3/6] rev update

---
 boot.php         |   2 +-
 mod/install.php  |   7 +-
 util/messages.po | 210 ++++++++++++++++++++++++++---------------------
 3 files changed, 122 insertions(+), 97 deletions(-)

diff --git a/boot.php b/boot.php
index 36e725c7f..73f2aa882 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1313' );
+define ( 'FRIENDICA_VERSION',      '2.3.1314' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );
 
diff --git a/mod/install.php b/mod/install.php
index 2eb98ee91..6f5552076 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -380,9 +380,9 @@ function check_funcs(&$checks) {
 	
 	if(function_exists('apache_get_modules')){
 		if (! in_array('mod_rewrite',apache_get_modules())) {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+			check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
 		} else {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+			check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
 		}
 	}
 	if(! function_exists('curl_init')){
@@ -464,3 +464,6 @@ function load_database($db) {
 	}
 	return $errors;
 }
+
+
+
diff --git a/util/messages.po b/util/messages.po
index 9eef043cc..b25e7654c 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1313\n"
+"Project-Id-Version: 2.3.1314\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-15 10:00-0700\n"
+"POT-Creation-Date: 2012-04-16 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"
@@ -55,7 +55,7 @@ msgstr ""
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
 #: ../../index.php:309
 msgid "Permission denied."
 msgstr ""
@@ -142,8 +142,8 @@ msgstr ""
 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/gravatar/gravatar.php:86
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
@@ -540,14 +540,14 @@ msgstr ""
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1214 ../../include/conversation.php:956
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
 #: ../../mod/message.php:357 ../../include/conversation.php:362
-#: ../../include/conversation.php:702 ../../include/conversation.php:979
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr ""
 
@@ -563,7 +563,7 @@ msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1235 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:997
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr ""
 
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr ""
 
@@ -647,17 +647,17 @@ msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:186 ../../mod/message.php:355
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:187 ../../mod/message.php:356
-#: ../../include/conversation.php:965
+#: ../../include/conversation.php:961
 msgid "Insert web link"
 msgstr ""
 
@@ -673,35 +673,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:980
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:989
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:990
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:992
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1645,9 +1645,9 @@ msgstr ""
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
 #: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:622
-#: ../../addon/facebook/facebook.php:1076
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
+#: ../../addon/facebook/facebook.php:625
+#: ../../addon/facebook/facebook.php:1090
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
 msgid "Administrator"
 msgstr ""
 
@@ -1726,7 +1726,7 @@ msgid "Export personal data"
 msgstr ""
 
 #: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
-#: ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
@@ -1782,7 +1782,8 @@ msgstr ""
 #: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
 #: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
+#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr ""
 
@@ -2279,7 +2280,7 @@ msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
@@ -2313,7 +2314,7 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:124 ../../mod/message.php:169
-#: ../../include/conversation.php:914
+#: ../../include/conversation.php:910
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2707,7 +2708,7 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1549
+#: ../../addon/facebook/facebook.php:1574
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook-red/theme.php:80
@@ -2723,7 +2724,7 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook-red/theme.php:94
 #: ../../view/theme/diabook-blue/theme.php:94
@@ -2741,7 +2742,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3054
+#: ../../mod/display.php:142 ../../include/items.php:3082
 msgid "Item not found."
 msgstr ""
 
@@ -3845,7 +3846,7 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4176,110 +4177,110 @@ msgstr ""
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:620
+#: ../../addon/facebook/facebook.php:623
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:644
+#: ../../addon/facebook/facebook.php:647
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:645
+#: ../../addon/facebook/facebook.php:648
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:656
+#: ../../addon/facebook/facebook.php:659
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:668
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:673
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:675
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:674
+#: ../../addon/facebook/facebook.php:677
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:677
+#: ../../addon/facebook/facebook.php:680
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:678
+#: ../../addon/facebook/facebook.php:681
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:679
+#: ../../addon/facebook/facebook.php:682
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:686
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:690
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:691
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:707
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:726
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:815
+#: ../../addon/facebook/facebook.php:818
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1033
+#: ../../addon/facebook/facebook.php:1039
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1058
+#: ../../addon/facebook/facebook.php:1072
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1094
+#: ../../addon/facebook/facebook.php:1108
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1095
+#: ../../addon/facebook/facebook.php:1109
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1096
+#: ../../addon/facebook/facebook.php:1110
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4801,6 +4802,27 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
@@ -6611,11 +6633,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "You have a new follower at "
 msgstr ""
 
@@ -6646,30 +6668,30 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:145 ../../include/conversation.php:813
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:146 ../../include/conversation.php:814
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:147 ../../include/conversation.php:815
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:148 ../../include/Contact.php:161
-#: ../../include/conversation.php:816
+#: ../../include/conversation.php:812
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:149 ../../include/Contact.php:161
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:813
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:150 ../../include/Contact.php:161
-#: ../../include/conversation.php:818
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr ""
 
@@ -6686,13 +6708,13 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -6748,118 +6770,118 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr ""
 

From 720c8324c7572ebf51e4083430e060900cb30750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 17 Apr 2012 11:33:50 +0000
Subject: [PATCH 4/6] Some Bugfixes, and variable checks

---
 include/Scrape.php           |  2 +-
 include/conversation.php     |  5 ++--
 include/items.php            | 55 ++++++++++++++++++------------------
 include/network.php          |  5 ++--
 include/pgettext.php         |  1 +
 include/profile_advanced.php | 15 +++++-----
 include/security.php         |  1 +
 mod/photo.php                |  2 +-
 mod/photos.php               |  1 -
 9 files changed, 44 insertions(+), 43 deletions(-)

diff --git a/include/Scrape.php b/include/Scrape.php
index 141c90dcf..b20d7d604 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 			logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
 			$a = get_app();
 
-			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA);
+			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);
 
    			$feed->set_raw_data($xml);
 
diff --git a/include/conversation.php b/include/conversation.php
index e5549a9c1..1b869b91e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'lock' => $lock,
 					'location' => template_escape($location),
 					'indent' => '',
 					'owner_name' => template_escape($owner_name),
@@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			}
 
 			$comments_collapsed = false;
+			$comments_seen = 0;
 			$comment_lastcollapsed = false;
 			$comment_firstcollapsed = false;
 			$blowhard = 0;
@@ -709,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	}
 
 	$page_template = get_markup_template("conversation.tpl");
-	$o .= replace_macros($page_template, array(
+	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
 		'$user' => $a->user,
@@ -1074,7 +1074,6 @@ function find_thread_parent_index($arr,$x) {
 }
 
 function render_location_google($item) {
-	$location = '';
 	$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 	$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 	if($coord) {
diff --git a/include/items.php b/include/items.php
index e005ffaef..63450cff5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -107,7 +107,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	if(! strlen($last_update))
 		$last_update = 'now -30 days';
 
-	if(x($category)) {
+	if(isset($category)) {
 		$sql_extra .= file_tag_file_query('item',$category,'category');
 	}
 
@@ -588,20 +588,21 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['object'] = '<object>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+			$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -626,20 +627,20 @@ function get_atom_elements($feed,$item) {
 
 	if($rawobj) {
 		$res['target'] = '<target>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@@ -2476,7 +2477,7 @@ function local_delivery($importer,$data) {
 
 				// find out if our user is involved in this conversation and wants to be notified.
 			
-				if($datarray['type'] != 'activity') {
+				if(!x($datarray['type']) || $datarray['type'] != 'activity') {
 
 					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
 						dbesc($parent_uri),
@@ -3048,7 +3049,7 @@ function item_expire($uid,$days) {
 function drop_items($items) {
 	$uid = 0;
 
-	if((! local_user()) && (! $remote_user()))
+	if(! local_user() && ! remote_user())
 		return;
 
 	if(count($items)) {
diff --git a/include/network.php b/include/network.php
index 8c678a443..4bec4a172 100644
--- a/include/network.php
+++ b/include/network.php
@@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
         $url_parsed = @parse_url($newurl);
         if (isset($url_parsed)) {
             $redirects++;
-            return fetch_url($newurl,$binary,$redirects,$timeout);
+            return fetch_url($newurl,false,$redirects,$timeout);
         }
     }
 	$a->set_curl_code($http_code);
@@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
 if(! function_exists('http_status_exit')) {
 function http_status_exit($val) {
 
+    $err = '';
 	if($val >= 400)
 		$err = 'Error';
 	if($val >= 200 && $val < 300)
@@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
 			logger('lrdd: parse error: ' . $e);
 		}
 
-		if($dom) {
+		if(isset($dom) && $dom) {
 			$items = $dom->getElementsByTagName('link');
 			foreach($items as $item) {
 				$x = $item->getAttribute('rel');
diff --git a/include/pgettext.php b/include/pgettext.php
index 83e76ba9d..a079a4687 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -49,6 +49,7 @@ function get_language() {
 	if(isset($preferred))
 		return $preferred;
 
+    $a = get_app();
 	return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}
 
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index 004a58524..bb9850cd0 100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -2,7 +2,7 @@
 
 function advanced_profile(&$a) {
 
-	$o .= '';
+	$o = '';
 
 	$o .= '<h2>' . t('Profile') . '</h2>';
 
@@ -69,13 +69,12 @@ function advanced_profile(&$a) {
 		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
 
 		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-	}
-
-		
-	return replace_macros($tpl, array(
-		'$title' => t('Profile'),
-		'$profile' => $profile,
-	));
 
+        return replace_macros($tpl, array(
+            '$title' => t('Profile'),
+            '$profile' => $profile,
+        ));
+    }
 
+	return '';
 }
diff --git a/include/security.php b/include/security.php
index fc816e5d7..a92400b5c 100755
--- a/include/security.php
+++ b/include/security.php
@@ -339,6 +339,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
+	    $a = get_app();
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		header('HTTP/1.1 403 Forbidden');
diff --git a/mod/photo.php b/mod/photo.php
index ec53af899..1d38fe8e4 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -170,7 +170,7 @@ function photo_init(&$a) {
 	}
 
 	// Writing in cachefile
-	if ($cachefile != '')
+	if (isset($cachefile) && $cachefile != '')
 		file_put_contents($cachefile, $data);
 
 	if(function_exists('header_remove')) {
diff --git a/mod/photos.php b/mod/photos.php
index 2a808cb41..8da94841e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -330,7 +330,6 @@ function photos_post(&$a) {
 			// Create item container
 
 			$title = '';
-			$basename = basename($filename);
 			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);
 
 			$arr = array();

From e6330e3b966401f83d54bdd08c9ed9ab294643e0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 17 Apr 2012 06:11:41 -0700
Subject: [PATCH 5/6] naked br appearing when attaching and textplain

---
 mod/wall_attach.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index bee7c29dc..03d9f5105 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -98,8 +98,13 @@ function wall_attach_post(&$a) {
 		killme();
 	}
 
-	echo  '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
+	$lf = '<br />';
 
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$lf = "\n";
+
+	echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
+	
 	killme();
 	// NOTREACHED
 }

From b30c761aae7e01e6fe727232e48b14303484a228 Mon Sep 17 00:00:00 2001
From: tommy tomson <thomas.bierey@gmx.de>
Date: Tue, 17 Apr 2012 16:15:49 +0200
Subject: [PATCH 6/6] diabook-themes: removed fpostit due to security issues
 and small fix in german translation

---
 view/de/strings.php                           |   2 +-
 view/theme/diabook-aerith/communityhome.tpl   |   7 -
 view/theme/diabook-aerith/fpostit/README      |   8 --
 view/theme/diabook-aerith/fpostit/fpostit.js  |   6 -
 view/theme/diabook-aerith/fpostit/fpostit.php | 135 ------------------
 .../diabook-aerith/fpostit/friendika-32.png   | Bin 1593 -> 0 bytes
 view/theme/diabook-aerith/style-network.css   |   2 +-
 view/theme/diabook-aerith/style-profile.css   |   2 +-
 view/theme/diabook-aerith/theme.php           |  38 ++---
 view/theme/diabook-blue/communityhome.tpl     |   6 -
 view/theme/diabook-blue/fpostit/README        |   8 --
 view/theme/diabook-blue/fpostit/fpostit.js    |   6 -
 view/theme/diabook-blue/fpostit/fpostit.php   | 135 ------------------
 .../diabook-blue/fpostit/friendika-32.png     | Bin 1593 -> 0 bytes
 view/theme/diabook-blue/style-network.css     |   2 +-
 view/theme/diabook-blue/style-profile.css     |   2 +-
 view/theme/diabook-blue/theme.php             |  38 +----
 view/theme/diabook-red/communityhome.tpl      |   6 -
 view/theme/diabook-red/fpostit/README         |   8 --
 view/theme/diabook-red/fpostit/fpostit.js     |   6 -
 view/theme/diabook-red/fpostit/fpostit.php    | 135 ------------------
 .../diabook-red/fpostit/friendika-32.png      | Bin 1593 -> 0 bytes
 view/theme/diabook-red/style-network.css      |   2 +-
 view/theme/diabook-red/style-profile.css      |   2 +-
 view/theme/diabook-red/theme.php              |  39 +----
 view/theme/diabook/communityhome.tpl          |   7 -
 view/theme/diabook/fpostit/README             |   8 --
 view/theme/diabook/fpostit/fpostit.js         |   6 -
 view/theme/diabook/fpostit/fpostit.php        | 135 ------------------
 view/theme/diabook/fpostit/friendika-32.png   | Bin 1593 -> 0 bytes
 view/theme/diabook/style-network.css          |   2 +-
 view/theme/diabook/style-profile.css          |   2 +-
 view/theme/diabook/theme.php                  |  38 ++---
 33 files changed, 39 insertions(+), 754 deletions(-)
 delete mode 100644 view/theme/diabook-aerith/fpostit/README
 delete mode 100644 view/theme/diabook-aerith/fpostit/fpostit.js
 delete mode 100644 view/theme/diabook-aerith/fpostit/fpostit.php
 delete mode 100644 view/theme/diabook-aerith/fpostit/friendika-32.png
 delete mode 100644 view/theme/diabook-blue/fpostit/README
 delete mode 100644 view/theme/diabook-blue/fpostit/fpostit.js
 delete mode 100644 view/theme/diabook-blue/fpostit/fpostit.php
 delete mode 100644 view/theme/diabook-blue/fpostit/friendika-32.png
 delete mode 100644 view/theme/diabook-red/fpostit/README
 delete mode 100644 view/theme/diabook-red/fpostit/fpostit.js
 delete mode 100644 view/theme/diabook-red/fpostit/fpostit.php
 delete mode 100644 view/theme/diabook-red/fpostit/friendika-32.png
 delete mode 100644 view/theme/diabook/fpostit/README
 delete mode 100755 view/theme/diabook/fpostit/fpostit.js
 delete mode 100644 view/theme/diabook/fpostit/fpostit.php
 delete mode 100644 view/theme/diabook/fpostit/friendika-32.png

diff --git a/view/de/strings.php b/view/de/strings.php
index 91c01f8cd..76c22f0ae 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1161,7 +1161,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";
diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 4873cdd14..875d83f1b 100644
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ 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>
diff --git a/view/theme/diabook-aerith/fpostit/README b/view/theme/diabook-aerith/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-aerith/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
deleted file mode 100644
index d183c7573..000000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-aerith/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-aerith/fpostit/friendika-32.png b/view/theme/diabook-aerith/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20a35fb21995b667e9a5e25436685a8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkl<ZSi_~4
zJ8T@+6^6evyWHhNA`M!W3B_`e#E>i(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj
zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%<ht2>Ji=M&inl5|IcfT
zk+r<M%;MrA0C(@+q`ezBHa|~wW&+8n*XP*WyvN+!i?muB)a$dfS`B9Fvut%5%++SO
zbH72oK1(OhsntZM9ogA=z>nW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y
z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWlo<yJp^#|>ebmi#Ot+6
zd};o$s8<Cz9wRPCipV`3d&E8Mk`Imz=jLjk2jO{aaykKbA$RibE}^+jXg_RD)a$Qb
z_``)eXU?3Vdg;<7mX?-Sz4!IMP8`pU{pi$$rY0ho8*(8x6afc$vB%*qKp~x1o%M|t
zUt}k!9eo-11i%p<q<Ad1&KE0lts5)X&YnH{#`*K-?^KtTmbiHF;-~%H#<90vnO0qH
z>PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz
ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s<
zPrZ8T)J*laOG{I$YhS<c_KCxgPZ+@k(QKb#;R%==V;>_Wkj&ZH*<z#9X1d)Ydc>u~
zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO
z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX
z0>Y_Jik*j>G<t3N?UagM06>N#EOR>D9xAf0TBc#I-GEMjkO5htwFbpv<?}wj_+S(A
zIHr1}Wd^Nns4ni($>R{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s
z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t<it
zA`|R@H<jKt!!-Pc*?7d+7$sqRn|R_iFl(mAJzIT>&yA8iJ_tc2^D0F%dsYBRj$WQp
zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f
zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46
zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`e<UOj3cv#w)Yk$
zN(r9?fJ*~^l`dcgf4kP_z29v<Qd=`<b)o*V0eyH`kF+PN4+2o$@ev3qOk#Aly2kvk
zKO!{mgJolxn?zKP94Bh1hkR%}Gt+2Y-U}d#7!9dXNC3*pc3;6N6%Kv-HA3ULgt53c
z+BZ|5077rCyC$Rz7a$)Lr~v@E5n`2oIc=2;#8gi5kWtAh5CaxN;@dT#y6pIwiU=|x
zr4Ek?E1q?8ve+M}Rt361^Zq7u`<Z%qfma~1Vk$CvF(b<|vd~8{ABi%J;LspZ(<lc{
zsech$F=EYifHu%A8Cd<tjX<-5<d%UXVZu`cBl`XF7od-a{*d0nV@F6DHgl;c<EcU=
zQiNwl|K3dlZUW5`!0$i5oxgYa&$~14FHXwAJPp7^+yHvTh!yiLG4Bu5l~Q*c&L6(#
zdcq~cOp+|D-K2BxO93B^#=u?hx6ggD_1RxOo1Fg14{G}1$r`nZq_2Q`8v&Qo-&iGX
zHxk{V7}tlCCmDRCFUydWuiqhGyG6eCC3yTf@YiuE{TA>c*hx_BnWmC&u29haG4LlI
rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj

diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 82c5a2575..abab80a6a 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1393,7 +1393,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 3471b67ad..dc1fbd285 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1367,7 +1367,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index c798643b5..358d28498 100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-aerith
  * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.019)";
+$diabook_version = "Diabook-aerith (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 
@@ -131,14 +131,7 @@ function diabook_aerith_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+	
    
    //nav FIND FRIENDS
 	if(local_user()) {
@@ -206,13 +199,7 @@ function diabook_aerith_community_info(){
 	
 	$aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-	
-	$aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl	      
    $url = $a->get_baseurl($ssl_state);   
@@ -255,9 +242,9 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_aerith_community_info();
 	
@@ -270,7 +257,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_aerith_community_info();
 	
@@ -369,7 +356,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +381,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@@ -436,10 +419,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -464,7 +443,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 6e126827b..6ac414ef4 100644
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
 
 <div id="close_lastusers">
 {{ if $lastusers_title }}
diff --git a/view/theme/diabook-blue/fpostit/README b/view/theme/diabook-blue/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-blue/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-blue/fpostit/fpostit.js b/view/theme/diabook-blue/fpostit/fpostit.js
deleted file mode 100644
index d183c7573..000000000
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-blue/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-blue/fpostit/friendika-32.png b/view/theme/diabook-blue/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20a35fb21995b667e9a5e25436685a8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkl<ZSi_~4
zJ8T@+6^6evyWHhNA`M!W3B_`e#E>i(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj
zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%<ht2>Ji=M&inl5|IcfT
zk+r<M%;MrA0C(@+q`ezBHa|~wW&+8n*XP*WyvN+!i?muB)a$dfS`B9Fvut%5%++SO
zbH72oK1(OhsntZM9ogA=z>nW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y
z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWlo<yJp^#|>ebmi#Ot+6
zd};o$s8<Cz9wRPCipV`3d&E8Mk`Imz=jLjk2jO{aaykKbA$RibE}^+jXg_RD)a$Qb
z_``)eXU?3Vdg;<7mX?-Sz4!IMP8`pU{pi$$rY0ho8*(8x6afc$vB%*qKp~x1o%M|t
zUt}k!9eo-11i%p<q<Ad1&KE0lts5)X&YnH{#`*K-?^KtTmbiHF;-~%H#<90vnO0qH
z>PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz
ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s<
zPrZ8T)J*laOG{I$YhS<c_KCxgPZ+@k(QKb#;R%==V;>_Wkj&ZH*<z#9X1d)Ydc>u~
zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO
z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX
z0>Y_Jik*j>G<t3N?UagM06>N#EOR>D9xAf0TBc#I-GEMjkO5htwFbpv<?}wj_+S(A
zIHr1}Wd^Nns4ni($>R{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s
z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t<it
zA`|R@H<jKt!!-Pc*?7d+7$sqRn|R_iFl(mAJzIT>&yA8iJ_tc2^D0F%dsYBRj$WQp
zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f
zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46
zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`e<UOj3cv#w)Yk$
zN(r9?fJ*~^l`dcgf4kP_z29v<Qd=`<b)o*V0eyH`kF+PN4+2o$@ev3qOk#Aly2kvk
zKO!{mgJolxn?zKP94Bh1hkR%}Gt+2Y-U}d#7!9dXNC3*pc3;6N6%Kv-HA3ULgt53c
z+BZ|5077rCyC$Rz7a$)Lr~v@E5n`2oIc=2;#8gi5kWtAh5CaxN;@dT#y6pIwiU=|x
zr4Ek?E1q?8ve+M}Rt361^Zq7u`<Z%qfma~1Vk$CvF(b<|vd~8{ABi%J;LspZ(<lc{
zsech$F=EYifHu%A8Cd<tjX<-5<d%UXVZu`cBl`XF7od-a{*d0nV@F6DHgl;c<EcU=
zQiNwl|K3dlZUW5`!0$i5oxgYa&$~14FHXwAJPp7^+yHvTh!yiLG4Bu5l~Q*c&L6(#
zdcq~cOp+|D-K2BxO93B^#=u?hx6ggD_1RxOo1Fg14{G}1$r`nZq_2Q`8v&Qo-&iGX
zHxk{V7}tlCCmDRCFUydWuiqhGyG6eCC3yTf@YiuE{TA>c*hx_BnWmC&u29haG4LlI
rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index d8e569338..3f4756ccc 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1355,7 +1355,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 135cdb1c6..c7b33dbc7 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 9aac48c38..827e36cb0 100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-blue
  * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.019)";
+$diabook_version = "Diabook-blue (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -130,14 +130,6 @@ function diabook_blue_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
 	if(local_user()) {
@@ -205,13 +197,7 @@ function diabook_blue_community_info(){
 	
 	$aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-	
-	$aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
@@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_blue_community_info();
 	
@@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_blue_community_info();
 	
@@ -369,7 +355,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -394,10 +380,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@@ -435,11 +417,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -464,7 +441,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl
index c47bfbda5..179757f4a 100644
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
 
 <div id="close_lastusers">
 {{ if $lastusers_title }}
diff --git a/view/theme/diabook-red/fpostit/README b/view/theme/diabook-red/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook-red/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook-red/fpostit/fpostit.js b/view/theme/diabook-red/fpostit/fpostit.js
deleted file mode 100644
index d183c7573..000000000
--- a/view/theme/diabook-red/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook-red/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook-red/fpostit/friendika-32.png b/view/theme/diabook-red/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20a35fb21995b667e9a5e25436685a8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkl<ZSi_~4
zJ8T@+6^6evyWHhNA`M!W3B_`e#E>i(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj
zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%<ht2>Ji=M&inl5|IcfT
zk+r<M%;MrA0C(@+q`ezBHa|~wW&+8n*XP*WyvN+!i?muB)a$dfS`B9Fvut%5%++SO
zbH72oK1(OhsntZM9ogA=z>nW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y
z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWlo<yJp^#|>ebmi#Ot+6
zd};o$s8<Cz9wRPCipV`3d&E8Mk`Imz=jLjk2jO{aaykKbA$RibE}^+jXg_RD)a$Qb
z_``)eXU?3Vdg;<7mX?-Sz4!IMP8`pU{pi$$rY0ho8*(8x6afc$vB%*qKp~x1o%M|t
zUt}k!9eo-11i%p<q<Ad1&KE0lts5)X&YnH{#`*K-?^KtTmbiHF;-~%H#<90vnO0qH
z>PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz
ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s<
zPrZ8T)J*laOG{I$YhS<c_KCxgPZ+@k(QKb#;R%==V;>_Wkj&ZH*<z#9X1d)Ydc>u~
zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO
z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX
z0>Y_Jik*j>G<t3N?UagM06>N#EOR>D9xAf0TBc#I-GEMjkO5htwFbpv<?}wj_+S(A
zIHr1}Wd^Nns4ni($>R{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s
z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t<it
zA`|R@H<jKt!!-Pc*?7d+7$sqRn|R_iFl(mAJzIT>&yA8iJ_tc2^D0F%dsYBRj$WQp
zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f
zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46
zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`e<UOj3cv#w)Yk$
zN(r9?fJ*~^l`dcgf4kP_z29v<Qd=`<b)o*V0eyH`kF+PN4+2o$@ev3qOk#Aly2kvk
zKO!{mgJolxn?zKP94Bh1hkR%}Gt+2Y-U}d#7!9dXNC3*pc3;6N6%Kv-HA3ULgt53c
z+BZ|5077rCyC$Rz7a$)Lr~v@E5n`2oIc=2;#8gi5kWtAh5CaxN;@dT#y6pIwiU=|x
zr4Ek?E1q?8ve+M}Rt361^Zq7u`<Z%qfma~1Vk$CvF(b<|vd~8{ABi%J;LspZ(<lc{
zsech$F=EYifHu%A8Cd<tjX<-5<d%UXVZu`cBl`XF7od-a{*d0nV@F6DHgl;c<EcU=
zQiNwl|K3dlZUW5`!0$i5oxgYa&$~14FHXwAJPp7^+yHvTh!yiLG4Bu5l~Q*c&L6(#
zdcq~cOp+|D-K2BxO93B^#=u?hx6ggD_1RxOo1Fg14{G}1$r`nZq_2Q`8v&Qo-&iGX
zHxk{V7}tlCCmDRCFUydWuiqhGyG6eCC3yTf@YiuE{TA>c*hx_BnWmC&u29haG4LlI
rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj

diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 115868711..8c0600b5a 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1389,7 +1389,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 1b2caa6c0..4f5de365b 100644
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1347,7 +1347,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 1ef65d83e..02b6ee5a4 100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook-red
  * Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.019)";
+$diabook_version = "Diabook-red (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -130,14 +130,6 @@ function diabook_red_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-red/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
    
    //nav FIND FRIENDS
 	if(local_user()) {
@@ -205,13 +197,7 @@ function diabook_red_community_info(){
 	
 	$aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-	
-	$aside['$postit'] = $postit;
-   //end postit
+   
   
    //get_baseurl   
    $url = $a->get_baseurl($ssl_state);   
@@ -254,9 +240,9 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_red_community_info();
 	
@@ -269,7 +255,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_red_community_info();
 	
@@ -367,7 +353,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -391,11 +377,6 @@ $("right_aside").ready(function(){
 		{
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
-	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@@ -433,11 +414,6 @@ function close_friends(){
  document.getElementById( "close_friends" ).style.display = "none";
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
-
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -462,7 +438,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 5c2164b50..ff04d9da0 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ 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>
diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README
deleted file mode 100644
index 39b7c5761..000000000
--- a/view/theme/diabook/fpostit/README
+++ /dev/null
@@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js
deleted file mode 100755
index d183c7573..000000000
--- a/view/theme/diabook/fpostit/fpostit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
deleted file mode 100644
index 4505c9946..000000000
--- a/view/theme/diabook/fpostit/fpostit.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20a35fb21995b667e9a5e25436685a8a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1593
zcmV-92FCe`P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L03itg03ithOzq;@000HdNkl<ZSi_~4
zJ8T@+6^6evyWHhNA`M!W3B_`e#E>i(P8=f+Y^Mqc1WDr}2vQk{QV2|+A}XxHfQrbj
zRH(85xk;}eX_zVqV1$KI$q_6^imXtyL@uc%ce#(b_xvgD%<ht2>Ji=M&inl5|IcfT
zk+r<M%;MrA0C(@+q`ezBHa|~wW&+8n*XP*WyvN+!i?muB)a$dfS`B9Fvut%5%++SO
zbH72oK1(OhsntZM9ogA=z>nW~cVMU8ZZk781Awt_EiW&B7^A=0&%>nLiE=zTF-F`Y
z?jnYe_L%k%19FkaK*b=2KJJkieXtuAdLjSn+z01=1918BWlo<yJp^#|>ebmi#Ot+6
zd};o$s8<Cz9wRPCipV`3d&E8Mk`Imz=jLjk2jO{aaykKbA$RibE}^+jXg_RD)a$Qb
z_``)eXU?3Vdg;<7mX?-Sz4!IMP8`pU{pi$$rY0ho8*(8x6afc$vB%*qKp~x1o%M|t
zUt}k!9eo-11i%p<q<Ad1&KE0lts5)X&YnH{#`*K-?^KtTmbiHF;-~%H#<90vnO0qH
z>PJixiZ(PPAQm8s^ZmeF?Cdnz=xsAO(@FBVaF<-N=#qcy`!ug#n_pR3xd8mK3UKSz
ze-_?6Il*+Li$cWY2shJyLy_ci0i--vac-j3Y_i#FQ=jYM?zlvBSqVZ}McY#^X#4s<
zPrZ8T)J*laOG{I$YhS<c_KCxgPZ+@k(QKb#;R%==V;>_Wkj&ZH*<z#9X1d)Ydc>u~
zg0LtdDzsyb^#^N5deLU8S3bR>qYE$d)9;;xa7ct;qgt!*(277b#xPPckcsy828~XO
z&Tf|&97!b$DHg11?OtGGYg+=U?e;FW|9wMW-EKqoxLKS?X(0y*BOpOH1|D_`U<2JX
z0>Y_Jik*j>G<t3N?UagM06>N#EOR>D9xAf0TBc#I-GEMjkO5htwFbpv<?}wj_+S(A
zIHr1}Wd^Nns4ni($>R{@;Ctz7((s+?@NK{Z7L&Gx6%|Jz&slFc^QS+?n-4e$MGa9s
z@)DT|VVGq|!YpH4>8tMZq1g3}E2WE5-+6=B`0s%%2t$Q@gDYkQ2pf7d9>A#28t<it
zA`|R@H<jKt!!-Pc*?7d+7$sqRn|R_iFl(mAJzIT>&yA8iJ_tc2^D0F%dsYBRj$WQp
zbG7>-v^y!}_aha|%vLyTO)2D=B?j!700?0+-hHjc-#=O4=)(Ji5XT~&teehX+0-9f
zzp_KGypG1fd|Ch|LnaPSWxVrUz}F7;X%Y_mmXUV`Vf@T7AWIAk6QlA7vSdy+jQl46
zkUc&El5rLO=peuJ|E1028PG@xrObbgPZm8P?~eyilu?aTv6^6^`e<UOj3cv#w)Yk$
zN(r9?fJ*~^l`dcgf4kP_z29v<Qd=`<b)o*V0eyH`kF+PN4+2o$@ev3qOk#Aly2kvk
zKO!{mgJolxn?zKP94Bh1hkR%}Gt+2Y-U}d#7!9dXNC3*pc3;6N6%Kv-HA3ULgt53c
z+BZ|5077rCyC$Rz7a$)Lr~v@E5n`2oIc=2;#8gi5kWtAh5CaxN;@dT#y6pIwiU=|x
zr4Ek?E1q?8ve+M}Rt361^Zq7u`<Z%qfma~1Vk$CvF(b<|vd~8{ABi%J;LspZ(<lc{
zsech$F=EYifHu%A8Cd<tjX<-5<d%UXVZu`cBl`XF7od-a{*d0nV@F6DHgl;c<EcU=
zQiNwl|K3dlZUW5`!0$i5oxgYa&$~14FHXwAJPp7^+yHvTh!yiLG4Bu5l~Q*c&L6(#
zdcq~cOp+|D-K2BxO93B^#=u?hx6ggD_1RxOo1Fg14{G}1$r`nZq_2Q`8v&Qo-&iGX
zHxk{V7}tlCCmDRCFUydWuiqhGyG6eCC3yTf@YiuE{TA>c*hx_BnWmC&u29haG4LlI
rGxj`Ruw!GZjr6p}i@z8)_TTs)qHGuE{mw-x00000NkvXXu0mjfEd=xj

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ba45f757e..21c08e856 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1331,7 +1331,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index ebde6ecfc..71b034865 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1307,7 +1307,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0fdcbf701..3ce0cc39d 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
 /*
  * Name: Diabook
  * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.019)
+ * Version: (Version: 1.020)
  * Author: 
  */
 
 
 //print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.019)";
+$diabook_version = "Diabook (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
 
 //change css on network and profilepages
@@ -136,14 +136,7 @@ function diabook_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
+	
    
    //right_aside FIND FRIENDS
 	if(local_user()) {
@@ -212,13 +205,7 @@ function diabook_community_info(){
 	
 	$aside['$con_services'] = $con_services;
    //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
-	
-	$aside['$postit'] = $postit;
-   //end postit
+  
   
    //get_baseurl
    $url = $a->get_baseurl($ssl_state);   
@@ -264,9 +251,9 @@ if ($a->argv[0] === "network" && local_user()){
 
 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
 
@@ -280,7 +267,7 @@ if ($a->argv[0] === "network" && local_user()){
 
 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_community_info();
 	
@@ -383,7 +370,7 @@ $a->page['htmlhead'] .= '
 </script>';
 
 
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@@ -408,10 +395,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@@ -450,10 +433,6 @@ function close_friends(){
  $.cookie("close_friends","1", { expires: 365, path: "/" });
  };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
  
 function close_lastusers(){
  document.getElementById( "close_lastusers" ).style.display = "none";
@@ -478,7 +457,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });