Merge branch 'pull'

45 files changed, 32 insertions, 13 deletions

diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 4873cdd14..4873cdd14 100644..100755
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
diff --git a/view/theme/diabook-aerith/contact_template.tpl b/view/theme/diabook-aerith/contact_template.tpl
index 48930b48a..48930b48a 100644..100755
--- a/view/theme/diabook-aerith/contact_template.tpl
+++ b/view/theme/diabook-aerith/contact_template.tpl
diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl
index db1936e4b..db1936e4b 100644..100755
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
diff --git a/view/theme/diabook-aerith/fpostit/fpostit.js b/view/theme/diabook-aerith/fpostit/fpostit.js
index d183c7573..d183c7573 100644..100755
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl
index af183d04d..af183d04d 100644..100755
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
diff --git a/view/theme/diabook-aerith/icons/attach.png b/view/theme/diabook-aerith/icons/attach.png
index 1958041cf..1958041cf 100644..100755
--- a/view/theme/diabook-aerith/icons/attach.png
+++ b/view/theme/diabook-aerith/icons/attach.png
diff --git a/view/theme/diabook-aerith/icons/audio.png b/view/theme/diabook-aerith/icons/audio.png
index 8d779a409..8d779a409 100644..100755
--- a/view/theme/diabook-aerith/icons/audio.png
+++ b/view/theme/diabook-aerith/icons/audio.png
diff --git a/view/theme/diabook-aerith/icons/camera.png b/view/theme/diabook-aerith/icons/camera.png
index a5c7f1236..a5c7f1236 100644..100755
--- a/view/theme/diabook-aerith/icons/camera.png
+++ b/view/theme/diabook-aerith/icons/camera.png
diff --git a/view/theme/diabook-aerith/icons/close_box.png b/view/theme/diabook-aerith/icons/close_box.png
index 28e2675b8..28e2675b8 100644..100755
--- a/view/theme/diabook-aerith/icons/close_box.png
+++ b/view/theme/diabook-aerith/icons/close_box.png
diff --git a/view/theme/diabook-aerith/icons/drop.png b/view/theme/diabook-aerith/icons/drop.png
index 2abb82ef2..2abb82ef2 100644..100755
--- a/view/theme/diabook-aerith/icons/drop.png
+++ b/view/theme/diabook-aerith/icons/drop.png
diff --git a/view/theme/diabook-aerith/icons/file_as.png b/view/theme/diabook-aerith/icons/file_as.png
index 16713fa53..16713fa53 100644..100755
--- a/view/theme/diabook-aerith/icons/file_as.png
+++ b/view/theme/diabook-aerith/icons/file_as.png
diff --git a/view/theme/diabook-aerith/icons/link.png b/view/theme/diabook-aerith/icons/link.png
index 0ef666a67..0ef666a67 100644..100755
--- a/view/theme/diabook-aerith/icons/link.png
+++ b/view/theme/diabook-aerith/icons/link.png
diff --git a/view/theme/diabook-aerith/icons/lock.png b/view/theme/diabook-aerith/icons/lock.png
index 7e34bf279..7e34bf279 100644..100755
--- a/view/theme/diabook-aerith/icons/lock.png
+++ b/view/theme/diabook-aerith/icons/lock.png
diff --git a/view/theme/diabook-aerith/icons/lupe.png b/view/theme/diabook-aerith/icons/lupe.png
index f8b228347..f8b228347 100644..100755
--- a/view/theme/diabook-aerith/icons/lupe.png
+++ b/view/theme/diabook-aerith/icons/lupe.png
diff --git a/view/theme/diabook-aerith/icons/messages.png b/view/theme/diabook-aerith/icons/messages.png
index e2bf7d24d..e2bf7d24d 100644..100755
--- a/view/theme/diabook-aerith/icons/messages.png
+++ b/view/theme/diabook-aerith/icons/messages.png
diff --git a/view/theme/diabook-aerith/icons/messages2.png b/view/theme/diabook-aerith/icons/messages2.png
index e2bf7d24d..e2bf7d24d 100644..100755
--- a/view/theme/diabook-aerith/icons/messages2.png
+++ b/view/theme/diabook-aerith/icons/messages2.png
diff --git a/view/theme/diabook-aerith/icons/next.png b/view/theme/diabook-aerith/icons/next.png
index 7b5e25b90..7b5e25b90 100644..100755
--- a/view/theme/diabook-aerith/icons/next.png
+++ b/view/theme/diabook-aerith/icons/next.png
diff --git a/view/theme/diabook-aerith/icons/notifications.png b/view/theme/diabook-aerith/icons/notifications.png
index 2b4fbb818..2b4fbb818 100644..100755
--- a/view/theme/diabook-aerith/icons/notifications.png
+++ b/view/theme/diabook-aerith/icons/notifications.png
diff --git a/view/theme/diabook-aerith/icons/notify.png b/view/theme/diabook-aerith/icons/notify.png
index 9765bfd53..9765bfd53 100644..100755
--- a/view/theme/diabook-aerith/icons/notify.png
+++ b/view/theme/diabook-aerith/icons/notify.png
diff --git a/view/theme/diabook-aerith/icons/notify2.png b/view/theme/diabook-aerith/icons/notify2.png
index 9765bfd53..9765bfd53 100644..100755
--- a/view/theme/diabook-aerith/icons/notify2.png
+++ b/view/theme/diabook-aerith/icons/notify2.png
diff --git a/view/theme/diabook-aerith/icons/pencil.png b/view/theme/diabook-aerith/icons/pencil.png
index 772e49b17..772e49b17 100644..100755
--- a/view/theme/diabook-aerith/icons/pencil.png
+++ b/view/theme/diabook-aerith/icons/pencil.png
diff --git a/view/theme/diabook-aerith/icons/photo-menu.jpg b/view/theme/diabook-aerith/icons/photo-menu.jpg
index fde5eb535..fde5eb535 100644..100755
--- a/view/theme/diabook-aerith/icons/photo-menu.jpg
+++ b/view/theme/diabook-aerith/icons/photo-menu.jpg
diff --git a/view/theme/diabook-aerith/icons/prev.png b/view/theme/diabook-aerith/icons/prev.png
index 55c1464ba..55c1464ba 100644..100755
--- a/view/theme/diabook-aerith/icons/prev.png
+++ b/view/theme/diabook-aerith/icons/prev.png
diff --git a/view/theme/diabook-aerith/icons/recycle.png b/view/theme/diabook-aerith/icons/recycle.png
index c3b8d2bf4..c3b8d2bf4 100644..100755
--- a/view/theme/diabook-aerith/icons/recycle.png
+++ b/view/theme/diabook-aerith/icons/recycle.png
diff --git a/view/theme/diabook-aerith/icons/remote.png b/view/theme/diabook-aerith/icons/remote.png
index a560cc55e..a560cc55e 100644..100755
--- a/view/theme/diabook-aerith/icons/remote.png
+++ b/view/theme/diabook-aerith/icons/remote.png
diff --git a/view/theme/diabook-aerith/icons/scroll_top.png b/view/theme/diabook-aerith/icons/scroll_top.png
index 0e7f7ae6a..0e7f7ae6a 100644..100755
--- a/view/theme/diabook-aerith/icons/scroll_top.png
+++ b/view/theme/diabook-aerith/icons/scroll_top.png
diff --git a/view/theme/diabook-aerith/icons/selected.png b/view/theme/diabook-aerith/icons/selected.png
index 2a30ae252..2a30ae252 100644..100755
--- a/view/theme/diabook-aerith/icons/selected.png
+++ b/view/theme/diabook-aerith/icons/selected.png
diff --git a/view/theme/diabook-aerith/icons/star.png b/view/theme/diabook-aerith/icons/star.png
index 0b00cb189..0b00cb189 100644..100755
--- a/view/theme/diabook-aerith/icons/star.png
+++ b/view/theme/diabook-aerith/icons/star.png
diff --git a/view/theme/diabook-aerith/icons/starred.png b/view/theme/diabook-aerith/icons/starred.png
index 2b82dfca3..2b82dfca3 100644..100755
--- a/view/theme/diabook-aerith/icons/starred.png
+++ b/view/theme/diabook-aerith/icons/starred.png
diff --git a/view/theme/diabook-aerith/icons/tagged.png b/view/theme/diabook-aerith/icons/tagged.png
index 144649ef8..144649ef8 100644..100755
--- a/view/theme/diabook-aerith/icons/tagged.png
+++ b/view/theme/diabook-aerith/icons/tagged.png
diff --git a/view/theme/diabook-aerith/icons/unlock.png b/view/theme/diabook-aerith/icons/unlock.png
index a0cda0ae5..a0cda0ae5 100644..100755
--- a/view/theme/diabook-aerith/icons/unlock.png
+++ b/view/theme/diabook-aerith/icons/unlock.png
diff --git a/view/theme/diabook-aerith/icons/unstarred.png b/view/theme/diabook-aerith/icons/unstarred.png
index ba3183f5c..ba3183f5c 100644..100755
--- a/view/theme/diabook-aerith/icons/unstarred.png
+++ b/view/theme/diabook-aerith/icons/unstarred.png
diff --git a/view/theme/diabook-aerith/icons/video.png b/view/theme/diabook-aerith/icons/video.png
index a03d1d818..a03d1d818 100644..100755
--- a/view/theme/diabook-aerith/icons/video.png
+++ b/view/theme/diabook-aerith/icons/video.png
diff --git a/view/theme/diabook-aerith/icons/weblink.png b/view/theme/diabook-aerith/icons/weblink.png
index 216e78344..216e78344 100644..100755
--- a/view/theme/diabook-aerith/icons/weblink.png
+++ b/view/theme/diabook-aerith/icons/weblink.png
diff --git a/view/theme/diabook-aerith/jot.tpl b/view/theme/diabook-aerith/jot.tpl
index ee30da7bf..ee30da7bf 100644..100755
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
index 989f17878..989f17878 100644..100755
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ b/view/theme/diabook-aerith/mail_conv.tpl
diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index f84b902d5..6fab83afc 100644
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -22,7 +22,7 @@
 				<span class="icon contacts">$nav.contacts.1</span>
 				<span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-contacts-menu" class="menu-popup">
