Merge develop into 1006-short-info

Conflicts:
	view/theme/frio/js/theme.js

diff --cc .gitignore
index b300f579e299ab2526462792c2ac1bf03a338c83,b300f579e299ab2526462792c2ac1bf03a338c83..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/.gitignore
--- 2/.gitignore
+++ /dev/null
@@@ -1,44 -1,44 +1,0 @@@
--favicon.*\r
--.htconfig.php\r
--.htpreconfig.php\r
--\#*\r
--include/jquery-1.4.2.min.js\r
--*.log\r
--*.out\r
--*.version*\r
--favicon.*\r
--home.html\r
--addon\r
--*~\r
--robots.txt\r
--\r
--#ignore documentation, it should be newly built\r
--doc/html\r
--\r
--#ignore reports, should be generted with every build\r
--report/\r
--\r
--#ignore config files from eclipse, we don't want IDE files in our repository\r
--.project\r
--.buildpath\r
--.externalToolBuilders\r
--.settings\r
--#ignore OSX .DS_Store files\r
--.DS_Store\r
--\r
--/nbproject/private/\r
--\r
--#ignore smarty cache\r
--/view/smarty3/compiled/\r
--\r
--#ignore cache folders\r
--/privacy_image_cache/\r
--/photo/\r
--/proxy/\r
--nbproject\r
--\r
--#ignore vagrant dir\r
--.vagrant/\r
--\r
--#ignore local folder\r
--/local/\r

diff --cc view/theme/frio/css/style.css
Simple merge

diff --cc view/theme/frio/js/theme.js
index 418c233e72c46916fd4231a350ecd5baf64833f1,28221dcd0d1ff7a2c31bc347d0d27ba6ad4880b3..45966e0117d8a1780b8c56c66f3623963be521cb
--- 1/view/theme/frio/js/theme.js
--- 2/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@@ -120,33 -113,48 +113,72 @@@ $(document).ready(function()
        // initialize the bootstrap-select
        $('.selectpicker').selectpicker();
  
 -
+       // add search-heading to the seccond navbar
+       if( $(".search-heading").length) {
+               $(".search-heading").appendTo("#topbar-second > .container > #tabmenu");
+       }
+ 
+       // add search results heading to the second navbar
+       // and insert the search value to the top nav search input
+       if( $(".search-content-wrapper").length ) {
+               // get the text of the heading (we catch the plain text because we don't
+               // want to have a h4 heading in the navbar
+               var searchText = $(".section-title-wrapper > h2").text();
+               // insert the plain text in a <h4> heading and give it a class
+               var newText = '<h4 class="search-heading">'+searchText+'</h4>';
+               // append the new heading to the navbar
+               $("#topbar-second > .container > #tabmenu").append(newText);
+ 
+               // try to get the value of the original search input to insert it 
+               // as value in the nav-search-input
+               var searchValue = $("#search-wrapper .form-group-search input").val();
+ 
+               // if the orignal search value isn't available use the location path as value
+               if( typeof searchValue === "undefined") {
+                       // get the location path
+                       var urlPath = window.location.search
+                       // and split it up in its parts
+                       var splitPath = urlPath.split(/(\?search?=)(.*$)/);
+ 
+                       if(typeof splitPath[2] !== 'undefined') {
+                               // decode the path (e.g to decode %40 to the character @)
+                               var searchValue = decodeURIComponent(splitPath[2]);
+                       }
+               }
+ 
+               if( typeof searchValue !== "undefined") {
+                       $("#nav-search-input-field").val(searchValue);
+               }
-                               
- 
+       }
+ 
+       // move the "Save the search" button to the second navbar
+       $(".search-content-wrapper #search-save-form ").appendTo("#topbar-second > .container > #navbar-button");
+ 
 +      // append the vcard-short-info to the second nav after passing the element
 +      // with .p-addr (vcard). Use scrollspy to get the scroll position.
 +      if( $("aside .vcard .p-addr").length) {
 +              $(".vcard .p-addr").scrollspy({
 +                      min: $(".vcard .p-addr").position().top - 50,
 +                      onLeaveTop: function onLeave(element) {
 +                              $("#vcard-short-info").fadeOut(500, function () {
 +                                      $("#vcard-short-info").appendTo("#vcard-short-info-wrapper");
 +                              });
 +                      },
 +                      onEnter: function(element) {
 +                              $("#vcard-short-info").appendTo("#nav-short-info");
 +                              $("#vcard-short-info").fadeIn(500);
 +                      },
 +              });
 +      }
 +
 +      // move the forum contact information of the network page into the second navbar
 +      if( $(".network-content-wrapper > #viewcontact_wrapper-network").length) {
 +              // get the contact-wrapper element and append it to the second nav bar
 +              // Note: We need the first() element with this class since at the present time we
 +              // store also the js template information in the html code and thats why
 +              // there are two elements with this class but we don't want the js template
 +              $(".network-content-wrapper > #viewcontact_wrapper-network .contact-wrapper").first().appendTo("#nav-short-info");
 +      }
  });
  //function commentOpenUI(obj, id) {
  //    $(document).unbind( "click.commentOpen", handler );

diff --cc view/theme/frio/templates/nav.tpl
Simple merge