diff --git a/public/build.json b/public/build.json index f7d0f96308..0cb9831ba8 100644 --- a/public/build.json +++ b/public/build.json @@ -20,7 +20,6 @@ "lib/public/css/legacy/fields.css", "lib/public/css/legacy/dialog.css", "lib/public/css/legacy/tabs.css", - "lib/public/css/legacy/sidebar.css", "lib/public/css/ui/common.css", "lib/public/css/views/tree_grid.css", ] @@ -110,7 +109,6 @@ "lib/public/js/legacy/widgets/layout.js", "lib/public/js/legacy/widgets/export_query.js", "lib/public/js/legacy/wn/page_layout.js", - "lib/public/js/legacy/wn/widgets/page_sidebar.js", "lib/public/js/wn/ui/toolbar/selector_dialog.js", "lib/public/js/wn/ui/toolbar/new.js", @@ -124,7 +122,6 @@ "lib/public/js/legacy/widgets/form/form.js", "lib/public/js/legacy/widgets/form/print_format.js", "lib/public/js/legacy/widgets/form/clientscriptAPI.js", - "lib/public/js/legacy/wn/widgets/form/sidebar.js", "lib/public/js/wn/form/toolbar.js", "lib/public/js/wn/form/layout.js", diff --git a/public/css/bootstrap.css b/public/css/bootstrap.css index bffe638eea..87b021ee7f 100644 --- a/public/css/bootstrap.css +++ b/public/css/bootstrap.css @@ -325,9 +325,13 @@ a:focus { } img { + vertical-align: middle; +} + +.img-responsive { + display: inline-block; height: auto; max-width: 100%; - vertical-align: middle; } .img-rounded { @@ -1482,6 +1486,11 @@ input[type="checkbox"]:focus { outline-offset: -2px; } +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { + height: auto; +} + input:-moz-placeholder, textarea:-moz-placeholder { color: #999999; @@ -1601,6 +1610,7 @@ input[type="color"].input-small { border-radius: 3px; } +.has-warning .help-block, .has-warning .control-label { color: #c09853; } @@ -1624,6 +1634,7 @@ input[type="color"].input-small { border-color: #c09853; } +.has-error .help-block, .has-error .control-label { color: #b94a48; } @@ -1647,6 +1658,7 @@ input[type="color"].input-small { border-color: #b94a48; } +.has-success .help-block, .has-success .control-label { color: #468847; } @@ -2322,6 +2334,11 @@ input[type="button"].btn-block { border-bottom-left-radius: 4px; } +.list-group-item > .badge { + float: right; + margin-right: -15px; +} + .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -2361,16 +2378,6 @@ a.list-group-item.active .list-group-item-text { color: #e1edf7; } -.list-group-item > .badge, -.list-group-item > .glyphicon-chevron-right { - float: right; - margin-right: -15px; -} - -.list-group-item > .glyphicon + .badge { - margin-right: 5px; -} - .panel { padding: 15px; margin-bottom: 20px; @@ -3206,11 +3213,6 @@ button.close { padding-left: 8px; } -.btn-group > .btn-mini + .dropdown-toggle { - padding-right: 5px; - padding-left: 5px; -} - .btn-group > .btn-large + .dropdown-toggle { padding-right: 12px; padding-left: 12px; @@ -3304,6 +3306,7 @@ button.close { .pagination { display: inline-block; + padding-left: 0; margin: 20px 0; border-radius: 4px; } @@ -3395,6 +3398,7 @@ button.close { } .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; @@ -3962,8 +3966,11 @@ button.close { display: block; } +.thumbnail > img, .img-thumbnail { display: inline-block; + height: auto; + max-width: 100%; } a.thumbnail:hover, @@ -3972,8 +3979,6 @@ a.thumbnail:focus { } .thumbnail > img { - display: block; - max-width: 100%; margin-right: auto; margin-left: auto; } @@ -4015,7 +4020,7 @@ a.thumbnail:focus { } .media-list { - margin-left: 0; + padding-left: 0; list-style: none; } @@ -4108,10 +4113,6 @@ a.badge:focus { top: -1px; } -.btn-mini .badge { - top: 0; -} - a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: #428bca; @@ -4279,9 +4280,6 @@ a.list-group-item.active > .badge, .accordion-heading .accordion-toggle { display: block; padding: 8px 15px; -} - -.accordion-toggle { cursor: pointer; } @@ -4311,7 +4309,9 @@ a.list-group-item.active > .badge, .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: block; + display: inline-block; + height: auto; + max-width: 100%; line-height: 1; } @@ -4418,24 +4418,26 @@ a.list-group-item.active > .badge, z-index: 15; width: 100px; padding-left: 0; - margin: 0 0 0 -50px; + margin-left: -50px; text-align: center; list-style: none; } .carousel-indicators li { display: inline-block; - width: 8px; - height: 8px; - margin-right: 0; - margin-left: 0; + width: 10px; + height: 10px; + margin: 1px; text-indent: -999px; cursor: pointer; border: 1px solid #fff; - border-radius: 5px; + border-radius: 10px; } .carousel-indicators .active { + width: 12px; + height: 12px; + margin: 0; background-color: #fff; } @@ -4574,14 +4576,41 @@ td.visible-sm { display: none !important; } +tr.visible-md { + display: none !important; +} + +th.visible-md, +td.visible-md { + display: none !important; +} + .visible-lg { display: none !important; } +tr.visible-lg { + display: none !important; +} + +th.visible-lg, +td.visible-lg { + display: none !important; +} + .hidden-sm { display: none !important; } +tr.hidden-sm { + display: none !important; +} + +th.hidden-sm, +td.hidden-sm { + display: none !important; +} + .hidden-md { display: block !important; } @@ -4612,6 +4641,13 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: block !important; } @@ -4625,6 +4661,13 @@ td.hidden-lg { .visible-lg { display: none !important; } + tr.visible-lg { + display: none !important; + } + th.visible-lg, + td.visible-lg { + display: none !important; + } .hidden-sm { display: block !important; } @@ -4638,6 +4681,13 @@ td.hidden-lg { .hidden-md { display: none !important; } + tr.hidden-md { + display: none !important; + } + th.hidden-md, + td.hidden-md { + display: none !important; + } .hidden-lg { display: block !important; } @@ -4654,9 +4704,23 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: none !important; } + tr.visible-md { + display: none !important; + } + th.visible-md, + td.visible-md { + display: none !important; + } .visible-lg { display: block !important; } @@ -4690,12 +4754,28 @@ td.hidden-lg { .hidden-lg { display: none !important; } + tr.hidden-lg { + display: none !important; + } + th.hidden-lg, + td.hidden-lg { + display: none !important; + } } .visible-print { display: none !important; } +tr.visible-print { + display: none !important; +} + +th.visible-print, +td.visible-print { + display: none !important; +} + @media print { .visible-print { display: block !important; @@ -4710,4 +4790,11 @@ td.hidden-lg { .hidden-print { display: none !important; } + tr.hidden-print { + display: none !important; + } + th.hidden-print, + td.hidden-print { + display: none !important; + } } diff --git a/public/css/legacy/sidebar.css b/public/css/legacy/sidebar.css deleted file mode 100644 index 4bac2c3ad2..0000000000 --- a/public/css/legacy/sidebar.css +++ /dev/null @@ -1,32 +0,0 @@ -div.psidebar { -} - -div.psidebar div.head { - font-size: 14px; - font-weight: bold; - color: #555; - margin-bottom: 12px; -} - -div.section { - margin-bottom: 15px; - overflow: hidden; -} - -div.section div.section-head { - padding: 5px 0px; - font-size: 109%; - font-weight: bold; -} - -div.section div.section-body { - -} - -div.section div.section-item { - margin-bottom: 7px; -} - -div.section div.section-item, div.section .section-link { - color: #666; -} \ No newline at end of file diff --git a/public/css/ui/common.css b/public/css/ui/common.css index 985335a6fd..d9c4d2fac9 100644 --- a/public/css/ui/common.css +++ b/public/css/ui/common.css @@ -47,21 +47,33 @@ a { /* module */ -.module-top .alert { +.alert-badge { padding-right: 15px; - margin-bottom: 10px; } -.module-top a, .module-top a:hover { +.alert-badge a, .alert-badge a:hover { color: black; font-size: 120%; font-weight: bold; } -.module-top .badge { +.alert-badge .badge { margin-top: 3px; } +.form-headline { + margin-bottom: 10px; + font-size: 130%; + text-align: right; +} + +.form-dashboard { + display: none; + border-bottom: 1px solid #eee; +} + +/* module */ + .module-item-progress { margin-bottom: 10px; height: 17px; @@ -384,4 +396,35 @@ textarea[data-fieldtype="Small Text"] { .hidden-sm-inline { display: inline; } -} \ No newline at end of file +} + +/* buttons */ +.btn-default { + color: #ffffff; + background-color: #a7a9aa; + border-color: #a7a9aa; +} + +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active { + background-color: #9a9c9d; + border-color: #8d9091; +} + +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { + background-color: #a7a9aa; + border-color: #a7a9aa; +} diff --git a/public/html/server.py b/public/html/server.py index 0a6b7399ae..af47bfeee6 100755 --- a/public/html/server.py +++ b/public/html/server.py @@ -41,7 +41,6 @@ import webnotes.auth def init(): webnotes.handler.get_cgi_fields() - # init request try: webnotes.http_request = webnotes.auth.HTTPRequest() diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js index d502e3c9c1..2367259365 100644 --- a/public/js/legacy/widgets/form/form.js +++ b/public/js/legacy/widgets/form/form.js @@ -339,16 +339,6 @@ _f.Frm.prototype.refresh_print_layout = function() { _p.build(this.$print_view_select.val(), print_callback, false, true, true); } - -_f.Frm.prototype.show_the_frm = function() { - // show the dialog - if(this.meta.in_dialog && !this.parent.dialog.display) { - if(!this.meta.istable) - this.parent.table_form = false; - this.parent.dialog.show(); - } -} - _f.Frm.prototype.set_print_heading = function(txt) { this.pformat[cur_frm.docname] = txt; } @@ -579,9 +569,6 @@ _f.Frm.prototype.refresh_dependency = function() { } } -// setnewdoc is called when a record is loaded for the first time -// ====================================================================================== - _f.Frm.prototype.setnewdoc = function(docname) { // moved this call to refresh function // this.check_doctype_conflict(docname); @@ -601,7 +588,7 @@ _f.Frm.prototype.setnewdoc = function(docname) { this.script_manager.trigger("onload"); this.last_view_is_edit[docname] = 1; - if(cint(this.meta.read_only_onload)) this.last_view_is_edit[docname] = 0; + //if(cint(this.meta.read_only_onload)) this.last_view_is_edit[docname] = 0; this.opendocs[docname] = true; } diff --git a/public/js/legacy/widgets/tags.js b/public/js/legacy/widgets/tags.js deleted file mode 100644 index 32379ccf1f..0000000000 --- a/public/js/legacy/widgets/tags.js +++ /dev/null @@ -1,285 +0,0 @@ -// Copyright (c) 2012 Web Notes Technologies Pvt Ltd (http://erpnext.com) -// -// MIT License (MIT) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -// PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -// ================================================= -// -// Tag Globals -// -_tags = { - dialog: null, - color_map: {}, - all_tags: [], - colors: {'Default':'#add8e6'} - //color_list: ['Default'] // for sequence -} - -// -// Tag List -// -TagList = function(parent, start_list, dt, dn, static, onclick) { - this.start_list = start_list ? start_list : []; - this.tag_list = []; - this.dt = dt; - this.onclick = onclick; - this.dn = dn; - this.static; - this.parent = parent; - this.make_body(); -} - -TagList.prototype.make = function(parent) { - for(var i=0; ithis.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){n.to(t)}):r==t?this.pause().cycle():this.slide(t>r?"next":"prev",e(this.$items[t]))},t.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},t.prototype.next=function(){if(this.sliding)return;return this.slide("next")},t.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},t.prototype.slide=function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();var f=e.Event("slide.bs.carousel",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("bs.carousel"),s=e.extend({},t.DEFAULTS,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("bs.carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("bs.carousel").pause().to(o).cycle(),t.preventDefault()}),e(window).on("load",function(){e('[data-ride="carousel"]').each(function(){var t=e(this);t.carousel(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r),this.transitioning=null,this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.DEFAULTS={toggle:!0},t.prototype.dimension=function(){var e=this.$element.hasClass("width");return e?"width":"height"},t.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){var i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show.bs.collapse"),"shown.bs.collapse"),e.support.transition&&this.$element[t](this.$element[0][n])},t.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var t=this.dimension();this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide.bs.collapse"),"hidden"),this.$element[t](0)},t.prototype.reset=function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!=null?"addClass":"removeClass"]("collapse"),this},t.prototype.transition=function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},t.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),+function(e){"use strict";function i(){e(t).remove(),e(n).each(function(t){var n=s(e(this));if(!n.hasClass("open"))return;n.trigger(t=e.Event("hide.bs.dropdown"));if(t.isDefaultPrevented())return;n.removeClass("open").trigger("hidden.bs.dropdown")})}function s(t){var n=t.attr("data-target");n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,""));var r=n&&e(n);return r&&r.length?r:t.parent()}var t=".dropdown-backdrop",n="[data-toggle=dropdown]",r=function(t){var n=e(t).on("click.bs.dropdown",this.toggle)};r.prototype.toggle=function(t){var n=e(this);if(n.is(".disabled, :disabled"))return;var r=s(n),o=r.hasClass("open");i();if(!o){"ontouchstart"in document.documentElement&&e('
').insertBefore(e(this)).on("click",i),r.trigger(t=e.Event("show.bs.dropdown"));if(t.isDefaultPrevented())return;r.toggleClass("open").trigger("shown.bs.dropdown")}return n.focus(),!1},r.prototype.keydown=function(t){if(!/(38|40|27)/.test(t.keyCode))return;var r=e(this);t.preventDefault(),t.stopPropagation();if(r.is(".disabled, :disabled"))return;var i=s(r),o=i.hasClass("open");if(!o||o&&t.keyCode==27)return t.which==27&&i.find(n).focus(),r.click();var u=e("[role=menu] li:not(.divider):visible a",i);if(!u.length)return;var a=u.index(u.filter(":focus"));t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("bs.modal"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})});var r=e(document.body).on("bs.modal.shown",".modal",function(){r.addClass("modal-open")}).on("bs.modal.hidden",".modal",function(){r.removeClass("modal-open")})}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",e,t)};t.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},t.prototype.init=function(t,n,r){this.enabled=!0,this.type=t,this.$element=e(n),this.options=this.getOptions(r);var i=this.options.trigger.split(" ");for(var s=i.length;s--;){var o=i[s];if(o=="click")this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this));else if(o!="manual"){var u=o=="hover"?"mouseenter":"focus",a=o=="hover"?"mouseleave":"blur";this.$element.on(u+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(a+"."+this.type,this.options.selector,e.proxy(this.leave,this))}}this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.getOptions=function(t){return t=e.extend({},this.getDefaults(),this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},t.prototype.enter=function(t){var n=this.getDefaults(),r={};this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)});var i=t instanceof this.constructor?t:e(t.currentTarget)[this.type](r).data("bs."+this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},t.prototype.leave=function(t){var n=t instanceof this.constructor?t:e(t.currentTarget)[this.type](this._options).data("bs."+this.type);clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},t.prototype.show=function(){var t=e.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.tip();this.setContent(),this.options.animation&&n.addClass("fade");var r=typeof this.options.placement=="function"?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement;n.detach().css({top:0,left:0,display:"block"}),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var i,s=this.getPosition(),o=n[0].offsetWidth,u=n[0].offsetHeight;switch(r){case"bottom":i={top:s.top+s.height,left:s.left+s.width/2-o/2};break;case"top":i={top:s.top-u,left:s.left+s.width/2-o/2};break;case"left":i={top:s.top+s.height/2-u/2,left:s.left-o};break;case"right":i={top:s.top+s.height/2-u/2,left:s.left+s.width}}this.applyPlacement(i,r),this.$element.trigger("shown.bs."+this.type)}},t.prototype.applyPlacement=function(e,t){var n,r=this.tip(),i=r[0].offsetWidth,s=r[0].offsetHeight;r.offset(e).addClass(t).addClass("in");var o=r[0].offsetWidth,u=r[0].offsetHeight;t=="top"&&u!=s&&(n=!0,e.top=e.top+s-u);if(t=="bottom"||t=="top"){var a=0;e.left<0&&(a=e.left*-2,e.left=0,r.offset(e),o=r[0].offsetWidth,u=r[0].offsetHeight),this.replaceArrow(a-i+o,o,"left")}else this.replaceArrow(u-s,u,"top");n&&r.offset(e)},t.prototype.replaceArrow=function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},t.prototype.hide=function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide.bs."+this.type);this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden.bs."+this.type),this},t.prototype.fixTitle=function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},t.prototype.hasContent=function(){return this.getTitle()},t.prototype.getPosition=function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},t.prototype.getTitle=function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},t.prototype.tip=function(){return this.$tip=this.$tip||e(this.options.template)},t.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},t.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},t.prototype.enable=function(){this.enabled=!0},t.prototype.disable=function(){this.enabled=!1},t.prototype.toggleEnabled=function(){this.enabled=!this.enabled},t.prototype.toggle=function(t){var n=t?e(t.currentTarget)[this.type](this._options).data("bs."+this.type):this;n.tip().hasClass("in")?n.leave(n):n.enter(n)},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tooltip"),s=typeof n=="object"&&n;i||r.data("bs.tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.DEFAULTS=e.extend({},e.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'

'}),t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),t.prototype.constructor=t,t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title:empty").hide()},t.prototype.hasContent=function(){return this.getTitle()||this.getContent()},t.prototype.getContent=function(){var e=typeof this.options.content=="function"?this.options.content.call(this.$element[0]):this.options.content;return e||this.$element.attr("data-content")},t.prototype.tip=function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("bs.popover"),s=typeof n=="object"&&n;i||r.data("bs.popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),+function(e){"use strict";function t(n,r){var i,s=e.proxy(this.process,this),o=e(n).is("body")?e(window):e(n);this.$body=e("body"),this.$scrollElement=o.on("scroll.bs.scroll-spy.data-api",s),this.options=e.extend({},t.DEFAULTS,r),this.selector=(this.options.target||(i=e(n).attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=e([]),this.targets=e([]),this.activeTarget=null,this.refresh(),this.process()}t.DEFAULTS={offset:10},t.prototype.refresh=function(){this.offsets=e([]),this.targets=e([]);var t=this,n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},t.prototype.activate=function(t){this.activeTarget=t,e(this.selector).parents(".active").removeClass("active");var n=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',r=e(n).parents("li").addClass("active");r.parent(".dropdown-menu").length&&(r=r.closest("li.dropdown").addClass("active")),r.trigger("activate")};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("bs.scrollspy"),s=typeof n=="object"&&n;i||r.data("bs.scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype.show=function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target");r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;var i=n.find(".active:last a")[0],s=e.Event("show.bs.tab",{relatedTarget:i});t.trigger(s);if(s.isDefaultPrevented())return;var o=e(r);this.activate(t.parent("li"),n),this.activate(o,o.parent(),function(){t.trigger({type:"shown.bs.tab",relatedTarget:i})})},t.prototype.activate=function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tab");i||r.data("bs.tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.options=e.extend({},t.DEFAULTS,r),this.$window=e(window).on("scroll.bs.affix.data-api",e.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",e.proxy(this.checkPositionWithEventLoop,this)),this.$element=e(n),this.affixed=this.unpin=null,this.checkPosition()};t.DEFAULTS={offset:0},t.prototype.checkPositionWithEventLoop=function(){setTimeout(e.proxy(this.checkPosition,this),1)},t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.top,o=i.bottom,u="affix affix-top affix-bottom";typeof i!="object"&&(o=s=i),typeof s=="function"&&(s=i.top()),typeof o=="function"&&(o=i.bottom());var a=this.unpin!=null&&n+this.unpin<=r.top?!1:o!=null&&r.top+this.$element.height()>=t-o?"bottom":s!=null&&n<=s?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("bs.affix"),s=typeof n=="object"&&n;i||r.data("bs.affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file ++function(e){"use strict";function t(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var n in t)if(e.style[n]!==undefined)return{end:t[n]}}e(function(){e.support.transition=t()})}(window.jQuery),+function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed.bs.alert").remove()}var n=e(this),r=n.attr("data-target");r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));var i=e(r);t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close.bs.alert"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("bs.alert");i||r.data("bs.alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.bs.alert.data-api",t,n.prototype.close)}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r)};t.DEFAULTS={loadingText:"loading..."},t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.is("input")?"val":"html",i=n.data();e+="Text",i.resetText||n.data("resetText",n[r]()),n[r](i[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("bs.button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.bs.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),+function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.DEFAULTS={interval:5e3,pause:"hover"},t.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},t.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},t.prototype.to=function(t){var n=this,r=this.getActiveIndex();if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){n.to(t)}):r==t?this.pause().cycle():this.slide(t>r?"next":"prev",e(this.$items[t]))},t.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},t.prototype.next=function(){if(this.sliding)return;return this.slide("next")},t.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},t.prototype.slide=function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();var f=e.Event("slide.bs.carousel",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("bs.carousel"),s=e.extend({},t.DEFAULTS,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("bs.carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("bs.carousel").pause().to(o).cycle(),t.preventDefault()}),e(window).on("load",function(){e('[data-ride="carousel"]').each(function(){var t=e(this);t.carousel(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r),this.transitioning=null,this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.DEFAULTS={toggle:!0},t.prototype.dimension=function(){var e=this.$element.hasClass("width");return e?"width":"height"},t.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){var i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show.bs.collapse"),"shown.bs.collapse"),e.support.transition&&this.$element[t](this.$element[0][n])},t.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var t=this.dimension();this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide.bs.collapse"),"hidden"),this.$element[t](0)},t.prototype.reset=function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!=null?"addClass":"removeClass"]("collapse"),this},t.prototype.transition=function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},t.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data(),o=n.attr("data-parent"),u=o&&e(o);u&&u.find("[data-toggle=collapse][data-parent="+o+"]").not(n).addClass("collapsed"),n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),+function(e){"use strict";function i(){e(t).remove(),e(n).each(function(t){var n=s(e(this));if(!n.hasClass("open"))return;n.trigger(t=e.Event("hide.bs.dropdown"));if(t.isDefaultPrevented())return;n.removeClass("open").trigger("hidden.bs.dropdown")})}function s(t){var n=t.attr("data-target");n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,""));var r=n&&e(n);return r&&r.length?r:t.parent()}var t=".dropdown-backdrop",n="[data-toggle=dropdown]",r=function(t){var n=e(t).on("click.bs.dropdown",this.toggle)};r.prototype.toggle=function(t){var n=e(this);if(n.is(".disabled, :disabled"))return;var r=s(n),o=r.hasClass("open");i();if(!o){"ontouchstart"in document.documentElement&&e('
').insertBefore(e(this)).on("click",i),r.trigger(t=e.Event("show.bs.dropdown"));if(t.isDefaultPrevented())return;r.toggleClass("open").trigger("shown.bs.dropdown")}return n.focus(),!1},r.prototype.keydown=function(t){if(!/(38|40|27)/.test(t.keyCode))return;var r=e(this);t.preventDefault(),t.stopPropagation();if(r.is(".disabled, :disabled"))return;var i=s(r),o=i.hasClass("open");if(!o||o&&t.keyCode==27)return t.which==27&&i.find(n).focus(),r.click();var u=e("[role=menu] li:not(.divider):visible a",i);if(!u.length)return;var a=u.index(u.filter(":focus"));t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("bs.modal"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})});var r=e(document.body).on("bs.modal.shown",".modal",function(){r.addClass("modal-open")}).on("bs.modal.hidden",".modal",function(){r.removeClass("modal-open")})}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",e,t)};t.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},t.prototype.init=function(t,n,r){this.enabled=!0,this.type=t,this.$element=e(n),this.options=this.getOptions(r);var i=this.options.trigger.split(" ");for(var s=i.length;s--;){var o=i[s];if(o=="click")this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this));else if(o!="manual"){var u=o=="hover"?"mouseenter":"focus",a=o=="hover"?"mouseleave":"blur";this.$element.on(u+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(a+"."+this.type,this.options.selector,e.proxy(this.leave,this))}}this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.getOptions=function(t){return t=e.extend({},this.getDefaults(),this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},t.prototype.enter=function(t){var n=this.getDefaults(),r={};this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)});var i=t instanceof this.constructor?t:e(t.currentTarget)[this.type](r).data("bs."+this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},t.prototype.leave=function(t){var n=t instanceof this.constructor?t:e(t.currentTarget)[this.type](this._options).data("bs."+this.type);clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},t.prototype.show=function(){var t=e.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.tip();this.setContent(),this.options.animation&&n.addClass("fade");var r=typeof this.options.placement=="function"?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement;n.detach().css({top:0,left:0,display:"block"}),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var i,s=this.getPosition(),o=n[0].offsetWidth,u=n[0].offsetHeight;switch(r){case"bottom":i={top:s.top+s.height,left:s.left+s.width/2-o/2};break;case"top":i={top:s.top-u,left:s.left+s.width/2-o/2};break;case"left":i={top:s.top+s.height/2-u/2,left:s.left-o};break;case"right":i={top:s.top+s.height/2-u/2,left:s.left+s.width}}this.applyPlacement(i,r),this.$element.trigger("shown.bs."+this.type)}},t.prototype.applyPlacement=function(e,t){var n,r=this.tip(),i=r[0].offsetWidth,s=r[0].offsetHeight;r.offset(e).addClass(t).addClass("in");var o=r[0].offsetWidth,u=r[0].offsetHeight;t=="top"&&u!=s&&(n=!0,e.top=e.top+s-u);if(t=="bottom"||t=="top"){var a=0;e.left<0&&(a=e.left*-2,e.left=0,r.offset(e),o=r[0].offsetWidth,u=r[0].offsetHeight),this.replaceArrow(a-i+o,o,"left")}else this.replaceArrow(u-s,u,"top");n&&r.offset(e)},t.prototype.replaceArrow=function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},t.prototype.hide=function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide.bs."+this.type);this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden.bs."+this.type),this},t.prototype.fixTitle=function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},t.prototype.hasContent=function(){return this.getTitle()},t.prototype.getPosition=function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},t.prototype.getTitle=function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},t.prototype.tip=function(){return this.$tip=this.$tip||e(this.options.template)},t.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},t.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},t.prototype.enable=function(){this.enabled=!0},t.prototype.disable=function(){this.enabled=!1},t.prototype.toggleEnabled=function(){this.enabled=!this.enabled},t.prototype.toggle=function(t){var n=t?e(t.currentTarget)[this.type](this._options).data("bs."+this.type):this;n.tip().hasClass("in")?n.leave(n):n.enter(n)},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tooltip"),s=typeof n=="object"&&n;i||r.data("bs.tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.DEFAULTS=e.extend({},e.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'

'}),t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),t.prototype.constructor=t,t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title:empty").hide()},t.prototype.hasContent=function(){return this.getTitle()||this.getContent()},t.prototype.getContent=function(){var e=typeof this.options.content=="function"?this.options.content.call(this.$element[0]):this.options.content;return e||this.$element.attr("data-content")},t.prototype.tip=function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("bs.popover"),s=typeof n=="object"&&n;i||r.data("bs.popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),+function(e){"use strict";function t(n,r){var i,s=e.proxy(this.process,this),o=e(n).is("body")?e(window):e(n);this.$body=e("body"),this.$scrollElement=o.on("scroll.bs.scroll-spy.data-api",s),this.options=e.extend({},t.DEFAULTS,r),this.selector=(this.options.target||(i=e(n).attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=e([]),this.targets=e([]),this.activeTarget=null,this.refresh(),this.process()}t.DEFAULTS={offset:10},t.prototype.refresh=function(){this.offsets=e([]),this.targets=e([]);var t=this,n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},t.prototype.activate=function(t){this.activeTarget=t,e(this.selector).parents(".active").removeClass("active");var n=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',r=e(n).parents("li").addClass("active");r.parent(".dropdown-menu").length&&(r=r.closest("li.dropdown").addClass("active")),r.trigger("activate")};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("bs.scrollspy"),s=typeof n=="object"&&n;i||r.data("bs.scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype.show=function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target");r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;var i=n.find(".active:last a")[0],s=e.Event("show.bs.tab",{relatedTarget:i});t.trigger(s);if(s.isDefaultPrevented())return;var o=e(r);this.activate(t.parent("li"),n),this.activate(o,o.parent(),function(){t.trigger({type:"shown.bs.tab",relatedTarget:i})})},t.prototype.activate=function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tab");i||r.data("bs.tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.options=e.extend({},t.DEFAULTS,r),this.$window=e(window).on("scroll.bs.affix.data-api",e.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",e.proxy(this.checkPositionWithEventLoop,this)),this.$element=e(n),this.affixed=this.unpin=null,this.checkPosition()};t.DEFAULTS={offset:0},t.prototype.checkPositionWithEventLoop=function(){setTimeout(e.proxy(this.checkPosition,this),1)},t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.top,o=i.bottom,u="affix affix-top affix-bottom";typeof i!="object"&&(o=s=i),typeof s=="function"&&(s=i.top()),typeof o=="function"&&(o=i.bottom());var a=this.unpin!=null&&n+this.unpin<=r.top?!1:o!=null&&r.top+this.$element.height()>=t-o?"bottom":s!=null&&n<=s?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("bs.affix"),s=typeof n=="object"&&n;i||r.data("bs.affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/public/js/wn/form/layout.js b/public/js/wn/form/layout.js index 9beeb9f78a..cffb0574e5 100644 --- a/public/js/wn/form/layout.js +++ b/public/js/wn/form/layout.js @@ -1,5 +1,6 @@ wn.ui.form.Layout = Class.extend({ init: function(opts) { + this.labelled_section_count = 0; this.ignore_types = ["Section Break", "Column Break"]; $.extend(this, opts); this.make(); @@ -7,6 +8,7 @@ wn.ui.form.Layout = Class.extend({ }, make: function() { this.wrapper = $('
').appendTo(this.parent); + this.dashboard = $('
').appendTo(this.wrapper); this.fields = wn.meta.get_docfields(this.frm.doctype); this.setup_tabbing(); }, @@ -67,14 +69,21 @@ wn.ui.form.Layout = Class.extend({ if(this.section) { //$("
").appendTo(this.wrapper); } - this.section = $('
').appendTo(this.wrapper); + this.section = $('
') + .appendTo(this.wrapper); this.frm.sections.push(this.section); var section = this.section[0]; section.df = df; if(df) { if(df.label) { - $('

' + df.label + "

").appendTo(this.section); + this.labelled_section_count++; + $('

' + this.labelled_section_count + + ". " + df.label + "

") + .css({"font-weight": "bold", "margin-bottom": "15px"}) + .appendTo(this.section); + if(this.frm.sections.length > 1) + this.section.css({"margin-top": "15px", "border-top": "1px solid #eee"}); } if(df.description) { $('
' + df.description + '
').appendTo(this.section); @@ -174,4 +183,38 @@ wn.ui.form.Layout = Class.extend({ get_open_grid_row: function() { return $(".grid-row-open").data("grid_row"); }, + + // dashboard + clear_dashboard: function() { + this.dashboard.empty(); + }, + add_doctype_badge: function(label, doctype, fieldname) { + if(wn.model.can_read(doctype)) { + this.add_badge(label, function() { + wn.route_options = {}; + wn.route_options[fieldname] = cur_frm.doc.name; + wn.set_route("List", doctype); + }).attr("data-doctype", doctype); + } + }, + add_badge: function(label, onclick) { + var badge = $(repl('
\ +
\ + %(label)s\ + -\ +
', {label:label})) + .appendTo(this.dashboard) + + badge.find(".badge-link").click(onclick); + + return badge.find(".alert-badge"); + }, + set_badge_count: function(data) { + var me = this; + $.each(data, function(doctype, count) { + $(me.dashboard) + .find(".alert-badge[data-doctype='"+doctype+"'] .badge") + .html(cint(count)); + }); + }, }) \ No newline at end of file diff --git a/public/js/wn/form/toolbar.js b/public/js/wn/form/toolbar.js index 730d132c7a..6feda1635c 100644 --- a/public/js/wn/form/toolbar.js +++ b/public/js/wn/form/toolbar.js @@ -63,8 +63,10 @@ wn.ui.form.Toolbar = Class.extend({ attachments = keys(docinfo.attachments).length, assignments = docinfo.assignments.length; - var $li1 = this.appframe.add_infobar(comments + " " + (comments===1 ? - wn._("Comment") : wn._("Comments")), + var $li1 = this.appframe.add_infobar( + (comments ? ' ' : '') + + comments + " " + + (comments===1 ? wn._("Comment") : wn._("Comments")), function() { $('html, body').animate({ scrollTop: $(me.frm.wrapper).find(".form-comments").offset().top @@ -249,7 +251,9 @@ wn.ui.form.Toolbar = Class.extend({ if(docstatus==0 && p[SUBMIT] && (!me.frm.doc.__islocal) && (!me.frm.doc.__unsaved)) { this.appframe.add_button('Submit', function() { - me.frm.savesubmit(this);}, 'icon-lock', true).addClass("btn-primary"); + me.frm.savesubmit(this);}, 'icon-lock', true) + .removeClass("btn-default") + .addClass("btn-primary"); } else if(docstatus==0) { this.make_save_button(); @@ -269,7 +273,9 @@ wn.ui.form.Toolbar = Class.extend({ return; var me = this; this.appframe.add_button('Save', function() { - me.frm.save('Save', null, this);}, 'icon-save', true).addClass("btn-primary"); + me.frm.save('Save', null, this);}, 'icon-save', true) + .removeClass("btn-default") + .addClass("btn-primary"); }, add_update_button_on_dirty: function() { var me = this; @@ -282,7 +288,9 @@ wn.ui.form.Toolbar = Class.extend({ && !me.appframe.$w.find(".action-update").length) { me.appframe.add_button("Update", function() { me.frm.save('Update', null, me); - }, 'icon-save', true).addClass("btn-primary action-update"); + }, 'icon-save', true) + .removeClass("btn-default") + .addClass("btn-primary action-update"); } }) }, diff --git a/public/js/wn/misc/user.js b/public/js/wn/misc/user.js index 7ca557aeff..5b285853e2 100644 --- a/public/js/wn/misc/user.js +++ b/public/js/wn/misc/user.js @@ -19,12 +19,13 @@ wn.avatar = function(user, large, title) { var to_size = large ? 72 : 30; if(!title) title = wn.user_info(user).fullname; - return repl('\ ', { image: image, len: to_size + "px", - title: title + title: title, + small_or_large: large ? "avatar-large" : "avatar-small" }); } diff --git a/public/js/wn/ui/appframe.js b/public/js/wn/ui/appframe.js index f2f7cabc5d..e7738ed27a 100644 --- a/public/js/wn/ui/appframe.js +++ b/public/js/wn/ui/appframe.js @@ -165,7 +165,7 @@ wn.ui.AppFrame = Class.extend({ .appendTo($right); if(e.type==active_view) { - btn.addClass("btn-info"); + btn.removeClass("btn-default").addClass("btn-info"); } }); }, diff --git a/public/js/wn/ui/listing.js b/public/js/wn/ui/listing.js index 283fafe093..a9d536960d 100644 --- a/public/js/wn/ui/listing.js +++ b/public/js/wn/ui/listing.js @@ -173,7 +173,7 @@ wn.ui.Listing = Class.extend({ // new if(this.new_doctype) { this.add_button(wn._('New') + ' ' + wn._(this.new_doctype), function() { - (me.custom_new_doc || me.make_new_doc)(me.new_doctype); + (me.custom_new_doc || me.make_new_doc).apply(me, [me.new_doctype]); }, 'icon-plus'); } @@ -189,8 +189,18 @@ wn.ui.Listing = Class.extend({ } }, - make_new_doc: function(new_doctype) { - new_doc(new_doctype); + make_new_doc: function(doctype) { + var me = this; + wn.model.with_doctype(doctype, function() { + var doc = wn.model.get_new_doc(doctype); + if(me.filter_list) { + $.each(me.filter_list.get_filters(), function(i, f) { + if(f[0]===doctype && f[2]==="=") + doc[f[1]]=f[3]; + }) + } + wn.set_route("Form", doctype, doc.name); + }); }, make_filters: function() { diff --git a/public/js/wn/views/doclistview.js b/public/js/wn/views/doclistview.js index 49c26b230e..d8bc44419e 100644 --- a/public/js/wn/views/doclistview.js +++ b/public/js/wn/views/doclistview.js @@ -149,7 +149,7 @@ wn.views.DocListView = wn.ui.Listing.extend({ // make_new_doc can be overridden so that default values can be prefilled // for example - communication list in customer $(this.wrapper).on("click", 'button[list_view_doc="'+me.doctype+'"]', function(){ - (me.listview.make_new_doc || me.make_new_doc)(me.doctype); + (me.listview.make_new_doc || me.make_new_doc).apply(me, [me.doctype]); }); if((auto_run !== false) && (auto_run !== 0)) @@ -190,7 +190,7 @@ wn.views.DocListView = wn.ui.Listing.extend({ make_no_result: function() { var new_button = wn.boot.profile.can_create.indexOf(this.doctype)!=-1 - ? ('

') : ''; diff --git a/public/js/wn/views/moduleview.js b/public/js/wn/views/moduleview.js index 6b7bc16059..041bb6486c 100644 --- a/public/js/wn/views/moduleview.js +++ b/public/js/wn/views/moduleview.js @@ -75,8 +75,10 @@ wn.views.moduleview.ModuleView = Class.extend({ add_section: function(section) { section._title = wn._(section.title); if(section.top) { + var module_top = $(this.wrapper).find(".module-top"); var list_group = $('
') - .appendTo($(this.wrapper).find(".module-top")); + .appendTo(module_top); + $('
').appendTo(module_top); } else { var list_group = $('
    \
  • \ @@ -95,16 +97,16 @@ wn.views.moduleview.ModuleView = Class.extend({ if(item.count==null) item.count = ""; if(section.top) { var $parent = $(repl('
    \ -
    \ -
    \ -
    \ -
    \ -
    \ -
    \ -
    \ -
    \ -
    \ -
    ', {doctype:item.doctype})) +
    ' + //
    \ + //
    \ + //
    \ + //
    \ + //
    \ + //
    \ + //
    \ + //
    \ + +'
', {doctype:item.doctype})) .appendTo(section.list_group) .find(".alert"); this.top_item_total[item.doctype] = 0; @@ -129,6 +131,7 @@ wn.views.moduleview.ModuleView = Class.extend({ } }, set_top_item_count: function(doctype, count, open_count) { + return; var me = this; if(this.top_item_total[doctype]!=null) { diff --git a/templates/js/login.js b/templates/js/login.js index 580674d005..33d15a520c 100644 --- a/templates/js/login.js +++ b/templates/js/login.js @@ -95,6 +95,7 @@ login.show_login = function() { } window.is_login = true; + window.is_signup = false; } login.show_sign_up = function() { diff --git a/webnotes/__init__.py b/webnotes/__init__.py index a97c92d8a2..b20301b3d3 100644 --- a/webnotes/__init__.py +++ b/webnotes/__init__.py @@ -416,6 +416,16 @@ def repsond_as_web_page(title, html): response['type'] = 'page' response['page_name'] = 'message.html' +def load_json(obj): + if isinstance(obj, basestring): + import json + try: + obj = json.loads(obj) + except ValueError: + pass + + return obj + _config = None def get_config(): global _config diff --git a/webnotes/client.py b/webnotes/client.py index 0d0b4bf322..9fcd4c47d2 100644 --- a/webnotes/client.py +++ b/webnotes/client.py @@ -90,4 +90,6 @@ def set_default(key, value, parent=None): def make_width_property_setter(): doclist = json.loads(webnotes.form_dict.doclist) if doclist[0]["doctype"]=="Property Setter" and doclist[0]["property"]=="width": - webnotes.bean(doclist).save() + bean = webnotes.bean(doclist) + bean.ignore_permissions = True + bean.insert() diff --git a/webnotes/db.py b/webnotes/db.py index ecf55c3c7f..105e7bfa87 100644 --- a/webnotes/db.py +++ b/webnotes/db.py @@ -330,7 +330,11 @@ class Database: return self.get_values_from_table(fields, filters, doctype, as_dict, debug) except Exception, e: if ignore and e.args[0] in (1146, 1054): + # table or column not found, return None return None + elif (not ignore) and e.args[0]==1146: + # table not found, look in singles + pass else: raise e @@ -365,9 +369,16 @@ class Database: return r and [[i[1] for i in r]] or [] def get_values_from_table(self, fields, filters, doctype, as_dict, debug): - fl = fields - if fields!="*": - fl = ("`" + "`, `".join(fields) + "`") + fl = [] + if isinstance(fields, (list, tuple)): + for f in fields: + if "(" in f: # function + fl.append(f) + else: + fl.append("`" + f + "`") + fl = ", ".join(fields) + else: + fl = fields conditions, filters = self.build_conditions(filters) diff --git a/webnotes/model/bean.py b/webnotes/model/bean.py index 4533de7c6e..411a70f6bf 100644 --- a/webnotes/model/bean.py +++ b/webnotes/model/bean.py @@ -77,7 +77,6 @@ class Bean: doclist += getchildren(doc.name, t[0], t[1], dt, prefix=prefix) self.set_doclist(doclist) - self.run_method("onload") def __iter__(self): return self.doclist.__iter__() diff --git a/webnotes/model/utils.py b/webnotes/model/utils.py index aee746d834..e0ad09dfc5 100644 --- a/webnotes/model/utils.py +++ b/webnotes/model/utils.py @@ -212,18 +212,19 @@ def check_if_doc_is_linked(dt, dn, method="Delete"): """ from webnotes.model.rename_doc import get_link_fields link_fields = get_link_fields(dt) - link_fields = [[lf['parent'], lf['fieldname']] for lf in link_fields] + link_fields = [[lf['parent'], lf['fieldname'], lf['issingle']] for lf in link_fields] - for link_dt, link_field in link_fields: - item = webnotes.conn.get_value(link_dt, {link_field:dn}, ["name", "parent", "parenttype", - "docstatus"], as_dict=True) + for link_dt, link_field, issingle in link_fields: + if not issingle: + item = webnotes.conn.get_value(link_dt, {link_field:dn}, + ["name", "parent", "parenttype", "docstatus"], as_dict=True) - if item and item.parent != dn and (method=="Delete" or - (method=="Cancel" and item.docstatus==1)): - webnotes.msgprint(method + " " + _("Error") + ":"+\ - ("%s (%s) " % (dn, dt)) + _("is linked in") + (" %s (%s)") % - (item.parent or item.name, item.parent and item.parenttype or link_dt), - raise_exception=LinkExistsError) + if item and item.parent != dn and (method=="Delete" or + (method=="Cancel" and item.docstatus==1)): + webnotes.msgprint(method + " " + _("Error") + ":"+\ + ("%s (%s) " % (dn, dt)) + _("is linked in") + (" %s (%s)") % + (item.parent or item.name, item.parent and item.parenttype or link_dt), + raise_exception=LinkExistsError) def set_default(doc, key): if not doc.is_default: diff --git a/webnotes/widgets/form/load.py b/webnotes/widgets/form/load.py index 8f7c40c11d..a83414f43d 100644 --- a/webnotes/widgets/form/load.py +++ b/webnotes/widgets/form/load.py @@ -45,7 +45,11 @@ def getdoc(doctype, name, user=None): return [] try: - doclist = webnotes.bean(doctype, name).doclist + bean = webnotes.bean(doctype, name) + bean.run_method("onload") + + doclist = bean.doclist + # add file list set_docinfo(doctype, name) @@ -54,7 +58,7 @@ def getdoc(doctype, name, user=None): webnotes.msgprint('Did not load.') raise e - if doclist and not name.startswith('_'): + if bean and not name.startswith('_'): webnotes.user.update_recent(doctype, name) webnotes.response['docs'] = doclist @@ -113,4 +117,15 @@ def add_assignments(dt, dn): "name": dn }) - return cl \ No newline at end of file + return cl + +@webnotes.whitelist() +def get_badge_info(doctypes, filters): + filters = json.loads(filters) + doctypes = json.loads(doctypes) + filters["docstatus"] = ["!=", 2] + out = {} + for doctype in doctypes: + out[doctype] = webnotes.conn.get_value(doctype, filters, "count(*)") + + return out \ No newline at end of file diff --git a/webnotes/widgets/moduleview.py b/webnotes/widgets/moduleview.py index b9476e0b8e..543d7d9dbd 100644 --- a/webnotes/widgets/moduleview.py +++ b/webnotes/widgets/moduleview.py @@ -27,13 +27,6 @@ def get_doctype_count_from_table(doctype): else: raise e return count - -def get_doctype_count(doctype): - count = webnotes.conn.get_global("item_count:" + doctype) - if count is None: - count = get_doctype_count_from_table(doctype) - webnotes.conn.set_global("item_count:" + doctype, count) - return count def get_report_list(module): """return list on new style reports for modules"""