Merge branch 'master' of https://github.com/friendica/friendica

13 files changed, 29 insertions, 36 deletions

diff --git a/view/theme/darkzero-NS/screenshot.jpg b/view/theme/darkzero-NS/screenshot.jpg
new file mode 100644
index 000000000..e91ae13f5
--- /dev/null
+++ b/view/theme/darkzero-NS/screenshot.jpg
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl
index f1714a436..2d9033b18 100755
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@@ -1,3 +1,7 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
 {{ if $lastusers_title }}
 <h3 style="margin-top:0px;">Help or @NewHere ?</h3>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
@@ -7,6 +11,11 @@
 {{ endif }}
 
 {{ if $lastusers_title }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
+{{ endif }}
+
+{{ if $lastusers_title }}
 <h3>Connectable Services</h3>
 <div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
@@ -47,14 +56,6 @@
 </div>
 {{ endif }}
 
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica</h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
-{{ endif }}
 
 {{ if $like_title }}
 <h3>$like_title</h3>
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 902c2a0ed..511fc73ac 100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
 
 <div id="photo-photo">
 	{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
-	<a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
+	<a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
 	{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
 </div>
 
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 85cf23da1..f23518555 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
 right_aside .items-wrapper{ overflow: auto;	width: 100%; }
 right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
 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{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
 /* wall item */
 .tread-wrapper {
@@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 500px;
+  max-width: 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 3671d963e..1296f1647 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1189,7 +1189,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
 right_aside .items-wrapper{ overflow: auto;	width: 100%; }
 right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
 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{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
 /* wall item */
 .tread-wrapper {
@@ -1271,7 +1271,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 500px;
+  max-width: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index a05a49e67..7488c2fed 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -178,8 +178,8 @@
 
 .icon.on             { background-image: url("../../../view/theme/diabook-blue/icons/toogle_on.png"); background-repeat: no-repeat;}
 .icon.off            { background-image: url("../../../view/theme/diabook-blue/icons/toogle_off.png"); background-repeat: no-repeat;}
-.prev           { background-position: -90px  -60px;}
-.next           { background-position: -110px -60px;}
+.icon.prev           { background-image: url("../../../view/theme/diabook-blue/icons/prev.png"); background-repeat: no-repeat;}
+.icon.next           { background-image: url("../../../view/theme/diabook-blue/icons/next.png"); background-repeat: no-repeat;}
 /*.tagged     { background-position: -130px -60px;}*/
 
 .attachtype {
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index a5f4490ba..322e16329 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -7,9 +7,6 @@
  * Author: 
  */
 
-$a->theme_info = array(
-  'extends' => 'diabook',
-);
 
 //change css on network and profilepages
 $cssFile = null;
diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index 20d24702b..123834064 100644
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index e02e5a8be..c5b6b36b5 100644
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-	{{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}	
 	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 23c26c910..aa150b9d0 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -1,3 +1,7 @@
+{{ if $page }}
+<div>$page</div>
+{{ endif }}
+
 {{ if $lastusers_title }}
 <h3 style="margin-top:0px;">Help or @NewHere ?</h3>
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br>
@@ -21,6 +25,11 @@
 {{ endif }}
 
 {{ if $lastusers_title }}
+<h3>PostIt to Friendica</h3>
+<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
+{{ endif }}
+
+{{ if $lastusers_title }}
 <h3>$lastusers_title</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
 {{ for $lastusers_items as $i }}
@@ -47,15 +56,6 @@
 </div>
 {{ endif }}
 
-{{ if $page }}
-<div>$page</div>
-{{ endif }}
-
-{{ if $lastusers_title }}
-<h3>PostIt to Friendica</h3>
-<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div>
-{{ endif }}
-
 {{ if $like_title }}
 <h3>$like_title</h3>
 <ul id='likes'>
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ba43c78c2..3854adc34 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1168,7 +1168,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
 right_aside .items-wrapper{ overflow: auto;	width: 100%; }
 right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
 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{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
 .icon.expand		{ 
 		background-image: url("../../../view/theme/diabook/icons/expand.png");
@@ -1252,7 +1252,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 500px;
+  max-width: 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 da1a7dd6d..0f05bf6c1 100644
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1166,7 +1166,7 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
 right_aside .items-wrapper{ overflow: auto;	width: 100%; }
 right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;	width: 100%; }
 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{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
 /* wall item */
 .tread-wrapper {
@@ -1244,7 +1244,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 500px;
+  max-width: 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 8064fb7e7..798eef422 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -7,9 +7,6 @@
  * Author: 
  */
 
-$a->theme_info = array(
-  //'extends' => 'diabook',  //it's diabook, don't need to extend himself...
-);
 
 //change css on network and profilepages
 $cssFile = null;