Permalink
Browse files

IP-382 - Dropdowns are cut on client details view, also solves Datepi…

…cker locale problem
  • Loading branch information...
1 parent 3fc6ada commit 5b88b95ffd5ae72d240230386480e5d14d0289da @Kovah Kovah committed Oct 25, 2016
@@ -57,16 +57,16 @@ class="btn btn-sm btn-default">
</div>
-<ul id="settings-tabs" class="nav nav-tabs nav-tabs-noborder">
+<ul id="submenu" class="nav nav-tabs nav-tabs-noborder">
<li class="active"><a data-toggle="tab" href="#clientDetails"><?php echo trans('details'); ?></a></li>
<li><a data-toggle="tab" href="#clientQuotes"><?php echo trans('quotes'); ?></a></li>
<li><a data-toggle="tab" href="#clientInvoices"><?php echo trans('invoices'); ?></a></li>
<li><a data-toggle="tab" href="#clientPayments"><?php echo trans('payments'); ?></a></li>
</ul>
-<div class="tabbable tabs-below">
+<div id="content" class="tabbable tabs-below">
- <div class="tab-content">
+ <div class="tab-content table-content">
<div id="clientDetails" class="tab-pane tab-info active">
@@ -360,7 +360,7 @@ class="btn btn-primary btn-sm" target="_blank">
<script src="<?php echo base_url(); ?>assets/default/js/libs/bootstrap-datepicker.min.js"></script>
<?php if (trans('cldr') != 'en') { ?>
<script
- src="<?php echo base_url(); ?>assets/default/js/locales/bootstrap-datepicker.<?php echo trans('cldr'); ?>.js"></script>
+ src="<?php echo base_url(); ?>assets/default/js/locales/bootstrap-datepicker.<?php echo trans('cldr'); ?>.min.js"></script>
<?php } ?>
</body>
Oops, something went wrong.
@@ -144,7 +144,8 @@ $(document).ready(function () {
var documentHeight = $('html').outerHeight(),
navbarHeight = $('.navbar').outerHeight(),
headerbarHeight = $('#headerbar').outerHeight(),
- contentHeight = documentHeight - navbarHeight - headerbarHeight;
+ submenuHeight = $('#submenu').outerHeight(),
+ contentHeight = documentHeight - navbarHeight - headerbarHeight - submenuHeight;
if ($('#content').outerHeight() < contentHeight) {
$('#content').outerHeight(contentHeight);
}
@@ -1 +1 @@
-"use strict";function insert_at_caret(e,t){var a=document.getElementById(e),l=a.scrollTop,i=0,r=a.selectionStart||"0"===a.selectionStart?"ff":document.selection?"ie":!1,n;"ie"===r?(a.focus(),n=document.selection.createRange(),n.moveStart("character",-a.value.length),i=n.text.length):"ff"===r&&(i=a.selectionStart);var c=a.value.substring(0,i),o=a.value.substring(i,a.value.length);a.value=c+t+o,i+=t.length,"ie"===r?(a.focus(),n=document.selection.createRange(),n.moveStart("character",-a.value.length),n.moveStart("character",i),n.moveEnd("character",0),n.select()):"ff"===r&&(a.selectionStart=i,a.selectionEnd=i,a.focus()),a.scrollTop=l}function inject_email_template(e,t){$.each(t,function(t,a){t=t.replace("email_template_",""),a&&e.indexOf(t)>-1&&("body"===t?$("#"+t).html(a):$("#"+t).val(a))})}function update_email_template_preview(){$("#email-template-preview").contents().find("body").html($(".email-template-body").val())}function insert_html_tag(e,t){var a,l,i,r,n,c,o,s,u;switch(e){case"text-bold":a=["<b>","</b>"];break;case"text-italic":a=["<em>","</em>"];break;case"text-paragraph":a=["<p>","</p>"];break;case"text-h1":a=["<h1>","</h1>"];break;case"text-h2":a=["<h2>","</h2>"];break;case"text-h3":a=["<h3>","</h3>"];break;case"text-h4":a=["<h4>","</h4>"];break;case"text-code":a=["<code>","</code>"];break;case"text-hr":a=["<hr/>",""];break;case"text-css":a=["<style></style>",""]}return i=document.getElementById(t),void 0!==document.selection?(i.focus(),l=document.selection.createRange(),r=l.text):""!==i.selectionStart&&(n=i.selectionStart,c=i.selectionEnd,r=i.value.substring(n,c)),"text-css"===e?(o=a[0]+"\n\r"+i.value,$(i).val(o),update_email_template_preview(),!0):0===a[1].length?(insert_at_caret(t,a[0]),update_email_template_preview(),!0):void(r&&r.length?(s=a[0]+r+a[1],u=i.value.length,o=i.value.substring(0,n)+s+i.value.substring(c,u),$(i).val(o),update_email_template_preview()):(a=a[0]+a[1],insert_at_caret(t,a),update_email_template_preview()))}$(document).ready(function(){var e=$("html").outerHeight(),t=$(".navbar").outerHeight(),a=$("#headerbar").outerHeight(),l=e-t-a;$("#content").outerHeight()<l&&$("#content").outerHeight(l),$("html").click(function(){$(".dropdown-menu:visible").not(".datepicker").removeAttr("style")}),$('[data-toggle="tooltip"]').tooltip();var i;$(".text-tag").bind("click",function(){var e=this.getAttribute("data-tag");return insert_at_caret(i.id,e),!1}),$(".taggable").on("focus",function(){i=this}),$(".html-tag").click(function(){var e=$(this).data("tagType"),t=$(".email-template-body").attr("id");insert_html_tag(e,t)});var r=$(".email-template-body").attr("id");$("#email_template_preview").empty()&&update_email_template_preview(),$(r).bind("input propertychange",function(){update_email_template_preview()}),$("#email-template-preview-reload").click(function(){update_email_template_preview()}),$(".ajax-loader").bind("click",function(){$("#fullpage-loader").fadeIn(200),$("#loader-error").delay(1e4).fadeIn(200)})});
+"use strict";function insert_at_caret(e,t){var a=document.getElementById(e),l=a.scrollTop,i=0,r=a.selectionStart||"0"===a.selectionStart?"ff":document.selection?"ie":!1,n;"ie"===r?(a.focus(),n=document.selection.createRange(),n.moveStart("character",-a.value.length),i=n.text.length):"ff"===r&&(i=a.selectionStart);var c=a.value.substring(0,i),o=a.value.substring(i,a.value.length);a.value=c+t+o,i+=t.length,"ie"===r?(a.focus(),n=document.selection.createRange(),n.moveStart("character",-a.value.length),n.moveStart("character",i),n.moveEnd("character",0),n.select()):"ff"===r&&(a.selectionStart=i,a.selectionEnd=i,a.focus()),a.scrollTop=l}function inject_email_template(e,t){$.each(t,function(t,a){t=t.replace("email_template_",""),a&&e.indexOf(t)>-1&&("body"===t?$("#"+t).html(a):$("#"+t).val(a))})}function update_email_template_preview(){$("#email-template-preview").contents().find("body").html($(".email-template-body").val())}function insert_html_tag(e,t){var a,l,i,r,n,c,o,u,s;switch(e){case"text-bold":a=["<b>","</b>"];break;case"text-italic":a=["<em>","</em>"];break;case"text-paragraph":a=["<p>","</p>"];break;case"text-h1":a=["<h1>","</h1>"];break;case"text-h2":a=["<h2>","</h2>"];break;case"text-h3":a=["<h3>","</h3>"];break;case"text-h4":a=["<h4>","</h4>"];break;case"text-code":a=["<code>","</code>"];break;case"text-hr":a=["<hr/>",""];break;case"text-css":a=["<style></style>",""]}return i=document.getElementById(t),void 0!==document.selection?(i.focus(),l=document.selection.createRange(),r=l.text):""!==i.selectionStart&&(n=i.selectionStart,c=i.selectionEnd,r=i.value.substring(n,c)),"text-css"===e?(o=a[0]+"\n\r"+i.value,$(i).val(o),update_email_template_preview(),!0):0===a[1].length?(insert_at_caret(t,a[0]),update_email_template_preview(),!0):void(r&&r.length?(u=a[0]+r+a[1],s=i.value.length,o=i.value.substring(0,n)+u+i.value.substring(c,s),$(i).val(o),update_email_template_preview()):(a=a[0]+a[1],insert_at_caret(t,a),update_email_template_preview()))}$(document).ready(function(){var e=$("html").outerHeight(),t=$(".navbar").outerHeight(),a=$("#headerbar").outerHeight(),l=$("#submenu").outerHeight(),i=e-t-a-l;$("#content").outerHeight()<i&&$("#content").outerHeight(i),$("html").click(function(){$(".dropdown-menu:visible").not(".datepicker").removeAttr("style")}),$('[data-toggle="tooltip"]').tooltip();var r;$(".text-tag").bind("click",function(){var e=this.getAttribute("data-tag");return insert_at_caret(r.id,e),!1}),$(".taggable").on("focus",function(){r=this}),$(".html-tag").click(function(){var e=$(this).data("tagType"),t=$(".email-template-body").attr("id");insert_html_tag(e,t)});var n=$(".email-template-body").attr("id");$("#email_template_preview").empty()&&update_email_template_preview(),$(n).bind("input propertychange",function(){update_email_template_preview()}),$("#email-template-preview-reload").click(function(){update_email_template_preview()}),$(".ajax-loader").bind("click",function(){$("#fullpage-loader").fadeIn(200),$("#loader-error").delay(1e4).fadeIn(200)})});
@@ -471,6 +471,7 @@ div.table-content {
.tab-content {
@extend #content;
+ height: 100%;
}
.modal-open {

0 comments on commit 5b88b95

Please sign in to comment.