From f6be9b27bbc4a621a7d0c9dfe0872dec0e01d608 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 24 Feb 2012 16:36:58 +0530 Subject: [PATCH] changed icons to bootstrap --- build.json | 1 - css/all-app.css | 253 ------------------------------------------------ js/all-app.js | 44 +++++---- js/all-web.js | 16 +-- version.num | 2 +- 5 files changed, 37 insertions(+), 279 deletions(-) diff --git a/build.json b/build.json index d9ec1e731a..95a38d6c57 100644 --- a/build.json +++ b/build.json @@ -61,7 +61,6 @@ "lib/css/legacy/autosuggest.css", "lib/css/legacy/dialog.css", "lib/css/legacy/tabs.css", - "lib/css/legacy/bw-icons.css", "lib/css/legacy/sidebar.css", "lib/css/bootstrap/headings.css", "lib/css/bootstrap/buttons.css", diff --git a/css/all-app.css b/css/all-app.css index 9382352af1..28e7c0ef1f 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1148,259 +1148,6 @@ ul.box_tabs li.box_tab_selected { ul.box_tabs li.box_tab_selected a { color: #fff; } -/* - * lib/css/legacy/bw-icons.css - */ -/** general icons **/ - -.wn-icon { background: url('../lib/images/icons/icons.png'); width: 16px; height: 16px; cursor: pointer; } -.ic-2x2_grid { background-position: 0 0; } -.ic-3x3_grid { background-position: 0 -36px; } -.ic-3x3_grid_2 { background-position: 0 -72px; } -.ic-air_signal { background-position: 0 -108px; } -.ic-align_center { background-position: 0 -144px; } -.ic-align_just { background-position: 0 -180px; } -.ic-align_left { background-position: 0 -216px; } -.ic-align_right { background-position: 0 -252px; } -.ic-app_window { background-position: 0 -288px; } -.ic-arrow_bottom { background-position: 0 -324px; } -.ic-arrow_bottom_left { background-position: 0 -360px; } -.ic-arrow_bottom_right { background-position: 0 -396px; } -.ic-arrow_l { background-position: 0 -432px; } -.ic-arrow_left { background-position: 0 -468px; } -.ic-arrow_r { background-position: 0 -504px; } -.ic-arrow_right { background-position: 0 -540px; } -.ic-arrow_top { background-position: 0 -576px; } -.ic-arrow_top_left { background-position: 0 -612px; } -.ic-arrow_top_right { background-position: 0 -648px; } -.ic-arrow_two_head { background-position: 0 -684px; } -.ic-arrow_two_head_2 { background-position: 0 -720px; } -.ic-attention { background-position: 0 -756px; } -.ic-battery { background-position: 0 -792px; } -.ic-bell { background-position: 0 -828px; } -.ic-book { background-position: 0 -864px; } -.ic-bookmark_1 { background-position: 0 -900px; } -.ic-bookmark_2 { background-position: 0 -936px; } -.ic-box { background-position: 0 -972px; } -.ic-br_down { background-position: 0 -1008px; } -.ic-br_next { background-position: 0 -1044px; } -.ic-br_prev { background-position: 0 -1080px; } -.ic-br_up { background-position: 0 -1116px; } -.ic-brackets { background-position: 0 -1152px; } -.ic-browser { background-position: 0 -1188px; } -.ic-brush { background-position: 0 -1224px; } -.ic-bug { background-position: 0 -1260px; } -.ic-burst { background-position: 0 -1296px; } -.ic-calc { background-position: 0 -1332px; } -.ic-calendar_1 { background-position: 0 -1368px; } -.ic-calendar_2 { background-position: 0 -1404px; } -.ic-cancel { background-position: 0 -1440px; } -.ic-case { background-position: 0 -1476px; } -.ic-cc { background-position: 0 -1512px; } -.ic-cert { background-position: 0 -1548px; } -.ic-chart_bar { background-position: 0 -1584px; } -.ic-chart_line { background-position: 0 -1620px; } -.ic-chart_line_2 { background-position: 0 -1656px; } -.ic-chart_pie { background-position: 0 -1692px; } -.ic-checkbox_checked { background-position: 0 -1728px; } -.ic-checkbox_unchecked { background-position: 0 -1764px; } -.ic-checkmark { background-position: 0 -1800px; } -.ic-clip { background-position: 0 -1836px; } -.ic-clipboard_copy { background-position: 0 -1872px; } -.ic-clipboard_cut { background-position: 0 -1908px; } -.ic-clipboard_past { background-position: 0 -1944px; } -.ic-clock { background-position: -36px 0; } -.ic-cloud { background-position: -36px -36px; } -.ic-cloud_rain { background-position: -36px -72px; } -.ic-cog { background-position: -36px -108px; } -.ic-comp { background-position: -36px -144px; } -.ic-compass { background-position: -36px -180px; } -.ic-contact_card { background-position: -36px -216px; } -.ic-cube { background-position: -36px -252px; } -.ic-cur_bp { background-position: -36px -288px; } -.ic-cur_dollar { background-position: -36px -324px; } -.ic-cur_euro { background-position: -36px -360px; } -.ic-cur_yen { background-position: -36px -396px; } -.ic-cursor_H_split { background-position: -36px -432px; } -.ic-cursor_V_split { background-position: -36px -468px; } -.ic-cursor_arrow { background-position: -36px -504px; } -.ic-cursor_drag_arrow { background-position: -36px -540px; } -.ic-cursor_drag_arrow_2 { background-position: -36px -576px; } -.ic-cursor_drag_hand { background-position: -36px -612px; } -.ic-cursor_hand { background-position: -36px -648px; } -.ic-db { background-position: -36px -684px; } -.ic-delete { background-position: -36px -720px; } -.ic-doc_delete { background-position: -36px -756px; } -.ic-doc_edit { background-position: -36px -792px; } -.ic-doc_empty { background-position: -36px -828px; } -.ic-doc_export { background-position: -36px -864px; } -.ic-doc_import { background-position: -36px -900px; } -.ic-doc_lines { background-position: -36px -936px; } -.ic-doc_lines_stright { background-position: -36px -972px; } -.ic-doc_minus { background-position: -36px -1008px; } -.ic-doc_new { background-position: -36px -1044px; } -.ic-doc_plus { background-position: -36px -1080px; } -.ic-document { background-position: -36px -1116px; } -.ic-download { background-position: -36px -1152px; } -.ic-emotion_sad { background-position: -36px -1188px; } -.ic-emotion_smile { background-position: -36px -1224px; } -.ic-expand { background-position: -36px -1260px; } -.ic-eye { background-position: -36px -1296px; } -.ic-eye_inv { background-position: -36px -1332px; } -.ic-facebook { background-position: -36px -1368px; } -.ic-filter { background-position: -36px -1404px; } -.ic-fire { background-position: -36px -1440px; } -.ic-flag { background-position: -36px -1476px; } -.ic-folder { background-position: -36px -1512px; } -.ic-folder_arrow { background-position: -36px -1548px; } -.ic-folder_delete { background-position: -36px -1584px; } -.ic-folder_minus { background-position: -36px -1620px; } -.ic-folder_open { background-position: -36px -1656px; } -.ic-folder_plus { background-position: -36px -1692px; } -.ic-font_bold { background-position: -36px -1728px; } -.ic-font_italic { background-position: -36px -1764px; } -.ic-font_size { background-position: -36px -1800px; } -.ic-font_strokethrough { background-position: -36px -1836px; } -.ic-font_underline { background-position: -36px -1872px; } -.ic-game_pad { background-position: -36px -1908px; } -.ic-globe_1 { background-position: -36px -1944px; } -.ic-globe_2 { background-position: -72px 0; } -.ic-globe_3 { background-position: -72px -36px; } -.ic-google { background-position: -72px -72px; } -.ic-hand_1 { background-position: -72px -108px; } -.ic-hand_2 { background-position: -72px -144px; } -.ic-hand_contra { background-position: -72px -180px; } -.ic-hand_pro { background-position: -72px -216px; } -.ic-headphones { background-position: -72px -252px; } -.ic-heart { background-position: -72px -288px; } -.ic-heart_empty { background-position: -72px -324px; } -.ic-home { background-position: -72px -360px; } -.ic-image_text { background-position: -72px -396px; } -.ic-inbox { background-position: -72px -432px; } -.ic-indent_decrease { background-position: -72px -468px; } -.ic-indent_increase { background-position: -72px -504px; } -.ic-info { background-position: -72px -540px; } -.ic-iphone { background-position: -72px -576px; } -.ic-key { background-position: -72px -612px; } -.ic-layers_1 { background-position: -72px -648px; } -.ic-layers_2 { background-position: -72px -684px; } -.ic-lightbulb { background-position: -72px -720px; } -.ic-lighting { background-position: -72px -756px; } -.ic-link { background-position: -72px -792px; } -.ic-list_bullets { background-position: -72px -828px; } -.ic-list_num { background-position: -72px -864px; } -.ic-magic_wand { background-position: -72px -900px; } -.ic-mail { background-position: -72px -936px; } -.ic-mail_2 { background-position: -72px -972px; } -.ic-mic { background-position: -72px -1008px; } -.ic-monitor { background-position: -72px -1044px; } -.ic-movie { background-position: -72px -1080px; } -.ic-music { background-position: -72px -1116px; } -.ic-net_comp { background-position: -72px -1152px; } -.ic-network { background-position: -72px -1188px; } -.ic-notepad { background-position: -72px -1224px; } -.ic-notepad_2 { background-position: -72px -1260px; } -.ic-on-off { background-position: -72px -1296px; } -.ic-openid { background-position: -72px -1332px; } -.ic-padlock_closed { background-position: -72px -1368px; } -.ic-padlock_open { background-position: -72px -1404px; } -.ic-page_layout { background-position: -72px -1440px; } -.ic-paragraph { background-position: -72px -1476px; } -.ic-pencil { background-position: -72px -1512px; } -.ic-phone { background-position: -72px -1548px; } -.ic-phone_1 { background-position: -72px -1584px; } -.ic-phone_2 { background-position: -72px -1620px; } -.ic-phone_touch { background-position: -72px -1656px; } -.ic-photo { background-position: -72px -1692px; } -.ic-picture { background-position: -72px -1728px; } -.ic-pin { background-position: -72px -1764px; } -.ic-pin_2 { background-position: -72px -1800px; } -.ic-pin_map { background-position: -72px -1836px; } -.ic-pin_map_down { background-position: -72px -1872px; } -.ic-pin_map_left { background-position: -72px -1908px; } -.ic-pin_map_right { background-position: -72px -1944px; } -.ic-pin_map_top { background-position: -108px 0; } -.ic-pin_sq_down { background-position: -108px -36px; } -.ic-pin_sq_left { background-position: -108px -72px; } -.ic-pin_sq_right { background-position: -108px -108px; } -.ic-pin_sq_top { background-position: -108px -144px; } -.ic-playback_ff { background-position: -108px -180px; } -.ic-playback_next { background-position: -108px -216px; } -.ic-playback_pause { background-position: -108px -252px; } -.ic-playback_play { background-position: -108px -288px; } -.ic-playback_prev { background-position: -108px -324px; } -.ic-playback_rec { background-position: -108px -360px; } -.ic-playback_reload { background-position: -108px -396px; } -.ic-playback_rew { background-position: -108px -432px; } -.ic-playback_stop { background-position: -108px -468px; } -.ic-preso { background-position: -108px -504px; } -.ic-print { background-position: -108px -540px; } -.ic-question { background-position: -108px -576px; } -.ic-redo { background-position: -108px -612px; } -.ic-rnd_br_down { background-position: -108px -648px; } -.ic-rnd_br_first { background-position: -108px -684px; } -.ic-rnd_br_last { background-position: -108px -720px; } -.ic-rnd_br_next { background-position: -108px -756px; } -.ic-rnd_br_prev { background-position: -108px -792px; } -.ic-rnd_br_up { background-position: -108px -828px; } -.ic-round { background-position: -108px -864px; } -.ic-round_and_up { background-position: -108px -900px; } -.ic-round_arrow_left { background-position: -108px -936px; } -.ic-round_arrow_right { background-position: -108px -972px; } -.ic-round_checkmark { background-position: -108px -1008px; } -.ic-round_delete { background-position: -108px -1044px; } -.ic-round_minus { background-position: -108px -1080px; } -.ic-round_plus { background-position: -108px -1116px; } -.ic-rss { background-position: -108px -1152px; } -.ic-rss_sq { background-position: -108px -1188px; } -.ic-sand { background-position: -108px -1224px; } -.ic-sat_dish { background-position: -108px -1260px; } -.ic-save { background-position: -108px -1296px; } -.ic-server { background-position: -108px -1332px; } -.ic-share { background-position: -108px -1368px; } -.ic-shop_cart { background-position: -108px -1404px; } -.ic-sound_high { background-position: -108px -1440px; } -.ic-sound_low { background-position: -108px -1476px; } -.ic-sound_mute { background-position: -108px -1512px; } -.ic-spechbubble { background-position: -108px -1548px; } -.ic-spechbubble_2 { background-position: -108px -1584px; } -.ic-spechbubble_sq { background-position: -108px -1620px; } -.ic-spechbubble_sq_line { background-position: -108px -1656px; } -.ic-sq_br_down { background-position: -108px -1692px; } -.ic-sq_br_first { background-position: -108px -1728px; } -.ic-sq_br_last { background-position: -108px -1764px; } -.ic-sq_br_next { background-position: -108px -1800px; } -.ic-sq_br_prev { background-position: -108px -1836px; } -.ic-sq_br_up { background-position: -108px -1872px; } -.ic-sq_down { background-position: -108px -1908px; } -.ic-sq_minus { background-position: -108px -1944px; } -.ic-sq_next { background-position: -144px 0; } -.ic-sq_plus { background-position: -144px -36px; } -.ic-sq_prev { background-position: -144px -72px; } -.ic-sq_up { background-position: -144px -108px; } -.ic-square_shape { background-position: -144px -144px; } -.ic-star { background-position: -144px -180px; } -.ic-star_fav { background-position: -144px -216px; } -.ic-star_fav_empty { background-position: -144px -252px; } -.ic-sun { background-position: -144px -288px; } -.ic-tag { background-position: -144px -324px; } -.ic-tape { background-position: -144px -360px; } -.ic-target { background-position: -144px -396px; } -.ic-text_curstor { background-position: -144px -432px; } -.ic-text_letter_t { background-position: -144px -468px; } -.ic-top_right_expand { background-position: -144px -504px; } -.ic-trash { background-position: -144px -540px; } -.ic-twitter { background-position: -144px -576px; } -.ic-twitter_2 { background-position: -144px -612px; } -.ic-undo { background-position: -144px -648px; } -.ic-user { background-position: -144px -684px; } -.ic-users { background-position: -144px -720px; } -.ic-wrench { background-position: -144px -756px; } -.ic-wrench_plus { background-position: -144px -792px; } -.ic-wrench_plus_2 { background-position: -144px -828px; } -.ic-zoom { background-position: -144px -864px; } - - /* * lib/css/legacy/sidebar.css */div.psidebar { diff --git a/js/all-app.js b/js/all-app.js index 048fe2b2d8..984f9b6e4f 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -470,7 +470,7 @@ if(!msg_dialog.display)msg_dialog.show();var has_msg=msg_dialog.msg_area.innerHT m.innerHTML=replace_newlines(msg);if(m.offsetHeight>200){$y(m,{height:'200px',width:'400px',overflow:'auto'})} 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,'div','wn-icon ic-round_delete',{cssFloat:'right'});$(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);} +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 @@ -597,7 +597,8 @@ DateField.prototype.validate=function(v){if(!v)return;var me=this;this.clear=fun 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;};var _link_onchange_flag=null;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,'ic-zoom','ic-sq_next','ic-sq_plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0)$ds(me.btn2);else $dh(me.btn2);}} +return v;};var _link_onchange_flag=null;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.set_onchange();me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;} me.get_value=function(){return me.txt.value;} wn.require('lib/js/legacy/widgets/autosuggest.js');var opts={script:'',json:true,maxresults:10,link_field:me};this.as=new AutoSuggest(me.txt,opts);} @@ -681,12 +682,15 @@ this.input.set_input=function(v){if(v==null)v='';me.set_time(v);} this.get_value=function(){return this.get_time();} this.refresh();} TimeField.prototype.set_disp=function(v){var t=time_to_ampm(v);var t=t[0]+':'+t[1]+' '+t[2];this.set_disp_html(t);} -function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){me.input=$a(me.input_area,'div');if(!me.not_in_form) +function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){var icon_style={cursor:'pointer',width:'16px',verticalAlign:'middle',marginBottom:'-3px'};me.input=$a(me.input_area,'div');if(!me.not_in_form) $y(me.input,{width:'80%'});me.input.set_width=function(w){$y(me.input,{width:(w-2)+'px'});} -var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'div','wn-icon '+iconsrc,{width:'16px'});if(iconsrc1) +var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'i',iconsrc,icon_style) +if(iconsrc1) me.btn.setAttribute('title','Search');else -me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'div','wn-icon '+iconsrc1,{width:'16px'});me.btn1.setAttribute('title','Open Link');} -if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'div','wn-icon '+iconsrc2,{width:'16px'});me.btn2.setAttribute('title','Create New');$dh(me.btn2);} +me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'i',iconsrc1,icon_style) +me.btn1.setAttribute('title','Open Link');} +if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'i',iconsrc2,icon_style) +me.btn2.setAttribute('title','Create New');$dh(me.btn2);} if(me.df.colour) me.txt.style.background='#'+me.df.colour.split(':')[1];me.txt.name=me.df.fieldname;me.setdisabled=function(tf){me.txt.disabled=tf;}} var tmpid=0;_f.ButtonField=function(){};_f.ButtonField.prototype=new Field();_f.ButtonField.prototype.with_label=0;_f.ButtonField.prototype.init=function(){this.prev_button=null;if(!this.frm)return;if(cur_frm&&cur_frm.fields[cur_frm.fields.length-1]&&cur_frm.fields[cur_frm.fields.length-1].df.fieldtype=='Button'){this.make_body=function(){this.prev_button=cur_frm.fields[cur_frm.fields.length-1];if(!this.prev_button.prev_button){this.prev_button.button_area=$a(this.prev_button.input_area,'span');} @@ -1174,7 +1178,7 @@ this.make_one_item=function(item,div){if(item.type.toLowerCase()=='link') this.items[item.label]=new wn.widgets.PageSidebarLink(this,item,div);else if(item.type.toLowerCase()=='button') this.items[item.label]=new wn.widgets.PageSidebarButton(this,this.opts.items[i],div);else if(item.type.toLowerCase()=='html') this.items[item.label]=new wn.widgets.PageSidebarHTML(this,this.opts.items[i],div);} -this.add_icon=function(parent,icon){if(icon.substr(0,3)=='ic-'){var img=$a(parent,'div','wn-icon '+icon,{cssFloat:'left',marginRight:'7px',marginBottom:'-3px'});}else{var img=$a(parent,'img','',{marginRight:'7px',marginBottom:'-3px'});img.src='lib/images/icons/'+icon;}} +this.add_icon=function(parent,icon){var img=$a(parent,'i',icon,{marginRight:'7px',marginBottom:'-3px'});} this.refresh=function(){this.body.innerHTML='';if(this.opts.render){this.opts.render(this.body);} else this.make_items();} @@ -1485,7 +1489,8 @@ DateField.prototype.validate=function(v){if(!v)return;var me=this;this.clear=fun 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;};var _link_onchange_flag=null;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,'ic-zoom','ic-sq_next','ic-sq_plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0)$ds(me.btn2);else $dh(me.btn2);}} +return v;};var _link_onchange_flag=null;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.set_onchange();me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;} me.get_value=function(){return me.txt.value;} wn.require('lib/js/legacy/widgets/autosuggest.js');var opts={script:'',json:true,maxresults:10,link_field:me};this.as=new AutoSuggest(me.txt,opts);} @@ -1569,12 +1574,15 @@ this.input.set_input=function(v){if(v==null)v='';me.set_time(v);} this.get_value=function(){return this.get_time();} this.refresh();} TimeField.prototype.set_disp=function(v){var t=time_to_ampm(v);var t=t[0]+':'+t[1]+' '+t[2];this.set_disp_html(t);} -function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){me.input=$a(me.input_area,'div');if(!me.not_in_form) +function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){var icon_style={cursor:'pointer',width:'16px',verticalAlign:'middle',marginBottom:'-3px'};me.input=$a(me.input_area,'div');if(!me.not_in_form) $y(me.input,{width:'80%'});me.input.set_width=function(w){$y(me.input,{width:(w-2)+'px'});} -var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'div','wn-icon '+iconsrc,{width:'16px'});if(iconsrc1) +var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'i',iconsrc,icon_style) +if(iconsrc1) me.btn.setAttribute('title','Search');else -me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'div','wn-icon '+iconsrc1,{width:'16px'});me.btn1.setAttribute('title','Open Link');} -if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'div','wn-icon '+iconsrc2,{width:'16px'});me.btn2.setAttribute('title','Create New');$dh(me.btn2);} +me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'i',iconsrc1,icon_style) +me.btn1.setAttribute('title','Open Link');} +if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'i',iconsrc2,icon_style) +me.btn2.setAttribute('title','Create New');$dh(me.btn2);} if(me.df.colour) me.txt.style.background='#'+me.df.colour.split(':')[1];me.txt.name=me.df.fieldname;me.setdisabled=function(tf){me.txt.disabled=tf;}} var tmpid=0;_f.ButtonField=function(){};_f.ButtonField.prototype=new Field();_f.ButtonField.prototype.with_label=0;_f.ButtonField.prototype.init=function(){this.prev_button=null;if(!this.frm)return;if(cur_frm&&cur_frm.fields[cur_frm.fields.length-1]&&cur_frm.fields[cur_frm.fields.length-1].df.fieldtype=='Button'){this.make_body=function(){this.prev_button=cur_frm.fields[cur_frm.fields.length-1];if(!this.prev_button.prev_button){this.prev_button.button_area=$a(this.prev_button.input_area,'span');} @@ -1810,7 +1818,7 @@ _f.SectionBreak.prototype.make_row=function(){this.row=this.df.label?this.frm.la _f.SectionBreak.prototype.make_collapsible=function(head){var me=this;var div=$a(head,'div','',{paddingBottom:'3px',borderBottom:'1px solid #AAA'});if(cur_frm.meta.in_dialog)$y(div,{marginLeft:'8px'});this.chk=$a_input(div,'checkbox',null,{marginRight:'8px'}) if(this.df.label){this.label=$a(div,'h3','',{display:'inline'},this.df.label);} var d=this.df.description;if(d){this.desc_area=$a(div,'span','field_description',{marginLeft:'8px'});this.desc_area.innerHTML=d.substr(0,50)+(d.length>50?'...':'');} -var span=$a(div,'div','wn-icon ic-arrow_top',{cssFloat:'right',marginRight:'8px',cursor:'pointer',marginTop:'7px'}) +var span=$a(div,'i','icon-arrow-up',{cssFloat:'right',marginRight:'8px',cursor:'pointer',verticalAlign:'middle',marginTop:'7px'}) span.title='Go to top';span.onclick=function(){scroll(0,0);} this.chk.onclick=function(){if(this.checked)me.expand();else me.collapse();} this.expand=function(){$(me.row.main_body).slideDown();} @@ -1880,7 +1888,7 @@ this.set_ht();return row;} _f.Grid.prototype.refresh_cell=function(docname,fieldname){for(var r=0;r12){time=(parseInt(hr)-12)+':'+min+' PM'} else{time=hr+':'+min+' AM'}} this.cmt_dtl.innerHTML='On '+d[ri][10].substring(0,3)+' '+d[ri][9]+', '+d[ri][11]+' at '+time;this.cmt.innerHTML=replace_newlines(d[ri][1]);} -CommentItem.prototype.cmt_delete=function(cell,ri,ci,d){var me=this;if(d[ri][2]==user||d[ri][3]==user){del=$a(cell,'div','wn-icon ic-trash',{cursor:'pointer'});del.cmt_id=d[ri][0];del.onclick=function(){wn.widgets.form.comments.remove(cur_frm.doctype,cur_frm.docname,this.cmt_id,function(){me.comment.lst.run();})}}} +CommentItem.prototype.cmt_delete=function(cell,ri,ci,d){var me=this;if(d[ri][2]==user||d[ri][3]==user){del=$a(cell,'i','icon-remove-sign',{cursor:'pointer'});del.cmt_id=d[ri][0];del.onclick=function(){wn.widgets.form.comments.remove(cur_frm.doctype,cur_frm.docname,this.cmt_id,function(){me.comment.lst.run();})}}} /* * lib/js/legacy/wn/widgets/form/sidebar.js */ -wn.widgets.form.sidebar={Sidebar:function(form){var me=this;this.form=form;this.opts={sections:[{title:'Actions',items:[{type:'link',label:'New',icon:'ic-doc_new',display:function(){return in_list(profile.can_create,form.doctype)},onclick:function(){new_doc(me.form.doctype)}},{type:'link',label:'Refresh',icon:'ic-playback_reload',onclick:function(){me.form.reload_doc()}},{type:'link',label:'Print',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_print);},icon:'ic-print',onclick:function(){me.form.print_doc()}},{type:'link',label:'Email',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_email);},icon:'ic-mail',onclick:function(){me.form.email_doc()}},{type:'link',label:'Copy',display:function(){return in_list(profile.can_create,me.form.doctype)&&!me.form.meta.allow_copy},icon:'ic-clipboard_copy',onclick:function(){me.form.copy_doc()}},{type:'link',label:'Delete',display:function(){return me.form.meta.allow_trash&&cint(me.form.doc.docstatus)!=2&&(!me.form.doc.__islocal)&&me.form.perm[0][CANCEL]},icon:'ic-trash',onclick:function(){me.form.savetrash()}}]},{title:'Assign To',render:function(wrapper){me.form.assign_to=new wn.widgets.form.sidebar.AssignTo(wrapper,me,me.form.doctype,me.form.docname);},display:function(){if(me.form.doc.__local)return false;else return true;}},{title:'Attachments',render:function(wrapper){me.form.attachments=new wn.widgets.form.sidebar.Attachments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return me.form.meta.allow_attach}},{title:'Comments',render:function(wrapper){new wn.widgets.form.sidebar.Comments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return!me.form.doc.__islocal}},{title:'Tags',render:function(wrapper){me.form.taglist=new TagList(wrapper,me.form.doc._user_tags?me.form.doc._user_tags.split(','):[],me.form.doctype,me.form.docname,0,function(){});},display:function(){return!me.form.doc.__islocal}}]} +wn.widgets.form.sidebar={Sidebar:function(form){var me=this;this.form=form;this.opts={sections:[{title:'Actions',items:[{type:'link',label:'New',icon:'icon-plus',display:function(){return in_list(profile.can_create,form.doctype)},onclick:function(){new_doc(me.form.doctype)}},{type:'link',label:'Refresh',icon:'icon-refresh',onclick:function(){me.form.reload_doc()}},{type:'link',label:'Print',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_print);},icon:'icon-print',onclick:function(){me.form.print_doc()}},{type:'link',label:'Email',display:function(){return!(me.form.doc.__islocal||me.form.meta.allow_email);},icon:'icon-envelope',onclick:function(){me.form.email_doc()}},{type:'link',label:'Copy',display:function(){return in_list(profile.can_create,me.form.doctype)&&!me.form.meta.allow_copy},icon:'icon-file',onclick:function(){me.form.copy_doc()}},{type:'link',label:'Delete',display:function(){return me.form.meta.allow_trash&&cint(me.form.doc.docstatus)!=2&&(!me.form.doc.__islocal)&&me.form.perm[0][CANCEL]},icon:'icon-remove-sign',onclick:function(){me.form.savetrash()}}]},{title:'Assign To',render:function(wrapper){me.form.assign_to=new wn.widgets.form.sidebar.AssignTo(wrapper,me,me.form.doctype,me.form.docname);},display:function(){if(me.form.doc.__local)return false;else return true;}},{title:'Attachments',render:function(wrapper){me.form.attachments=new wn.widgets.form.sidebar.Attachments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return me.form.meta.allow_attach}},{title:'Comments',render:function(wrapper){new wn.widgets.form.sidebar.Comments(wrapper,me,me.form.doctype,me.form.docname);},display:function(){return!me.form.doc.__islocal}},{title:'Tags',render:function(wrapper){me.form.taglist=new TagList(wrapper,me.form.doc._user_tags?me.form.doc._user_tags.split(','):[],me.form.doctype,me.form.docname,0,function(){});},display:function(){return!me.form.doc.__islocal}}]} this.refresh=function(){var parent=this.form.page_layout.sidebar_area;if(!this.sidebar){this.sidebar=new wn.widgets.PageSidebar(parent,this.opts);}else{this.sidebar.refresh();}}}} /* * lib/js/legacy/wn/widgets/form/comments.js diff --git a/js/all-web.js b/js/all-web.js index 2de598d7c6..e958e94ccb 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -396,7 +396,7 @@ if(!msg_dialog.display)msg_dialog.show();var has_msg=msg_dialog.msg_area.innerHT m.innerHTML=replace_newlines(msg);if(m.offsetHeight>200){$y(m,{height:'200px',width:'400px',overflow:'auto'})} 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,'div','wn-icon ic-round_delete',{cssFloat:'right'});$(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);} +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 @@ -506,7 +506,8 @@ DateField.prototype.validate=function(v){if(!v)return;var me=this;this.clear=fun 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;};var _link_onchange_flag=null;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,'ic-zoom','ic-sq_next','ic-sq_plus');me.setup_buttons();me.onrefresh=function(){if(me.can_create&&cur_frm.doc.docstatus==0)$ds(me.btn2);else $dh(me.btn2);}} +return v;};var _link_onchange_flag=null;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.set_onchange();me.input.set_input=function(val){if(val==undefined)val='';me.txt.value=val;} me.get_value=function(){return me.txt.value;} wn.require('lib/js/legacy/widgets/autosuggest.js');var opts={script:'',json:true,maxresults:10,link_field:me};this.as=new AutoSuggest(me.txt,opts);} @@ -590,12 +591,15 @@ this.input.set_input=function(v){if(v==null)v='';me.set_time(v);} this.get_value=function(){return this.get_time();} this.refresh();} TimeField.prototype.set_disp=function(v){var t=time_to_ampm(v);var t=t[0]+':'+t[1]+' '+t[2];this.set_disp_html(t);} -function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){me.input=$a(me.input_area,'div');if(!me.not_in_form) +function makeinput_popup(me,iconsrc,iconsrc1,iconsrc2){var icon_style={cursor:'pointer',width:'16px',verticalAlign:'middle',marginBottom:'-3px'};me.input=$a(me.input_area,'div');if(!me.not_in_form) $y(me.input,{width:'80%'});me.input.set_width=function(w){$y(me.input,{width:(w-2)+'px'});} -var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'div','wn-icon '+iconsrc,{width:'16px'});if(iconsrc1) +var tab=$a(me.input,'table');me.tab=tab;$y(tab,{width:'100%',borderCollapse:'collapse',tableLayout:'fixed'});var c0=tab.insertRow(0).insertCell(0);var c1=tab.rows[0].insertCell(1);$y(c1,{width:'20px'});me.txt=$a($a($a(c0,'div','',{paddingRight:'8px'}),'div'),'input','',{width:'100%'});me.btn=$a(c1,'i',iconsrc,icon_style) +if(iconsrc1) me.btn.setAttribute('title','Search');else -me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'div','wn-icon '+iconsrc1,{width:'16px'});me.btn1.setAttribute('title','Open Link');} -if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'div','wn-icon '+iconsrc2,{width:'16px'});me.btn2.setAttribute('title','Create New');$dh(me.btn2);} +me.btn.setAttribute('title','Select Date');if(iconsrc1){var c2=tab.rows[0].insertCell(2);$y(c2,{width:'20px'});me.btn1=$a(c2,'i',iconsrc1,icon_style) +me.btn1.setAttribute('title','Open Link');} +if(iconsrc2){var c3=tab.rows[0].insertCell(3);$y(c3,{width:'20px'});me.btn2=$a(c3,'i',iconsrc2,icon_style) +me.btn2.setAttribute('title','Create New');$dh(me.btn2);} if(me.df.colour) me.txt.style.background='#'+me.df.colour.split(':')[1];me.txt.name=me.df.fieldname;me.setdisabled=function(tf){me.txt.disabled=tf;}} var tmpid=0;_f.ButtonField=function(){};_f.ButtonField.prototype=new Field();_f.ButtonField.prototype.with_label=0;_f.ButtonField.prototype.init=function(){this.prev_button=null;if(!this.frm)return;if(cur_frm&&cur_frm.fields[cur_frm.fields.length-1]&&cur_frm.fields[cur_frm.fields.length-1].df.fieldtype=='Button'){this.make_body=function(){this.prev_button=cur_frm.fields[cur_frm.fields.length-1];if(!this.prev_button.prev_button){this.prev_button.button_area=$a(this.prev_button.input_area,'span');} diff --git a/version.num b/version.num index 0552576c87..8a2602231b 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -669 \ No newline at end of file +686 \ No newline at end of file