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

diff --combined view/theme/diabook/communityhome.tpl
index ff04d9da0db0657b7e6f2136ee905c388c980d74,66f93c32d825a0ef08ea82909e0541c2379a21f9..66f93c32d825a0ef08ea82909e0541c2379a21f9
mode 100644,100755..100644
--- 1/view/theme/diabook/communityhome.tpl
--- 2/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@@ -82,4 -82,4 +82,4 @@@ $nv.searc
  {{ endfor }}
  </ul>
  {{ endif }}
- </div>
+ </div>

diff --combined view/theme/diabook/diabook-dark/ch_directory_item.tpl
index 0000000000000000000000000000000000000000,db1936e4b725d6cd532b3d347531295e71356c9e..db1936e4b725d6cd532b3d347531295e71356c9e
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/ch_directory_item.tpl
+++ b/view/theme/diabook/diabook-dark/ch_directory_item.tpl
@@@ -1,0 -1,10 +1,10 @@@
+ 
+ <div class="directory-item" id="directory-item-$id" >
+       <div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+               <div class="directory-photo" id="directory-photo-$id" >
+                       <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+                               <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+                       </a>
+               </div>
+       </div>
+ </div>

diff --combined view/theme/diabook/diabook-dark/directory_item.tpl
index 0000000000000000000000000000000000000000,bc2af16c21f0d25c67534dbc0a9bfc199ee3b076..bc2af16c21f0d25c67534dbc0a9bfc199ee3b076
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/directory_item.tpl
+++ b/view/theme/diabook/diabook-dark/directory_item.tpl
@@@ -1,0 -1,11 +1,11 @@@
+ 
+ <div class="directory-item" id="directory-item-$id" >
+       <div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+               <div class="directory-photo" id="directory-photo-$id" >
+                       <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+                               <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+                       </a>
+               </div>
+       </div>
+       <div class="contact-name" id="directory-name-$id">$name</div>
+ </div>

diff --combined view/theme/diabook/diabook-dark/group_side.tpl
index 0000000000000000000000000000000000000000,8600402f291c429cf61eba8ece8e5c405ce8c928..8600402f291c429cf61eba8ece8e5c405ce8c928
mode 000000,100755..100644
--- /dev/null
--- 2/view/theme/diabook/diabook-dark/group_side.tpl
+++ b/view/theme/diabook/diabook-dark/group_side.tpl
@@@ -1,0 -1,34 +1,34 @@@
+ <div id="profile_side" >
+       <div class="">
+               <h3 style="margin-left: 2px;">$title<a href="group/new" title="$createtext" class="icon text_add"></a></h3>
+       </div>
+ 
+       <div id="sidebar-group-list">
+               <ul class="menu-profile-side">
+                       {{ for $groups as $group }}
+                       <li class="menu-profile-list">
+                               <span class="menu-profile-icon {{ if $group.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>
+                               <a href="$group.href" class="menu-profile-list-item">
+                                       $group.text
+                               </a>
+                               {{ if $group.edit }}
+                                       <a href="$group.edit.href" class="action"><span class="icon text_edit" ></span></a>
+                               {{ endif }}
+                               {{ if $group.cid }}
+                                       <input type="checkbox" 
+                                               class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+                                               onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+                                               {{ if $group.ismember }}checked="checked"{{ endif }}
+                                       />
+                               {{ endif }}
+                       </li>
+                       {{ endfor }}
+               </ul>
+       </div>
+        {{ if $ungrouped }}
+   <div id="sidebar-ungrouped">
+   <a href="nogroup">$ungrouped</a>
+   </div>
+   {{ endif }}
+ </div>        
+ 

diff --combined view/theme/diabook/diabook-dark/icons/block.png
index 0000000000000000000000000000000000000000,a0b1dffe91473daf6cea96e5e159fec01e5aa831..a0b1dffe91473daf6cea96e5e159fec01e5aa831
mode 000000,100755..100644
Binary files differ

diff --combined view/theme/diabook/theme.php
index 29e71c61154fcd18f45d1632761b5940da3b79c0,e8518a1c6f4423c38b08f2b68ceac21212ccb15a..e8518a1c6f4423c38b08f2b68ceac21212ccb15a
mode 100644,100755..100644
--- 1/view/theme/diabook/theme.php
--- 2/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@@ -26,6 -26,7 +26,7 @@@ if ($color=="blue") $color_path = "/dia
  if ($color=="red") $color_path = "/diabook-red/";
  if ($color=="pink") $color_path = "/diabook-pink/";
  if ($color=="green") $color_path = "/diabook-green/";
+ if ($color=="dark") $color_path = "/diabook-dark/";
  
  
  /**
@@@ -146,7 -147,6 +147,6 @@@ function diabook_community_info()
                }
        }
        
-       
     
     //right_aside FIND FRIENDS
        if(local_user()) {
@@@ -329,6 -329,7 +329,7 @@@ $a->page['htmlhead'] .= 
     
   </script>';
   
+  
  $a->page['htmlhead'] .= '
  
  <script type="text/javascript">
@@@ -479,7 -480,7 +480,7 @@@ function close_lastlikes()
  $a->page['htmlhead'] .= ' 
  
  <script>
- function insertFormatting(comment,BBcode,id) {
+ function insertFormatting(BBcode,id) {
        
                var tmpStr = $("#comment-edit-text-" + id).val();
                if(tmpStr == comment) {
@@@ -507,4 -508,12 +508,12 @@@
        }
        return true;
  }
+ 
+ function cmtBbOpen(id) {
+       $(".comment-edit-bb-" + id).show();
+ }
+ function cmtBbClose(id) {
+       $(".comment-edit-bb-" + id).hide();
+ }
+ 
  </script> ';