Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  support lowercase :-p smilie
  work around doubled linefeeds in tinymce3.5b2
  add icons to aside diabook, fixes in css
  revert permissions relaxation on community
  add comix-plain
  smooth the comix comment box
  make autocomplete work with updated tinymce
  ika to ica
  private file in repository
  facepark is unsupported ATM
  remove stray template variable from old code
  add comix theme
  use password field for DB input
  added Vijay's theme from facepark.in
  added README to mcefixes to explain what is going on.
  update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
  more friend suggestions

* master:

4 files changed, 8 insertions, 21 deletions

diff --git a/view/theme/diabook-blue/icons/head.jpg b/view/theme/diabook-blue/icons/head.jpg
deleted file mode 100644
index 6210b76be..000000000
--- a/view/theme/diabook-blue/icons/head.jpg
+++ /dev/null
diff --git a/view/theme/diabook-blue/photo_album.tpl b/view/theme/diabook-blue/photo_album.tpl
deleted file mode 100755
index 7e6c2f666..000000000
--- a/view/theme/diabook-blue/photo_album.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
-	<a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
-		<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
-		<p class='caption'>$desc</p>		
-	</a>
-</div>
-<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/diabook-blue/photo_top.tpl b/view/theme/diabook-blue/photo_top.tpl
deleted file mode 100755
index 98ac9c457..000000000
--- a/view/theme/diabook-blue/photo_top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
-	<a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
-		<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
-	</a>
-	<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
-</div>
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 738dde0e5..f88c7b954 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -2411,21 +2411,22 @@ float: left;
    -moz-box-shadow: 0 0 5px #888;
    -webkit-box-shadow: 0 0 5px #888;
    box-shadow: 0 0 5px #888;
-  background-color: #EEE;
+  background-color: #000;
    -webkit-border-radius: 5px;
    -moz-border-radius: 5px;
   border-radius: 5px;
   padding-bottom: 20px;
   position: relative;
   margin: 0 10px 10px 0;
-  overflow: hidden;
-  float: left;
-  position: relative;
+  width: 200px; height: 140px;
+  overflow: hidden;  
 }
 .photo-top-album-name {
-  position: absolute;
-  bottom: 0;
-  padding: 0 5px;
+        width: 100%;
+        position: absolute; 
+        bottom: 0px; 
+        padding-left: 3px;
+        background-color: #EEE;
 }
 .photo-top-album-link{
   color: #1872A2;