-					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+					<li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
@@ -35,7 +35,7 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
diff --git a/view/theme/diabook-aerith/photo_view.tpl b/view/theme/diabook-aerith/photo_view.tpl
index 511fc73ac..511fc73ac 100644..100755
--- a/view/theme/diabook-aerith/photo_view.tpl
+++ b/view/theme/diabook-aerith/photo_view.tpl
diff --git a/view/theme/diabook-aerith/profile_vcard.tpl b/view/theme/diabook-aerith/profile_vcard.tpl
index e28ec2909..6fcffcc9b 100644
--- a/view/theme/diabook-aerith/profile_vcard.tpl
+++ b/view/theme/diabook-aerith/profile_vcard.tpl
@@ -22,7 +22,7 @@
 				
 	
 
-	<div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+	<div id="profile-photo-wrapper"><img class="photo"  src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
 	{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
 
 
diff --git a/view/theme/diabook-aerith/rs_common_tabs.tpl b/view/theme/diabook-aerith/rs_common_tabs.tpl
index 6a1c5c71b..6a1c5c71b 100644..100755
--- a/view/theme/diabook-aerith/rs_common_tabs.tpl
+++ b/view/theme/diabook-aerith/rs_common_tabs.tpl
diff --git a/view/theme/diabook-aerith/search_item.tpl b/view/theme/diabook-aerith/search_item.tpl
index 123834064..123834064 100644..100755
--- a/view/theme/diabook-aerith/search_item.tpl
+++ b/view/theme/diabook-aerith/search_item.tpl
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 6e3b3f822..9925a90aa 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -2093,9 +2093,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index f41c4a98a..19fea9a83 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -2082,10 +2082,10 @@ ul.tabs li .active {
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 3d53115df..f7bdaeef6 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -447,6 +447,24 @@ a:hover {
   /*color: #005c94; */
   text-decoration: underline;
 }
+.intro-end {
+	border-bottom: 1px solid black;
+   clear: both;
+   margin-bottom: 25px;
+   padding-bottom: 25px;
+   width: 75%;
+	}
+.intro-form-end {
+	clear: both;
+	}
+.intro-fullname {
+	padding-bottom: 5px;
+   padding-top: 5px;
+	}
+.intro-wrapper-end {
+	clear: both;
+   padding-bottom: 5px;
+	}
 code {
   font-family: Courier, monospace;
   white-space: pre;
@@ -2111,10 +2129,10 @@ height: 350px;
 /* photo */
 .photo {
 box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
 border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
 }
 .lframe {
   float: left;
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e56f0ab74..b48f061fd 100644..100755
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,7 +3,7 @@
 /*
  * 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.012)
+ * Version: (Version: 1.013)
  * Author: 
  */