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

@@ -323,8 +323,9 @@ switch($serendipity['GET']['adminAction']) {
         $data['categories'] = $categories;
         $data['offSet']     = $offSet;
         $data['use_iframe'] = $serendipity['use_iframe'];
-        $data['page'] = $page;
-        $data['totalEntries'] = serendipity_getTotalEntries();
+        $data['page']       = $page;
+
+        $data['totalEntries']  = serendipity_getTotalEntries();
         $data['simpleFilters'] = $serendipity['simpleFilters'];
 
         if (is_array($entries)) {
@@ -373,8 +374,8 @@ switch($serendipity['GET']['adminAction']) {
             $data['formtoken']         = serendipity_setFormToken();
             $data['serverOffsetHour']  = serendipity_serverOffsetHour();
             $data['showFutureEntries'] = $serendipity['showFutureEntries'];
-            $data['filter_import'] = $filter_import;
-            $data['sort_import'] = $sort_import;
+            $data['filter_import']     = $filter_import;
+            $data['sort_import']       = $sort_import;
         } else {
             $data['no_entries'] = true;
         } // if entries end

include/admin/overview.inc.php

@@ -44,10 +44,10 @@ $output = array();
 serendipity_plugin_api::hook_event('backend_frontpage_display', $output);
 $data['backend_frontpage_display'] = $output['more'];
 
-$data['usedVersion'] = $serendipity['version'];
-$data['updateCheck'] = $serendipity['updateCheck'];
-$data['curVersion'] = serendipity_getCurrentVersion();
-$data['update'] = version_compare($data['usedVersion'], $data['curVersion'], '<');
+$data['usedVersion']  = $serendipity['version'];
+$data['updateCheck']  = $serendipity['updateCheck'];
+$data['curVersion']   = serendipity_getCurrentVersion();
+$data['update']       = version_compare($data['usedVersion'], $data['curVersion'], '<');
 serendipity_plugin_api::hook_event('plugin_dashboard_updater', $output, $data['curVersion']);
 $data['updateButton'] = $output;
 

include/functions_trackbacks.inc.php

@@ -59,7 +59,7 @@ function serendipity_pingback_is_success($resp) {
  * @return
  */
 function serendipity_pingback_autodiscover($loc, $body, $url=null) {
-global $serendipity;
+    global $serendipity;
 
     // This is the old way, sending pingbacks, for downward compatibility.
     // But this is wrong, as it does link from the main blog URL instead of the article URL
@@ -236,7 +236,7 @@ function serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $
  * @return null
  */
 function serendipity_reference_autodiscover($loc, $url, $author, $title, $text) {
-global $serendipity;
+    global $serendipity;
     $timeout   = 30;
 
     $u = parse_url($loc);
@@ -306,7 +306,7 @@ global $serendipity;
  * @param   string  The excerpt text of the foreign blog
  * @return true
  */
-function add_trackback ($id, $title, $url, $name, $excerpt) {
+function add_trackback($id, $title, $url, $name, $excerpt) {
     global $serendipity;
 
     if ($GLOBALS['tb_logging']) {
@@ -405,7 +405,7 @@ function add_trackback ($id, $title, $url, $name, $excerpt) {
  * @param   string  The foreign postdata to add
  * @return boolean
  */
-function add_pingback ($id, $postdata) {
+function add_pingback($id, $postdata) {
     global $serendipity;
     log_pingback("Reached add_pingback. ID:[$id]");
 
@@ -515,7 +515,7 @@ function getPingbackParam($paramName, $data) {
  * @access private
  * @param array comment array to be filled
  */
-function fetchPingbackData( &$comment) {
+function fetchPingbackData(&$comment) {
     global $serendipity;
 
     // Don't fetch remote page, if not explicitly allowed in serendipity_config_local.php:
@@ -580,8 +580,8 @@ 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:
+function trackback_body_strip($body){
+    // 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,