Merge branch 'merlin'

Leonardo Merlin
2 parents aab3f021 13a682a2
Showing 3 changed files with 31 additions and 18 deletions Show diff stats
index.html
js/jquery.equalHeights.js
js/main.js
@@ -196,21 +196,20 @@
             {{!-- <div class="container"> --}}
               <article class="proposal-detail hide" id="proposal-item-{{id}}">
                 <div class="categories {{#each categories}}{{slug}}{{/each}}">
-
-                  <div class="select">
-                    {{#each categories}}
-                      <div class="category proposal-category" data-category="{{slug}}">
-                        <button class="go-back btn btn-default">
-                          <span class="fa fa-reply"></span>
-                          Voltar
-                        </button>
-                        <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
-                        {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
+                
+                  <div class="row">
+                    <div class="col-xs-12">
+                      <div class="select">
+                        {{#each categories}}
+                          <div class="category proposal-category" data-category="{{slug}}">
+                            <button class="go-back btn btn-default"><span class="fa fa-reply"></span> Voltar</button>
+                            <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
+                            {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
+                          </div>
+                        {{/each}}
                       </div>
-                    {{/each}}
+                    </div>
                   </div>
-
-
                   <div class="proposal-header">
                     <div class="abstract">
                       <img src="{{../host}}{{image.url}}" alt="Imagem de apresentação do programa."/>
@@ -5,12 +5,12 @@ $.fn.equalHeights = function(px) {
   $(this).each(function(index, item){
     var $item = $(item);
     $item.height('auto'); // force a 'recalc' height
-    
-    if ($item.height() > currentTallest) { currentTallest = $item.height(); }
+    var h = $item.height();
+    if ( h > currentTallest) { currentTallest = h; }
     if (!px && Number.prototype.pxToEm) { currentTallest = currentTallest.pxToEm(); } //use ems unless px is specified
     // for ie6, set height since min-height isn't supported
     if (typeof(document.body.style.minHeight) === 'undefined') { $item.css({'height': currentTallest}); }
-    $item.css({'height': currentTallest});
+    $item.height(currentTallest);
   });
   return this;
 };
@@ -316,6 +316,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
         // this.randomProposalByTheme(['category-saude', 'category-seguranca-publica', 'category-educacao', 'category-reducao-da-pobreza']);
         $('.proposal-item').show(); /* Show all programs */
         $('#proposal-group').show();
+        $('.content').addClass('background');
         $('#proposal-categories').show();
         $('.proposal-category-items').hide();
         $('#nav-proposal-group a').addClass('active');
@@ -701,7 +702,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
               e.preventDefault();
               var $bt = $(this);
               if(!logged_in) {
-                $('#login-button').click();
+                $('#login-panel').show();
                 $('html, body').animate({scrollTop: 0}, 'fast');
               } else {
                 $.ajax({
@@ -837,7 +838,7 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
         $(document).click(function(e){
           var $target = $(e.target);
-          var isLoginButton = ($target.attr('id') === 'login-button');
+          var isLoginButton = ($target.closest('#login-button').length !== 0);
           var requireLogin = $target.hasClass('require-main-login');
           var isChildOfPanel = ($target.closest(loginPanelId).length !== 0);
@@ -1175,6 +1176,19 @@ define([&#39;jquery&#39;, &#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;, &#39;piwik&#39;], fun
       e.preventDefault();
     });
+    // hack-fix IE iframe video over 9999 z-index div.
+    $('iframe').each(function(){
+      var $iframe = $(this);
+      var url = $iframe.attr('src');
+      var c = '?';
+
+      if(url.indexOf("?") != -1){
+        c = "&";
+      }
+      
+      $iframe.attr("src",url+c+"wmode=transparent");
+    });
+
   });
   window.addEventListener("message", function(ev) {