Merge branch 'pull'

12 files changed, 37 insertions, 22 deletions

diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index fc1a3d47b..417578a32 100755..100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -63,7 +63,7 @@
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
-	<textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea>
+	<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
 	<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </div>
 <div id="contact-edit-info-end"></div>
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index 5b807c8ad..5bae06178 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -46,7 +46,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $page }}
 <div>$page</div>
 {{ endif }}
 
diff --git a/view/theme/diabook-blue/screenshot.png b/view/theme/diabook-blue/screenshot.png
new file mode 100644
index 000000000..b1c890285
--- /dev/null
+++ b/view/theme/diabook-blue/screenshot.png
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2c878e6f0..a5f4490ba 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -18,7 +18,7 @@ $cssFile = null;
 /**
  * prints last community activity
  */
-function diabook_community_info(){
+function diabook_blue_community_info(){
 	$a = get_app();
 	//right_aside at networkpages
 
@@ -170,6 +170,7 @@ function diabook_community_info(){
 	if (sizeof($contacts) > 0)
 		
 		$aside['$page'] = $page;
+		
   //END Community Page		   
    
    
@@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){
 	}
 	
 	// COMMUNITY
-	diabook_community_info();
+	diabook_blue_community_info();
 	
 	// CUSTOM CSS
 	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
@@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){
 if ($a->argv[0] === "profile"){
 	
 	// COMMUNITY
-	diabook_community_info();
+	diabook_blue_community_info();
 	
 	// CUSTOM CSS
 	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index c1b395dbe..1ba9ad081 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -46,7 +46,7 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+{{ if $page }}
 <div>$page</div>
 {{ endif }}
 
diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png
new file mode 100644
index 000000000..2826f4261
--- /dev/null
+++ b/view/theme/diabook/screenshot.png
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 00856c8d2..ba43c78c2 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -111,6 +111,7 @@
 .icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
 
 
+
 .camera 	{ background-image: url("../../../view/theme/diabook/icons/camera.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;
 			  }
@@ -1169,6 +1170,12 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
 right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
 #page-sidebar-right_aside{margin-top: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
+.icon.expand		{ 
+		background-image: url("../../../view/theme/diabook/icons/expand.png");
+		float: right;
+		cursor: pointer;
+		}
+
 /* wall item */
 .tread-wrapper {
   border-bottom: 1px solid #D2D2D2;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 5b87e3142..0279dd925 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -251,14 +251,7 @@ $a->page['htmlhead'] .= <<< EOT
  $(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>
 EOT;
 
diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl
index 0659ebe20..0838fc757 100644
--- a/view/theme/dispy-dark/communityhome.tpl
+++ b/view/theme/dispy-dark/communityhome.tpl
@@ -1,4 +1,4 @@
-{{ if $lastusers_title }}
+{{ if $page }}
 <h3>PostIt to Friendica</h3>
 <div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
 {{ endif }}
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 6292da6d2..e47eb22ed 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -491,13 +491,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	margin: 5px;
-	width: 65%;
+	display: inline-block;
 	height: 40px;
-	z-index: 100;
+	margin: 12px 0 0 -3px;
+	position: relative;
+	right: -12px;
+	top: 17px;
+	width: 0;
 }
 #search-text {
 	border: 1px #2e2f2e solid;
+	background: #2e2f2e;
+	color: #eec;
 }
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 0659ebe20..0838fc757 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -1,4 +1,4 @@
-{{ if $lastusers_title }}
+{{ if $page }}
 <h3>PostIt to Friendica</h3>
 <div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
 {{ endif }}
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 116f88b31..7c80c8b5b 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -199,6 +199,10 @@ input[type=submit] {
 .action {
 	margin: 5px 0;
 }
+.tool {
+	margin: 5px 0;
+	list-style: none;
+}
 
 
 /**
@@ -483,13 +487,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	background: transparent url(icons.png) -190px -60px no-repeat;
 }
 .search-box {
-	margin: 5px;
-	width: 65%;
+	display: inline-block;
 	height: 40px;
-	z-index: 100;
+	margin: 12px 0 0 -3px;
+	position: relative;
+	right: -12px;
+	top: 17px;
+	width: 0;
 }
 #search-text {
 	border: 1px #eec solid;
+	background: #eec;
+	color: #e2e33436;
 }
 .nav-ajax-update, .nav-ajax-left {
 	width: 30px;