From 2154bc38fccc3f33a5826d8daadc84bd83f45841 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 28 Sep 2012 12:18:42 +0530 Subject: [PATCH] added shortcuts --- core/doctype/event/event.txt | 4 +- public/build.json | 1 + public/css/legacy/body.css | 46 ----------------- public/css/legacy/dialog.css | 4 +- public/css/ui/list.css | 2 +- public/css/ui/views.css | 67 +++++++++++++++++++------ public/js/legacy/widgets/form/fields.js | 2 + public/js/lib/jscolor/jscolor.js | 6 +-- public/js/lib/mousetrap.min.js | 8 +++ public/js/wn/ui/listing.js | 1 + public/js/wn/ui/search.js | 6 ++- public/js/wn/views/doclistview.js | 6 ++- 12 files changed, 82 insertions(+), 71 deletions(-) create mode 100644 public/js/lib/mousetrap.min.js diff --git a/core/doctype/event/event.txt b/core/doctype/event/event.txt index 34a186677f..18529c2ed0 100644 --- a/core/doctype/event/event.txt +++ b/core/doctype/event/event.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - u'creation': '2012-05-03 19:03:22', + u'creation': '2012-09-26 15:12:23', u'docstatus': 0, - u'modified': '2012-09-24 15:40:46', + u'modified': '2012-09-28 12:09:33', u'modified_by': u'Administrator', u'owner': u'Administrator' }, diff --git a/public/build.json b/public/build.json index 0c0a272c2e..f30119b261 100644 --- a/public/build.json +++ b/public/build.json @@ -119,6 +119,7 @@ "lib/public/js/lib/jquery/jquery.ui.autocomplete.js:concat", "lib/public/js/lib/tiny_mce_33/jquery.tinymce.js:concat", "lib/public/js/lib/bootstrap.min.js:concat", + "lib/public/js/lib/mousetrap.min.js", "lib/public/js/lib/sprintf.js", "public/js/core.min.js", "lib/public/js/legacy/globals.js", diff --git a/public/css/legacy/body.css b/public/css/legacy/body.css index 07addbd59c..0aa2fc045d 100644 --- a/public/css/legacy/body.css +++ b/public/css/legacy/body.css @@ -243,52 +243,6 @@ div.std-footer-item { border-radius: 5px; } -.layout_wrapper, .layout-wrapper { - -moz-box-shadow: 0px 0px 9px rgba(0,0,0,0.5); - -webkit-box-shadow: 0px 0px 9px rgba(0,0,0,0.5); - box-shadow: 0px 0px 9px rgba(0,0,0,0.5); - background-color: #fff; - padding: 15px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - overflow: hidden; -} - -.layout-wrapper-appframe { - padding: 0px; -} - -.layout-wrapper-background { - background-color: #fafafa !important; - padding: 0px; -} - -.layout-main { - padding: 15px; - background-color: #fff; -} - -.layout-main-section { - width: 71%; - float: left; - padding: 15px; - background-color: #FFF; - min-height: 600px; - -moz-box-shadow: 2px 0px 1px #ddd; - -webkit-box-shadow: 2px 0px 1px #ddd; - box-shadow: 2px 0px 1px #ddd; -} - -.layout-side-section { - width: 22%; - /*float: right;*/ - color: #606060; - overflow-x: hidden; - padding: 15px; - min-height: 600px; -} - /* from bootstrap */ .container { margin-left: auto; diff --git a/public/css/legacy/dialog.css b/public/css/legacy/dialog.css index e08b482b92..601223e13f 100644 --- a/public/css/legacy/dialog.css +++ b/public/css/legacy/dialog.css @@ -10,9 +10,9 @@ div.dialog_wrapper { -moz-box-shadow: 1px 1px 8px #444; -webkit-box-shadow: 1px 1px 8px #444; - border-radius: 5px; + /*border-radius: 5px; -moz-border-radius: 5px; - -webkit-border-radius: 5px; + -webkit-border-radius: 5px;*/ overflow: hidden; } diff --git a/public/css/ui/list.css b/public/css/ui/list.css index c880c8ce6f..1b3c4aedb0 100644 --- a/public/css/ui/list.css +++ b/public/css/ui/list.css @@ -15,7 +15,7 @@ /* list-row */ div.list-row { border-bottom: 1px solid #ddd; - padding: 5px 0px; + padding: 5px; } div.list-row .label { diff --git a/public/css/ui/views.css b/public/css/ui/views.css index af43efcd83..dcaaea3164 100644 --- a/public/css/ui/views.css +++ b/public/css/ui/views.css @@ -1,3 +1,48 @@ +.layout_wrapper, .layout-wrapper { + -moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); + -webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.9); + box-shadow: 0px 0px 3px rgba(0,0,0,0.9); + background-color: #fff; + padding: 15px; +/* -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; */ + overflow: hidden; +} + +.layout-wrapper-appframe { + padding: 0px; +} + +.layout-main { + padding: 15px; + background-color: #fff; +} + +.layout-wrapper-background { + background-color: #f2f2f2 !important; + padding: 0px; +} + +.layout-main-section { + width: 71%; + float: left; + padding: 15px; + background-color: #FFF; + min-height: 600px; + -moz-box-shadow: 1px 0px 1px #ccc; + -webkit-box-shadow: 1px 0px 1px #ccc; + box-shadow: 1px 0px 1px #ccc; +} + +.layout-side-section { + width: 22%; + /*float: right;*/ + color: #606060; + overflow-x: hidden; + padding: 15px; + min-height: 600px; +} .breadcrumb-area, .breadcrumb-area span { vertical-align: middle; @@ -5,22 +50,15 @@ div.appframe-titlebar { padding: 6px; - background: #eeeeee; /* Old browsers */ - background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ - background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */ - border-bottom: 1px solid #aaa; + background: #dfdfdf; /* Old browsers */ min-height: 1.2em; - border-radius: 5px 5px 0px 0px; + /*border-radius: 5px 5px 0px 0px; -webkit-border-radius: 5px 5px 0px 0px; - -moz-border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px;*/ - text-shadow: 0px 1px 1px #fff; + /*text-shadow: 0px 1px 1px #fff;*/ color: #555; + border-bottom: 1px solid #c2c2c2; } span.appframe-title { @@ -30,9 +68,8 @@ span.appframe-title { div.appframe-toolbar { padding: 4px; - background: #eeeeee; - border-top: 1px solid #f8f8f8; - border-bottom: 1px solid #ccc; + background: #e9e9e9; + border-bottom: 1px solid #c2c2c2; } div.appframe-toolbar .label { diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index 717f39a565..5c5e5c4cfa 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -208,6 +208,8 @@ Field.prototype.refresh_display = function() { if(this.disp_status=='Write') { // write if(this.make_input&&(!this.input)) { // make input if reqd this.make_input(); + if(this.txt || this.input) + $(this.txt || this.input).addClass("mousetrap"); if(this.onmake_input) this.onmake_input(); } diff --git a/public/js/lib/jscolor/jscolor.js b/public/js/lib/jscolor/jscolor.js index d497465874..8415310d8d 100644 --- a/public/js/lib/jscolor/jscolor.js +++ b/public/js/lib/jscolor/jscolor.js @@ -13,7 +13,7 @@ var jscolor = { - dir : 'js/lib/jscolor/', // location of jscolor directory (leave empty to autodetect) + dir : 'lib/js/lib/jscolor/', // location of jscolor directory (leave empty to autodetect) bindClass : 'color', // class name binding : true, // automatic binding via preloading : true, // use image preloading? @@ -36,8 +36,8 @@ var jscolor = { getDir : function() { if(!jscolor.dir) { - var detected = jscolor.detectDir(); - jscolor.dir = detected!==false ? detected : 'jscolor/'; + //var detected = jscolor.detectDir(); + jscolor.dir = "lib/js/lib/jscolor"; } return jscolor.dir; }, diff --git a/public/js/lib/mousetrap.min.js b/public/js/lib/mousetrap.min.js new file mode 100644 index 0000000000..e0c49b7e49 --- /dev/null +++ b/public/js/lib/mousetrap.min.js @@ -0,0 +1,8 @@ +/* mousetrap v1.1.3 craig.is/killing/mice */ +(function(){function p(a,c,b){if(a.addEventListener)return a.addEventListener(c,b,!1);a.attachEvent("on"+c,b)}function v(a){return"keypress"==a.type?String.fromCharCode(a.which):h[a.which]?h[a.which]:w[a.which]?w[a.which]:String.fromCharCode(a.which).toLowerCase()}function q(a){var a=a||{},c=!1,b;for(b in l)a[b]?c=!0:l[b]=0;c||(n=!1)}function x(a,c,b,d,E){var g,e,f=[],i=b.type;if(!k[a])return[];"keyup"==i&&r(a)&&(c=[a]);for(g=0;gd||h.hasOwnProperty(d)&&(o[h[d]]=d)}b=o[a]? +"keydown":"keypress"}"keypress"==b&&c.length&&(b="keydown");return b}function z(a,c,b,d,f){var a=a.replace(/\s+/g," "),g=a.split(" "),e,h,i=[];if(1":".","?":"/","|":"\\"},B={option:"alt",command:"meta","return":"enter",escape:"esc"},o,k={},j={},l={},A,u=!1,n=!1,f=1;20>f;++f)h[111+f]="f"+f;for(f=0;9>=f;++f)h[f+96]=f;p(document,"keypress",t);p(document,"keydown",t);p(document,"keyup",t);var D={bind:function(a,c,b){for(var d=a instanceof Array?a:[a],f=0;f' + $ln = $('' + data.name +'') .appendTo(parent) .click(function() { @@ -51,7 +51,11 @@ wn.ui.Search = Class.extend({ me.callback(val); else wn.set_route('Form', me.doctype, val); + return false; }); + if(this.data.length==1) { + $ln.click(); + } } }); this.list.filter_list.add_filter(this.doctype, 'name', 'like'); diff --git a/public/js/wn/views/doclistview.js b/public/js/wn/views/doclistview.js index 57d66a5437..654b5b97be 100644 --- a/public/js/wn/views/doclistview.js +++ b/public/js/wn/views/doclistview.js @@ -171,6 +171,10 @@ wn.views.DocListView = wn.ui.Listing.extend({ return no_result_message; }, render_row: function(row, data) { + $(row).css({ + "margin-left": "-15px", + "margin-right": "-15px" + }); data.doctype = this.doctype; this.listview.render(row, data, this); }, @@ -192,7 +196,7 @@ wn.views.DocListView = wn.ui.Listing.extend({ var me = this; if(this.can_delete) { this.add_button('Delete', function() { me.delete_items(); }, 'icon-remove'); - $('
\ + $('
\ Select all
').insertBefore(this.$page.find('.result-list')); this.$page.find('[name="select-all"]').click(function() { me.$page.find('.list-delete').attr('checked', $(this).attr('checked') || false);