Merge pull request #210 from tomtom84/master

fixes in diabook-derivates

js/main.js

@@ -119,9 +119,7 @@
 			var home = $(data).find('home').text();
 			if(home == 0) { home = '';  $('#home-update').removeClass('show') } else { $('#home-update').addClass('show') }
 			$('#home-update').html(home);
-
- 
-
+			
 			var intro = $(data).find('intro').text();
 			if(intro == 0) { intro = '';  $('#intro-update').removeClass('show') } else { $('#intro-update').addClass('show') }
 			$('#intro-update').html(intro);
@@ -129,6 +127,14 @@
 			var mail = $(data).find('mail').text();
 			if(mail == 0) { mail = '';  $('#mail-update').removeClass('show') } else { $('#mail-update').addClass('show') }
 			$('#mail-update').html(mail);
+			
+			var intro = $(data).find('intro').text();
+			if(intro == 0) { intro = '';  $('#intro-update-li').removeClass('show') } else { $('#intro-update-li').addClass('show') }
+			$('#intro-update-li').html(intro);
+
+			var mail = $(data).find('mail').text();
+			if(mail == 0) { mail = '';  $('#mail-update-li').removeClass('show') } else { $('#mail-update-li').addClass('show') }
+			$('#mail-update-li').html(mail);
 
 			var eNotif = $(data).find('notif')
 			notif = eNotif.attr('count');

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>

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 }}
 
 

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;

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;

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;

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: 
  */
 

view/theme/diabook-blue/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>

view/theme/diabook-blue/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 }}
 
 

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

@@ -2054,9 +2054,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;

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

@@ -2049,10 +2049,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;

view/theme/diabook-blue/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;
@@ -2067,10 +2085,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;

view/theme/diabook-blue/theme.php

@@ -3,7 +3,7 @@
 /*
  * 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.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 

view/theme/diabook-red/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>

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

@@ -529,6 +529,7 @@ background-image: -o-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 6
 background-image: -moz-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -webkit-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
 background-image: -ms-linear-gradient(bottom, rgb(173,59,10) 0%, rgb(255,79,15) 65%);
+filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ad3b0a', endColorstr='#ff4f0f');
 
 background-image: -webkit-gradient(
 	linear,
@@ -2090,9 +2091,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;

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

@@ -2063,10 +2063,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;

view/theme/diabook-red/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;
@@ -2097,10 +2115,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;

view/theme/diabook-red/theme.php

@@ -3,7 +3,7 @@
 /*
  * 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.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 

view/theme/diabook/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>	
@@ -36,7 +36,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>

view/theme/diabook/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 }}
 
 

view/theme/diabook/style-profile.css

@@ -2023,6 +2023,8 @@ ul.tabs li .active {
 /* photo */
 .photo {
 border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
 	}
 .lframe {
   float: left;

view/theme/diabook/style.css

@@ -449,6 +449,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;
@@ -2046,6 +2064,8 @@ height: 350px;
 /* photo */
 .photo {
 border-radius: 10px;	
+height: 145px !important;
+width: 145px !important;
 	}
 .lframe {
   float: left;

view/theme/diabook/theme.php

@@ -3,7 +3,7 @@
 /*
  * 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.012)
+ * Version: (Version: 1.013)
  * Author: 
  */
 
@@ -339,9 +339,10 @@ if ($a->argv[0] === "settings"){
 if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
 
 //load jquery.cookie.js
-$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
+$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery.cookie.js";
 $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
 
+
 //js scripts
 
 $a->page['htmlhead'] .= '
@@ -350,15 +351,9 @@ $a->page['htmlhead'] .= '
  $(function() {
 	$("a.lightbox").fancybox(); // Select all links with lightbox class
  });
- 
- $(document).ready(function (){
-	$("iframe").each(function(){
-		var url = $(this).attr("src");
-		$(this).attr("src",url+"?wmode=transparent"); });
-    });
-  
+   
  </script>';
-
+ 
 
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] === "network" && local_user()){
 $a->page['htmlhead'] .= '