diff --git a/build.json b/build.json index 6069394da55..e5f09396b5a 100644 --- a/build.json +++ b/build.json @@ -89,7 +89,6 @@ "js/all-web.js": [ "lib/js/lib/history/history.min.js:concat", "lib/js/lib/bootstrap.min.js:concat", - "lib/js/lib/sprintf.js", "lib/js/core.min.js:concat", "lib/js/legacy/globals.js", "lib/js/legacy/utils/datatype.js", @@ -97,21 +96,12 @@ "lib/js/legacy/utils/dom.js", "lib/js/legacy/utils/handler.js", "lib/js/legacy/utils/msgprint.js", - "lib/js/legacy/utils/shortcut.js", - "lib/js/legacy/widgets/form/fields.js", "lib/js/wn/ui/dialog.js", - "lib/js/wn/ui/button.js", "lib/js/legacy/widgets/dialog.js", "lib/js/wn/ui/listing.js", - "lib/js/legacy/widgets/layout.js", "lib/js/legacy/webpage/page_header.js", - "lib/js/legacy/webpage/search.js", "lib/js/legacy/webpage/spinner.js", - "lib/js/legacy/webpage/error_console.js", "lib/js/legacy/webpage/loaders.js", - "lib/js/legacy/webpage/uploader.js", - "lib/js/legacy/webpage/page.js", - "lib/js/legacy/wn/page_layout.js", "lib/js/legacy/wn/widgets/footer.js", "lib/js/legacy/model/local_data.js", "lib/js/legacy/model/doclist.js", @@ -138,7 +128,6 @@ "lib/js/legacy/utils/dom.js", "lib/js/legacy/utils/handler.js", "lib/js/legacy/utils/msgprint.js", - "lib/js/legacy/utils/shortcut.js", "lib/js/legacy/utils/printElement.js", "lib/js/legacy/widgets/form/fields.js", "lib/js/wn/ui/dialog.js", @@ -154,7 +143,6 @@ "lib/js/legacy/webpage/error_console.js", "lib/js/legacy/webpage/loaders.js", "lib/js/legacy/webpage/uploader.js", - "lib/js/legacy/webpage/page.js", "lib/js/legacy/wn/page_layout.js", "lib/js/legacy/wn/widgets/page_sidebar.js", "lib/js/legacy/wn/widgets/footer.js", diff --git a/css/all-app.css b/css/all-app.css index 4ed2d5771aa..24c333c0618 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -109,7 +109,7 @@ div.comment { color: #444; } } .help { - margin: 3px 0px; + margin-bottom: 3px; color: #888; } @@ -323,6 +323,20 @@ div.notice { */ /* FORMS */ +.breadcrumbs-area { + margin-bottom: 8px; +} + +.breadcrumbs { + background-color: #e8e8e8; + padding: 3px; + border-radius: 3px; +} + +.breadcrumbs a { + color: #000000; +} + div.form-section-head { margin: 11px 0px 3px 0px; border-top: 1px solid #ccc; @@ -1763,7 +1777,6 @@ h6 { font-weight: bold; color: #333333; text-rendering: optimizelegibility; - margin-bottom: 0.3em; } h1 small, h2 small, @@ -1775,37 +1788,37 @@ h6 small { color: #999999; } h1 { - font-size: 30px; - line-height: 36px; + font-size: 280%; + line-height: 120%; } h1 small { - font-size: 18px; + font-size: 150%; } h2 { - font-size: 24px; - line-height: 36px; + font-size: 200%; + line-height: 120%; } h2 small { - font-size: 18px; + font-size: 150%; } h3 { - line-height: 27px; - font-size: 18px; + font-size: 210%; + font-size: 150%; } h3 small { - font-size: 14px; + font-size: 130%; } h4, h5, h6 { - line-height: 18px; + font-size: 150%; } h4 { - font-size: 14px; + font-size: 113%; } h4 small { - font-size: 12px; + font-size: 100%; } h5 { - font-size: 12px; + font-size: 100%; } h6 { font-size: 11px; @@ -3470,7 +3483,8 @@ button.btn.small, input[type="submit"].btn.small { */ h1, h2, h3, h4, h5 { font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif; - font-weight: bold; + font-weight: normal; + margin-top: 0.2em; } body { @@ -3484,6 +3498,7 @@ span, div, td, input, textarea, button, select { body { background: url(../images/redbeech.jpg) repeat; + color: #616161; } .small { @@ -3495,25 +3510,6 @@ body { text-align: center; } -.module-icons { - background: url(../images/module-icons.png) no-repeat top left; - width:16px; - height:16px; -} - -.module-icons-accounts{ background-position: 0 0; } -.module-icons-analysis{ background-position: 0 -66px; } -.module-icons-buying{ background-position: 0 -132px; } -.module-icons-home{ background-position: 0 -198px; } -.module-icons-hr{ background-position: 0 -264px; } -.module-icons-people{ background-position: 0 -330px; } -.module-icons-production{ background-position: 0 -396px; } -.module-icons-projects{ background-position: 0 -462px; } -.module-icons-selling{ background-position: 0 -528px; } -.module-icons-setup{ background-position: 0 -594px; } -.module-icons-stock{ background-position: 0 -660px; } -.module-icons-support{ background-position: 0 -726px; } - .navbar-new-comments { margin: -3px 0px; padding: 2px; diff --git a/css/all-web.css b/css/all-web.css index bdd2ad584f5..64e5566c6e3 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -109,7 +109,7 @@ div.comment { color: #444; } } .help { - margin: 3px 0px; + margin-bottom: 3px; color: #888; } @@ -415,7 +415,6 @@ h6 { font-weight: bold; color: #333333; text-rendering: optimizelegibility; - margin-bottom: 0.3em; } h1 small, h2 small, @@ -427,37 +426,37 @@ h6 small { color: #999999; } h1 { - font-size: 30px; - line-height: 36px; + font-size: 280%; + line-height: 120%; } h1 small { - font-size: 18px; + font-size: 150%; } h2 { - font-size: 24px; - line-height: 36px; + font-size: 200%; + line-height: 120%; } h2 small { - font-size: 18px; + font-size: 150%; } h3 { - line-height: 27px; - font-size: 18px; + font-size: 210%; + font-size: 150%; } h3 small { - font-size: 14px; + font-size: 130%; } h4, h5, h6 { - line-height: 18px; + font-size: 150%; } h4 { - font-size: 14px; + font-size: 113%; } h4 small { - font-size: 12px; + font-size: 100%; } h5 { - font-size: 12px; + font-size: 100%; } h6 { font-size: 11px; @@ -1799,7 +1798,8 @@ div.stat-bar { */ h1, h2, h3, h4, h5 { font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif; - font-weight: bold; + font-weight: normal; + margin-top: 0.2em; } body { @@ -1813,6 +1813,7 @@ span, div, td, input, textarea, button, select { body { background: url(../images/redbeech.jpg) repeat; + color: #616161; } .small { @@ -1824,25 +1825,6 @@ body { text-align: center; } -.module-icons { - background: url(../images/module-icons.png) no-repeat top left; - width:16px; - height:16px; -} - -.module-icons-accounts{ background-position: 0 0; } -.module-icons-analysis{ background-position: 0 -66px; } -.module-icons-buying{ background-position: 0 -132px; } -.module-icons-home{ background-position: 0 -198px; } -.module-icons-hr{ background-position: 0 -264px; } -.module-icons-people{ background-position: 0 -330px; } -.module-icons-production{ background-position: 0 -396px; } -.module-icons-projects{ background-position: 0 -462px; } -.module-icons-selling{ background-position: 0 -528px; } -.module-icons-setup{ background-position: 0 -594px; } -.module-icons-stock{ background-position: 0 -660px; } -.module-icons-support{ background-position: 0 -726px; } - .navbar-new-comments { margin: -3px 0px; padding: 2px; @@ -1890,20 +1872,12 @@ body { /* * erpnext/website/css/website.css */ +div#body_div, header .container, .content, #opened-page-selector, footer { + width: 900px; +} + .layout_wrapper { - padding: 20px; -} - -h1 { - margin-bottom: 15px; -} - -h2 { - margin-bottom: 11px; -} - -h3 { - margin-bottom: 7px; + padding: 27px; } p, li { @@ -1942,6 +1916,7 @@ pre { margin-right: 15px; color: #606060; overflow-x: hidden; + font-size: 90%; } .web-page-status { @@ -2006,3 +1981,42 @@ footer a:hover { .web-footer-menu ul li:last-child { border-right: 0px solid #777 !important; } + +/* slide view */ + +.next-slide { + margin: 0px -27px 100px -27px; + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #eeeeee 0%, #fff 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #eeeeee 0%, #fff 100%); /* IE10+ */ + background: linear-gradient(top, #eeeeee 0%, #fff 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */ + height: 36px; +} + +.slide-shadow { + background: #eeeeee; /* Old browsers */ + background: -moz-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* IE10+ */ + background: linear-gradient(top, #bababa 0%,#eeeeee 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ + height: 3px; + margin: 100px -27px 0px -27px; + border-top: 1px solid #bababa; +} + +.two-column { + width: 40%; + float: left; + padding: 5%; +} + +.clear { + clear: both; +} + +/* */ diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index a6f4e920fb5..f59c082141a 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -1,6 +1,7 @@ h1, h2, h3, h4, h5 { font-family: "Open Sans", Helvetica, "Helvetica Neue", sans-serif; - font-weight: bold; + font-weight: normal; + margin-top: 0.2em; } body { @@ -14,6 +15,7 @@ span, div, td, input, textarea, button, select { body { background: url(../images/redbeech.jpg) repeat; + color: #616161; } .small { @@ -25,25 +27,6 @@ body { text-align: center; } -.module-icons { - background: url(../images/module-icons.png) no-repeat top left; - width:16px; - height:16px; -} - -.module-icons-accounts{ background-position: 0 0; } -.module-icons-analysis{ background-position: 0 -66px; } -.module-icons-buying{ background-position: 0 -132px; } -.module-icons-home{ background-position: 0 -198px; } -.module-icons-hr{ background-position: 0 -264px; } -.module-icons-people{ background-position: 0 -330px; } -.module-icons-production{ background-position: 0 -396px; } -.module-icons-projects{ background-position: 0 -462px; } -.module-icons-selling{ background-position: 0 -528px; } -.module-icons-setup{ background-position: 0 -594px; } -.module-icons-stock{ background-position: 0 -660px; } -.module-icons-support{ background-position: 0 -726px; } - .navbar-new-comments { margin: -3px 0px; padding: 2px; diff --git a/erpnext/website/css/website.css b/erpnext/website/css/website.css index b56b55ee353..1fd0bb055c6 100644 --- a/erpnext/website/css/website.css +++ b/erpnext/website/css/website.css @@ -1,17 +1,9 @@ +div#body_div, header .container, .content, #opened-page-selector, footer { + width: 900px; +} + .layout_wrapper { - padding: 20px; -} - -h1 { - margin-bottom: 15px; -} - -h2 { - margin-bottom: 11px; -} - -h3 { - margin-bottom: 7px; + padding: 27px; } p, li { @@ -50,6 +42,7 @@ pre { margin-right: 15px; color: #606060; overflow-x: hidden; + font-size: 90%; } .web-page-status { @@ -113,4 +106,43 @@ footer a:hover { .web-footer-menu ul li:last-child { border-right: 0px solid #777 !important; -} \ No newline at end of file +} + +/* slide view */ + +.next-slide { + margin: 0px -27px 100px -27px; + background: #ffffff; /* Old browsers */ + background: -moz-linear-gradient(top, #eeeeee 0%, #fff 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #eeeeee 0%, #fff 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #eeeeee 0%, #fff 100%); /* IE10+ */ + background: linear-gradient(top, #eeeeee 0%, #fff 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#fff',GradientType=0 ); /* IE6-9 */ + height: 36px; +} + +.slide-shadow { + background: #eeeeee; /* Old browsers */ + background: -moz-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* FF3.6+ */ + background: -webkit-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #bababa 0%,#eeeeee 100%); /* IE10+ */ + background: linear-gradient(top, #bababa 0%,#eeeeee 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#bababa', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ + height: 3px; + margin: 100px -27px 0px -27px; + border-top: 1px solid #bababa; +} + +.two-column { + width: 40%; + float: left; + padding: 5%; +} + +.clear { + clear: both; +} + +/* */ \ No newline at end of file diff --git a/erpnext/website/doctype/web_page/template.html b/erpnext/website/doctype/web_page/template.html index 69500699a71..e6f071d0a7a 100644 --- a/erpnext/website/doctype/web_page/template.html +++ b/erpnext/website/doctype/web_page/template.html @@ -1,16 +1,25 @@
-
- {% if doc.head_section %} +
+ {% if doc.head_section and doc.layout=='Two column with header' %}
{{ doc.head_section_html }}
{% endif %} + + {% if doc.layout.startswith('Two column') %}
+ {% endif %} {{ doc.main_section_html }} {% if doc.next_page_html %} {{ doc.next_page_html }} {% endif %} + + {% if doc.layout.startswith('Two column') %}
+ {% endif %} + + {% if doc.layout.startswith('Two column') %}
{{ doc.side_section_html }} {% if doc.see_also %} @@ -20,6 +29,7 @@
{% endif %}
+ {% endif %}
diff --git a/erpnext/website/doctype/web_page/web_page.js b/erpnext/website/doctype/web_page/web_page.js new file mode 100644 index 00000000000..442907512a2 --- /dev/null +++ b/erpnext/website/doctype/web_page/web_page.js @@ -0,0 +1,15 @@ +$.extend(cur_frm.cscript, { + layout: function(doc) { + if(!doc.layout) doc.layout = 'Two column with header' + hide_field(['head_section', 'side_section']); + if(doc.layout=='Two column with header') { + unhide_field(['head_section', 'side_section']); + } + if(doc.layout=='Two column') { + unhide_field('side_section'); + } + }, + refresh: function(doc) { + cur_frm.cscript.layout(doc); + } +}) \ No newline at end of file diff --git a/erpnext/website/doctype/web_page/web_page.txt b/erpnext/website/doctype/web_page/web_page.txt index 5adbccc6252..7c155d788c6 100644 --- a/erpnext/website/doctype/web_page/web_page.txt +++ b/erpnext/website/doctype/web_page/web_page.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:36:48', + 'creation': '2012-04-02 16:02:43', 'docstatus': 0, - 'modified': '2012-03-27 14:36:48', + 'modified': '2012-04-10 10:41:00', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -17,12 +17,12 @@ 'colour': u'White:FFF', 'description': u'A custom page is a simple page with the layout - headline, main section, side section\n\nEditing:\n\n- Editing is in [markdown format](http://daringfireball.net/projects/markdown/syntax)\n- You can also add images and embed html code\n\nAccessing the page:\n\n- The page can be accessed as #![page-name] after the main url\n\nIdeal for pages like FAQ, Terms and Conditions, Help etc.\n\n', 'doctype': 'DocType', - 'max_attachments': 5, + 'max_attachments': 20, 'module': u'Website', 'name': '__common__', 'section_style': u'Simple', 'show_in_menu': 0, - 'version': 6 + 'version': 11 }, # These values are common for all DocField @@ -66,6 +66,14 @@ 'permlevel': 1 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'sb0', + 'fieldtype': u'Section Break', + 'label': u'Title and Style' + }, + # DocField { 'colour': u'White:FFF', @@ -77,6 +85,42 @@ 'reqd': 1 }, + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'layout', + 'fieldtype': u'Select', + 'label': u'Layout', + 'options': u'Two column with header\nTwo column\nSingle column' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'cb1', + 'fieldtype': u'Column Break', + 'width': u'50%' + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'text_align', + 'fieldtype': u'Select', + 'label': u'Text Align', + 'options': u'Left\nCenter\nRight' + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Page content', + 'doctype': u'DocField', + 'fieldname': u'sb1', + 'fieldtype': u'Section Break', + 'label': u'Content' + }, + # DocField { 'colour': u'White:FFF', @@ -107,6 +151,16 @@ 'label': u'Side Section' }, + # DocField + { + 'colour': u'White:FFF', + 'description': u'Link to other pages in the side bar and next section', + 'doctype': u'DocField', + 'fieldname': u'sb2', + 'fieldtype': u'Section Break', + 'label': u'Links' + }, + # DocField { 'colour': u'White:FFF', diff --git a/js/all-app.js b/js/all-app.js index 0d379fc16d5..5ca3e7c6b00 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -525,17 +525,7 @@ return false;} var inList=in_list;function add_lists(l1,l2){var l=[];for(var k in l1)l.push(l1[k]);for(var k in l2)l.push(l2[k]);return l;} function docstring(obj){return JSON.stringify(obj);} function DocLink(p,doctype,name,onload){var a=$a(p,'span','link_type');a.innerHTML=a.dn=name;a.dt=doctype;a.onclick=function(){loaddoc(this.dt,this.dn,onload)};return a;} -var doc_link=DocLink;var known_numbers={0:'zero',1:'one',2:'two',3:'three',4:'four',5:'five',6:'six',7:'seven',8:'eight',9:'nine',10:'ten',11:'eleven',12:'twelve',13:'thirteen',14:'fourteen',15:'fifteen',16:'sixteen',17:'seventeen',18:'eighteen',19:'nineteen',20:'twenty',30:'thirty',40:'forty',50:'fifty',60:'sixty',70:'seventy',80:'eighty',90:'ninety'} -function in_words(n){var is_million=wn.control_panel.currency_format=='Millions'?1:0;n=cint(n) -if(known_numbers[n])return known_numbers[n];var bestguess=n+'';var remainder=0 -if(n<=20) -alert('Error while converting to words');else if(n<100){return in_words(Math.floor(n/10)*10)+'-'+in_words(n%10);}else if(n<1000){bestguess=in_words(Math.floor(n/100))+' '+'hundred';remainder=n%100;}else if(!is_million){if(n<100000){bestguess=in_words(Math.floor(n/1000))+' '+'thousand';remainder=n%1000;}else if(n<10000000){bestguess=in_words(Math.floor(n/100000))+' '+'lakh';remainder=n%100000;}else{bestguess=in_words(Math.floor(n/10000000))+' '+'crore' -remainder=n%10000000}}else{if(n<1000000){bestguess=in_words(Math.floor(n/1000))+' '+'thousand';remainder=n%1000;}else if(n<1000000000){bestguess=in_words(Math.floor(n/1000000))+' '+'million';remainder=n%1000000;}else{bestguess=in_words(Math.floor(n/1000000000))+' '+'billion' -remainder=n%1000000000}} -if(remainder){if(remainder>=100)comma=',' -else comma='' -return bestguess+comma+' '+in_words(remainder);}else{return bestguess;}} -function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} +var doc_link=DocLink;function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} /* * lib/js/legacy/utils/datetime.js */ @@ -696,18 +686,6 @@ msg_dialog.custom_onhide=callback;} var growl_area;function show_alert(txt,id){if(!growl_area){growl_area=$a(popup_cont,'div','',{position:'fixed',bottom:'8px',right:'8px',width:'320px',zIndex:10});} var wrapper=$a(growl_area,'div','',{position:'relative'});var body=$a(wrapper,'div','notice');var c=$a(body,'i','icon-remove-sign',{cssFloat:'right',cursor:'pointer'});$(c).click(function(){$dh(this.wrapper)});c.wrapper=wrapper;var t=$a(body,'div','',{color:'#FFF'});$(t).html(txt);if(id){$(t).attr('id',id);} $(wrapper).hide().fadeIn(1000);} -/* - * lib/js/legacy/utils/shortcut.js - */ -(function(jQuery){jQuery.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":": ","'":"\"",",":"<",".":">","/":"?","\\":"|"}};function keyHandler(handleObj){if(typeof handleObj.data!=="string"){return;} -var origHandler=handleObj.handler,keys=handleObj.data.toLowerCase().split(" ");handleObj.handler=function(event){if(this!==event.target&&(/textarea|select/i.test(event.target.nodeName)||event.target.type==="text")){return;} -var special=event.type!=="keypress"&&jQuery.hotkeys.specialKeys[event.which],character=String.fromCharCode(event.which).toLowerCase(),key,modif="",possible={};if(event.altKey&&special!=="alt"){modif+="alt+";} -if(event.ctrlKey&&special!=="ctrl"){modif+="ctrl+";} -if(event.metaKey&&!event.ctrlKey&&special!=="meta"){modif+="meta+";} -if(event.shiftKey&&special!=="shift"){modif+="shift+";} -if(special){possible[modif+special]=true;}else{possible[modif+character]=true;possible[modif+jQuery.hotkeys.shiftNums[character]]=true;if(modif==="shift+"){possible[jQuery.hotkeys.shiftNums[character]]=true;}} -for(var i=0,l=keys.length;i '):'';var $button=$('').click(fn).appendTo(tb);if(green){$button.addClass('btn-info');$button.find('i').addClass('icon-white');} if(bold)$button.css('font-weight','bold');this.buttons[label]=$button.get(0);$ds(this.toolbar_area);return this.buttons[label];} PageHeader.prototype.clear_toolbar=function(){this.toolbar_area.innerHTML='';this.buttons={};} @@ -1189,22 +1167,6 @@ var uploaders={};var upload_frame_count=0;Uploader=function(parent,args,callback var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];} uploaders[id]=this;} function upload_callback(id,fid){uploaders[id].callback(fid);} -/* - * lib/js/legacy/webpage/page.js - */ -function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) -pscript[event+'_'+this.name](me.wrapper);if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}} -this.page_show=function(){set_title(me.doc.title?me.doc.title:me.name);if(!me.onload_complete){me.trigger('onload');me.onload_complete=true;} -me.trigger('onshow');cur_frm=null;} -this.wrapper=wn.container.add_page(page_name,this.page_show);this.cont=this.wrapper -if(content) -this.wrapper.innerHTML=content;return this;} -function render_page(page_name,menuitem){if(!page_name)return;if((!locals['Page'])||(!locals['Page'][page_name])){loadpage('_home');return;} -var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style) -var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);} -wn.container.change_to(page_name);return p;} -function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)} -$c('webnotes.widgets.page.getpage',{'name':page_name},fn);} /* * lib/js/legacy/wn/page_layout.js */ @@ -1409,7 +1371,7 @@ return false;} * lib/js/wn/views/breadcrumbs.js */ wn.provide('wn.views');wn.views.breadcrumbs=function(parent,module,doctype,name){var $bspan=$(repl('\ - ',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / %(module)s Home',{module:module,module_small:module.toLowerCase()}))} + Home',{home_page:wn.boot.home_page}));if(module){$bspan.append(repl(' / %(module)s Home',{module:module,module_small:module.toLowerCase()}))} if(doctype&&(locals.DocType[doctype]&&!locals.DocType[doctype].issingle)){$bspan.append(repl(' / %(doctype)s List',{doctype:doctype}))} if(name){$bspan.append(' / '+name)} $bspan.appendTo(parent);} @@ -1642,7 +1604,7 @@ d.cur_frm=f;d.dn=dn;d.table_form=f.meta.istable;f.refresh(dn);d.dialog.show();}) /* * lib/js/legacy/widgets/form/form_header.js */ -_f.FrmHeader=function(parent,frm){var me=this;this.wrapper=$a(parent,'div');if(frm.meta.in_dialog)$y(this.wrapper,{marginLeft:'8px',marginRight:'8px'});this.page_head=new PageHeader(this.wrapper);wn.views.breadcrumbs(this.page_head.breadcrumbs,frm.meta.module,frm.meta.name);this.dt_area=$a(this.page_head.main_head,'h1','',{marginRight:'8px',display:'inline'}) +_f.FrmHeader=function(parent,frm){var me=this;this.wrapper=$a(parent,'div');if(frm.meta.in_dialog)$y(this.wrapper,{marginLeft:'8px',marginRight:'8px'});this.page_head=new PageHeader(this.wrapper);wn.views.breadcrumbs(this.page_head.breadcrumbs,frm.meta.module,frm.meta.name);this.dt_area=$a(this.page_head.main_head,'span','',{marginRight:'8px',display:'inline'}) var div=$a(null,'div','',{marginBottom:'4px'});this.page_head.wrapper.insertBefore(div,this.page_head.sub_head);this.dn_area=$a(div,'span','',{fontSize:'14px',fontWeight:'normal',marginRight:'8px',padding:'2px'}) this.status_area=$a(div,'span','',{marginRight:'8px',marginBottom:'2px',cursor:'pointer',textShadow:'none'})} _f.FrmHeader.prototype.show=function(){$ds(this.wrapper);} diff --git a/js/all-web.js b/js/all-web.js index 90f035eb3f9..d7f8f1c43e7 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -19,33 +19,6 @@ */ !function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.remove(),e.trigger("closed")}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){a(b.target).button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide)};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;return this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h](),!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element.addClass("collapse")},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=a.extend({},a.fn.modal.defaults,c),this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=typeof c=="object"&&c;e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
'}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){a.stopPropagation(),a.preventDefault();switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:this.hide();break;default:this.lookup()}},keypress:function(a){a.stopPropagation();if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}},blur:function(a){var b=this;a.stopPropagation(),a.preventDefault(),setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'',item:'
    • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); -/* - * lib/js/lib/sprintf.js - */ -var sprintf=(function(){function get_type(variable){return Object.prototype.toString.call(variable).slice(8,-1).toLowerCase();} -function str_repeat(input,multiplier){for(var output=[];multiplier>0;output[--multiplier]=input){} -return output.join('');} -var str_format=function(){if(!str_format.cache.hasOwnProperty(arguments[0])){str_format.cache[arguments[0]]=str_format.parse(arguments[0]);} -return str_format.format.call(null,str_format.cache[arguments[0]],arguments);};str_format.format=function(parse_tree,argv){var cursor=1,tree_length=parse_tree.length,node_type='',arg,output=[],i,k,match,pad,pad_character,pad_length;for(i=0;i=0?'+'+arg:arg);pad_character=match[4]?match[4]=='0'?'0':match[4].charAt(1):' ';pad_length=match[6]-String(arg).length;pad=match[6]?str_repeat(pad_character,pad_length):'';output.push(match[5]?arg+pad:pad+arg);}} -return output.join('');};str_format.cache={};str_format.parse=function(fmt){var _fmt=fmt,match=[],parse_tree=[],arg_names=0;while(_fmt){if((match=/^[^\x25]+/.exec(_fmt))!==null){parse_tree.push(match[0]);} -else if((match=/^\x25{2}/.exec(_fmt))!==null){parse_tree.push('%');} -else if((match=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt))!==null){if(match[2]){arg_names|=1;var field_list=[],replacement_field=match[2],field_match=[];if((field_match=/^([a-z_][a-z_\d]*)/i.exec(replacement_field))!==null){field_list.push(field_match[1]);while((replacement_field=replacement_field.substring(field_match[0].length))!==''){if((field_match=/^\.([a-z_][a-z_\d]*)/i.exec(replacement_field))!==null){field_list.push(field_match[1]);} -else if((field_match=/^\[(\d+)\]/.exec(replacement_field))!==null){field_list.push(field_match[1]);} -else{throw('[sprintf] huh?');}}} -else{throw('[sprintf] huh?');} -match[2]=field_list;} -else{arg_names|=2;} -if(arg_names===3){throw('[sprintf] mixing positional and named placeholders is not (yet) supported');} -parse_tree.push(match);} -else{throw('[sprintf] huh?');} -_fmt=_fmt.substring(match[0].length);} -return parse_tree;};return str_format;})();var vsprintf=function(fmt,argv){argv.unshift(fmt);return sprintf.apply(null,argv);}; /* * lib/js/core.min.js */ @@ -439,17 +412,7 @@ return false;} var inList=in_list;function add_lists(l1,l2){var l=[];for(var k in l1)l.push(l1[k]);for(var k in l2)l.push(l2[k]);return l;} function docstring(obj){return JSON.stringify(obj);} function DocLink(p,doctype,name,onload){var a=$a(p,'span','link_type');a.innerHTML=a.dn=name;a.dt=doctype;a.onclick=function(){loaddoc(this.dt,this.dn,onload)};return a;} -var doc_link=DocLink;var known_numbers={0:'zero',1:'one',2:'two',3:'three',4:'four',5:'five',6:'six',7:'seven',8:'eight',9:'nine',10:'ten',11:'eleven',12:'twelve',13:'thirteen',14:'fourteen',15:'fifteen',16:'sixteen',17:'seventeen',18:'eighteen',19:'nineteen',20:'twenty',30:'thirty',40:'forty',50:'fifty',60:'sixty',70:'seventy',80:'eighty',90:'ninety'} -function in_words(n){var is_million=wn.control_panel.currency_format=='Millions'?1:0;n=cint(n) -if(known_numbers[n])return known_numbers[n];var bestguess=n+'';var remainder=0 -if(n<=20) -alert('Error while converting to words');else if(n<100){return in_words(Math.floor(n/10)*10)+'-'+in_words(n%10);}else if(n<1000){bestguess=in_words(Math.floor(n/100))+' '+'hundred';remainder=n%100;}else if(!is_million){if(n<100000){bestguess=in_words(Math.floor(n/1000))+' '+'thousand';remainder=n%1000;}else if(n<10000000){bestguess=in_words(Math.floor(n/100000))+' '+'lakh';remainder=n%100000;}else{bestguess=in_words(Math.floor(n/10000000))+' '+'crore' -remainder=n%10000000}}else{if(n<1000000){bestguess=in_words(Math.floor(n/1000))+' '+'thousand';remainder=n%1000;}else if(n<1000000000){bestguess=in_words(Math.floor(n/1000000))+' '+'million';remainder=n%1000000;}else{bestguess=in_words(Math.floor(n/1000000000))+' '+'billion' -remainder=n%1000000000}} -if(remainder){if(remainder>=100)comma=',' -else comma='' -return bestguess+comma+' '+in_words(remainder);}else{return bestguess;}} -function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} +var doc_link=DocLink;function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;} /* * lib/js/legacy/utils/datetime.js */ @@ -610,228 +573,6 @@ msg_dialog.custom_onhide=callback;} var growl_area;function show_alert(txt,id){if(!growl_area){growl_area=$a(popup_cont,'div','',{position:'fixed',bottom:'8px',right:'8px',width:'320px',zIndex:10});} var wrapper=$a(growl_area,'div','',{position:'relative'});var body=$a(wrapper,'div','notice');var c=$a(body,'i','icon-remove-sign',{cssFloat:'right',cursor:'pointer'});$(c).click(function(){$dh(this.wrapper)});c.wrapper=wrapper;var t=$a(body,'div','',{color:'#FFF'});$(t).html(txt);if(id){$(t).attr('id',id);} $(wrapper).hide().fadeIn(1000);} -/* - * lib/js/legacy/utils/shortcut.js - */ -(function(jQuery){jQuery.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":": ","'":"\"",",":"<",".":">","/":"?","\\":"|"}};function keyHandler(handleObj){if(typeof handleObj.data!=="string"){return;} -var origHandler=handleObj.handler,keys=handleObj.data.toLowerCase().split(" ");handleObj.handler=function(event){if(this!==event.target&&(/textarea|select/i.test(event.target.nodeName)||event.target.type==="text")){return;} -var special=event.type!=="keypress"&&jQuery.hotkeys.specialKeys[event.which],character=String.fromCharCode(event.which).toLowerCase(),key,modif="",possible={};if(event.altKey&&special!=="alt"){modif+="alt+";} -if(event.ctrlKey&&special!=="ctrl"){modif+="ctrl+";} -if(event.metaKey&&!event.ctrlKey&&special!=="meta"){modif+="meta+";} -if(event.shiftKey&&special!=="shift"){modif+="shift+";} -if(special){possible[modif+special]=true;}else{possible[modif+character]=true;possible[modif+jQuery.hotkeys.shiftNums[character]]=true;if(modif==="shift+"){possible[jQuery.hotkeys.shiftNums[character]]=true;}} -for(var i=0,l=keys.length;i0)ret='Read';var a_o_s=cint(this.df.allow_on_submit);if(a_o_s&&(this.in_grid||(this.frm&&this.frm.not_in_container))){a_o_s=null;if(this.in_grid)a_o_s=this.grid.field.df.allow_on_submit;if(this.frm&&this.frm.not_in_container){a_o_s=cur_grid.field.df.allow_on_submit;}} -if(cur_frm.editable&&a_o_s&&cint(cur_frm.doc.docstatus)>0&&!this.df.hidden){tmp_perm=get_perm(cur_frm.doctype,cur_frm.docname,1);if(tmp_perm[this.df.permlevel]&&tmp_perm[this.df.permlevel][WRITE])ret='Write';} -return ret;} -Field.prototype.set_style_mandatory=function(add){if(add){$(this.txt?this.txt:this.input).addClass('input-mandatory');if(this.disp_area)$(this.disp_area).addClass('input-mandatory');}else{$(this.txt?this.txt:this.input).removeClass('input-mandatory');if(this.disp_area)$(this.disp_area).removeClass('input-mandatory');}} -Field.prototype.refresh_mandatory=function(){if(this.in_filter)return;if(this.df.reqd){if(this.label_area)this.label_area.style.color="#d22";this.set_style_mandatory(1);}else{if(this.label_area)this.label_area.style.color="#222";this.set_style_mandatory(0);} -this.refresh_label_icon() -this.set_reqd=this.df.reqd;} -Field.prototype.refresh_display=function(){if(!this.current_status||this.current_status!=this.disp_status){if(this.disp_status=='Write'){if(this.make_input&&(!this.input)){this.make_input();if(this.onmake_input)this.onmake_input();} -if(this.show)this.show() -else{$ds(this.wrapper);} -if(this.input){$ds(this.input_area);$dh(this.disp_area);if(this.input.refresh)this.input.refresh();}else{$dh(this.input_area);$ds(this.disp_area);}}else if(this.disp_status=='Read'){if(this.show)this.show() -else{$ds(this.wrapper);} -$dh(this.input_area);$ds(this.disp_area);}else{if(this.hide)this.hide();else $dh(this.wrapper);} -this.current_status=this.disp_status;}} -Field.prototype.refresh=function(){this.disp_status=this.get_status();if(this.in_grid&&this.table_refresh&&this.disp_status=='Write') -{this.table_refresh();return;} -this.set_label();this.refresh_display();if(this.onrefresh) -this.onrefresh();if(this.input){if(this.input.refresh)this.input.refresh(this.df);} -if(this.wrapper){this.wrapper.fieldobj=this;$(this.wrapper).trigger('refresh');} -if(!this.not_in_form) -this.set_input(_f.get_value(this.doctype,this.docname,this.df.fieldname));this.refresh_mandatory();this.set_max_width();} -Field.prototype.refresh_label_icon=function(){if(this.df.reqd){if(this.get_value&&is_null(this.get_value())){if(this.label_icon)$ds(this.label_icon);$(this.txt?this.txt:this.input).addClass('field-to-update')}else{if(this.label_icon)$dh(this.label_icon);$(this.txt?this.txt:this.input).removeClass('field-to-update')}}} -Field.prototype.set=function(val){if(this.not_in_form) -return;if((!this.docname)&&this.grid){this.docname=this.grid.add_newrow();} -var set_val=val;if(this.validate)set_val=this.validate(val);_f.set_value(this.doctype,this.docname,this.df.fieldname,set_val);this.value=val;} -Field.prototype.set_input=function(val){this.value=val;if(this.input&&this.input.set_input){if(val==null)this.input.set_input('');else this.input.set_input(val);} -var disp_val=val;if(val==null)disp_val='';this.set_disp(disp_val);} -Field.prototype.run_trigger=function(){this.refresh_label_icon();if(this.df.reqd&&this.get_value&&!is_null(this.get_value())&&this.set_as_error) -this.set_as_error(0);if(this.not_in_form){return;} -if(cur_frm.cscript[this.df.fieldname]) -cur_frm.runclientscript(this.df.fieldname,this.doctype,this.docname);cur_frm.refresh_dependency();} -Field.prototype.set_disp_html=function(t){if(this.disp_area){$(this.disp_area).addClass('disp_area');this.disp_area.innerHTML=(t==null?'':t);if(!t)$(this.disp_area).addClass('disp_area_no_val');}} -Field.prototype.set_disp=function(val){this.set_disp_html(val);} -Field.prototype.set_as_error=function(set){if(this.in_grid||this.in_filter)return;var w=this.txt?this.txt:this.input;if(set){$y(w,{border:'2px solid RED'});}else{$y(w,{border:'1px solid #888'});}} -Field.prototype.activate=function(docname){this.docname=docname;this.refresh();if(this.input){var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);this.last_value=v;if(this.input.onchange&&this.input.get_value&&this.input.get_value()!=v){if(this.validate) -this.input.set_value(this.validate(v));else -this.input.set_value((v==null)?'':v);if(this.format_input) -this.format_input();} -if(this.input.focus){try{this.input.focus();}catch(e){}}} -if(this.txt){try{this.txt.focus();}catch(e){} -this.txt.field_object=this;}} -function DataField(){}DataField.prototype=new Field();DataField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,this.df.fieldtype=='Password'?'password':'text');this.get_value=function(){var v=this.input.value;if(this.validate) -v=this.validate(v);return v;} -this.input.name=this.df.fieldname;$(this.input).change(function(){me.set_value($(this).val());});this.set_value=function(val){if(!me.last_value)me.last_value='';if(me.validate){val=me.validate(val);me.input.value=val;} -me.set(val);if(me.format_input) -me.format_input();if(in_list(['Currency','Float','Int'],me.df.fieldtype)){if(flt(me.last_value)==flt(val)){me.last_value=val;return;}} -me.last_value=val;me.run_trigger();} -this.input.set_input=function(val){if(val==null)val='';me.input.value=val;if(me.format_input)me.format_input();} -if(this.df.options=='Suggest'){if(this.suggest_icon)$di(this.suggest_icon);$(me.input).autocomplete({source:function(request,response){wn.call({method:'webnotes.widgets.search.search_link',args:{'txt':request.term,'dt':me.df.options,'query':repl('SELECT DISTINCT `%(fieldname)s` FROM \ - `tab%(dt)s` WHERE `%(fieldname)s` LIKE "%s" LIMIT 50',{fieldname:me.df.fieldname,dt:me.df.parent})},callback:function(r){response(r.results);}});}});}} -DataField.prototype.validate=function(v){if(this.df.options=='Phone'){if(v+''=='')return'';v1='' -v=v.replace(/ /g,'').replace(/-/g,'').replace(/\(/g,'').replace(/\)/g,'');if(v&&v.substr(0,1)=='+'){v1='+';v=v.substr(1);} -if(v&&v.substr(0,2)=='00'){v1+='00';v=v.substr(2);} -if(v&&v.substr(0,1)=='0'){v1+='0';v=v.substr(1);} -v1+=cint(v)+'';return v1;}else if(this.df.options=='Email'){if(v+''=='')return'';if(!validate_email(v)){msgprint(this.df.label+': '+v+' is not a valid email id');return'';}else -return v;}else{return v;}} -DataField.prototype.onrefresh=function(){if(this.input&&this.df.colour){var col='#'+this.df.colour.split(':')[1];$bg(this.input,col);}} -function ReadOnlyField(){} -ReadOnlyField.prototype=new Field();function HTMLField(){} -HTMLField.prototype=new Field();HTMLField.prototype.with_label=0;HTMLField.prototype.set_disp=function(val){this.disp_area.innerHTML=val;} -HTMLField.prototype.set_input=function(val){if(val)this.set_disp(val);} -HTMLField.prototype.onrefresh=function(){this.set_disp(this.df.options?this.df.options:'');} -var datepicker_active=0;function DateField(){}DateField.prototype=new Field();DateField.prototype.make_input=function(){var me=this;this.user_fmt=wn.control_panel.date_format;if(!this.user_fmt)this.user_fmt='dd-mm-yy';this.input=$a(this.input_area,'input');$(this.input).datepicker({dateFormat:me.user_fmt.replace('yyyy','yy'),altFormat:'yy-mm-dd',changeYear:true,beforeShow:function(input,inst){datepicker_active=1},onClose:function(dateText,inst){datepicker_active=0;if(_f.cur_grid_cell) -_f.cur_grid_cell.grid.cell_deselect();}});var me=this;me.input.onchange=function(){if(this.value==null)this.value='';if(!this.not_in_form) -me.set(dateutil.user_to_str(me.input.value));me.run_trigger();} -me.input.set_input=function(val){if(val==null)val='';else val=dateutil.str_to_user(val);me.input.value=val;} -me.get_value=function(){if(me.input.value) -return dateutil.user_to_str(me.input.value);}} -DateField.prototype.set_disp=function(val){var v=dateutil.str_to_user(val);if(v==null)v='';this.set_disp_html(v);} -DateField.prototype.validate=function(v){if(!v)return;var me=this;this.clear=function(){msgprint("Date must be in format "+this.user_fmt);me.input.set_input('');return'';} -var t=v.split('-');if(t.length!=3){return this.clear();} -else if(cint(t[1])>12||cint(t[1])<1){return this.clear();} -else if(cint(t[2])>31||cint(t[2])<1){return this.clear();} -return v;};function LinkField(){}LinkField.prototype=new Field();LinkField.prototype.make_input=function(){var me=this;if(me.df.no_buttons){this.txt=$a(this.input_area,'input');this.input=this.txt;}else{makeinput_popup(this,'icon-search','icon-play','icon-plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0) -$(me.btn2).css('display','inline-block');else $dh(me.btn2);}} -me.txt.field_object=this;me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;} -me.get_value=function(){return me.txt.value;} -$(me.txt).autocomplete({source:function(request,response){wn.call({method:'webnotes.widgets.search.search_link',args:{'txt':request.term,'dt':me.df.options,'query':me.get_custom_query()},callback:function(r){response(r.results);},});},select:function(event,ui){me.set_input_value(ui.item.value);}}).data('autocomplete')._renderItem=function(ul,item){return $('
  • ').data('item.autocomplete',item).append(repl('%(label)s
    %(info)s    ',item)).appendTo(ul);};$(this.txt).change(function(){if(!$(this).val()) -me.set_input_value('');})} -LinkField.prototype.get_custom_query=function(){this.set_get_query();if(this.get_query){if(cur_frm) -var doc=locals[cur_frm.doctype][cur_frm.docname];return this.get_query(doc,this.doctype,this.docname);}} -LinkField.prototype.setup_buttons=function(){var me=this;me.btn.onclick=function(){selector.set(me,me.df.options,me.df.label);selector.show(me.txt);} -if(me.btn1)me.btn1.onclick=function(){if(me.txt.value&&me.df.options){loaddoc(me.df.options,me.txt.value);}} -me.can_create=0;if((!me.not_in_form)&&in_list(profile.can_create,me.df.options)){me.can_create=1;me.btn2.onclick=function(){var on_save_callback=function(new_rec){if(new_rec){var d=_f.calling_doc_stack.pop();locals[d[0]][d[1]][me.df.fieldname]=new_rec;me.refresh();if(me.grid)me.grid.refresh();me.run_trigger();}} -_f.calling_doc_stack.push([me.doctype,me.docname]);new_doc(me.df.options,me.on_new,1,on_save_callback,me.doctype,me.docname,me.frm.not_in_container);}}else{$dh(me.btn2);$y($td(me.tab,0,2),{width:'0px'});}} -LinkField.prototype.set_input_value=function(val){var me=this;me.refresh_label_icon();if(me.not_in_form){$(this.txt).val(val);return;} -if(cur_frm){if(val==locals[me.doctype][me.docname][me.df.fieldname]){me.set(val);me.run_trigger();return;}} -me.set(val);if(_f.cur_grid_cell) -_f.cur_grid_cell.grid.cell_deselect();if(!val){me.run_trigger();return;} -var fetch='';if(cur_frm.fetch_dict[me.df.fieldname]) -fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':val,'options':me.df.options,'fetch':fetch},function(r,rt){if(selector&&selector.display)return;if(r.message=='Ok'){if($(me.txt).val()!=val){me.set_input(val);} -if(r.fetch_values) -me.set_fetch_values(r.fetch_values);me.run_trigger();}else{var astr='';if(in_list(profile.can_create,me.df.options))astr=repl('

    Click here to create a new %(dtl)s',{dt:me.df.options,dtl:get_doctype_label(me.df.options)}) -msgprint(repl('error:%(val)s is not a valid %(dt)s.

    You must first create a new %(dt)s %(val)s and then select its value. To find an existing %(dt)s, click on the magnifying glass next to the field.%(add)s',{val:me.txt.value,dt:get_doctype_label(me.df.options),add:astr}));me.txt.value='';me.set('');}});} -LinkField.prototype.set_fetch_values=function(fetch_values){var fl=cur_frm.fetch_dict[this.df.fieldname].fields;var changed_fields=[];for(var i=0;i"+val+"";this.set_disp_html(t);} -function IntField(){}IntField.prototype=new DataField();IntField.prototype.validate=function(v){if(isNaN(parseInt(v)))return null;return cint(v);};IntField.prototype.format_input=function(){if(this.input.value==null)this.input.value='';} -function FloatField(){}FloatField.prototype=new DataField();FloatField.prototype.validate=function(v){var v=parseFloat(v);if(isNaN(v)) -return null;return v;};FloatField.prototype.format_input=function(){if(this.input.value==null)this.input.value='';} -function CurrencyField(){}CurrencyField.prototype=new DataField();CurrencyField.prototype.format_input=function(){var v=fmt_money(this.input.value);if(this.not_in_form){if(!flt(this.input.value))v='';} -this.input.value=v;} -CurrencyField.prototype.validate=function(v){if(v==null||v=='') -return 0;return flt(v,2);} -CurrencyField.prototype.set_disp=function(val){var v=fmt_money(val);this.set_disp_html(v);} -CurrencyField.prototype.onmake_input=function(){if(!this.input)return;this.input.onfocus=function(){if(flt(this.value)==0)this.select();}} -function CheckField(){}CheckField.prototype=new Field();CheckField.prototype.validate=function(v){var v=parseInt(v);if(isNaN(v))return 0;return v;};CheckField.prototype.onmake=function(){this.checkimg=$a(this.disp_area,'div');var img=$a(this.checkimg,'img');img.src='lib/images/ui/tick.gif';$dh(this.checkimg);} -CheckField.prototype.make_input=function(){var me=this;this.input=$a_input(this.input_area,'checkbox');$y(this.input,{width:"16px",border:'0px',margin:'2px'});$(this.input).click(function(){me.set(this.checked?1:0);me.run_trigger();}) -this.input.set_input=function(v){v=parseInt(v);if(isNaN(v))v=0;if(v)me.input.checked=true;else me.input.checked=false;} -this.get_value=function(){return this.input.checked?1:0;}} -CheckField.prototype.set_disp=function(val){if(val){$ds(this.checkimg);} -else{$dh(this.checkimg);}} -function TextField(){}TextField.prototype=new Field();TextField.prototype.set_disp=function(val){this.disp_area.innerHTML=replace_newlines(val);} -TextField.prototype.make_input=function(){var me=this;if(this.in_grid) -return;this.input=$a(this.input_area,'textarea');if(this.df.fieldtype=='Small Text') -this.input.style.height="80px";this.input.set_input=function(v){me.input.value=v;} -this.input.onchange=function(){me.set(me.input.value);me.run_trigger();} -this.get_value=function(){return this.input.value;}} -var text_dialog;function make_text_dialog(){var d=new Dialog(520,410,'Edit Text');d.make_body([['Text','Enter Text'],['HTML','Description'],['Button','Update']]);d.widgets['Update'].onclick=function(){var t=this.dialog;t.field.set(t.widgets['Enter Text'].value);t.hide();} -d.onshow=function(){this.widgets['Enter Text'].style.height='300px';var v=_f.get_value(this.field.doctype,this.field.docname,this.field.df.fieldname);this.widgets['Enter Text'].value=v==null?'':v;this.widgets['Enter Text'].focus();this.widgets['Description'].innerHTML='' -if(this.field.df.description) -$a(this.widgets['Description'],'div','help small','',this.field.df.description);} -d.onhide=function(){if(_f.cur_grid_cell) -_f.cur_grid_cell.grid.cell_deselect();} -text_dialog=d;} -TextField.prototype.table_refresh=function(){if(!this.text_dialog) -make_text_dialog();text_dialog.set_title('Enter text for "'+this.df.label+'"');text_dialog.field=this;text_dialog.show();} -function SelectField(){}SelectField.prototype=new Field();SelectField.prototype.make_input=function(){var me=this;var opt=[];if(this.in_filter&&(!this.df.single_select)){this.input=$a(this.input_area,'select');this.input.multiple=true;this.input.style.height='4em';this.input.lab=$a(this.input_area,'div',{fontSize:'9px',color:'#999'});this.input.lab.innerHTML='(Use Ctrl+Click to select multiple or de-select)'}else{this.input=$a(this.input_area,'select');this.input.onchange=function(){if(me.validate) -me.validate();me.set(sel_val(this));me.run_trigger();} -if(this.df.options=='attach_files:'){this.file_attach=true;}} -this.set_as_single=function(){var i=this.input;i.multiple=false;i.style.height=null;if(i.lab)$dh(i.lab)} -this.refresh_options=function(options){if(options) -me.df.options=options;if(this.file_attach) -this.set_attach_options();me.options_list=me.df.options?me.df.options.split('\n'):[];empty_select(this.input);if(me.in_filter&&me.options_list[0]!=''){me.options_list=add_lists([''],me.options_list);} -add_sel_options(this.input,me.options_list);} -this.onrefresh=function(){this.refresh_options();if(this.not_in_form){this.input.value='';return;} -if(_f.get_value) -var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.options_list&&this.options_list.length) -var v=this.options_list[0];else -var v=null;} -this.input.set_input(v);} -this.input.set_input=function(v){if(!v){if(!me.input.multiple){if(me.docname){if(me.options_list&&me.options_list.length){me.set(me.options_list[0]);me.input.value=me.options_list[0];}else{me.input.value='';}}}}else{if(me.options_list){if(me.input.multiple){for(var i=0;i '):'';var $button=$('').click(fn).appendTo(tb);if(green){$button.addClass('btn-info');$button.find('i').addClass('icon-white');} if(bold)$button.css('font-weight','bold');this.buttons[label]=$button.get(0);$ds(this.toolbar_area);return this.buttons[label];} PageHeader.prototype.clear_toolbar=function(){this.toolbar_area.innerHTML='';this.buttons={};} PageHeader.prototype.make_buttonset=function(){$(this.toolbar_area).buttonset();} -/* - * lib/js/legacy/webpage/search.js - */ -search_fields={};function setlinkvalue(name){selector.input.set_input_value(name);selector.hide();} -function makeselector(){var d=new Dialog(540,440,'Search');d.make_body([['Data','Beginning With','Tip: You can use wildcard "%"'],['Select','Search By'],['Button','Search'],['HTML','Help'],['HTML','Result']]);var inp=d.widgets['Beginning With'];var field_sel=d.widgets['Search By'];var btn=d.widgets['Search'];d.sel_type='';d.values_len=0;d.set=function(input,type,label){d.sel_type=type;d.input=input;if(d.style!='Link'){d.rows['Result'].innerHTML='';d.values_len=0;} -d.style='Link';d.set_query_description() -if(!d.sel_type)d.sel_type='Value';d.set_title('Select a "'+d.sel_type+'" for field "'+label+'"');} -d.set_search=function(dt){if(d.style!='Search'){d.rows['Result'].innerHTML='';d.values_len=0;} -d.style='Search';if(d.input){d.input=null;sel_type=null;} -d.sel_type=get_label_doctype(dt);d.set_title('Quick Search for '+dt);} -$(inp).keydown(function(e){if(e.which==13){if(!btn.disabled)btn.onclick();}}) -d.set_query_description=function(){if(d.input&&d.input.query_description){d.rows['Help'].innerHTML='
    '+d.input.query_description+'
    ';}else{d.rows['Help'].innerHTML=''}} -d.onshow=function(){if(d.set_doctype!=d.sel_type){d.rows['Result'].innerHTML='';d.values_len=0;} -inp.value='';if(d.input&&d.input.txt.value){inp.value=d.input.txt.value;} -try{inp.focus();}catch(e){} -if(d.input)d.input.set_get_query();var get_sf_list=function(dt){var l=[];var lf=search_fields[dt];for(var i=0;i'+t+'');} -$(document).bind('startup',function(){err_console=new Dialog(640,480,'Error Console') -err_console.make_body([['HTML','Error List'],['Button','Clear'],['HTML','Error Report']]);var span=$a(err_console.widgets['Error Report'],'span','link_type');span.innerHTML='Send Error Report';span.onclick=function(){msg=prompt('How / where did you get the error [optional]') -var call_back=function(r,rt){err_console.hide();msgprint("Error Report Sent")} -$c('webnotes.utils.send_error_report',{'err_msg':err_console.rows['Error List'].innerHTML,'msg':msg},call_back);} -err_console.widgets['Clear'].onclick=function(){err_list=[];err_console.rows['Error List'].innerHTML='';err_console.hide();} -err_console.onshow=function(){err_console.rows['Error List'].innerHTML='
    ' -+err_list.join('
    ')+'
    ';}}); /* * lib/js/legacy/webpage/loaders.js */ @@ -1080,35 +742,6 @@ _f.edit_record(doctype,name);}else{wn.set_route('Form',doctype,name);}})} var load_doc=loaddoc;function new_doc(doctype,onload,in_dialog,on_save_callback,cdt,cdn,cnic){doctype=get_label_doctype(doctype);wn.model.with_doctype(doctype,function(){if(locals.DocType[doctype].in_dialog){_f.edit_record(doctype,'New '+doctype);}else{wn.set_route('Form',doctype,'New '+doctype);}})} var newdoc=new_doc;var pscript={};function loadpage(page_name,call_back,no_history){wn.set_route(page_name);} function loaddocbrowser(dt){wn.set_route('List',dt);} -/* - * lib/js/legacy/webpage/uploader.js - */ -var uploaders={};var upload_frame_count=0;Uploader=function(parent,args,callback){var id='frame'+upload_frame_count;upload_frame_count++;this.callback=callback;var div=$a(parent,'div');div.innerHTML='';var div=$a(parent,'div');div.innerHTML='
    ';var ul_form=div.childNodes[0];var f_list=[];var inp_fdata=$a_input($a(ul_form,'span'),'file',{name:'filedata'},{marginLeft:'7px'});if(!('cmd'in args)){var inp=$a_input($a(ul_form,'span'),'hidden',{name:'cmd'});inp.value='uploadfile';} -var inp=$a_input($a(ul_form,'span'),'hidden',{name:'uploader_id'});inp.value=id;var inp=$a_input($a(ul_form,'span'),'submit',null,{marginLeft:'7px'});inp.value='Upload';$y(inp,{width:'80px'});for(var key in args){var inp=$a_input($a(ul_form,'span'),'hidden',{name:key});inp.value=args[key];} -uploaders[id]=this;} -function upload_callback(id,fid){uploaders[id].callback(fid);} -/* - * lib/js/legacy/webpage/page.js - */ -function Page(page_name,content){var me=this;this.name=page_name;this.trigger=function(event){try{if(pscript[event+'_'+this.name]) -pscript[event+'_'+this.name](me.wrapper);if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}} -this.page_show=function(){set_title(me.doc.title?me.doc.title:me.name);if(!me.onload_complete){me.trigger('onload');me.onload_complete=true;} -me.trigger('onshow');cur_frm=null;} -this.wrapper=wn.container.add_page(page_name,this.page_show);this.cont=this.wrapper -if(content) -this.wrapper.innerHTML=content;return this;} -function render_page(page_name,menuitem){if(!page_name)return;if((!locals['Page'])||(!locals['Page'][page_name])){loadpage('_home');return;} -var pdoc=locals['Page'][page_name];if(pdoc.style)set_style(pdoc.style) -var p=new Page(page_name,pdoc._Page__content?pdoc._Page__content:pdoc.content);var script=pdoc.__script?pdoc.__script:pdoc.script;p.doc=pdoc;if(script){eval(script);} -wn.container.change_to(page_name);return p;} -function refresh_page(page_name){var fn=function(r,rt){render_page(page_name)} -$c('webnotes.widgets.page.getpage',{'name':page_name},fn);} -/* - * lib/js/legacy/wn/page_layout.js - */ -wn.PageLayout=function(args){$.extend(this,args) -this.wrapper=$a(this.parent,'div','layout-wrapper layout-wrapper-background');this.main=$a(this.wrapper,'div','layout-main-section');this.sidebar_area=$a(this.wrapper,'div','layout-side-section');$a(this.wrapper,'div','',{clear:'both'});this.head=$a(this.main,'div');this.toolbar_area=$a(this.main,'div');this.body=$a(this.main,'div');this.footer=$a(this.main,'div');if(this.heading){this.page_head=new PageHeader(this.head,this.heading);}} /* * lib/js/legacy/wn/widgets/footer.js */ diff --git a/temp.py b/temp.py index cdbd4b0c442..b6080f013f9 100644 --- a/temp.py +++ b/temp.py @@ -39,17 +39,19 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. if __name__=='__main__': import os - clicense = '\n'.join([('# ' + l) for l in license2.split('\n')]) - - for wt in os.walk('lib/py/build/'): + #clicense = '\n'.join([('# ' + l) for l in license2.split('\n')]) + cnt = 0 + for wt in os.walk('.'): for fname in wt[2]: - if fname.endswith('.py'): - path = os.path.join(wt[0], fname) - with open(path, 'r') as codefile: - codetxt = codefile.read() + if fname.endswith('.js'): + cnt += 1 + #path = os.path.join(wt[0], fname) + #with open(path, 'r') as codefile: + # codetxt = codefile.read() - if codetxt.strip(): - with open(path, 'w') as codefile: - codefile.write(clicense + '\n\n' + codetxt) + #if codetxt.strip(): + # with open(path, 'w') as codefile: + # codefile.write(clicense + '\n\n' + codetxt) - print 'updated in ' + path \ No newline at end of file + # print 'updated in ' + path + print cnt diff --git a/version.num b/version.num index ae6f1163f23..1fd9918d8f2 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -1507 \ No newline at end of file +1539