Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css

include/admin/entries.inc.php

@@ -324,6 +324,7 @@ switch($serendipity['GET']['adminAction']) {
         $data['offSet']     = $offSet;
         $data['use_iframe'] = $serendipity['use_iframe'];
         $data['page']       = $page;
+
         $data['totalEntries']  = serendipity_getTotalEntries();
         $data['simpleFilters'] = $serendipity['simpleFilters'];
 

include/functions_trackbacks.inc.php

@@ -581,7 +581,7 @@ function fetchPingbackData( &$comment) {
  * Strips any unneeded code from trackback / pingback bodies returning pure (UTF8) text.
  */
 function trackback_body_strip($body){
-    // replace non brakeable space with normal space:
+    // replace non breakable space with normal space:
     $body = str_replace(' ', ' ', $body);
 
     // strip html entities and tags.

templates/2k11/admin/entries.tpl

@@ -15,7 +15,7 @@
         <input id="entryTitle" name="serendipity[title]" type="text" value="{$entry_vars.entry.title|escape}">
     </div>
 
-    <div id="cats_list" class="clearfix taxonomy">
+    <div id="category_list" class="clearfix">
         <h3>{$CONST.CATEGORIES}</h3>
 
         <ul class="plainList"></ul>

templates/2k11/admin/serendipity_editor.js.tpl

@@ -626,9 +626,9 @@
         $(img).attr('src', $(img).attr('src')+'?'+Math.random());
     }
 
-    serendipity.catsList = function() {
+    serendipity.categoryList = function() {
         var $source = $('#edit_entry_category');
-        var $target = $('#cats_list > ul');
+        var $target = $('#category_list > ul');
         var $selected = $source.find('input:checkbox:checked');
 
         $target.empty();
@@ -829,8 +829,7 @@ $(function() {
 
     // Editor-area
     if($('#serendipityEntry').length > 0) {
-        serendipity.catsList();
-        serendipity.tagsList();
+        serendipity.categoryList();
         serendipity.toggle_category_selector('categoryselector');
         serendipity.toggle_extended();
     }
@@ -998,7 +997,7 @@ $(function() {
                     afterClose: function() {
                         // Accessibility helper
                         $('#edit_entry_category .form_check input[type="checkbox"]').attr('aria-hidden', 'false');
-                        serendipity.catsList();
+                        serendipity.categoryList();
                     }
                 }
             });
@@ -1047,9 +1046,7 @@ $(function() {
                 type: "inline",
                 closeMarkup: '<button title="%title%" class="mfp-close" type="button">'+ btnText +'</button>',
                 callbacks: {
-                    afterClose: function() {
-                        serendipity.tagsList();
-                    }
+                    afterClose: function() {}
                 }
             });
 

templates/2k11/admin/style.css

@@ -1076,7 +1076,7 @@ h4,
 }
 
 .toggle_headline,
-.taxonomy h3,
+#category_list h3,
 h5,
 h6 {
     font-size: 1em;
@@ -1783,8 +1783,8 @@ form > .button_link:first-of-type,
     padding-bottom: .583335em;
 }
 
-.taxonomy h3,
-.taxonomy li {
+.taxonomy h3:hover,
+.taxonomy li:hover {
     cursor: pointer;
 }
 
@@ -1794,16 +1794,12 @@ form > .button_link:first-of-type,
     margin: .375em 2em .375em 0;
 }
 
-.taxonomy ul {
-    clear: left;
+#category_list ul {
     margin: .375em 0;
     line-height: 1.5em;
-    padding: 0;
-    text-align: left;
-    width: 100%;
 }
 
-.taxonomy li {
+#category_list li {
     display: inline-block;
     margin: 0 1em 0 0;
 }
@@ -2309,7 +2305,7 @@ label .perm_name,
 .no-js .customfieldMedia,
 .no-js .toggle_links,
 .no-js .toggle_info,
-.no-js .taxonomy,
+.no-js #category_list,
 .no-js .comment_summary,
 .no-js .show_config_option .icon-right-dir,
 .no-js #keyword_list,
@@ -2929,12 +2925,6 @@ img.mfp-img {
         width: 48%;
     }
 
-    .taxonomy ul {
-        clear: none;
-        float: right;
-        width: 84%;
-    }
-
     #template_select .current_backend_template,
     #template_select li:nth-child(even) article,
     .media_pane .even,