From 9943db95a3b429d94ee668bb97ba47b52ae51c58 Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Sat, 1 Jun 2013 13:27:20 +0200
Subject: [PATCH 1/3] bigger default thumbnail size

---
 include/tpl/config_local.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tpl/config_local.inc.php b/include/tpl/config_local.inc.php
index e8ca5f62..ec98446e 100644
--- a/include/tpl/config_local.inc.php
+++ b/include/tpl/config_local.inc.php
@@ -563,7 +563,7 @@
                                           'description' => INSTALL_THUMBWIDTH_DESC,
                                           'type'        => 'int',
                                           'permission'  => 'siteConfiguration',
-                                          'default'     => 110),
+                                          'default'     => 400),
 
                                     array('var'         => 'thumbConstraint',
                                           'title'       => INSTALL_THUMBDIM,

From cff869e33c98f260f7b23da324532e58d8c02a3a Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Sat, 1 Jun 2013 13:42:10 +0200
Subject: [PATCH 2/3] add image overlay in ML

---
 templates/2k11/admin/media_items.tpl |  4 ++--
 templates/2k11/admin/style.css       | 33 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index f05936a8..f5726481 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -41,7 +41,7 @@
                 {if $file.authorid != 0}<span class="author block_level">{$file.authorname}</span>{/if}
             </header>
 
-            <div class="clearfix equal_heights">
+            <div class="clearfix equal_heights serendipity_ImageWrapper"">
                 <div class="media_file_preview">
                     {if $file.is_image AND $file.full_thumb}
                         {if $file.url}
@@ -70,7 +70,7 @@
                     {/if}
                 </div>
 
-                <footer>
+                <footer class="serendipity_ImageCaption">
                     <ul class="media_file_meta plainList">
                 {if $file.hotlink}
                         <li>{$file.nice_hotlink}</li>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 8c417413..f4854828 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1406,6 +1406,7 @@ form > .button_link:first-of-type { margin-top: 0; }
 
 
 /* MEDIA DB
+ 
 
    (These might go into imgedit.css or be merged with it.)
    ----------------------------------------------------------------- */
@@ -1413,6 +1414,38 @@ form > .button_link:first-of-type { margin-top: 0; }
 
 .media_pane .pagination { margin: 0; }
 
+.serendipity_ImageWrapper:hover > .serendipity_ImageCaption {
+    display: block;
+    -webkit-animation: fade-in 0.4s 1;
+    -moz-animation: fade-in 0.4s 1;
+    animation: fade-in 0.4s 1;
+    opacity: 1;
+}
+
+.serendipity_ImageCaption {
+    display: none;
+    position: absolute;
+    color: white;
+    background-color: rgba(0, 0, 0, 0.6);
+    opacity: 0;
+    
+    
+}
+
+@-webkit-keyframes fade-in {
+    0% { opacity: 0;  }
+    100% { opacity: 1; }
+}
+@-moz-keyframes fade-in {
+    0% { opacity: 0; }
+    100% { opacity: 1; }
+}
+
+@keyframes fade-in {
+    0% { opacity: 0;  }
+    100% { opacity: 1; }
+}
+
 
 /* SMALL SCREEN (e.g. smartphones)
    ----------------------------------------------------------------- */

From e1d403057bd4ea5b7cf9c256c8c3c856d52f276c Mon Sep 17 00:00:00 2001
From: onli <onli89@googlemail.com>
Date: Sat, 1 Jun 2013 15:21:13 +0200
Subject: [PATCH 3/3] Add Media Category Filter Buttons

---
 include/functions_images.inc.php       | 12 ++++++++++--
 lang/UTF-8/serendipity_lang_en.inc.php |  1 +
 lang/serendipity_lang_en.inc.php       |  1 +
 templates/2k11/admin/media_items.tpl   |  4 ++--
 templates/2k11/admin/media_pane.tpl    | 11 +++++++++++
 templates/2k11/admin/style.css         | 25 +++++++++++++++++++++----
 6 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php
index 86c779cd..df268331 100644
--- a/include/functions_images.inc.php
+++ b/include/functions_images.inc.php
@@ -104,9 +104,8 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $
         $cond['parts']['keywords'] = " AND (mk.property IN ('" . serendipity_db_implode("', '", $keywords, 'string') . "'))\n";
         $cond['joinparts']['keywords'] = true;
     }
