Merge remote-tracking branch 'upstream/develop' into 1701-performance

diff --git a/view/global.css b/view/global.css
index 4dd4cd57262efdfafb76c40d842b4dc937925ac6..3fb31a30cc15e7b54e15af75a31785b5134480fd 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -117,6 +117,10 @@ span.connector {
   position: relative;
 }
 
+.embed_video.active {
+  float: none;
+}
+
 .embed_rich {
   display: block;
   transition: height .75s;

diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl
index 8392c469cdf7144009696efb7b3469f11d9481b8..8645fea674be9ed2852428c816778823aa0b8e3f 100644 (file)
--- a/view/templates/oembed_video.tpl
+++ b/view/templates/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_video" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;'>
+<a class="embed_video" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); this.classList.add("active"); return false;'>
        <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
        <div style='width: {{$tw}}px; height: {{$th}}px;'></div>
 </a>

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 7f74ed55f6384f06d5a99e4079e17ab52a5e0a95..df9585d07026f5440341e034e72440120c22bcfb 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1719,13 +1719,14 @@ img.acpopup-img {
 
 }
 /* Menubar Tabs */
-section > ul.tabbar {
+section > .tabbar-wrapper {
 /* The tabbar shouldn't' be visibile inside
 the section element. Only after we have
 moved it to the nav through js */
     display: none !important;
 }
 #tabmenu,
+.tabbar-wrapper,
 .tabbar,
 .tabbar > li {
     height: 100%;

diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index c149271804fe377f25a3ac1be5cc8b187162f276..b51d6b39dd94d5bac920b745c8589dcc6ff75654 100644 (file)
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -40,7 +40,7 @@ $(document).ready(function(){
        $(".field.select > select, .field.custom > select").addClass("form-control");
 
        // move the tabbar to the second nav bar
-       $("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu");
+       $("section .tabbar-wrapper").first().appendTo("#topbar-second > .container > #tabmenu");
 
        // add mask css url to the logo-img container
        //
@@ -256,40 +256,30 @@ $(document).ready(function(){
                input.val(val);
        });
 
+       // Set the padding for input elements with inline buttons
+       //
+       // In Frio we use some input elements where the submit button is visually
+       // inside the the input field (through css). We need to set a padding-right
+       // to the input element where the padding value would be at least the width
+       // of the button. Otherwise long user input would be invisible because it is
+       // behind the button.
+       $("body").on('click', '.form-group-search > input', function() {
+               // Get the width of the button (if the button isn't available
+               // buttonWidth will be null
+               var buttonWidth = $(this).next('.form-button-search').outerWidth();
+
+               if (buttonWidth) {
+                       // Take the width of the button and ad 5px
+                       var newWidth = buttonWidth + 5;
+                       // Set the padding of the input element according
+                       // to the width of the button
+                       $(this).css('padding-right', newWidth);
+               }
+
+       });
+
+
 });
-//function commentOpenUI(obj, id) {
-//     $(document).unbind( "click.commentOpen", handler );
-//
-//     var handler = function() {
-//             if(obj.value == '{{$comment}}') {
-//                     obj.value = '';
-//                     $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
-//                     // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
-//                     // The submit button gets tabindex + 1
-//                     $("#comment-edit-text-" + id).attr('tabindex','9');
-//                     $("#comment-edit-submit-" + id).attr('tabindex','10');
-//                     $("#comment-edit-submit-wrapper-" + id).show();
-//             }
-//     };
-//
-//     $(document).bind( "click.commentOpen", handler );
-//}
-//
-//function commentCloseUI(obj, id) {
-//     $(document).unbind( "click.commentClose", handler );
-//
-//     var handler = function() {
-//             if(obj.value === '') {
-//             obj.value = '{{$comment}}';
-//                     $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
-//                     $("#comment-edit-text-" + id).removeAttr('tabindex');
-//                     $("#comment-edit-submit-" + id).removeAttr('tabindex');
-//                     $("#comment-edit-submit-wrapper-" + id).hide();
-//             }
-//     };
-//
-//     $(document).bind( "click.commentClose", handler );
-//}
 
 function openClose(theID) {
        var elem = document.getElementById(theID);

diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl
index c5d1dac6bd282b8855815f0f00454d6bc9d9c55f..7cfd63528adb589f26a2ec8fa95f929aed2eef31 100644 (file)
--- a/view/theme/frio/templates/common_tabs.tpl
+++ b/view/theme/frio/templates/common_tabs.tpl
@@ -1,58 +1,60 @@
 
-{{* Tab navigation bar for tablets and computer *}}
-<ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
-       {{* The normal tabbar *}}
-       <li>
-               <ul class="tabs  flex-nav" role="menu" >
-               {{foreach $tabs as $tab}}
-                       <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-               {{/foreach}}
-               </ul>
-       </li>
-
-       {{* The extended dropdown menu - this would be shown if the tab menu points
-               dosn't fit in the available space. This is done through flexMenu.js *}}
-       <li class="pull-right">
-               <ul class="tabs tabs-extended" role="menu">
-                       <li role="menuitem" class="dropdown flex-target">
-                               <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
-                               <i class="fa fa-chevron-down"></i>
-                               </a>
-                       </li>
-                </ul>
-       </li>
-</ul>
-
-{{* Tab navigation bar for smartphones *}}
-<ul role="menubar" class="tabbar list-inline visible-xs">
-       {{* The active menupoint will be shown as one menupoint*}}
-       <li>
-               <ul class="tabs" role="menu">
+<div class="tabbar-wrapper">
+       {{* Tab navigation bar for tablets and computer *}}
+       <ul role="menubar" class="tabbar list-inline visible-lg visible-md visible-sm hidden-xs">
+               {{* The normal tabbar *}}
+               <li>
+                       <ul class="tabs  flex-nav" role="menu" >
                        {{foreach $tabs as $tab}}
-                               {{if $tab.sel}}
                                <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-                               {{else}}
-                               {{$exttabs[]=$tab}}
-                               {{/if}}
                        {{/foreach}}
+                       </ul>
+               </li>
 
-
-               </ul>
-       </li>
-
-       {{* All others are moved to this dropdown menu *}}
-       <li class="pull-right">
-               <ul class="tabs tabs-extended">
-                       <li class="dropdown">
-                               <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+               {{* The extended dropdown menu - this would be shown if the tab menu points
+                       dosn't fit in the available space. This is done through flexMenu.js *}}
+               <li class="pull-right">
+                       <ul class="tabs tabs-extended" role="menu">
+                               <li role="menuitem" class="dropdown flex-target">
+                                       <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
                                        <i class="fa fa-chevron-down"></i>
-                               </a>
-                               <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
-                                       {{foreach $exttabs as $tab}}
+                                       </a>
+                               </li>
+                        </ul>
+               </li>
+       </ul>
+
+       {{* Tab navigation bar for smartphones *}}
+       <ul role="menubar" class="tabbar list-inline visible-xs">
+               {{* The active menupoint will be shown as one menupoint*}}
+               <li>
+                       <ul class="tabs" role="menu">
+                               {{foreach $tabs as $tab}}
+                                       {{if $tab.sel}}
                                        <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
-                                       {{/foreach}}
-                               </ul>
-                       </li>
-               </ul>
-       </li>
-</ul>
+                                       {{else}}
+                                       {{$exttabs[]=$tab}}
+                                       {{/if}}
+                               {{/foreach}}
+
+
+                       </ul>
+               </li>
+
+               {{* All others are moved to this dropdown menu *}}
+               <li class="pull-right">
+                       <ul class="tabs tabs-extended">
+                               <li class="dropdown">
+                                       <a class="dropdown-toggle" type="button" id="dropdownMenuTools" data-toggle="dropdown" aria-expanded="true">
+                                               <i class="fa fa-chevron-down"></i>
+                                       </a>
+                                       <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
+                                               {{foreach $exttabs as $tab}}
+                                               <li id="{{$tab.id}}" role="menuitem" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
+                                               {{/foreach}}
+                                       </ul>
+                               </li>
+                       </ul>
+               </li>
+       </ul>
+</div>

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 0e5c394394370a186bcd1663264732166da1a2f8..4a1f77881d9d8d08a390e729db813e12c55a181c 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1210,7 +1210,7 @@ section {
 .wall-item-container .wall-item-actions-social a {
   margin-right: 3em;
 }
-.wall-item-container .wall-item-actions-social a.active {
+.wall-item-container .wall-item-actions-social a .active {
   font-weight: bold;
 }
 .wall-item-container .wall-item-actions-tools {
@@ -1459,7 +1459,6 @@ blockquote.shared_content {
 }
 .oembed.video > a.embed_video {
   display: block;
-  float: left;
   position: relative;
 }
 .oembed.video > a.embed_video > div {

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 0532bc1ed153ac52b89874ad0dfedc4f9d27503c..11fff105da2f53f8a23b6e748ff40b80d3afc1ea 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1210,7 +1210,7 @@ section {
 .wall-item-container .wall-item-actions-social a {
   margin-right: 3em;
 }
-.wall-item-container .wall-item-actions-social a.active {
+.wall-item-container .wall-item-actions-social a .active {
   font-weight: bold;
 }
 .wall-item-container .wall-item-actions-tools {
@@ -1459,7 +1459,6 @@ blockquote.shared_content {
 }
 .oembed.video > a.embed_video {
   display: block;
-  float: left;
   position: relative;
 }
 .oembed.video > a.embed_video > div {

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index a982c6e59c37ff5703430b8ecccf3b6c52cbdd14..81564a0d266933cb798714ca679d98249c61733c 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #f6ecf9;
+  background-color: #F6ECF9;
   color: #2d2d2d;
   margin: 50px 0 0 0;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #ffffff;
+  background: #FFFFFF;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -1210,7 +1210,7 @@ section {
 .wall-item-container .wall-item-actions-social a {
   margin-right: 3em;
 }
-.wall-item-container .wall-item-actions-social a.active {
+.wall-item-container .wall-item-actions-social a .active {
   font-weight: bold;
 }
 .wall-item-container .wall-item-actions-tools {
@@ -1459,7 +1459,6 @@ blockquote.shared_content {
 }
 .oembed.video > a.embed_video {
   display: block;
-  float: left;
   position: relative;
 }
 .oembed.video > a.embed_video > div {
@@ -1772,7 +1771,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #f6ecf9;
+  border: 1px solid #F6ECF9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1799,7 +1798,7 @@ span[id^="showmore-wrap"] {
   margin: 0;
   height: 20px;
   width: 200px;
-  border: 1px solid #f6ecf9;
+  border: 1px solid #F6ECF9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 25a524043bdf1a28ae3d7f7693c2a210bad16833..469c075c41f50e65f926dbce599e6d9377b78f21 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -788,12 +788,10 @@ blockquote.shared_content {
         border: none;
 }
 
-
 .oembed.video {
        > a.embed_video {
                display: block;
-               float: left;
-        position: relative;
+               position: relative;
                > div {
             position: absolute; top: 0px; left: 0px;
                        background:
@@ -805,7 +803,6 @@ blockquote.shared_content {
        }
 }
 
-
 /* threaded comments */
 .children {
        margin-top: 1em;