From e9a3daf5728469d5fa5e7c77d9635ea54539fafa Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 20 Mar 2012 14:37:51 +0530 Subject: [PATCH] cleanup of form, rename, route, added fonts --- css/bootstrap/buttons.css | 1 + css/fonts/droidsans.woff | Bin 0 -> 15292 bytes css/fonts/pontanosans.woff | Bin 0 -> 15036 bytes css/legacy/body.css | 5 +- css/legacy/sidebar.css | 3 +- css/ui/fonts.css | 13 ++++ js/core.min.js | 9 ++- js/legacy/app.js | 2 +- js/legacy/model/doclist.js | 6 -- js/legacy/model/local_data.js | 37 ++-------- js/legacy/webpage/loaders.js | 25 +++++-- js/legacy/widgets/form/form.js | 69 ++++++------------ js/legacy/widgets/form/form_comments.js | 1 + .../{form_container.js => form_dialog.js} | 37 ++++++++++ js/legacy/widgets/form/form_header.js | 24 +----- js/legacy/wn/widgets/form/attachments.js | 2 +- js/legacy/wn/widgets/form/sidebar.js | 26 +++++++ js/wn/model.js | 2 + js/wn/router.js | 3 +- js/wn/ui/listing.js | 4 +- js/wn/ui/toolbar.min.js | 2 +- js/wn/ui/toolbar/recent.js | 8 +- js/wn/views/formview.js | 4 + py/webnotes/utils/file_manager.py | 4 +- 24 files changed, 157 insertions(+), 130 deletions(-) create mode 100644 css/fonts/droidsans.woff create mode 100644 css/fonts/pontanosans.woff create mode 100644 css/ui/fonts.css rename js/legacy/widgets/form/{form_container.js => form_dialog.js} (81%) diff --git a/css/bootstrap/buttons.css b/css/bootstrap/buttons.css index c0d5993b03..812707d52b 100644 --- a/css/bootstrap/buttons.css +++ b/css/bootstrap/buttons.css @@ -1,4 +1,5 @@ .close { + font-family: Helvetica, Sans; float: right; font-size: 20px; font-weight: bold; diff --git a/css/fonts/droidsans.woff b/css/fonts/droidsans.woff new file mode 100644 index 0000000000000000000000000000000000000000..3807cd67d73c9e55798737da293c798fe48f1933 GIT binary patch literal 15292 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

w+hdbo4y{sO>o!MZ9UA_ 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 literal 0 HcmV?d00001 diff --git a/css/legacy/body.css b/css/legacy/body.css index 74c93df118..dbc9ba801a 100644 --- a/css/legacy/body.css +++ b/css/legacy/body.css @@ -213,6 +213,7 @@ div.std-footer-item { box-shadow: 0px 0px 6px rgba(0,0,0,0.3); background-color: #fff; padding: 15px; + margin-bottom: 30px; } .layout-wrapper-background { @@ -225,7 +226,7 @@ div.std-footer-item { float: left; padding: 15px; background-color: #FFF; - min-height: 450px; + min-height: 600px; -moz-box-shadow: 7px 0px 6px -2px #ddd; -webkit-box-shadow: 7px 0px 6px -2px #ddd; box-shadow: 7px 0px 6px -2px #ddd; @@ -237,7 +238,7 @@ div.std-footer-item { color: #606060; overflow-x: hidden; padding: 15px; - min-height: 450px; + min-height: 600px; } /* from bootstrap */ diff --git a/css/legacy/sidebar.css b/css/legacy/sidebar.css index a6f3b46fd4..82ae9c2ccc 100644 --- a/css/legacy/sidebar.css +++ b/css/legacy/sidebar.css @@ -14,9 +14,8 @@ div.psidebar div.section { } div.psidebar div.section-head { - font-size: 12px; padding: 5px 11px; - border-bottom: 2px solid #444; + border-bottom: 2px solid #777; } div.psidebar div.section-body { diff --git a/css/ui/fonts.css b/css/ui/fonts.css new file mode 100644 index 0000000000..a56a215d96 --- /dev/null +++ b/css/ui/fonts.css @@ -0,0 +1,13 @@ +@font-face { + font-family: 'Pontano Sans'; + font-style: normal; + font-weight: 400; + src: url('../lib/css/fonts/pontanosans.woff') format('woff'); +} + +@font-face { + font-family: 'Droid Sans'; + font-style: normal; + font-weight: normal; + src: local('Droid Sans'), local('DroidSans'), url('../lib/css/fonts/droidsans.woff') format('woff'); +} \ No newline at end of file diff --git a/js/core.min.js b/js/core.min.js index 468250df07..39dcd54c39 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -48,7 +48,7 @@ wn.get_cookie=function(c){var t=""+document.cookie;var ind=t.indexOf(c);if(ind== /* * lib/js/wn/model.js */ -wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break','HTML','Table','Button','Image'],with_doctype:function(doctype,callback){if(locals.DocType[doctype]){callback();}else{wn.call({method:'webnotes.widgets.form.load.getdoctype',args:{doctype:doctype},callback:callback});}},with_doc:function(doctype,name,callback){if(!name)name=doctype;if(locals[doctype]&&locals[doctype][name]){callback(name);}else{if(name&&name.indexOf('New '+doctype)!=-1){name=LocalDB.create(doctype);callback(name);}else{wn.call({method:'webnotes.widgets.form.load.getdoc',args:{doctype:doctype,name:name},callback:function(r){callback(name);}});}}},can_delete:function(doctype){if(!doctype)return false;return locals.DocType[doctype].allow_trash&&wn.boot.profile.can_cancel.indexOf(doctype)!=-1;}} +wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break','HTML','Table','Button','Image'],new_names:{},with_doctype:function(doctype,callback){if(locals.DocType[doctype]){callback();}else{wn.call({method:'webnotes.widgets.form.load.getdoctype',args:{doctype:doctype},callback:callback});}},with_doc:function(doctype,name,callback){if(!name)name=doctype;if(locals[doctype]&&locals[doctype][name]){callback(name);}else{if(name&&name.indexOf('New '+doctype)!=-1){name=LocalDB.create(doctype);callback(name);}else{wn.call({method:'webnotes.widgets.form.load.getdoc',args:{doctype:doctype,name:name},callback:function(r){callback(name);}});}}},can_delete:function(doctype){if(!doctype)return false;return locals.DocType[doctype].allow_trash&&wn.boot.profile.can_cancel.indexOf(doctype)!=-1;}} /* * lib/js/wn/misc/user.js */ @@ -95,7 +95,7 @@ wn.route=function(){wn._cur_route=window.location.hash;route=wn.get_route();swit wn.views.formview.show(route[1],route[2]);break;case"Report":wn.views.reportview.show(route[1],route[2]);break;default:wn.views.pageview.show(route[0]);}} wn.get_route=function(route){if(!route) route=window.location.hash;if(route.substr(0,1)=='#')route=route.substr(1);if(route.substr(0,1)=='!')route=route.substr(1);return $.map(route.split('/'),function(r){return decodeURIComponent(r);});} -wn.set_route=function(route){window.location.hash=route;} +wn.set_route=function(){route=$.map(arguments,function(a){return encodeURIComponent(a)}).join('/');window.location.hash=route;} wn._cur_route=null;$(window).bind('hashchange',function(){if(location.hash==wn._cur_route) return;wn.route();if(wn.boot.analytics_code){try{eval(wn.boot.analytics_code);}catch(e){console.log(e);}}}); /* @@ -144,7 +144,7 @@ this.prepare_opts();$.extend(this,this.opts);$(this.parent).html(repl('\ \ \ ',this.opts));this.$w=$(this.parent).find('.wnlist');this.set_events();this.make_filters();},add_button:function(html,onclick,before){$(html).click(onclick).insertBefore(this.$w.find('.list-toolbar '+before));this.btn_groupify();},show_view:function($btn,$div,$btn_unsel,$div_unsel){$btn_unsel.removeClass('btn-info');$btn_unsel.find('i').removeClass('icon-white');$div_unsel.toggle(false);$btn.addClass('btn-info');$btn.find('i').addClass('icon-white');$div.toggle(true);},set_events:function(){var me=this;this.$w.find('.btn-refresh').click(function(){me.run();});this.$w.find('.btn-more').click(function(){me.run({append:true});});if(this.title){this.$w.find('h3').html(this.title).toggle(true);} -if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype,me.new_doc_onload,true,me.new_doc_onsave);})}else{this.$w.find('.btn-new').remove();} +if(this.new_doctype){this.$w.find('.btn-new').toggle(true).click(function(){newdoc(me.new_doctype);})}else{this.$w.find('.btn-new').remove();} if(!me.show_filters){this.$w.find('.btn-filter').remove();} if(this.hide_refresh||this.no_refresh){this.$w.find('.btn-refresh').remove();} this.btn_groupify();},btn_groupify:function(){var nbtns=this.$w.find('.list-toolbar a').length;if(nbtns>1){this.$w.find('.list-toolbar').addClass('btn-group')} @@ -270,7 +270,8 @@ if(me.wrapper[event]){me.wrapper[event](me.wrapper);}}catch(e){console.log(e);}} /* * lib/js/wn/views/formview.js */ -wn.provide('wn.views.formview');wn.views.formview={show:function(dt,dn){wn.model.with_doctype(dt,function(){wn.model.with_doc(dt,dn,function(dn){if(!wn.views.formview[dt]){wn.views.formview[dt]=wn.container.add_page('Form - '+dt);wn.views.formview[dt].frm=new _f.Frm(dt,wn.views.formview[dt]);} +wn.provide('wn.views.formview');wn.views.formview={show:function(dt,dn){if(wn.model.new_names[dn]) +dn=wn.model.new_names[dn];wn.model.with_doctype(dt,function(){wn.model.with_doc(dt,dn,function(dn){if(!wn.views.formview[dt]){wn.views.formview[dt]=wn.container.add_page('Form - '+dt);wn.views.formview[dt].frm=new _f.Frm(dt,wn.views.formview[dt]);} wn.container.change_to('Form - '+dt);wn.views.formview[dt].frm.refresh(dn);});})}} /* * lib/js/wn/views/reportview.js diff --git a/js/legacy/app.js b/js/legacy/app.js index 118a1cd8ad..ea53b58430 100644 --- a/js/legacy/app.js +++ b/js/legacy/app.js @@ -58,7 +58,7 @@ function startup() { // open an existing page or record var t = to_open(); if(t) { - wn.set_route(t); + window.location.hash = t; } else if(home_page) { loadpage(home_page); } diff --git a/js/legacy/model/doclist.js b/js/legacy/model/doclist.js index 64cfc959a0..d4f0b0a9b4 100644 --- a/js/legacy/model/doclist.js +++ b/js/legacy/model/doclist.js @@ -86,12 +86,6 @@ function save_doclist(dt, dn, save_action, onsave, onerr) { } } - var f = frms[dt]; - if(f && !all_clear) { // has errors - if(f)f.savingflag = false; - return 'Error'; - } - var _save = function() { //console.log(compress_doclist(doclist)); $c('webnotes.widgets.form.save.savedocs', {'docs':compress_doclist(doclist), 'docname':dn, 'action': save_action, 'user':user }, diff --git a/js/legacy/model/local_data.js b/js/legacy/model/local_data.js index e7f47f6008..c49aca2150 100644 --- a/js/legacy/model/local_data.js +++ b/js/legacy/model/local_data.js @@ -107,8 +107,11 @@ LocalDB.sync = function(list) { fields[d.parent][d.label] = d; } } - if(d.localname) - notify_rename_observers(d.doctype, d.localname, d.name); + if(d.localname) { + wn.model.new_names[d.localname] = d.name; + $(document).trigger('rename', [d.doctype, d.localname, d.name]); + delete locals[d.doctype][d.localname]; + } } } @@ -145,17 +148,6 @@ LocalDB.set_default_values = function(doc) { } return fields_to_refresh; } -// ====================================================================================== - -LocalDB.is_doc_loaded = function(dt, dn) { - var exists = false; - if(locals[dt] && locals[dt][dn]) exists = true; - if(exists && dt=='DocType' // if it is a doctype - && !locals[dt][dn].__islocal // and not copied - && !frms[dt]) // and not loaded - exists = false; // reload - return exists; -} // ====================================================================================== @@ -315,25 +307,6 @@ function make_doclist(dt, dn, deleted) { return dl; } -// Renaming notification list -// ====================================================================================== - -var rename_observers = []; -function notify_rename_observers(dt, old_name, new_name) { - // delete from local - try { - delete locals[dt][old_name]; - } catch(e) { - alert("[rename_from_local] No Document for: "+ old_name); - } - - // everyone who observers - for(var i=0; iCreated:
\ + \ + %(creation)s

\ +

Modified:
\ + \ + %(modified)s

', { + created_by: wn.user_info(doc.owner).fullname, + avatar_created: wn.user_info(doc.owner).image, + creation: scrub_date(doc.creation), + modified_by: wn.user_info(doc.modified_by).fullname, + avatar_modified: wn.user_info(doc.modified_by).image, + modified: scrub_date(doc.modified) + })); + }, + display: function() { return !me.form.doc.__islocal } + }, { title: 'Help', diff --git a/js/wn/model.js b/js/wn/model.js index e181d01071..4eac1e02d2 100644 --- a/js/wn/model.js +++ b/js/wn/model.js @@ -26,6 +26,8 @@ wn.model = { no_value_type: ['Section Break', 'Column Break', 'HTML', 'Table', 'Button', 'Image'], + new_names: {}, + with_doctype: function(doctype, callback) { if(locals.DocType[doctype]) { callback(); diff --git a/js/wn/router.js b/js/wn/router.js index 193bfdaafb..15a563f66b 100644 --- a/js/wn/router.js +++ b/js/wn/router.js @@ -32,7 +32,8 @@ wn.get_route = function(route) { return $.map(route.split('/'), function(r) { return decodeURIComponent(r); }); } -wn.set_route = function(route) { +wn.set_route = function() { + route = $.map(arguments, function(a) { return encodeURIComponent(a) }).join('/'); window.location.hash = route; } diff --git a/js/wn/ui/listing.js b/js/wn/ui/listing.js index deae534435..bb79d0805a 100644 --- a/js/wn/ui/listing.js +++ b/js/wn/ui/listing.js @@ -43,8 +43,6 @@ // page_length (20) // hide_refresh (False) // new_doctype -// new_doc_onload -// new_doc_onsave // [function] render_row(parent, data) // [function] onrun // no_loading (no ajax indicator) @@ -158,7 +156,7 @@ wn.ui.Listing = Class.extend({ // new if(this.new_doctype) { this.$w.find('.btn-new').toggle(true).click(function() { - newdoc(me.new_doctype, me.new_doc_onload, true, me.new_doc_onsave); + newdoc(me.new_doctype); }) } else { this.$w.find('.btn-new').remove(); diff --git a/js/wn/ui/toolbar.min.js b/js/wn/ui/toolbar.min.js index 2d0dfc1c35..f25f51b60f 100644 --- a/js/wn/ui/toolbar.min.js +++ b/js/wn/ui/toolbar.min.js @@ -24,7 +24,7 @@ wn.ui.toolbar.RecentDocs=Class.extend({init:function(){$('.navbar .nav:first').a Recent\ \ - ');this.setup();this.bind_events();},bind_events:function(){rename_observers.push(this);},rename_notify:function(dt,old,name){this.remove(dt,old);this.add(dt,name,1);},add:function(dt,dn,on_top){if(this.istable(dt))return;this.remove(dt,dn);var html=repl('
  • \ +
    • ');this.setup();this.bind_events();},bind_events:function(){var me=this;$(document).bind('rename',function(event,dt,old_name,new_name){me.rename_notify(dt,old_name,new_name)});},rename_notify:function(dt,old,name){this.remove(dt,old);this.add(dt,name,1);},add:function(dt,dn,on_top){if(this.istable(dt))return;this.remove(dt,dn);var html=repl('
  • \ \ %(dn)s (%(dt)s)\
    • ',{dt:dt,dn:dn});if(on_top){$('#toolbar-recent').prepend(html);}else{$('#toolbar-recent').append(html);}},istable:function(dt){return locals.DocType[dt]&&locals.DocType[dt].istable||false;},remove:function(dt,dn){$(repl('#toolbar-recent li[data-docref="%(dt)s/%(dn)s"]',{dt:dt,dn:dn})).remove();},setup:function(){try{var rlist=JSON.parse(profile.recent);} diff --git a/js/wn/ui/toolbar/recent.js b/js/wn/ui/toolbar/recent.js index c3592ffb32..08ce9d81ea 100644 --- a/js/wn/ui/toolbar/recent.js +++ b/js/wn/ui/toolbar/recent.js @@ -31,8 +31,12 @@ wn.ui.toolbar.RecentDocs = Class.extend({ this.setup(); this.bind_events(); }, - bind_events: function() { - rename_observers.push(this); + bind_events: function() { + // notify on rename + var me = this; + $(document).bind('rename', function(event, dt, old_name, new_name) { + me.rename_notify(dt, old_name, new_name) + }); }, rename_notify: function(dt, old, name) { this.remove(dt, old); diff --git a/js/wn/views/formview.js b/js/wn/views/formview.js index b06ac57d57..179a663682 100644 --- a/js/wn/views/formview.js +++ b/js/wn/views/formview.js @@ -4,6 +4,10 @@ wn.provide('wn.views.formview'); wn.views.formview = { show: function(dt, dn) { + // renamed (on save)? + if(wn.model.new_names[dn]) + dn = wn.model.new_names[dn]; + // show doctype wn.model.with_doctype(dt, function() { wn.model.with_doc(dt, dn, function(dn) { diff --git a/py/webnotes/utils/file_manager.py b/py/webnotes/utils/file_manager.py index 594f7ab162..4d806b2c4f 100644 --- a/py/webnotes/utils/file_manager.py +++ b/py/webnotes/utils/file_manager.py @@ -34,7 +34,7 @@ def upload(): if not webnotes.form['filedata'].filename: webnotes.response['result'] = """ """ % dt return @@ -53,7 +53,7 @@ def upload(): webnotes.response['result'] = """ """ % { 'dt': dt,