-
     foreach($filter AS $f => $fval) {
-        if (!isset($orderfields[$f]) || empty($fval)) {
+        if (! (isset($orderfields[$f]) || $f == "fileCategory") || empty($fval)) {
             continue;
         }
 
@@ -140,6 +139,15 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total=null, $
             } else {
                 $cond['parts']['filter'] .= " AND ($f = '" . serendipity_db_escape_string(trim($fval)) . "')\n";
             }
+        } elseif ($f == 'fileCategory') {
+            switch ($fval) {
+                case 'image':
+                    $cond['parts']['filter'] .= " AND (i.mime LIKE 'image/%')\n";
+                    break;
+                case 'video':
+                    $cond['parts']['filter'] .= " AND (i.mime LIKE 'video/%')\n";
+                    break;
+            }
         } else {
             if (substr($f, 0, 3) === 'bp.') {
                 $realf = substr($f, 3);
diff --git a/lang/UTF-8/serendipity_lang_en.inc.php b/lang/UTF-8/serendipity_lang_en.inc.php
index e046cfa5..00d53d91 100644
--- a/lang/UTF-8/serendipity_lang_en.inc.php
+++ b/lang/UTF-8/serendipity_lang_en.inc.php
@@ -79,6 +79,7 @@
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Your search for %s returned %s results:');
 @define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.');
 @define('IMAGE', 'Image');
+@define('VIDEO', 'Video');
 @define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename does not exist!');
 @define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
 @define('ERROR_SOMETHING', 'Error: Something is wrong.');
diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php
index b918c269..ee4e053a 100644
--- a/lang/serendipity_lang_en.inc.php
+++ b/lang/serendipity_lang_en.inc.php
@@ -79,6 +79,7 @@
 @define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Your search for %s returned %s results:');
 @define('SEARCH_TOO_SHORT', 'Your search-query must be longer than 3 characters. You can try to append * to shorter words, like: s9y* to trick the search into using shorter words.');
 @define('IMAGE', 'Image');
+@define('VIDEO', 'Video');
 @define('ERROR_FILE_NOT_EXISTS', 'Error: Old filename does not exist!');
 @define('ERROR_FILE_EXISTS', 'Error: New filename already used, pick another!');
 @define('ERROR_SOMETHING', 'Error: Something is wrong.');
diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index f5726481..02bdf9fc 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -41,7 +41,7 @@
                 {if $file.authorid != 0}<span class="author block_level">{$file.authorname}</span>{/if}
             </header>
 
-            <div class="clearfix equal_heights serendipity_ImageWrapper"">
+            <div class="clearfix equal_heights image_wrapper"">
                 <div class="media_file_preview">
                     {if $file.is_image AND $file.full_thumb}
                         {if $file.url}
@@ -70,7 +70,7 @@
                     {/if}
                 </div>
 
-                <footer class="serendipity_ImageCaption">
+                <footer class="image_caption">
                     <ul class="media_file_meta plainList">
                 {if $file.hotlink}
                         <li>{$file.nice_hotlink}</li>
diff --git a/templates/2k11/admin/media_pane.tpl b/templates/2k11/admin/media_pane.tpl
index 0f9cb8eb..33ff91e2 100644
--- a/templates/2k11/admin/media_pane.tpl
+++ b/templates/2k11/admin/media_pane.tpl
@@ -135,6 +135,17 @@
     <div class="form_buttons">
         <input name="go" type="submit" value="{$CONST.GO}">
     </div>
+    
+    
+    <input type="radio" id="serendipity[filter][fileCategory][All]" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == ""}checked{/if} value=""></input>
+    <label for="serendipity[filter][fileCategory][All]" class="media_selector button_link">All</label>
+    
+    <input id="serendipity[filter][fileCategory][Image]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "image"}checked{/if} value="image"></input>
+    <label for="serendipity[filter][fileCategory][Image]" class="media_selector button_link">{$CONST.IMAGE}</label>
+    
+    <input id="serendipity[filter][fileCategory][Video]" type="radio" name="serendipity[filter][fileCategory]" {if $media.filter.fileCategory == "video"}checked{/if} value="video"></input>
+    <label for="serendipity[filter][fileCategory][Video]" class="media_selector button_link">{$CONST.VIDEO}</label>
+    
 </form>
 {if $media.nr_files < 1}
     <span class="msg_notice"><span class="icon-info-circle"></span> {$CONST.NO_IMAGES_FOUND}</span>
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index f4854828..c0ebe5af 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -1414,7 +1414,7 @@ form > .button_link:first-of-type { margin-top: 0; }
 
 .media_pane .pagination { margin: 0; }
 
-.serendipity_ImageWrapper:hover > .serendipity_ImageCaption {
+.image_wrapper:hover > .image_caption {
     display: block;
     -webkit-animation: fade-in 0.4s 1;
     -moz-animation: fade-in 0.4s 1;
@@ -1422,14 +1422,12 @@ form > .button_link:first-of-type { margin-top: 0; }
     opacity: 1;
 }
 
-.serendipity_ImageCaption {
+.image_caption {
     display: none;
     position: absolute;
     color: white;
     background-color: rgba(0, 0, 0, 0.6);
     opacity: 0;
-    
-    
 }
 
 @-webkit-keyframes fade-in {
@@ -1446,6 +1444,25 @@ form > .button_link:first-of-type { margin-top: 0; }
     100% { opacity: 1; }
 }
 
+input[name="serendipity[filter][fileCategory]"] {
+    display: none;
+}
+
+label.media_selector {
+    cursor: pointer;
+}
+input:checked + label.media_selector {
+    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fff), color-stop(1px, #ddd), color-stop(100%, #eee));
+    background-image: -webkit-linear-gradient(#fff, #ddd 1px, #eee);
+    background-image: -moz-linear-gradient(#fff, #ddd 1px, #eee);
+    background-image: -o-linear-gradient(#fff, #ddd 1px, #eee);
+    background-image: linear-gradient(#fff, #ddd 1px, #eee);
+    -webkit-box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+    -moz-box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+    box-shadow: inset rgba(0, 0, 0, 0.25) 0 1px 2px 0;
+    border-color: #999 #bbb #ddd;
+}
+
 
 /* SMALL SCREEN (e.g. smartphones)
    ----------------------------------------------------------------- */